- {$kpi}
-
-
-
-
-
-
-
- {l s='Customer information' d='Admin.Orderscustomers.Feature'}
- {if $customer->id} - {$customer->email} -- {if $customer->id_gender == 1} - - {elseif $customer->id_gender == 2} - - {else} - - {/if} - {$customer->firstname} {$customer->lastname}
-
-
- {else}
-
-
-
-
- {dateFormat date=$customer->date_add}
-
-
-
- {$customer_stats.nb_orders}
-
-
-
- {displayWtPriceWithCurrency price=$customer_stats.total_orders currency=$currency}
{l s='Guest not registered' d='Admin.Orderscustomers.Feature'}
- {/if} -
-
-
-
- {l s='Order information' d='Admin.Orderscustomers.Feature'}
- {if $order->id} -{l s='Order #%d' sprintf=[$order->id|string_format:"%06d"] d='Admin.Orderscustomers.Feature'}
- {l s='Made on:' d='Admin.Orderscustomers.Feature'} {dateFormat date=$order->date_add} - {else} -{l s='No order was created from this cart.' d='Admin.Orderscustomers.Feature'}
- {if $customer->id} - - {l s='Create an order from this cart.' d='Admin.Orderscustomers.Feature'} - - {/if} - {/if} -
-
-
-
-{/block}
diff --git a/admin-dev/themes/default/template/controllers/feature_value/helpers/index.php b/admin-dev/themes/default/template/controllers/feature_value/helpers/index.php
deleted file mode 100644
index b459cc3ae5750..0000000000000
--- a/admin-dev/themes/default/template/controllers/feature_value/helpers/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../../../../../../../');
-exit;
diff --git a/admin-dev/themes/default/template/controllers/features/helpers/form/index.php b/admin-dev/themes/default/template/controllers/features/helpers/form/index.php
deleted file mode 100644
index 3de54df1f73e7..0000000000000
--- a/admin-dev/themes/default/template/controllers/features/helpers/form/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../../../../../../../../');
-exit;
diff --git a/admin-dev/themes/default/template/controllers/features/helpers/index.php b/admin-dev/themes/default/template/controllers/features/helpers/index.php
deleted file mode 100644
index b459cc3ae5750..0000000000000
--- a/admin-dev/themes/default/template/controllers/features/helpers/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../../../../../../../');
-exit;
diff --git a/admin-dev/themes/default/template/controllers/features/index.php b/admin-dev/themes/default/template/controllers/features/index.php
deleted file mode 100644
index 6c011614e2845..0000000000000
--- a/admin-dev/themes/default/template/controllers/features/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../../../../../../');
-exit;
diff --git a/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
index 6bca9f03f123a..b78e726089712 100644
--- a/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
@@ -155,7 +155,7 @@ $(function() {
{l s='Cart summary' d='Admin.Orderscustomers.Feature'}
-
-
-
-
-
- {if $discounts}
- | - | {l s='Product' d='Admin.Global'} | -{l s='Unit price' d='Admin.Global'} | -{l s='Quantity' d='Admin.Global'} | -{l s='Stock' d='Admin.Global'} | -{l s='Total' d='Admin.Global'} | -
|---|---|---|---|---|---|
| {$product.image} | -
-
- {$product.name}{if isset($product.attributes)} {$product.attributes}{/if} - {if $product.reference}{l s='Ref:' d='Admin.Orderscustomers.Feature'} {$product.reference}{/if} - {if $product.reference && $product.supplier_reference} / {$product.supplier_reference}{/if} - - |
- {displayWtPriceWithCurrency price=$product.product_price currency=$currency} | -{$product.cart_quantity} | -{$product.qty_in_stock} | -{displayWtPriceWithCurrency price=$product.product_total currency=$currency} | -
- {foreach from=$customization.datas key='type' item='datas'}
- {if $type == constant('Product::CUSTOMIZE_FILE')}
-
- {foreach from=$datas key='index' item='data'}
-
- {/if}
- {/foreach}
-
- {if $data.name}{$data.name}{else}{l s='Text #' d='Admin.Orderscustomers.Feature'}{$index}{/if}
-
- {/foreach}
-
-
- {$data.value} - |
- - | - | - | - | |
| {l s='Total cost of products:' d='Admin.Orderscustomers.Feature'} | -{displayWtPriceWithCurrency price=$total_products currency=$currency} | -||||
| {l s='Total value of vouchers:' d='Admin.Orderscustomers.Feature'} | -{displayWtPriceWithCurrency price=$total_discounts currency=$currency} | -||||
| {l s='Total cost of gift wrapping:' d='Admin.Orderscustomers.Feature'} | -{displayWtPriceWithCurrency price=$total_wrapping currency=$currency} | -||||
| {l s='Total shipping costs:' d='Admin.Orderscustomers.Feature'} | -{displayWtPriceWithCurrency price=$total_shipping currency=$currency} | -||||
| {l s='Total' d='Admin.Global'} | -{displayWtPriceWithCurrency price=$total_price currency=$currency} | -||||
-
-
-
-
- {/if}
-  |
- {l s='Discount name'} | -{l s='Value' d='Admin.Global'} | -
|---|---|---|
| {$discount.id_discount} | -{$discount.name} | -{if (float)$discount.value_real == 0 && (int)$discount.free_shipping == 1}{l s='Free shipping' d='Admin.Shipping.Feature'}{else}- {displayWtPriceWithCurrency price=$discount.value_real currency=$currency}{/if} | -
- {l s='For this particular customer group, prices are displayed as:' d='Admin.Orderscustomers.Notification'} {if $tax_calculation_method == $smarty.const.PS_TAX_EXC}{l s='Tax excluded' d='Admin.Global'}{else}{l s='Tax included' d='Admin.Global'}{/if}
-
-
- {/if}
- {$smarty.block.parent}
-{/block}
-
-{block name="input"}
- {if $input.type == "select_template"}
-
- {/if}
-{/block}
-
-{block name="script"}
- $(function() {
- $('#send_email_on').on('click', function() {
- $('#tpl').slideToggle();
- });
- });
-{/block}
diff --git a/admin-dev/themes/default/template/controllers/statuses/helpers/form/index.php b/admin-dev/themes/default/template/controllers/statuses/helpers/form/index.php
deleted file mode 100644
index 3de54df1f73e7..0000000000000
--- a/admin-dev/themes/default/template/controllers/statuses/helpers/form/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../../../../../../../../');
-exit;
diff --git a/admin-dev/themes/default/template/controllers/statuses/helpers/index.php b/admin-dev/themes/default/template/controllers/statuses/helpers/index.php
deleted file mode 100644
index b459cc3ae5750..0000000000000
--- a/admin-dev/themes/default/template/controllers/statuses/helpers/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
-
-header('Location: ../../../../../../../');
-exit;
diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index ca246c4a5aacb..05fb1db57b1b1 100644
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -238,7 +238,7 @@
{if isset($maintenance_mode) && $maintenance_mode == true}
{capture name="title"}
-
-
-
- {else}
- {$smarty.block.parent}
- {/if}
-{/block}
-
-{block name="field"}
- {$smarty.block.parent}
- {if $input.type == "select_template"}
-
- {foreach $languages as $language}
- {assign var='value_text' value=$fields_value[$input.name][$language.id_lang]}
-
-
-
-
- {/foreach}
- {if isset($input.hint)}
-
-
-
-
-
-
-
-
-
-
- {/if}
-
- {if is_array($input.hint)}
- {foreach from=$input.hint item=hint}
- {$hint}
- {/foreach} - {else} - {$input.hint} - {/if} -
- - {/foreach} - {else} - {$input.hint} - {/if} -
+
{l s='Your store is in maintenance mode.' d='Admin.Navigation.Notification'}
@@ -391,7 +391,7 @@ {foreach from=$displayBackOfficeEmployeeMenu item=$menuItem} {assign var=menuItemProperties value=$menuItem->getProperties()}
{
+ generatorButtons.forEach((btn: Element): void => {
+ btn.addEventListener('click', (event: Event): void => {
const {attributes} = event.currentTarget;
const targetInputId = attributes.getNamedItem('data-target-input-id')
@@ -75,7 +75,7 @@ export default class GeneratableInput {
targetInput.value = this.generateValue(generatedValueLength);
targetInput.dispatchEvent(new CustomEvent('change', {bubbles: true}));
});
- }
+ });
}
/**
diff --git a/admin-dev/themes/new-theme/js/components/grid/extension/bulk-action-checkbox-extension.ts b/admin-dev/themes/new-theme/js/components/grid/extension/bulk-action-checkbox-extension.ts
index 0fa5b3e5d5cca..4ff5244246806 100644
--- a/admin-dev/themes/new-theme/js/components/grid/extension/bulk-action-checkbox-extension.ts
+++ b/admin-dev/themes/new-theme/js/components/grid/extension/bulk-action-checkbox-extension.ts
@@ -38,10 +38,26 @@ export default class BulkActionCheckboxExtension {
* @param {Grid} grid
*/
extend(grid: Grid): void {
+ this.handleBulkActionCheckboxStatus(grid);
this.handleBulkActionCheckboxSelect(grid);
this.handleBulkActionSelectAllCheckbox(grid);
}
+ /**
+ * Disable/Enable "Select all" button in the grid
+ *
+ * @param {Grid} grid
+ *
+ * @private
+ */
+ private handleBulkActionCheckboxStatus(grid: Grid) {
+ const gridBulkActionSelectAll = grid.getContainer().find(GridMap.bulks.actionSelectAll);
+ gridBulkActionSelectAll.prop(
+ 'disabled',
+ grid.getContainer().find(GridMap.bulks.bulkActionCheckbox).length === 0,
+ );
+ }
+
/**
* Handles "Select all" button in the grid
*
diff --git a/admin-dev/themes/new-theme/js/components/grid/extension/position-extension.ts b/admin-dev/themes/new-theme/js/components/grid/extension/position-extension.ts
index 6cd8a781f8110..cfe3e5db7ec1d 100644
--- a/admin-dev/themes/new-theme/js/components/grid/extension/position-extension.ts
+++ b/admin-dev/themes/new-theme/js/components/grid/extension/position-extension.ts
@@ -85,6 +85,9 @@ export default class PositionExtension {
.removeClass('hover');
},
);
+
+ this.setReorderButtonLabel();
+ this.getReorderButton().on('click', (event) => this.oncClickReorderButton(event));
}
/**
@@ -258,4 +261,65 @@ export default class PositionExtension {
return mapping;
}
+
+ /**
+ * Check if position reorder is active
+ *
+ * @private
+ */
+ private isPositionsReorderActive(): boolean {
+ return this.grid.getContainer()
+ .find('.ps-sortable-column[data-sort-col-name="position"]')
+ .first()
+ .data('sort-is-current');
+ }
+
+ /**
+ * Get reorder button
+ *
+ * @private
+ */
+ private getReorderButton(): JQuery {
+ return this.grid
+ .getContainer()
+ .find('.js-btn-reorder-positions')
+ .first();
+ }
+
+ /**
+ * Set reorder button label in function of sortable column state.
+ *
+ * @private
+ */
+ private setReorderButtonLabel(): void {
+ const rearrangeButton = this.getReorderButton();
+ const label = this.isPositionsReorderActive()
+ ? rearrangeButton.data('label-save')
+ : rearrangeButton.data('label-reorder');
+ rearrangeButton.html(label);
+ }
+
+ /**
+ * Onclick reorder button
+ *
+ * @param event
+ * @private
+ */
+ private oncClickReorderButton(event: JQuery.Event): void {
+ event.preventDefault();
+ // If positions are actually being reordered...
+ if (this.isPositionsReorderActive()) {
+ // we need to reset filters and order by of the grid
+ this.grid.getContainer()
+ .find('.ps-sortable-column')
+ .first()
+ .click();
+ } else {
+ // Else, we need to set the position column as the current sort ordering
+ this.grid.getContainer()
+ .find('.ps-sortable-column[data-sort-col-name="position"]')
+ .first()
+ .click();
+ }
+ }
}
diff --git a/admin-dev/themes/new-theme/js/components/module-card.ts b/admin-dev/themes/new-theme/js/components/module-card.ts
index 02214c4e9df8c..33fbdef534912 100644
--- a/admin-dev/themes/new-theme/js/components/module-card.ts
+++ b/admin-dev/themes/new-theme/js/components/module-card.ts
@@ -388,12 +388,19 @@ export default class ModuleCard {
const alteredSelector = this.moduleItemListSelector.replace('.', '');
let mainElement = null;
- if (action === 'uninstall') {
+ if (action === 'delete' && !result[moduleTechName].has_download_url) {
+ mainElement = jqElementObj.closest(`.${alteredSelector}`);
+ this.eventEmitter.emit('Module Delete', mainElement);
+ } else if (action === 'uninstall') {
mainElement = jqElementObj.closest(`.${alteredSelector}`);
mainElement.attr('data-installed', '0');
mainElement.attr('data-active', '0');
- this.eventEmitter.emit('Module Uninstalled', mainElement);
+ if ((forceDeletion === 'true' || forceDeletion === true) && !result[moduleTechName].has_download_url) {
+ this.eventEmitter.emit('Module Delete', mainElement);
+ } else {
+ this.eventEmitter.emit('Module Uninstalled', mainElement);
+ }
} else if (action === 'disable') {
mainElement = jqElementObj.closest(`.${alteredSelector}`);
mainElement.addClass(`${alteredSelector}-isNotActive`);
@@ -417,7 +424,7 @@ export default class ModuleCard {
mainElement = jqElementObj.closest(`.${alteredSelector}`);
this.eventEmitter.emit('Module Upgraded', mainElement);
- };
+ }
// Since we replace the DOM content
// we need to update the jquery object reference to target the new content,
diff --git a/admin-dev/themes/new-theme/js/components/translatable-input.ts b/admin-dev/themes/new-theme/js/components/translatable-input.ts
index 5678f1b82760b..2fd760ac84ebc 100644
--- a/admin-dev/themes/new-theme/js/components/translatable-input.ts
+++ b/admin-dev/themes/new-theme/js/components/translatable-input.ts
@@ -100,7 +100,7 @@ class TranslatableInput {
const localeButton = form.find(this.localeButtonSelector);
const changeLanguageUrl = localeButton.data('change-language-url');
- localeButton.text(this.selectedLocale);
+ localeButton.text(this.selectedLocale.toUpperCase());
form.find(this.localeInputSelector).addClass('d-none');
form
.find(`${this.localeInputSelector}.js-locale-${this.selectedLocale}`)
diff --git a/admin-dev/themes/new-theme/js/nav_bar.ts b/admin-dev/themes/new-theme/js/nav_bar.ts
index e636cef2c1d2a..aefb8c857535a 100644
--- a/admin-dev/themes/new-theme/js/nav_bar.ts
+++ b/admin-dev/themes/new-theme/js/nav_bar.ts
@@ -290,7 +290,6 @@ export default class NavBar {
.removeClass('collapse')
.addClass('submenu');
$('.shop-list-title').remove();
- $('.js-non-responsive').hide();
$('.mobile-layer')
.addClass('d-none')
.removeClass('expanded');
diff --git a/admin-dev/themes/default/template/controllers/features/helpers/form/form.tpl b/admin-dev/themes/new-theme/js/pages/attribute-group/form/attribute-group-form-map.ts
similarity index 84%
rename from admin-dev/themes/default/template/controllers/features/helpers/form/form.tpl
rename to admin-dev/themes/new-theme/js/pages/attribute-group/form/attribute-group-form-map.ts
index f2d63f0ecc9a4..d01e19912d1db 100644
--- a/admin-dev/themes/default/template/controllers/features/helpers/form/form.tpl
+++ b/admin-dev/themes/new-theme/js/pages/attribute-group/form/attribute-group-form-map.ts
@@ -1,4 +1,4 @@
-{**
+/**
* Copyright since 2007 PrestaShop SA and Contributors
* PrestaShop is an International Registered Trademark & Property of PrestaShop SA
*
@@ -21,12 +21,11 @@
* @author PrestaShop SA and Contributors
* @copyright Since 2007 PrestaShop SA and Contributors
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- *}
-{extends file="helpers/form/form.tpl"}
+ */
-{block name="input_row"}
- {$smarty.block.parent}
- {if $input.name == 'name'}
- {hook h="displayFeatureForm" id_feature=$form_id}
- {/if}
-{/block}
+/**
+ * Defines all selectors that are used in customers address add/edit form.
+ */
+export default {
+ attributeGroupShopAssociationInput: '#attribute_group_shop_association',
+};
diff --git a/admin-dev/themes/default/template/controllers/carts/index.php b/admin-dev/themes/new-theme/js/pages/attribute-group/form/index.ts
similarity index 74%
rename from admin-dev/themes/default/template/controllers/carts/index.php
rename to admin-dev/themes/new-theme/js/pages/attribute-group/form/index.ts
index 6c011614e2845..cc33062c5bc3c 100644
--- a/admin-dev/themes/default/template/controllers/carts/index.php
+++ b/admin-dev/themes/new-theme/js/pages/attribute-group/form/index.ts
@@ -1,4 +1,3 @@
- {
+ window.prestashop.component.initComponents(
+ [
+ 'TranslatableInput',
+ 'TranslatableField',
+ ],
+ );
+
+ new window.prestashop.component.ChoiceTree(AttributeGroupFormMap.attributeGroupShopAssociationInput).enableAutoCheckChildren();
+});
diff --git a/admin-dev/themes/new-theme/js/pages/authorization-server/index.ts b/admin-dev/themes/new-theme/js/pages/authorization-server/index.ts
index 67dbfe517d86b..1062a365d0025 100644
--- a/admin-dev/themes/new-theme/js/pages/authorization-server/index.ts
+++ b/admin-dev/themes/new-theme/js/pages/authorization-server/index.ts
@@ -31,11 +31,12 @@ import SortingExtension from '@components/grid/extension/sorting-extension';
import SubmitGridActionExtension from '@components/grid/extension/submit-grid-action-extension';
import FiltersSubmitButtonEnablerExtension
from '@components/grid/extension/filters-submit-button-enabler-extension';
+import SubmitRowActionExtension from '@components/grid/extension/action/row/submit-row-action-extension';
const {$} = window;
$(() => {
- const grid = new Grid('authorization_server');
+ const grid = new Grid('authorized_application');
grid.addExtension(new ReloadListActionExtension());
grid.addExtension(new ExportToSqlManagerExtension());
@@ -43,4 +44,5 @@ $(() => {
grid.addExtension(new SortingExtension());
grid.addExtension(new SubmitGridActionExtension());
grid.addExtension(new FiltersSubmitButtonEnablerExtension());
+ grid.addExtension(new SubmitRowActionExtension());
});
diff --git a/admin-dev/themes/default/template/controllers/feature_value/helpers/form/form.tpl b/admin-dev/themes/new-theme/js/pages/feature/feature-value/form.ts
similarity index 82%
rename from admin-dev/themes/default/template/controllers/feature_value/helpers/form/form.tpl
rename to admin-dev/themes/new-theme/js/pages/feature/feature-value/form.ts
index a302f20a18bd9..2e36830fa28e2 100644
--- a/admin-dev/themes/default/template/controllers/feature_value/helpers/form/form.tpl
+++ b/admin-dev/themes/new-theme/js/pages/feature/feature-value/form.ts
@@ -1,4 +1,4 @@
-{**
+/**
* Copyright since 2007 PrestaShop SA and Contributors
* PrestaShop is an International Registered Trademark & Property of PrestaShop SA
*
@@ -21,12 +21,10 @@
* @author PrestaShop SA and Contributors
* @copyright Since 2007 PrestaShop SA and Contributors
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- *}
-{extends file="helpers/form/form.tpl"}
+ */
-{block name="input_row"}
- {$smarty.block.parent}
- {if $input.name == 'value'}
- {hook h="displayFeatureValueForm" id_feature_value=$feature_value->id|intval}
- {/if}
-{/block}
+import TranslatableInput from '@components/translatable-input';
+
+$(() => {
+ new TranslatableInput();
+});
diff --git a/admin-dev/themes/new-theme/js/pages/feature/feature-value/index.ts b/admin-dev/themes/new-theme/js/pages/feature/feature-value/index.ts
new file mode 100644
index 0000000000000..b8876ea7d941d
--- /dev/null
+++ b/admin-dev/themes/new-theme/js/pages/feature/feature-value/index.ts
@@ -0,0 +1,49 @@
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author PrestaShop SA and Contributors
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+import ExportToSqlManagerExtension from '@components/grid/extension/export-to-sql-manager-extension';
+import FiltersResetExtension from '@components/grid/extension/filters-reset-extension';
+import FiltersSubmitButtonEnablerExtension from '@components/grid/extension/filters-submit-button-enabler-extension';
+import Grid from '@components/grid/grid';
+import ReloadListActionExtension from '@components/grid/extension/reload-list-extension';
+import SortingExtension from '@components/grid/extension/sorting-extension';
+import SubmitRowActionExtension from '@components/grid/extension/action/row/submit-row-action-extension';
+import SubmitBulkExtension from '@components/grid/extension/submit-bulk-action-extension';
+import BulkActionCheckboxExtension from '@components/grid/extension/bulk-action-checkbox-extension';
+
+const {$} = window;
+
+$(() => {
+ const grid = new Grid('feature_value');
+
+ grid.addExtension(new ExportToSqlManagerExtension());
+ grid.addExtension(new FiltersResetExtension());
+ grid.addExtension(new FiltersSubmitButtonEnablerExtension());
+ grid.addExtension(new ReloadListActionExtension());
+ grid.addExtension(new SortingExtension());
+ grid.addExtension(new SubmitRowActionExtension());
+ grid.addExtension(new SubmitBulkExtension());
+ grid.addExtension(new BulkActionCheckboxExtension());
+});
diff --git a/admin-dev/themes/new-theme/js/pages/module/controller.js b/admin-dev/themes/new-theme/js/pages/module/controller.js
index 04d769d2323ab..795c5bfe17e76 100644
--- a/admin-dev/themes/new-theme/js/pages/module/controller.js
+++ b/admin-dev/themes/new-theme/js/pages/module/controller.js
@@ -197,6 +197,7 @@ class AdminModuleController {
this.eventEmitter.on('Module Enabled', (context) => this.onModuleDisabled(context));
this.eventEmitter.on('Module Disabled', (context) => this.onModuleDisabled(context));
this.eventEmitter.on('Module Uninstalled', (context) => this.installHandler(context));
+ this.eventEmitter.on('Module Delete', (context) => this.onModuleDelete(context));
this.eventEmitter.on('Module Installed', (context) => this.installHandler(context));
}
@@ -205,11 +206,17 @@ class AdminModuleController {
this.updateModuleVisibility();
}
+ /**
+ * Updates the modulesList object
+ *
+ * @param event a DOM element that contains module data such as id, name, version...
+ */
updateModuleStatus(event) {
this.modulesList = this.modulesList.map((module) => {
const moduleElement = $(event);
- if (moduleElement.data('tech-name') === module.techName) {
+ if ((moduleElement.data('tech-name') === module.techName)
+ && (moduleElement.data('version') !== undefined)) {
const newModule = {
domObject: moduleElement,
id: moduleElement.data('id'),
@@ -246,6 +253,77 @@ class AdminModuleController {
});
}
+ onModuleDelete(event) {
+ this.modulesList = this.modulesList.filter((value) => value.techName !== $(event).data('tech-name'));
+ this.installHandler(event);
+ }
+
+ initPlaceholderMechanism() {
+ const self = this;
+
+ if ($(self.placeholderGlobalSelector).length) {
+ self.ajaxLoadPage();
+ }
+
+ // Retry loading mechanism
+ $('body').on('click', self.placeholderFailureRetryBtnSelector, () => {
+ $(self.placeholderFailureGlobalSelector).fadeOut();
+ $(self.placeholderGlobalSelector).fadeIn();
+ self.ajaxLoadPage();
+ });
+ }
+
+ ajaxLoadPage() {
+ const self = this;
+
+ $.ajax({
+ method: 'GET',
+ url: window.moduleURLs.catalogRefresh,
+ })
+ .done((response) => {
+ if (response.status === true) {
+ if (typeof response.domElements === 'undefined') response.domElements = null;
+ if (typeof response.msg === 'undefined') response.msg = null;
+
+ const stylesheet = document.styleSheets[0];
+ const stylesheetRule = '{display: none}';
+ const moduleGlobalSelector = '.modules-list';
+ const moduleSortingSelector = '.module-sorting-menu';
+ const requiredSelectorCombination = `${moduleGlobalSelector},${moduleSortingSelector}`;
+
+ if (stylesheet.insertRule) {
+ stylesheet.insertRule(requiredSelectorCombination + stylesheetRule, stylesheet.cssRules.length);
+ } else if (stylesheet.addRule) {
+ stylesheet.addRule(requiredSelectorCombination, stylesheetRule, -1);
+ }
+
+ $(self.placeholderGlobalSelector).fadeOut(800, () => {
+ $.each(response.domElements, (index, element) => {
+ $(element.selector).append(element.content);
+ });
+ $(moduleGlobalSelector)
+ .fadeIn(800)
+ .css('display', 'flex');
+ $(moduleSortingSelector).fadeIn(800);
+ $('[data-toggle="popover"]').popover();
+ self.initCurrentDisplay();
+ self.fetchModulesList();
+ });
+ } else {
+ $(self.placeholderGlobalSelector).fadeOut(800, () => {
+ $(self.placeholderFailureMsgSelector).text(response.msg);
+ $(self.placeholderFailureGlobalSelector).fadeIn(800);
+ });
+ }
+ })
+ .fail((response) => {
+ $(self.placeholderGlobalSelector).fadeOut(800, () => {
+ $(self.placeholderFailureMsgSelector).text(response.statusText);
+ $(self.placeholderFailureGlobalSelector).fadeIn(800);
+ });
+ });
+ }
+
fetchModulesList() {
const self = this;
let container;
diff --git a/admin-dev/themes/new-theme/js/pages/order-states/index.ts b/admin-dev/themes/new-theme/js/pages/order-states/index.ts
index 8a403d543d75f..2ffdf47668fbb 100644
--- a/admin-dev/themes/new-theme/js/pages/order-states/index.ts
+++ b/admin-dev/themes/new-theme/js/pages/order-states/index.ts
@@ -32,6 +32,8 @@ import ColumnTogglingExtension from '@components/grid/extension/column-toggling-
import SubmitBulkActionExtension from '@components/grid/extension/submit-bulk-action-extension';
import BulkActionCheckboxExtension from '@components/grid/extension/bulk-action-checkbox-extension';
import SubmitRowActionExtension from '@components/grid/extension/action/row/submit-row-action-extension';
+import SubmitGridExtension from '@components/grid/extension/submit-grid-action-extension';
+import FiltersSubmitButtonEnablerExtension from '@components/grid/extension/filters-submit-button-enabler-extension';
const {$} = window;
@@ -39,10 +41,12 @@ $(() => {
const orderStatesGrid = new Grid('order_states');
orderStatesGrid.addExtension(new FiltersResetExtension());
+ orderStatesGrid.addExtension(new FiltersSubmitButtonEnablerExtension());
orderStatesGrid.addExtension(new SortingExtension());
orderStatesGrid.addExtension(new ExportToSqlManagerExtension());
orderStatesGrid.addExtension(new ReloadListActionExtension());
orderStatesGrid.addExtension(new BulkActionCheckboxExtension());
+ orderStatesGrid.addExtension(new SubmitGridExtension());
orderStatesGrid.addExtension(new SubmitBulkActionExtension());
orderStatesGrid.addExtension(new SubmitRowActionExtension());
orderStatesGrid.addExtension(new ColumnTogglingExtension());
@@ -50,10 +54,12 @@ $(() => {
const orderReturnStatusesGrid = new Grid('order_return_states');
orderReturnStatusesGrid.addExtension(new FiltersResetExtension());
+ orderReturnStatusesGrid.addExtension(new FiltersSubmitButtonEnablerExtension());
orderReturnStatusesGrid.addExtension(new SortingExtension());
orderReturnStatusesGrid.addExtension(new ExportToSqlManagerExtension());
orderReturnStatusesGrid.addExtension(new ReloadListActionExtension());
orderReturnStatusesGrid.addExtension(new BulkActionCheckboxExtension());
+ orderReturnStatusesGrid.addExtension(new SubmitGridExtension());
orderReturnStatusesGrid.addExtension(new SubmitBulkActionExtension());
orderReturnStatusesGrid.addExtension(new SubmitRowActionExtension());
});
diff --git a/admin-dev/themes/new-theme/js/pages/order/create/create-order-page.ts b/admin-dev/themes/new-theme/js/pages/order/create/create-order-page.ts
index 0ad971c7d73d4..4840654dafda6 100644
--- a/admin-dev/themes/new-theme/js/pages/order/create/create-order-page.ts
+++ b/admin-dev/themes/new-theme/js/pages/order/create/create-order-page.ts
@@ -84,6 +84,7 @@ export interface CartShipping {
giftMessage: string;
recycledPackaging: boolean;
selectedCarrierId: number | null | string;
+ virtual: boolean;
}
export interface CartSummary {
@@ -732,6 +733,9 @@ export default class CreateOrderPage {
$(createOrderMap.cartBlock).removeClass('d-none');
$(createOrderMap.cartBlock).data('cartId', cartInfo.cartId);
+ if (cartInfo.shipping?.virtual) {
+ $(createOrderMap.shippingBlock).addClass('d-none');
+ }
}
/**
diff --git a/admin-dev/themes/new-theme/js/pages/performance-preferences/index.ts b/admin-dev/themes/new-theme/js/pages/performance-preferences/index.ts
index 0bdde9994a2af..7d88aea6149fa 100644
--- a/admin-dev/themes/new-theme/js/pages/performance-preferences/index.ts
+++ b/admin-dev/themes/new-theme/js/pages/performance-preferences/index.ts
@@ -25,6 +25,7 @@
import ConfirmModal from '@components/modal/confirm-modal';
import PerformancePreferencesPageMap from '@pages/performance-preferences/PerformancePreferencesPageMap';
+import GeneratableInput from '@components/generatable-input';
const {$} = window;
@@ -47,4 +48,8 @@ $(() => {
modal.show();
});
+
+ // Initialize cookie name and value generatable inputs
+ const generatableInput = new GeneratableInput();
+ generatableInput.attachOn('.js-generator-btn');
});
diff --git a/admin-dev/themes/new-theme/js/pages/product/create/create-product-modal.ts b/admin-dev/themes/new-theme/js/pages/product/create/create-product-modal.ts
index 564a952c26456..83311be3683c7 100644
--- a/admin-dev/themes/new-theme/js/pages/product/create/create-product-modal.ts
+++ b/admin-dev/themes/new-theme/js/pages/product/create/create-product-modal.ts
@@ -73,7 +73,13 @@ export default class CreateProductModal {
}
if (dataAttributes.productId) {
- const editUrl = this.router.generate('admin_products_edit', {productId: dataAttributes.productId});
+ // The parameter forceDefaultActive must be passed down in the redirect URL or it will be ignored, it was passed via data attributes
+ // for this purpose only
+ const editUrl = this.router.generate('admin_products_edit', {
+ productId: dataAttributes.productId,
+ forceDefaultActive: dataAttributes.forceDefaultActive ? 1 : 0,
+ });
+
// Keep showing loading until the page is refreshed
iframeModal.showLoading();
window.location.href = editUrl;
diff --git a/admin-dev/themes/new-theme/js/pages/product/edit/index.ts b/admin-dev/themes/new-theme/js/pages/product/edit/index.ts
index 1f1b165c39c26..d18b076acfc15 100644
--- a/admin-dev/themes/new-theme/js/pages/product/edit/index.ts
+++ b/admin-dev/themes/new-theme/js/pages/product/edit/index.ts
@@ -121,7 +121,10 @@ $(() => {
// From here we init component specific to edition
initDropzone(ProductMap.dropzoneImagesContainer);
initImagesShopAssociation(ProductMap.manageShopImagesButtonContainer, shopId);
- initCarrierSelector(ProductMap.shipping.carrierSelectorContainer, eventEmitter);
+
+ if (productType !== ProductConst.PRODUCT_TYPE.VIRTUAL) {
+ initCarrierSelector(ProductMap.shipping.carrierSelectorContainer, eventEmitter);
+ }
new FeatureValuesManager(eventEmitter);
new CustomizationsManager();
diff --git a/admin-dev/themes/new-theme/js/pages/product/edit/manager/attachments-manager.ts b/admin-dev/themes/new-theme/js/pages/product/edit/manager/attachments-manager.ts
index 65660d9a54785..66b07cc993a72 100644
--- a/admin-dev/themes/new-theme/js/pages/product/edit/manager/attachments-manager.ts
+++ b/admin-dev/themes/new-theme/js/pages/product/edit/manager/attachments-manager.ts
@@ -68,7 +68,7 @@ export default class AttachmentsManager {
id: 'modal-create-product-attachment',
modalTitle: this.$addAttachmentBtn.data('modalTitle'),
formSelector: 'form[name="attachment"]',
- formUrl: $(event.target).prop('href'),
+ formUrl: $(event.currentTarget).prop('href'),
closable: true,
onFormLoaded: (form: HTMLElement, formData: FormData, dataAttributes: DOMStringMap | null): void => {
if (dataAttributes && dataAttributes.attachmentId) {
diff --git a/admin-dev/themes/new-theme/js/pages/product/edit/manager/product-seo-manager.ts b/admin-dev/themes/new-theme/js/pages/product/edit/manager/product-seo-manager.ts
index 76fa1aea372fc..09b0d92ad1e99 100644
--- a/admin-dev/themes/new-theme/js/pages/product/edit/manager/product-seo-manager.ts
+++ b/admin-dev/themes/new-theme/js/pages/product/edit/manager/product-seo-manager.ts
@@ -90,8 +90,43 @@ export default class ProductSEOManager {
},
});
+ // On reset button click we regenerate the friendly url for currently selected locale
const resetLinkRewriteBtn = document.querySelector(ProductMap.seo.resetLinkRewriteBtn)!;
resetLinkRewriteBtn.addEventListener('click', () => this.resetLinkRewrite());
+
+ // Disable or enable reset button depending on the name input value at init, on language change and on keyup inputs (on name and url inputs)
+ this.linkRewriteStateRefresh();
+ this.eventEmitter.on('languageSelected', () => this.linkRewriteStateRefresh());
+ this.initCallbackOnInputChange(ProductMap.productLocalizedNameInput, () => this.linkRewriteStateRefresh());
+ this.initCallbackOnInputChange(ProductMap.productLocalizedLinkRewriteInput, () => this.linkRewriteStateRefresh());
+
+ if (resetLinkRewriteBtn.dataset.automaticChange === '1') {
+ this.initCallbackOnInputChange(ProductMap.productLocalizedNameInput, () => this.resetAllLinkRewrites());
+ }
+ }
+
+ private initCallbackOnInputChange(inputSelector: string, callback: EventListenerOrEventListenerObject): void {
+ const inputs = document.querySelectorAll(inputSelector);
+
+ if (inputs) {
+ for (let i = 0; i < inputs.length; i += 1) {
+ inputs[i].addEventListener('keyup', callback);
+ }
+ }
+ }
+
+ private linkRewriteStateRefresh(): void {
+ const resetLinkRewriteBtn = document.querySelector(ProductMap.seo.resetLinkRewriteBtn)!;
+ // eslint-disable-next-line max-len
+ const nameInput = document.querySelector(`${this.translatableInput.localeInputSelector}:not(.d-none) ${ProductMap.productLocalizedNameInput}`);
+ // eslint-disable-next-line max-len
+ const linkRewriteInput = document.querySelector(`${this.translatableInput.localeInputSelector}:not(.d-none) ${ProductMap.productLocalizedLinkRewriteInput}`);
+
+ if (!nameInput || !linkRewriteInput || !resetLinkRewriteBtn) {
+ return;
+ }
+
+ resetLinkRewriteBtn.disabled = linkRewriteInput.value === window.str2url(nameInput.value);
}
private resetLinkRewrite(): void {
@@ -99,8 +134,9 @@ export default class ProductSEOManager {
const nameInput = document.querySelector(`${this.translatableInput.localeInputSelector}:not(.d-none) ${ProductMap.productLocalizedNameInput}`);
// eslint-disable-next-line max-len
const linkRewriteInput = document.querySelector(`${this.translatableInput.localeInputSelector}:not(.d-none) ${ProductMap.productLocalizedLinkRewriteInput}`);
+ const resetLinkRewriteBtn = document.querySelector(ProductMap.seo.resetLinkRewriteBtn)!;
- if (!nameInput || !linkRewriteInput) {
+ if (!nameInput || !linkRewriteInput || !resetLinkRewriteBtn) {
console.error('Couldn\'t find product name or link rewrite input');
return;
}
@@ -111,7 +147,32 @@ export default class ProductSEOManager {
return;
}
+ this.updateUrlInput(linkRewriteInput, nameValue);
+ resetLinkRewriteBtn.disabled = true;
+ }
+
+ private updateUrlInput(linkRewriteInput: HTMLInputElement, nameValue: string): void {
+ // eslint-disable-next-line no-param-reassign
linkRewriteInput.value = window.str2url(nameValue);
linkRewriteInput.dispatchEvent(new Event('change', {bubbles: true}));
}
+
+ private resetAllLinkRewrites(): void {
+ const nameInputs = document.querySelectorAll(ProductMap.productLocalizedNameInput);
+ nameInputs.forEach((nameInput: HTMLInputElement) => {
+ nameInput.parentElement?.classList?.forEach((parentClass:string) => {
+ // Search for class mapping js-locale-en, js-locale-fr, ...
+ if (parentClass.match(/^js-locale-[a-zA-Z]{2}$/)) {
+ const linkRewriteSelector = `.${parentClass} ${ProductMap.productLocalizedLinkRewriteInput}`;
+ const linkRewriteInput = document.querySelector(linkRewriteSelector);
+
+ if (linkRewriteInput) {
+ this.updateUrlInput(linkRewriteInput, nameInput.value);
+ }
+ }
+ });
+ });
+
+ this.linkRewriteStateRefresh();
+ }
}
diff --git a/admin-dev/themes/new-theme/js/pages/product/specific-price/form/combination-selector.ts b/admin-dev/themes/new-theme/js/pages/product/specific-price/form/combination-selector.ts
index b13a0ec70d3ea..d30c8b444c6bb 100644
--- a/admin-dev/themes/new-theme/js/pages/product/specific-price/form/combination-selector.ts
+++ b/admin-dev/themes/new-theme/js/pages/product/specific-price/form/combination-selector.ts
@@ -110,7 +110,13 @@ export default class CombinationSelector {
};
const shopIdSelect = this.container.querySelector(SpecificPriceMap.shopIdSelect);
- const shopId = Number(shopIdSelect.value) ?? null;
+ let shopId = null;
+
+ // This check is here for when the multishop is not enabled.
+ // The selector shopIdSelect does not exist when multishop is not enabled.
+ if (shopIdSelect !== null) {
+ shopId = Number(shopIdSelect.value);
+ }
if (shopId) {
routeParams.shopId = shopId;
diff --git a/admin-dev/themes/new-theme/js/pages/product/specific-price/form/customer-selector.ts b/admin-dev/themes/new-theme/js/pages/product/specific-price/form/customer-selector.ts
index 66585e25c9313..fe8c8fda4f406 100644
--- a/admin-dev/themes/new-theme/js/pages/product/specific-price/form/customer-selector.ts
+++ b/admin-dev/themes/new-theme/js/pages/product/specific-price/form/customer-selector.ts
@@ -32,9 +32,15 @@ export default class CustomerSelector {
}
private init(): void {
- const customerSearchInput = this.initCustomerSearchInput();
- // clear selected customers whenever shop is changed, because customers may differ between shops
- this.getShopIdSelect()?.addEventListener('change', () => customerSearchInput.setValues([]));
+ // This check is here for when the multishop is not enabled.
+ // The selector returned by the this.getShopIdSelect does not exist when multishop is not enabled.
+ const shopIdSelect = this.getShopIdSelect();
+
+ if (shopIdSelect !== null) {
+ const customerSearchInput = this.initCustomerSearchInput();
+ // clear selected customers whenever shop is changed, because customers may differ between shops
+ shopIdSelect.addEventListener('change', () => customerSearchInput.setValues([]));
+ }
}
private initCustomerSearchInput(): CustomerSearchInput {
diff --git a/admin-dev/themes/new-theme/js/pages/product/supplier/product-suppliers-collection.ts b/admin-dev/themes/new-theme/js/pages/product/supplier/product-suppliers-collection.ts
index 7e7b0ca448483..3e17c5d97a4d3 100644
--- a/admin-dev/themes/new-theme/js/pages/product/supplier/product-suppliers-collection.ts
+++ b/admin-dev/themes/new-theme/js/pages/product/supplier/product-suppliers-collection.ts
@@ -121,6 +121,14 @@ export default class ProductSuppliersCollection {
this.$productsTable.on('change', ':input', () => {
this.memorizeCurrentSuppliers();
});
+ this.$productsTable.on('change', 'select[name$="[currency_id]"]', (e) => {
+ const symbol = $(e.target).find(':selected')?.attr('symbol');
+ $(e.target)
+ .parents(this.map.productsSupplierRowSelector)
+ .find('.money-type .input-group-prepend .input-group-text')
+ // @ts-ignore
+ .html(symbol);
+ });
}
private addSupplier(supplier: Supplier): void {
@@ -226,6 +234,13 @@ export default class ProductSuppliersCollection {
$(rowMap.referenceInput(supplier.supplierId)).val(supplier.reference);
$(rowMap.priceInput(supplier.supplierId)).val(supplier.price);
$(rowMap.currencyIdInput(supplier.supplierId)).val(supplier.currencyId);
+
+ // Update currency symbol
+ const symbol = $(rowMap.currencyIdInput(supplier.supplierId)).find(':selected')?.attr('symbol');
+
+ if (symbol) {
+ $(rowMap.currencySymbol(supplier.supplierId)).html(symbol);
+ }
});
}
diff --git a/admin-dev/themes/new-theme/js/pages/product/supplier/product-suppliers-map.ts b/admin-dev/themes/new-theme/js/pages/product/supplier/product-suppliers-map.ts
index a95b0866096cc..ee1dd02771048 100644
--- a/admin-dev/themes/new-theme/js/pages/product/supplier/product-suppliers-map.ts
+++ b/admin-dev/themes/new-theme/js/pages/product/supplier/product-suppliers-map.ts
@@ -42,6 +42,7 @@ export default (productSuppliersId: string): Record => {
priceInput: (supplierIndex: string): string => productSupplierInputId(supplierIndex, 'price_tax_excluded'),
currencyIdInput: (supplierIndex: string): string => productSupplierInputId(supplierIndex, 'currency_id'),
supplierNamePreview: (supplierIndex: string): string => `#product_supplier_row_${supplierIndex} .supplier_name .preview`,
+ currencySymbol: (supplierIndex: string): string => `#product_supplier_row_${supplierIndex} .money-type .input-group-text`,
},
};
};
diff --git a/admin-dev/themes/new-theme/js/product-page/combination.js b/admin-dev/themes/new-theme/js/product-page/combination.js
index a01046592d31d..1095738759d52 100644
--- a/admin-dev/themes/new-theme/js/product-page/combination.js
+++ b/admin-dev/themes/new-theme/js/product-page/combination.js
@@ -211,7 +211,6 @@ export default function () {
$('#create-combinations, #submit, .btn-submit').removeAttr('disabled');
activateCombinationsBulk();
window.supplierCombinations.refresh();
- window.warehouseCombinations.refresh();
},
});
};
diff --git a/admin-dev/themes/new-theme/scss/components/_colorpicker.scss b/admin-dev/themes/new-theme/scss/components/_colorpicker.scss
index 951dfe353d3a2..73474c6230a6e 100644
--- a/admin-dev/themes/new-theme/scss/components/_colorpicker.scss
+++ b/admin-dev/themes/new-theme/scss/components/_colorpicker.scss
@@ -6,4 +6,13 @@
&::after {
border: none;
}
+
+ .form-control {
+ &,
+ &:focus-visible,
+ &:focus {
+ color: transparent;
+ text-shadow: none;
+ }
+ }
}
diff --git a/admin-dev/themes/new-theme/scss/components/_delta_quantity.scss b/admin-dev/themes/new-theme/scss/components/_delta_quantity.scss
index 5bb5e4fc0c1ca..efbfad36812e6 100644
--- a/admin-dev/themes/new-theme/scss/components/_delta_quantity.scss
+++ b/admin-dev/themes/new-theme/scss/components/_delta_quantity.scss
@@ -6,9 +6,13 @@ $component-name: delta-quantity;
flex-direction: row;
&-quantity {
- min-width: 120px;
+ min-width: 40px;
font-weight: $font-weight-semibold;
+ @media screen and (min-width: 768px) {
+ min-width: 120px;
+ }
+
.quantity-update {
color: $brand-primary;
visibility: hidden;
@@ -38,7 +42,12 @@ $component-name: delta-quantity;
}
label {
- min-width: 240px;
+ min-width: 150px;
+
+ @media screen and (min-width: 768px) {
+ min-width: 240px;
+ }
+
margin: 0 0.3125rem;
overflow: hidden;
line-height: 39px;
diff --git a/admin-dev/themes/new-theme/scss/components/_grid.scss b/admin-dev/themes/new-theme/scss/components/_grid.scss
index 61b9055368c74..01bdd96f775d1 100644
--- a/admin-dev/themes/new-theme/scss/components/_grid.scss
+++ b/admin-dev/themes/new-theme/scss/components/_grid.scss
@@ -319,10 +319,6 @@ table {
td[data-column-id^="id_"] {
max-width: 8rem;
-
- input {
- max-width: 6rem;
- }
}
td[data-column-id^="price_tax_excluded"] {
diff --git a/admin-dev/themes/new-theme/scss/components/_modal.scss b/admin-dev/themes/new-theme/scss/components/_modal.scss
index 22c3dd9d98dcd..631ee708823d6 100644
--- a/admin-dev/themes/new-theme/scss/components/_modal.scss
+++ b/admin-dev/themes/new-theme/scss/components/_modal.scss
@@ -25,6 +25,12 @@
// stylelint-disable-next-line
$component-name: modal;
+.#{$component-name}.show {
+ .#{$component-name}-dialog {
+ margin: 10px auto;
+ }
+}
+
.#{$component-name}-iframe {
.#{$component-name}-dialog {
width: 90%;
diff --git a/admin-dev/themes/new-theme/scss/components/_timeline.scss b/admin-dev/themes/new-theme/scss/components/_timeline.scss
index 0208ad27af076..0b060f6fb730a 100644
--- a/admin-dev/themes/new-theme/scss/components/_timeline.scss
+++ b/admin-dev/themes/new-theme/scss/components/_timeline.scss
@@ -1,123 +1,163 @@
.timeline {
position: relative;
- display: table;
+ display: flex;
+ flex-direction: column;
width: 100%;
- table-layout: fixed;
- border-spacing: 0;
- border-collapse: collapse;
+ max-width: 1500px;
+ margin-right: auto;
+ margin-left: auto;
&::before {
position: absolute;
- top: 0;
- bottom: 30px;
+ top: 1.25rem;
+ bottom: 1.25rem;
left: 50%;
z-index: 0;
width: 6px;
margin-left: -4px;
content: "";
+ @include border-radius(10rem);
background-color: #ddd;
}
+ /* Row layout and basic grid settings for desktop */
.timeline-item {
- display: table-row;
+ display: grid;
+ grid-template-rows: auto;
+ grid-template-columns: 1fr 4rem 1fr;
+ align-items: start;
+ margin-bottom: 1.25rem;
+ }
+
+ /* Wrappers for content */
+ .timeline-date-wrapper {
+ grid-row: 1 / 2;
+ grid-column: 1;
+ }
+
+ .timeline-icon-wrapper {
+ display: flex;
+ grid-column: 2;
+ justify-content: center;
+ }
- &.alt {
+ .timeline-content-wrapper {
+ position: relative;
+ grid-row: 1 / 2;
+ grid-column: 3;
+ }
+
+ /* Alternative settings for reverted row */
+ .timeline-item.right {
+ .timeline-date-wrapper {
+ grid-column: 3;
+ justify-content: left;
+ }
+
+ .timeline-content-wrapper {
+ grid-column: 1;
text-align: right;
+ }
- &::before {
- display: none;
- }
+ .timeline-date {
+ justify-content: left;
+ }
+ }
+
+ /* Content styling */
+ .timeline-date {
+ display: flex;
+ align-items: center;
+ justify-content: right;
+ margin-top: 0.6rem;
+ margin-bottom: 0.6rem;
+
+ i {
+ margin-right: 0.1rem;
+ }
+ }
- .timeline-panel {
- margin-right: 42px;
- margin-left: 0;
+ .timeline-date-day {
+ margin-right: 0.4rem;
+ }
+
+ .timeline-icon {
+ z-index: 1;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 2.5rem;
+ height: 2.5rem;
+ line-height: 2.5rem;
+ background-color: #666;
+ border: 2px solid $white;
+ @include border-radius(2.5rem);
+ }
+
+ .timeline-content {
+ padding: 1.25rem;
+ background-color: $white;
+ border: 1px solid #ddd;
+ @include border-radius(5px);
+ }
+
+ @include media-breakpoint-down(sm) {
+
+ .timeline-item,
+ .timeline-item.right {
+ grid-template-columns: 3.2rem 1fr;
+
+ .timeline-date-wrapper {
+ grid-row: 1;
+ grid-column: 2;
}
- .timeline-caption {
- .timeline-panel {
- .timeline-icon {
- right: -60px;
- left: auto;
- }
-
- .timeline-date {
- right: -220px;
- left: auto;
- text-align: left;
- }
- }
+ .timeline-date {
+ justify-content: left;
}
- }
- &::before,
- &.alt::after {
- display: block;
- width: 50%;
- content: "";
- }
+ .timeline-icon-wrapper {
+ grid-row: 1 / span 2;
+ grid-column: 1;
+ justify-content: left;
+ }
- .timeline-caption {
- display: table-cell;
- width: 50%;
- vertical-align: top;
-
- .timeline-panel {
- position: relative;
- display: inline-block;
- padding: 20px;
- margin-bottom: 20px;
- margin-left: 42px;
+ .timeline-content-wrapper {
+ grid-row: 2;
+ grid-column: 2;
text-align: left;
- background-color: $white;
- border: 1px solid #ddd;
- @include border-radius(5px);
-
- .timeline-icon {
- position: absolute;
- top: -2px;
- left: -62px;
- width: 40px;
- height: 40px;
- line-height: 40px;
- text-align: center;
- background-color: #666;
- border: 2px solid $white;
- @include border-radius(40px);
- }
-
- .timeline-date {
- position: absolute;
- top: 10px;
- left: -270px;
- width: 200px;
- text-align: right;
- }
}
}
- }
- .arrow::after,
- .arrow::before {
- position: absolute;
- display: inline-block;
- content: "";
- border-color: transparent;
- border-style: solid;
+ /* Timeline line shifted to the left */
+ &::before {
+ left: 1.3rem;
+ }
}
- .arrow-left::before {
- top: 6px;
- left: 0;
- margin-left: -7px;
- border-width: 7px 7px 7px 0;
- border-right-color: #d1d4d7;
- }
+ /* Arrows for desktop cards */
+ @include media-breakpoint-up(md) {
+ .timeline-content::before {
+ position: absolute;
+ top: 0.8rem;
+ display: inline-block;
+ content: "";
+ border-color: transparent;
+ border-style: solid;
+ }
+
+ .timeline-item.left .timeline-content::before {
+ left: 0;
+ margin-left: -7px;
+ border-width: 7px 7px 7px 0;
+ border-right-color: #d1d4d7;
+ }
- .arrow-right::before {
- top: 6px;
- right: 0;
- margin-right: -7px;
- border-width: 7px 0 7px 7px;
- border-left-color: #d1d4d7;
+ .timeline-item.right .timeline-content::before {
+ right: 0;
+ margin-right: -7px;
+ border-width: 7px 0 7px 7px;
+ border-left-color: #d1d4d7;
+ }
}
}
diff --git a/admin-dev/themes/new-theme/scss/components/_typeahead_product_collection_type.scss b/admin-dev/themes/new-theme/scss/components/_typeahead_product_collection_type.scss
new file mode 100644
index 0000000000000..b9a6f77031bc2
--- /dev/null
+++ b/admin-dev/themes/new-theme/scss/components/_typeahead_product_collection_type.scss
@@ -0,0 +1,41 @@
+.typeahead-product-collection-type {
+ .typeahead-list {
+ li {
+ @extend .p-1;
+ @extend .mt-1;
+ @extend .d-flex;
+ @extend .align-items-center;
+ border: 1px solid $gray-light;
+
+ // thumbnail
+ > .media-left {
+ img {
+ max-width: 50px;
+ max-height: 50px;
+ }
+ }
+
+ // text
+ > .media-body {
+ .label {
+ @extend .mx-1;
+ }
+
+ // delete button
+ i.delete {
+ float: right;
+ color: $medium-gray;
+ cursor: pointer;
+ }
+ }
+ }
+ }
+
+ .autocomplete-search {
+ .search-suggestion {
+ img {
+ width: 50px;
+ }
+ }
+ }
+}
diff --git a/admin-dev/themes/new-theme/scss/components/layout/_main_header.scss b/admin-dev/themes/new-theme/scss/components/layout/_main_header.scss
index 9577cf16ee7ef..6b2ade2e08f92 100644
--- a/admin-dev/themes/new-theme/scss/components/layout/_main_header.scss
+++ b/admin-dev/themes/new-theme/scss/components/layout/_main_header.scss
@@ -746,6 +746,20 @@ $header-text-color: #4e6167 !default;
a {
&.dropdown-item {
margin: 10px 0;
+
+ &[target="_blank"]::after {
+ position: relative;
+ top: 2px;
+ font-family: "Material Icons", sans-serif;
+ color: #bbcdd2;
+ content: "\e89e";
+ opacity: 0.7;
+ }
+
+ &:hover {
+ color: #fff;
+ background-color: #25b9d7;
+ }
}
&.admin-link {
diff --git a/admin-dev/themes/new-theme/scss/components/layout/_non_responsive.scss b/admin-dev/themes/new-theme/scss/components/layout/_non_responsive.scss
deleted file mode 100644
index ca88c5ff15842..0000000000000
--- a/admin-dev/themes/new-theme/scss/components/layout/_non_responsive.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-#non-responsive {
- position: fixed;
- top: 3.438rem;
- left: 0.125rem;
- z-index: 501;
- display: none;
- width: 100%;
- height: 100%;
- padding: 4.375rem 2.5rem 0;
- font-size: 1.063rem;
- color: $white;
- background: $gray-dark;
-
- h1 {
- font-size: 1.875rem;
- font-weight: 400;
- color: $white;
- }
-}
diff --git a/admin-dev/themes/new-theme/scss/pages/_authorization_server.scss b/admin-dev/themes/new-theme/scss/pages/_authorization_server.scss
new file mode 100644
index 0000000000000..08a9e21dea019
--- /dev/null
+++ b/admin-dev/themes/new-theme/scss/pages/_authorization_server.scss
@@ -0,0 +1,19 @@
+.view-authorized-application-card {
+ .card-body {
+ .row {
+ .text-right {
+ font-weight: $font-weight-semibold;
+ }
+ }
+ }
+}
+
+#api_access_grid_panel {
+ #api_access_grid_table {
+ .column-headers {
+ th[data-column-id="active"] {
+ text-align: center;
+ }
+ }
+ }
+}
diff --git a/admin-dev/themes/new-theme/scss/pages/_order_states.scss b/admin-dev/themes/new-theme/scss/pages/_order_states.scss
index 3e8195a72876b..b49761f96792d 100644
--- a/admin-dev/themes/new-theme/scss/pages/_order_states.scss
+++ b/admin-dev/themes/new-theme/scss/pages/_order_states.scss
@@ -1,9 +1,9 @@
table#order_states_grid_table,
table#order_return_states_grid_table {
- thead {
- tr.column-headers {
- th:first-child {
- width: 130px;
+ tbody {
+ .color-type.column-name {
+ .badge {
+ font-size: inherit;
}
}
}
diff --git a/admin-dev/themes/new-theme/scss/pages/product/product_page.scss b/admin-dev/themes/new-theme/scss/pages/product/product_page.scss
index 824f03e919235..bff6bc77d03b2 100644
--- a/admin-dev/themes/new-theme/scss/pages/product/product_page.scss
+++ b/admin-dev/themes/new-theme/scss/pages/product/product_page.scss
@@ -1961,6 +1961,7 @@ $product-page-padding-bottom: 80px !default;
.combination-page {
#combination_form {
+ position: relative;
padding-top: 1rem;
}
@@ -2214,46 +2215,7 @@ $product-page-padding-bottom: 80px !default;
#related-product,
#id-product-redirected,
.redirect-option-widget {
- // list of added related products
- .typeahead-list {
- li {
- @extend .p-1;
- @extend .mt-1;
- @extend .d-flex;
- @extend .align-items-center;
- border: 1px solid $gray-light;
-
- // thumbnail
- > .media-left {
- img {
- max-width: 50px;
- max-height: 50px;
- }
- }
-
- // text
- > .media-body {
- .label {
- @extend .mx-1;
- }
-
- // delete button
- i.delete {
- float: right;
- color: $medium-gray;
- cursor: pointer;
- }
- }
- }
- }
-
- .autocomplete-search {
- .search-suggestion {
- img {
- width: 50px;
- }
- }
- }
+ @import "../../components/typeahead_product_collection_type";
}
@media only screen and (min-width: 320px) and (max-width: 1450px) {
@@ -2747,7 +2709,7 @@ $mobile-menu-height: 2.6rem !default;
.combination-cover-row {
position: absolute;
top: 1rem;
- left: 1rem;
+ left: 0;
max-width: $product-cover-mobile-size;
max-height: $product-cover-mobile-size;
}
diff --git a/admin-dev/themes/new-theme/scss/theme.scss b/admin-dev/themes/new-theme/scss/theme.scss
index 80ea26e1ae1f3..b615e2a1c9af8 100644
--- a/admin-dev/themes/new-theme/scss/theme.scss
+++ b/admin-dev/themes/new-theme/scss/theme.scss
@@ -49,7 +49,6 @@
@import "components/layout/light_display";
@import "components/layout/main_header";
@import "components/layout/nav_bar";
-@import "components/layout/non_responsive";
@import "components/material_choice_tree";
@import "components/modal";
@import "components/modulescards";
@@ -70,6 +69,7 @@
@import "components/toggable_field";
@import "components/translatable_input";
@import "components/unavailable-feature";
+@import "components/typeahead_product_collection_type";
// Pages specifics SCSS files
@import "pages/invoices";
@@ -89,6 +89,7 @@
@import "pages/payment";
@import "pages/translation_page";
@import "pages/product_preferences";
+@import "pages/authorization_server";
// Main Layout
@import "pages/modules";
diff --git a/admin-dev/themes/new-theme/template/components/layout/employee_dropdown.tpl b/admin-dev/themes/new-theme/template/components/layout/employee_dropdown.tpl
index c622ac6b88010..0d3a735fe33e0 100644
--- a/admin-dev/themes/new-theme/template/components/layout/employee_dropdown.tpl
+++ b/admin-dev/themes/new-theme/template/components/layout/employee_dropdown.tpl
@@ -44,7 +44,7 @@
{foreach from=$displayBackOfficeEmployeeMenu item=$menuItem}
{assign var=menuItemProperties value=$menuItem->getProperties()}
-
+
{if isset($menuItemProperties.icon)}{$menuItemProperties.icon} {/if}{$menuItem->getContent()}
{if $menuItem@last}
diff --git a/admin-dev/themes/new-theme/template/components/layout/non-responsive.tpl b/admin-dev/themes/new-theme/template/components/layout/non-responsive.tpl
deleted file mode 100644
index 32b0dd55aa858..0000000000000
--- a/admin-dev/themes/new-theme/template/components/layout/non-responsive.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-{**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author PrestaShop SA and Contributors
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- *}
-
@@ -55,7 +68,7 @@
{if isset($maintenance_mode) && $maintenance_mode == true}
{capture name="title"}
-
Header set Access-Control-Allow-Origin \"*\"
-
-
- Header set Content-Disposition \"Attachment\"
- Header set X-Content-Type-Options \"nosniff\"
-
\n\n");
fwrite($write_fd, '
# Apache 2.2
@@ -2359,6 +2286,9 @@ public static function generateHtaccess($path = null, $rewrite_settings = null,
if ($cache_control) {
$cache_control = "
ExpiresActive On
+ AddType image/webp .webp
+ ExpiresByType image/webp \"access plus 1 month\"
+ ExpiresByType image/avif \"access plus 1 month\"
ExpiresByType image/gif \"access plus 1 month\"
ExpiresByType image/jpeg \"access plus 1 month\"
ExpiresByType image/png \"access plus 1 month\"
diff --git a/classes/Validate.php b/classes/Validate.php
index 0783a19f0ae4f..cc7d4f506a679 100644
--- a/classes/Validate.php
+++ b/classes/Validate.php
@@ -39,7 +39,7 @@
class ValidateCore
{
public const ORDER_BY_REGEXP = '/^(?:(`?)[\w!_-]+\1\.)?(?:(`?)[\w!_-]+\2)$/';
- public const OBJECT_CLASS_NAME_REGEXP = '/^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*$/';
+ public const OBJECT_CLASS_NAME_REGEXP = '/^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*(\\\\[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*)*$/';
/**
* Maximal 32 bits value: (2^32)-1
*
@@ -498,6 +498,7 @@ public static function isCleanHtml($html, $allow_iframe = false)
$events .= '|ondragleave|ondragover|ondragstart|ondrop|onerrorupdate|onfilterchange|onfinish|onfocusin|onfocusout|onhashchange|onhelp|oninput|onlosecapture|onmessage|onmouseup|onmovestart';
$events .= '|onoffline|ononline|onpaste|onpropertychange|onreadystatechange|onresizeend|onresizestart|onrowenter|onrowexit|onrowsdelete|onrowsinserted|onscroll|onsearch|onselectionchange';
$events .= '|onselectstart|onstart|onstop|onanimationcancel|onanimationend|onanimationiteration|onanimationstart';
+ $events .= '|onpointerover|onpointerenter|onpointerdown|onpointermove|onpointerup|onpointerout|onpointerleave|onpointercancel|ongotpointercapture|onlostpointercapture';
if (preg_match('/<[\s]*script/ims', $html) || preg_match('/(' . $events . ')[\s]*=/ims', $html) || preg_match('/.*script\:/ims', $html)) {
return false;
diff --git a/classes/checkout/CheckoutDeliveryStep.php b/classes/checkout/CheckoutDeliveryStep.php
index e00149391d36d..e4d80915d3ee7 100644
--- a/classes/checkout/CheckoutDeliveryStep.php
+++ b/classes/checkout/CheckoutDeliveryStep.php
@@ -200,6 +200,7 @@ protected function isModuleComplete($requestParams)
}
$isComplete = true;
+ // Hook called only for the module concerned
Hook::exec(
'actionValidateStepComplete',
[
diff --git a/classes/checkout/ConditionsToApproveFinder.php b/classes/checkout/ConditionsToApproveFinder.php
index 0349983d33a28..1edf024833c02 100644
--- a/classes/checkout/ConditionsToApproveFinder.php
+++ b/classes/checkout/ConditionsToApproveFinder.php
@@ -61,6 +61,8 @@ private function getDefaultTermsAndConditions()
private function getConditionsToApprove()
{
$allConditions = [];
+
+ // An array [module_name => module_output] will be returned
$hookedConditions = Hook::exec('termsAndConditions', [], null, true);
if (!is_array($hookedConditions)) {
$hookedConditions = [];
diff --git a/classes/checkout/DeliveryOptionsFinder.php b/classes/checkout/DeliveryOptionsFinder.php
index 26fd271a796af..ddab5f9db7e64 100644
--- a/classes/checkout/DeliveryOptionsFinder.php
+++ b/classes/checkout/DeliveryOptionsFinder.php
@@ -125,6 +125,7 @@ public function getDeliveryOptions()
$carrier['extraContent'] = '';
if ($carrier['is_module']) {
if ($moduleId = Module::getModuleIdByName($carrier['external_module_name'])) {
+ // Hook called only for the module concerned
$carrier['extraContent'] = Hook::exec('displayCarrierExtraContent', ['carrier' => $carrier], $moduleId);
}
}
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 7d28f7a6efa85..cf56ca9da2ae6 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -685,6 +685,7 @@ public function initBreadcrumbs($tab_id = null, $tabs = null)
break;
}
+ // An array [module_name => module_output] will be returned (no effect)
Hook::exec('actionAdminBreadcrumbModifier', ['tabs' => $tabs, 'breadcrumb' => &$breadcrumbs2], null, true);
$this->context->smarty->assign([
@@ -995,13 +996,13 @@ public function postProcess()
$action = Tools::getValue('action');
// no need to use displayConf() here
if (!empty($action) && method_exists($this, 'ajaxProcess' . Tools::toCamelCase($action))) {
- Hook::exec('actionAdmin' . ucfirst($this->action) . 'Before', ['controller' => $this]);
- Hook::exec('action' . get_class($this) . ucfirst($this->action) . 'Before', ['controller' => $this]);
+ Hook::exec('actionAdmin' . ucfirst($action) . 'Before', ['controller' => $this]);
+ Hook::exec('action' . get_class($this) . ucfirst($action) . 'Before', ['controller' => $this]);
$return = $this->{'ajaxProcess' . Tools::toCamelCase($action)}();
- Hook::exec('actionAdmin' . ucfirst($this->action) . 'After', ['controller' => $this, 'return' => $return]);
- Hook::exec('action' . get_class($this) . ucfirst($this->action) . 'After', ['controller' => $this, 'return' => $return]);
+ Hook::exec('actionAdmin' . ucfirst($action) . 'After', ['controller' => $this, 'return' => $return]);
+ Hook::exec('action' . get_class($this) . ucfirst($action) . 'After', ['controller' => $this, 'return' => $return]);
return $return;
} elseif (!empty($action) && $this->controller_name == 'AdminModules' && Tools::getIsset('configure')) {
@@ -1931,6 +1932,7 @@ public function display()
if (!is_array($this->$type)) {
$this->$type = (array) $this->$type;
}
+
$this->context->smarty->assign($type, $this->json ? json_encode(array_unique($this->$type)) : array_unique($this->$type));
}
@@ -1938,6 +1940,7 @@ public function display()
$this->context->smarty->assign(
[
'page_header_toolbar' => $this->context->smarty->fetch($page_header_toolbar),
+ 'page_header_toolbar_template' => $page_header_toolbar,
]
);
}
@@ -2001,6 +2004,8 @@ public function initHeader()
// Fetch Employee Menu
$menuLinksCollections = new ActionsBarButtonsCollection();
+
+ // An array [module_name => module_output] will be returned (no effect)
Hook::exec(
'displayBackOfficeEmployeeMenu',
[
@@ -2025,6 +2030,8 @@ public function initHeader()
}
$tabs = $this->getTabs();
+
+ // An array [module_name => module_output] will be returned (no effect)
Hook::exec('actionAdminMenuTabsModifier', ['tabs' => &$tabs], null, true);
$currentTabLevel = 0;
@@ -2135,7 +2142,7 @@ private function getTabs($parentId = 0, $level = 0)
foreach ($tabs as $index => $tab) {
if (!Tab::checkTabRights($tab['id_tab'])
|| !$tab['enabled']
- || ($tab['class_name'] == 'AdminStock' && Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') == 0)
+ || $tab['class_name'] == 'AdminStock'
|| $tab['class_name'] == 'AdminCarrierWizard') {
unset($tabs[$index]);
@@ -4243,7 +4250,7 @@ public function getTabSlug()
/**
* @return ContainerInterface
*/
- protected function buildContainer()
+ protected function buildContainer(): ContainerInterface
{
return SymfonyContainer::getInstance();
}
diff --git a/classes/controller/Controller.php b/classes/controller/Controller.php
index f5476f572bb83..50a3ddc82bd16 100644
--- a/classes/controller/Controller.php
+++ b/classes/controller/Controller.php
@@ -24,8 +24,9 @@
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/
+use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
use PrestaShopBundle\Translation\TranslatorComponent;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* @TODO Move undeclared variables and methods to this (base) class: $errors, $layout, checkLiveEditAccess, etc.
@@ -155,7 +156,7 @@ abstract class ControllerCore
/**
* Dependency container.
*
- * @var ContainerBuilder
+ * @var ContainerInterface
*/
protected $container;
@@ -644,7 +645,7 @@ protected function smartyOutputContent($templates)
$this->context->cookie->write();
$js_tag = 'js_def';
- $this->context->smarty->assign($js_tag, $js_tag);
+ $this->context->smarty->assign($js_tag, \Media::getJsDef());
if (!is_array($templates)) {
$templates = [$templates];
@@ -781,9 +782,12 @@ protected function ajaxRender($value = null, $controller = null, $method = null)
/**
* Construct the dependency container.
*
- * @return ContainerBuilder
+ * @return ContainerInterface
*/
- abstract protected function buildContainer();
+ protected function buildContainer(): ContainerInterface
+ {
+ return SymfonyContainer::getInstance();
+ }
/**
* Gets a service from the service container.
@@ -816,7 +820,7 @@ public function getParameter($parameterId)
/**
* Gets the dependency container.
*
- * @return ContainerBuilder|null
+ * @return ContainerInterface|null
*/
public function getContainer()
{
diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php
index 5f928c9ae32f7..a8e51b3acca21 100644
--- a/classes/controller/FrontController.php
+++ b/classes/controller/FrontController.php
@@ -30,7 +30,9 @@
use PrestaShop\PrestaShop\Adapter\Image\ImageRetriever;
use PrestaShop\PrestaShop\Adapter\Presenter\Cart\CartPresenter;
use PrestaShop\PrestaShop\Adapter\Presenter\Object\ObjectPresenter;
+use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
use PrestaShop\PrestaShop\Core\Security\PasswordPolicyConfiguration;
+use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\HttpFoundation\IpUtils;
@@ -476,6 +478,7 @@ protected function assignGeneralPurposeVariables()
'debug' => _PS_MODE_DEV_,
];
+ // An array [module_name => module_output] will be returned
$modulesVariables = Hook::exec(
'actionFrontControllerSetVariables',
[
@@ -692,10 +695,10 @@ protected function prepareNotifications()
}
if (session_status() == PHP_SESSION_ACTIVE && isset($_SESSION['notifications'])) {
- $notifications = array_merge($notifications, json_decode($_SESSION['notifications'], true));
+ $notifications = array_merge_recursive($notifications, json_decode($_SESSION['notifications'], true));
unset($_SESSION['notifications']);
} elseif (isset($_COOKIE['notifications'])) {
- $notifications = array_merge($notifications, json_decode($_COOKIE['notifications'], true));
+ $notifications = array_merge_recursive($notifications, json_decode($_COOKIE['notifications'], true));
unset($_COOKIE['notifications']);
}
@@ -778,7 +781,7 @@ protected function sslRedirection()
*
* @param string $canonical_url
*/
- protected function canonicalRedirection($canonical_url = '')
+ protected function canonicalRedirection(string $canonical_url = '')
{
if (!$canonical_url || !Configuration::get('PS_CANONICAL_REDIRECT') || strtoupper($_SERVER['REQUEST_METHOD']) != 'GET') {
return;
@@ -1148,13 +1151,32 @@ public function removeJS($js_uri, $check_path = true)
*/
public function addJqueryUI($component, $theme = 'base', $check_dependencies = true)
{
- $css_theme_path = '/js/jquery/ui/themes/' . $theme . '/minified/jquery.ui.theme.min.css';
- $css_path = '/js/jquery/ui/themes/' . $theme . '/minified/jquery-ui.min.css';
- $js_path = '/js/jquery/ui/jquery-ui.min.js';
+ // If the component does not start with ui. prefix, we need to add it
+ if (substr($component, 0, 3) !== 'ui.') {
+ $component = 'ui.' . $component;
+ }
+
+ if (!is_array($component)) {
+ $component = [$component];
+ }
- $this->registerStylesheet('jquery-ui-theme', $css_theme_path, ['media' => 'all', 'priority' => 95]);
- $this->registerStylesheet('jquery-ui', $css_path, ['media' => 'all', 'priority' => 90]);
- $this->registerJavascript('jquery-ui', $js_path, ['position' => 'bottom', 'priority' => 49]);
+ foreach ($component as $ui) {
+ $ui_path = Media::getJqueryUIPath($ui, $theme, $check_dependencies);
+ foreach ($ui_path['css'] as $uiPathCss => $uiMediaCss) {
+ $this->registerStylesheet(
+ str_replace(_PS_JS_DIR_ . 'jquery/ui/themes/' . $theme . '/', '', $uiPathCss),
+ str_replace(_PS_JS_DIR_, '/js/', $uiPathCss),
+ ['media' => $uiMediaCss, 'priority' => 95]
+ );
+ }
+ foreach ($ui_path['js'] as $uiPathJs) {
+ $this->registerJavascript(
+ str_replace(_PS_JS_DIR_ . 'jquery/ui/', '', $uiPathJs),
+ str_replace(_PS_JS_DIR_, '/js/', $uiPathJs),
+ ['position' => 'bottom', 'priority' => 49]
+ );
+ }
+ }
}
/**
@@ -1586,11 +1608,11 @@ public function getTemplateVarCustomer($customer = null)
*/
public function getShopLogo(): array
{
- if (!Configuration::hasKey('PS_LOGO')) {
+ $logoFileName = Configuration::get('PS_LOGO');
+ if (!$logoFileName) {
return [];
}
- $logoFileName = Configuration::get('PS_LOGO');
$logoFileDir = _PS_IMG_DIR_ . $logoFileName;
if (!file_exists($logoFileDir)) {
@@ -1633,10 +1655,10 @@ public function getTemplateVarShop()
'long' => Configuration::get('PS_STORES_CENTER_LONG'),
'lat' => Configuration::get('PS_STORES_CENTER_LAT'),
- 'logo' => Configuration::hasKey('PS_LOGO') ? $psImageUrl . Configuration::get('PS_LOGO') : '',
+ 'logo' => self::configuredImageUrl('PS_LOGO', $psImageUrl),
'logo_details' => $this->getShopLogo(),
- 'stores_icon' => Configuration::hasKey('PS_STORES_ICON') ? $psImageUrl . Configuration::get('PS_STORES_ICON') : '',
- 'favicon' => Configuration::hasKey('PS_FAVICON') ? $psImageUrl . Configuration::get('PS_FAVICON') : '',
+ 'stores_icon' => self::configuredImageUrl('PS_STORES_ICON', $psImageUrl),
+ 'favicon' => self::configuredImageUrl('PS_STORES_ICON', $psImageUrl),
'favicon_update_time' => Configuration::get('PS_IMG_UPDATE_TIME'),
'address' => [
@@ -1655,6 +1677,13 @@ public function getTemplateVarShop()
return $shop;
}
+ private static function configuredImageUrl(string $configKey, $psImageUrl)
+ {
+ $image = Configuration::get($configKey);
+
+ return $image ? $psImageUrl . $image : '';
+ }
+
/**
* Initializes a set of commonly used variables related to the current page, available for use
* in the template. @see FrontController::assignGeneralPurposeVariables for more information.
@@ -2050,9 +2079,14 @@ public function getAssetUriFromLegacyDeprecatedMethod($legacy_uri)
/**
* {@inheritdoc}
*/
- protected function buildContainer()
+ protected function buildContainer(): ContainerInterface
{
- return ContainerBuilder::getContainer('front', _PS_MODE_DEV_);
+ /* @phpstan-ignore-next-line */
+ if (FRONT_LEGACY_CONTEXT) {
+ return ContainerBuilder::getContainer('front', _PS_MODE_DEV_);
+ }
+
+ return SymfonyContainer::getInstance();
}
/**
@@ -2086,18 +2120,24 @@ protected function getAlternativeLangsUrl()
protected function sanitizeUrl(string $url): string
{
$params = [];
- $url_details = parse_url($url);
+ // Extract all parts of the URL
+ $url_details = parse_url($url);
if (!empty($url_details['query'])) {
parse_str($url_details['query'], $query);
$params = $this->sanitizeQueryOutput($query);
}
- $excluded_key = ['isolang', 'id_lang', 'controller', 'fc', 'id_product', 'id_category', 'id_manufacturer', 'id_supplier', 'id_cms'];
- $excluded_key = array_merge($excluded_key, $this->redirectionExtraExcludedKeys);
- foreach ($_GET as $key => $value) {
+ // Build a list of parameters we won't be sanitizing
+ $excludedKeys = array_merge(
+ ['isolang', 'id_lang', 'controller', 'fc', 'id_product', 'id_category', 'id_manufacturer', 'id_supplier', 'id_cms'],
+ $this->redirectionExtraExcludedKeys
+ );
+
+ // Go through each parameter we got from dispatcher and sanitize it
+ foreach ($params as $key => $value) {
if (
- in_array($key, $excluded_key)
+ in_array($key, $excludedKeys)
|| !Validate::isUrl($key)
|| !$this->validateInputAsUrl($value)
) {
@@ -2107,6 +2147,7 @@ protected function sanitizeUrl(string $url): string
$params[Tools::safeOutput($key)] = is_array($value) ? array_walk_recursive($value, 'Tools::safeOutput') : Tools::safeOutput($value);
}
+ // Build back the query
$str_params = http_build_query($params, '', '&');
$sanitizedUrl = preg_replace('/^([^?]*)?.*$/', '$1', $url) . (!empty($str_params) ? '?' . $str_params : '');
diff --git a/classes/controller/ProductListingFrontController.php b/classes/controller/ProductListingFrontController.php
index b8a4397fd3a40..d0b372f9faa70 100644
--- a/classes/controller/ProductListingFrontController.php
+++ b/classes/controller/ProductListingFrontController.php
@@ -267,6 +267,7 @@ protected function renderActiveFilters(ProductSearchResult $result)
*/
private function getProductSearchProviderFromModules($query)
{
+ // An array [module_name => module_output] will be returned
$providers = Hook::exec(
'productSearchProvider',
['query' => $query],
diff --git a/classes/db/Db.php b/classes/db/Db.php
index 9d44e5e0fe1eb..6223b6a1d03f7 100644
--- a/classes/db/Db.php
+++ b/classes/db/Db.php
@@ -603,7 +603,11 @@ public function executeS($sql, $array = true, $use_cache = true)
}
// This method must be used only with queries which display results
- if (!preg_match('#^\s*\(?\s*(select|show|explain|describe|desc|checksum)\s#i', $sql)) {
+ if (
+ !preg_match('#^\s*\(?\s*(select|show|explain|describe|desc|checksum)\s#i', $sql)
+ || stripos($sql, 'outfile') !== false
+ || stripos($sql, 'dumpfile') !== false
+ ) {
throw new PrestaShopDatabaseException('Db->executeS() must be used only with select, show, explain or describe queries');
}
diff --git a/classes/form/CustomerAddressForm.php b/classes/form/CustomerAddressForm.php
index 013eb164096e3..0eb1e9982ffdf 100644
--- a/classes/form/CustomerAddressForm.php
+++ b/classes/form/CustomerAddressForm.php
@@ -134,8 +134,8 @@ public function validate()
}
}
- if (($hookReturn = Hook::exec('actionValidateCustomerAddressForm', ['form' => $this])) !== '') {
- $is_valid &= (bool) $hookReturn;
+ if ($is_valid && Hook::exec('actionValidateCustomerAddressForm', ['form' => $this]) === false) {
+ $is_valid = false;
}
return $is_valid && parent::validate();
diff --git a/classes/form/CustomerAddressFormatter.php b/classes/form/CustomerAddressFormatter.php
index 2ff6ed85f0e5c..56ebeeed2e315 100644
--- a/classes/form/CustomerAddressFormatter.php
+++ b/classes/form/CustomerAddressFormatter.php
@@ -147,6 +147,7 @@ public function getFormat()
}
//To add the extra fields in address form
+ // An array [module_name => module_output] will be returned
$additionalAddressFormFields = Hook::exec('additionalCustomerAddressFields', ['fields' => &$format], null, true);
if (is_array($additionalAddressFormFields)) {
foreach ($additionalAddressFormFields as $moduleName => $additionnalFormFields) {
diff --git a/classes/form/CustomerForm.php b/classes/form/CustomerForm.php
index bef940b147a15..46506762f1c88 100644
--- a/classes/form/CustomerForm.php
+++ b/classes/form/CustomerForm.php
@@ -304,6 +304,8 @@ private function validateByModules()
foreach ($formFieldsAssociated as $moduleName => $formFields) {
if ($moduleId = Module::getModuleIdByName($moduleName)) {
// ToDo : replace Hook::exec with HookFinder, because we expect a specific class here
+ // Hook called only for the module concerned
+ // An array [module_name => module_output] will be returned
$validatedCustomerFormFields = Hook::exec('validateCustomerFormFields', ['fields' => $formFields], $moduleId, true);
if (!is_array($validatedCustomerFormFields)) {
diff --git a/classes/form/CustomerFormatter.php b/classes/form/CustomerFormatter.php
index 00513779a0bf0..94d090c47ffc6 100644
--- a/classes/form/CustomerFormatter.php
+++ b/classes/form/CustomerFormatter.php
@@ -233,6 +233,7 @@ public function getFormat()
}
// ToDo, replace the hook exec with HookFinder when the associated PR will be merged
+ // An array [module_name => module_output] will be returned
$additionalCustomerFormFields = Hook::exec('additionalCustomerFormFields', ['fields' => &$format], null, true);
if (is_array($additionalCustomerFormFields)) {
diff --git a/classes/lang/KeysReference/FeatureFlagLang.php b/classes/lang/KeysReference/FeatureFlagLang.php
index b510b166fa840..87b6e0ec49cc3 100644
--- a/classes/lang/KeysReference/FeatureFlagLang.php
+++ b/classes/lang/KeysReference/FeatureFlagLang.php
@@ -94,3 +94,9 @@
trans('Features', 'Admin.Advparameters.Feature');
trans('Enable or disable the migrated features page.', 'Admin.Advparameters.Help');
+
+trans('Symfony layout', 'Admin.Advparameters.Feature');
+trans('Enable / Disable symfony layout (in opposition to legacy layout).', 'Admin.Advparameters.Help');
+
+trans('New front container', 'Admin.Advparameters.Feature');
+trans('Enable / Disable the new front container.', 'Admin.Advparameters.Help');
diff --git a/classes/lang/KeysReference/StockMvtReasonLang.php b/classes/lang/KeysReference/StockMvtReasonLang.php
index f3724239991b2..f9f5ef67c72c1 100644
--- a/classes/lang/KeysReference/StockMvtReasonLang.php
+++ b/classes/lang/KeysReference/StockMvtReasonLang.php
@@ -31,12 +31,6 @@
trans('Adjustment following an inventory of stock', 'Admin.Catalog.Feature');
-trans('Transfer to another warehouse', 'Admin.Catalog.Feature');
-
-trans('Transfer from another warehouse', 'Admin.Catalog.Feature');
-
-trans('Supply Order', 'Admin.Catalog.Feature');
-
trans('Product Return', 'Admin.Catalog.Feature');
trans('Manual Entry', 'Admin.Catalog.Feature');
diff --git a/classes/lang/KeysReference/TabLang.php b/classes/lang/KeysReference/TabLang.php
index 13ef4aebfedab..78afe8d27ea6e 100644
--- a/classes/lang/KeysReference/TabLang.php
+++ b/classes/lang/KeysReference/TabLang.php
@@ -119,7 +119,6 @@
trans('Stock', 'Admin.Navigation.Menu');
trans('Stores', 'Admin.Navigation.Menu');
trans('Suppliers', 'Admin.Navigation.Menu');
-trans('Supply orders', 'Admin.Navigation.Menu');
trans('Tags', 'Admin.Navigation.Menu');
trans('Taxes', 'Admin.Navigation.Menu');
trans('Tax Rules', 'Admin.Navigation.Menu');
@@ -128,7 +127,6 @@
trans('Titles', 'Admin.Navigation.Menu');
trans('Traffic & SEO', 'Admin.Navigation.Menu');
trans('Translations', 'Admin.Navigation.Menu');
-trans('Warehouses', 'Admin.Navigation.Menu');
trans('Webservice', 'Admin.Navigation.Menu');
trans('Authorization Server', 'Admin.Navigation.Menu');
trans('Zones', 'Admin.Navigation.Menu');
diff --git a/classes/module/Module.php b/classes/module/Module.php
index 31e234d0d810e..1975c449eee31 100755
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -759,7 +759,7 @@ public static function getUpgradeStatus($module_name)
}
/**
- * Delete module from datable.
+ * Uninstalls the module from database.
*
* @return bool result
*/
@@ -767,14 +767,14 @@ public function uninstall()
{
Hook::exec('actionModuleUninstallBefore', ['object' => $this]);
- // Check module installation id validation
+ // Check if module instance is valid
if (!Validate::isUnsignedId($this->id)) {
$this->_errors[] = Context::getContext()->getTranslator()->trans('The module is not installed.', [], 'Admin.Modules.Notification');
return false;
}
- // Uninstall overrides
+ // Uninstall all overrides this module may have used
if (!$this->uninstallOverrides()) {
return false;
}
@@ -783,10 +783,13 @@ public function uninstall()
$sql = 'SELECT DISTINCT(`id_hook`) FROM `' . _DB_PREFIX_ . 'hook_module` WHERE `id_module` = ' . (int) $this->id;
$result = Db::getInstance()->executeS($sql);
foreach ($result as $row) {
+ // Unhook this module from each of the hooks
$this->unregisterHook((int) $row['id_hook']);
+ // Remove all hook conditions that may have been configured - don't confuse it with error exception. :-)
$this->unregisterExceptions((int) $row['id_hook']);
}
+ // Remove all configured meta data (titles, URLs etc.) for this module's front controllers
foreach ($this->controllers as $controller) {
$page_name = 'module-' . $this->name . '-' . $controller;
$meta = Db::getInstance()->getValue('SELECT id_meta FROM `' . _DB_PREFIX_ . 'meta` WHERE page="' . pSQL($page_name) . '"');
@@ -1021,8 +1024,9 @@ public function disable($force_all = false)
$result &= $this->uninstallOverrides();
}
- // Disable module for all shops
- $result &= Db::getInstance()->delete('module_shop', '`id_module` = ' . (int) $this->id);
+ // Disable module for all shops or contextual shops
+ $whereIdShop = $force_all ? '' : ' AND `id_shop` IN(' . implode(', ', Shop::getContextListShopID()) . ')';
+ $result &= Db::getInstance()->delete('module_shop', '`id_module` = ' . (int) $this->id . $whereIdShop);
// if module has no more shop associations, set module.active = 0
if (!$this->hasShopAssociations()) {
diff --git a/classes/order/Order.php b/classes/order/Order.php
index d32cde4ee5f87..5df71e391b5f9 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -737,21 +737,13 @@ protected function setProductCustomizedDatas(&$product, $customized_datas)
/**
* This method allow to add stock information on a product detail.
*
- * If advanced stock management is active, get physical stock of this product in the warehouse associated to the ptoduct for the current order
- * Else get the available quantity of the product in fucntion of the shop associated to the order
+ * Get the available quantity of the product in fucntion of the shop associated to the order
*
* @param array $product
*/
protected function setProductCurrentStock(&$product)
{
- if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')
- && (int) $product['advanced_stock_management'] == 1
- && (int) $product['id_warehouse'] > 0) {
- $product['current_stock'] = StockManagerFactory::getManager()->getProductPhysicalQuantities($product['product_id'], $product['product_attribute_id'], (int) $product['id_warehouse'], true);
- } else {
- $product['current_stock'] = StockAvailable::getQuantityAvailableByProduct($product['product_id'], $product['product_attribute_id'], (int) $this->id_shop);
- }
-
+ $product['current_stock'] = StockAvailable::getQuantityAvailableByProduct($product['product_id'], $product['product_attribute_id'], (int) $this->id_shop);
$product['location'] = StockAvailable::getLocation($product['product_id'], $product['product_attribute_id'], (int) $this->id_shop);
}
@@ -2249,25 +2241,17 @@ public function getOrderInvoiceIdIfHasDelivery()
* Get warehouse associated to the order.
*
* return array List of warehouse
+ *
+ * @deprecated Since 9.0 and will be removed in 10.0
*/
public function getWarehouseList()
{
- $results = Db::getInstance()->executeS(
- 'SELECT id_warehouse
- FROM `' . _DB_PREFIX_ . 'order_detail`
- WHERE `id_order` = ' . (int) $this->id . '
- GROUP BY id_warehouse'
- );
- if (!$results) {
- return [];
- }
-
- $warehouse_list = [];
- foreach ($results as $row) {
- $warehouse_list[] = $row['id_warehouse'];
- }
+ @trigger_error(sprintf(
+ '%s is deprecated since 9.0 and will be removed in 10.0.',
+ __METHOD__
+ ), E_USER_DEPRECATED);
- return $warehouse_list;
+ return [0];
}
/**
@@ -2507,7 +2491,7 @@ public function getProductTaxesDetails($limitToOrderDetails = false)
$discounted_price_tax_excl = $order_detail['unit_price_tax_excl'] - $discount_ratio * $order_discount_tax_excl;
// specific discount
if (!empty($product_specific_discounts[$order_detail['product_id']])) {
- $discounted_price_tax_excl -= $product_specific_discounts[$order_detail['product_id']];
+ $discounted_price_tax_excl -= $product_specific_discounts[$order_detail['product_id']] / $order_detail['product_quantity'];
}
$quantity = $order_detail['product_quantity'];
diff --git a/classes/order/OrderDetail.php b/classes/order/OrderDetail.php
index ee3935857582b..7c8d5069ddd2e 100644
--- a/classes/order/OrderDetail.php
+++ b/classes/order/OrderDetail.php
@@ -163,8 +163,11 @@ class OrderDetailCore extends ObjectModel
/** @var int Id tax rules group */
public $id_tax_rules_group;
- /** @var int Id warehouse */
- public $id_warehouse;
+ /** @var int Id warehouse
+ *
+ * @deprecated since 9.0, advanced stock management has been completely removed
+ */
+ public $id_warehouse = 0;
/** @var float additional shipping price tax excl */
public $total_shipping_price_tax_excl;
@@ -547,24 +550,20 @@ protected function updateProductQuantityInStock($product, $orderStateId): void
if (in_array($orderStateId, $dismissOrderStateIds)) {
return;
}
- if (!StockAvailable::dependsOnStock($product['id_product'])) {
- $orderState = new OrderState($orderStateId, $this->id_lang);
- $isQuantityUpdated = StockAvailable::updateQuantity(
- $product['id_product'],
- $product['id_product_attribute'],
- -(int) $product['cart_quantity'],
- $product['id_shop'],
- // Add stock movement only if order state is flagged as shipped
- true === (bool) $orderState->shipped,
- [
- 'id_order' => $this->id_order,
- // Only one stock movement reason fits a new order creation
- 'id_stock_mvt_reason' => Configuration::get('PS_STOCK_CUSTOMER_ORDER_REASON'),
- ]
- );
- } else {
- $isQuantityUpdated = true;
- }
+ $orderState = new OrderState($orderStateId, $this->id_lang);
+ $isQuantityUpdated = StockAvailable::updateQuantity(
+ $product['id_product'],
+ $product['id_product_attribute'],
+ -(int) $product['cart_quantity'],
+ $product['id_shop'],
+ // Add stock movement only if order state is flagged as shipped
+ true === (bool) $orderState->shipped,
+ [
+ 'id_order' => $this->id_order,
+ // Only one stock movement reason fits a new order creation
+ 'id_stock_mvt_reason' => Configuration::get('PS_STOCK_CUSTOMER_ORDER_REASON'),
+ ]
+ );
if ($isQuantityUpdated === true) {
$product['stock_quantity'] -= $product['cart_quantity'];
}
@@ -750,7 +749,7 @@ protected function setDetailProductPrice(Order $order, Cart $cart, $product)
* @param int $id_order_state
* @param int $id_order_invoice
* @param bool $use_taxes set to false if you don't want to use taxes
- * @param int $id_warehouse
+ * @param int $id_warehouse - not used anymore
*/
protected function create(Order $order, Cart $cart, $product, $id_order_state, $id_order_invoice, $use_taxes = true, $id_warehouse = 0)
{
@@ -776,7 +775,6 @@ protected function create(Order $order, Cart $cart, $product, $id_order_state, $
$this->product_supplier_reference = empty($product['supplier_reference']) ? null : pSQL($product['supplier_reference']);
$product_weight = $product['id_product_attribute'] ? (float) $product['weight_attribute'] : (float) $product['weight'];
$this->product_weight = $product_weight + Customization::getCustomizationWeight($product['id_customization']);
- $this->id_warehouse = $id_warehouse;
// We get the real quantity of the product in stock and save how much of the ordered quantity was in stock
$product_quantity_in_stock = (int) Product::getQuantity($this->product_id, $this->product_attribute_id);
@@ -819,7 +817,7 @@ protected function create(Order $order, Cart $cart, $product, $id_order_state, $
* @param array $product_list
* @param int $id_order_invoice
* @param bool $use_taxes set to false if you don't want to use taxes
- * @param int $id_warehouse
+ * @param int $id_warehouse - not used anymore
*/
public function createList(Order $order, Cart $cart, $id_order_state, $product_list, $id_order_invoice = 0, $use_taxes = true, $id_warehouse = 0)
{
@@ -830,7 +828,7 @@ public function createList(Order $order, Cart $cart, $id_order_state, $product_l
$this->outOfStock = false;
foreach ($product_list as $product) {
- $this->create($order, $cart, $product, $id_order_state, $id_order_invoice, $use_taxes, $id_warehouse);
+ $this->create($order, $cart, $product, $id_order_state, $id_order_invoice, $use_taxes);
}
unset(
diff --git a/classes/order/OrderHistory.php b/classes/order/OrderHistory.php
index d8c449679e00f..91296074bfd84 100644
--- a/classes/order/OrderHistory.php
+++ b/classes/order/OrderHistory.php
@@ -101,10 +101,12 @@ public function changeIdOrderState($new_order_state, $id_order, $use_existing_pa
// executes hook
if (in_array($new_os->id, [Configuration::get('PS_OS_PAYMENT'), Configuration::get('PS_OS_WS_PAYMENT')])) {
+ // Hook called only for the shop concerned
Hook::exec('actionPaymentConfirmation', ['id_order' => (int) $order->id], null, false, true, false, $order->id_shop);
}
// executes hook
+ // Hook called only for the shop concerned
Hook::exec('actionOrderStatusUpdate', [
'newOrderStatus' => $new_os,
'oldOrderStatus' => $old_os,
@@ -197,9 +199,6 @@ public function changeIdOrderState($new_order_state, $id_order, $use_existing_pa
/** @since 1.5.0 : gets the stock manager */
$manager = null;
- if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
- $manager = StockManagerFactory::getManager();
- }
$error_or_canceled_statuses = [Configuration::get('PS_OS_ERROR'), Configuration::get('PS_OS_CANCELED')];
@@ -224,8 +223,7 @@ public function changeIdOrderState($new_order_state, $id_order, $use_existing_pa
ProductSale::addProductSale($product['product_id'], $product['product_quantity']);
// @since 1.5.0 - Stock Management
if (!Pack::isPack($product['product_id']) &&
- in_array($old_os->id, $error_or_canceled_statuses) &&
- !StockAvailable::dependsOnStock($product['id_product'], (int) $order->id_shop)) {
+ in_array($old_os->id, $error_or_canceled_statuses)) {
StockAvailable::updateQuantity($product['product_id'], $product['product_attribute_id'], -(int) $product['product_quantity'], $order->id_shop);
}
} elseif (!$new_os->logable && $old_os->logable) {
@@ -234,14 +232,12 @@ public function changeIdOrderState($new_order_state, $id_order, $use_existing_pa
// @since 1.5.0 - Stock Management
if (!Pack::isPack($product['product_id']) &&
- in_array($new_os->id, $error_or_canceled_statuses) &&
- !StockAvailable::dependsOnStock($product['id_product'])) {
+ in_array($new_os->id, $error_or_canceled_statuses)) {
StockAvailable::updateQuantity($product['product_id'], $product['product_attribute_id'], (int) $product['product_quantity'], $order->id_shop);
}
} elseif (!$new_os->logable && !$old_os->logable &&
in_array($new_os->id, $error_or_canceled_statuses) &&
- !in_array($old_os->id, $error_or_canceled_statuses) &&
- !StockAvailable::dependsOnStock($product['id_product'])
+ !in_array($old_os->id, $error_or_canceled_statuses)
) {
// if waiting for payment => payment error/canceled
StockAvailable::updateQuantity($product['product_id'], $product['product_attribute_id'], (int) $product['product_quantity'], $order->id_shop);
@@ -250,85 +246,9 @@ public function changeIdOrderState($new_order_state, $id_order, $use_existing_pa
// From here, there is 2 cases : $old_os exists, and we can test shipped state evolution,
// Or old_os does not exists, and we should consider that initial shipped state is 0 (to allow decrease of stocks)
- // @since 1.5.0 : if the order is being shipped and this products uses the advanced stock management :
- // decrements the physical stock using $id_warehouse
- if ($new_os->shipped == 1 && (!Validate::isLoadedObject($old_os) || $old_os->shipped == 0) &&
- Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') &&
- Warehouse::exists($product['id_warehouse']) &&
- $manager != null &&
- (int) $product['advanced_stock_management'] == 1) {
- // gets the warehouse
- $warehouse = new Warehouse($product['id_warehouse']);
-
- // decrements the stock (if it's a pack, the StockManager does what is needed)
- $manager->removeProduct(
- $product['product_id'],
- $product['product_attribute_id'],
- $warehouse,
- ($product['product_quantity'] - $product['product_quantity_refunded'] - $product['product_quantity_return']),
- (int) Configuration::get('PS_STOCK_CUSTOMER_ORDER_REASON'),
- true,
- (int) $order->id
- );
- } elseif ($new_os->shipped == 0 && Validate::isLoadedObject($old_os) && $old_os->shipped == 1 &&
- Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') &&
- Warehouse::exists($product['id_warehouse']) &&
- $manager != null &&
- (int) $product['advanced_stock_management'] == 1
- ) {
- // @since.1.5.0 : if the order was shipped, and is not anymore, we need to restock products
-
- // if the product is a pack, we restock every products in the pack using the last negative stock mvts
- if (Pack::isPack($product['product_id'])) {
- $pack_products = Pack::getItems($product['product_id'], Configuration::get('PS_LANG_DEFAULT', null, null, $order->id_shop));
- foreach ($pack_products as $pack_product) {
- if ($pack_product->advanced_stock_management == 1) {
- $mvts = StockMvt::getNegativeStockMvts($order->id, $pack_product->id, 0, $pack_product->pack_quantity * $product['product_quantity']);
- foreach ($mvts as $mvt) {
- $manager->addProduct(
- $pack_product->id,
- 0,
- new Warehouse($mvt['id_warehouse']),
- $mvt['physical_quantity'],
- null,
- $mvt['price_te'],
- true,
- null
- );
- }
- if (!StockAvailable::dependsOnStock($product['id_product'])) {
- StockAvailable::updateQuantity($pack_product->id, 0, (int) $pack_product->pack_quantity * $product['product_quantity'], $order->id_shop);
- }
- }
- }
- } else {
- // else, it's not a pack, re-stock using the last negative stock mvts
-
- $mvts = StockMvt::getNegativeStockMvts(
- $order->id,
- $product['product_id'],
- $product['product_attribute_id'],
- ($product['product_quantity'] - $product['product_quantity_refunded'] - $product['product_quantity_return'])
- );
-
- foreach ($mvts as $mvt) {
- $manager->addProduct(
- $product['product_id'],
- $product['product_attribute_id'],
- new Warehouse($mvt['id_warehouse']),
- $mvt['physical_quantity'],
- null,
- $mvt['price_te'],
- true
- );
- }
- }
- }
-
// Save movement if :
- // not Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')
// new_os->shipped != old_os->shipped
- if (Validate::isLoadedObject($old_os) && Validate::isLoadedObject($new_os) && $new_os->shipped != $old_os->shipped && !Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
+ if (Validate::isLoadedObject($old_os) && Validate::isLoadedObject($new_os) && $new_os->shipped != $old_os->shipped) {
$product_quantity = (int) ($product['product_quantity'] - $product['product_quantity_refunded'] - $product['product_quantity_return']);
if ($product_quantity > 0) {
@@ -415,6 +335,7 @@ public function changeIdOrderState($new_order_state, $id_order, $use_existing_pa
}
// executes hook
+ // Hook called only for the shop concerned
Hook::exec('actionOrderStatusPostUpdate', [
'newOrderStatus' => $new_os,
'oldOrderStatus' => $old_os,
@@ -569,6 +490,7 @@ public function add($autodate = true, $null_values = false)
$order->current_state = $this->id_order_state;
$order->update();
+ // Hook called only for the shop concerned
Hook::exec('actionOrderHistoryAddAfter', ['order_history' => $this], null, false, true, false, $order->id_shop);
return true;
diff --git a/classes/order/OrderInvoice.php b/classes/order/OrderInvoice.php
index b72cdabc1752f..813ee3673bc3a 100644
--- a/classes/order/OrderInvoice.php
+++ b/classes/order/OrderInvoice.php
@@ -270,13 +270,8 @@ protected function setProductCustomizedDatas(&$product, $customized_datas)
*/
protected function setProductCurrentStock(&$product)
{
- if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')
- && (int) $product['advanced_stock_management'] == 1
- && (int) $product['id_warehouse'] > 0) {
- $product['current_stock'] = StockManagerFactory::getManager()->getProductPhysicalQuantities($product['product_id'], $product['product_attribute_id'], null, true);
- } else {
- $product['current_stock'] = '--';
- }
+ $product['current_stock'] = StockAvailable::getQuantityAvailableByProduct((int) $product['product_id'], (int) $product['product_attribute_id'], (int) $product['id_shop']);
+ $product['location'] = StockAvailable::getLocation((int) $product['product_id'], (int) $product['product_attribute_id'], (int) $product['id_shop']);
}
/**
diff --git a/classes/order/OrderReturn.php b/classes/order/OrderReturn.php
index d74167b2988d8..b949b095da431 100644
--- a/classes/order/OrderReturn.php
+++ b/classes/order/OrderReturn.php
@@ -207,7 +207,7 @@ public static function getReturnedCustomizedProducts($id_order)
$return['product_attribute_id'] = (int) $products[(int) $return['id_order_detail']]['product_attribute_id'];
$return['name'] = $products[(int) $return['id_order_detail']]['product_name'];
$return['reference'] = $products[(int) $return['id_order_detail']]['product_reference'];
- $return['id_address_delivery'] = $products[(int) $return['id_order_detail']]['id_address_delivery'];
+ $return['id_address_delivery'] = (int) $order->id_address_delivery;
}
return $returns;
diff --git a/classes/order/OrderReturnState.php b/classes/order/OrderReturnState.php
index cdbd4c16ec9ef..db76b91e56881 100644
--- a/classes/order/OrderReturnState.php
+++ b/classes/order/OrderReturnState.php
@@ -1,4 +1,7 @@
['type' => self::TYPE_STRING, 'validate' => 'isColor'],
/* Lang fields */
- 'name' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 64],
+ 'name' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => OrderReturnStateSettings::NAME_MAX_LENGTH],
],
];
diff --git a/classes/order/OrderState.php b/classes/order/OrderState.php
index 6c7096ca01098..611a1bb92113c 100644
--- a/classes/order/OrderState.php
+++ b/classes/order/OrderState.php
@@ -1,4 +1,7 @@
['type' => self::TYPE_BOOL, 'validate' => 'isBool'],
/* Lang fields */
- 'name' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 64],
+ 'name' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => OrderStateSettings::NAME_MAX_LENGTH],
'template' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isTplName', 'size' => 64],
],
];
diff --git a/classes/pdf/HTMLTemplateSupplyOrderForm.php b/classes/pdf/HTMLTemplateSupplyOrderForm.php
index 58d94d60851d3..0eede155385b6 100644
--- a/classes/pdf/HTMLTemplateSupplyOrderForm.php
+++ b/classes/pdf/HTMLTemplateSupplyOrderForm.php
@@ -26,6 +26,7 @@
/**
* @since 1.5
+ * @deprecated since 9.0 and will be removed in 10.0, stock is now managed by new logic
*/
class HTMLTemplateSupplyOrderFormCore extends HTMLTemplate
{
diff --git a/classes/pdf/PDF.php b/classes/pdf/PDF.php
index 71fb2ea3ec6d9..94fb9020f89e2 100644
--- a/classes/pdf/PDF.php
+++ b/classes/pdf/PDF.php
@@ -63,6 +63,8 @@ class PDFCore
public const TEMPLATE_ORDER_RETURN = 'OrderReturn';
public const TEMPLATE_ORDER_SLIP = 'OrderSlip';
public const TEMPLATE_DELIVERY_SLIP = 'DeliverySlip';
+
+ /** @deprecated since 9.0 and will be removed in 10.0 **/
public const TEMPLATE_SUPPLY_ORDER_FORM = 'SupplyOrderForm';
/**
diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php
index cd30a9aa9b60f..1f09e0e1eaf05 100644
--- a/classes/shop/Shop.php
+++ b/classes/shop/Shop.php
@@ -26,11 +26,12 @@
use PrestaShop\PrestaShop\Core\Addon\Theme\Theme;
use PrestaShop\PrestaShop\Core\Addon\Theme\ThemeManagerBuilder;
+use PrestaShop\PrestaShop\Core\Model\ShopInterface;
/**
* @since 1.5.0
*/
-class ShopCore extends ObjectModel
+class ShopCore extends ObjectModel implements ShopInterface
{
/** @var int ID of shop group */
public $id_shop_group;
@@ -1279,6 +1280,7 @@ public function copyShopData($old_id, $tables_import = false, $deleted = false)
if (is_array($modules_list) && count($modules_list) > 0) {
foreach ($modules_list as $m) {
if (!$tables_import || isset($tables_import['Module' . ucfirst($m['module'])])) {
+ // Hook called only for the module concerned
Hook::exec('actionShopDataDuplication', [
'old_id_shop' => (int) $old_id,
'new_id_shop' => (int) $this->id,
@@ -1364,4 +1366,63 @@ private static function findShopByHost($host)
return $result;
}
+
+ /*
+ * Interface methods
+ */
+
+ public function getId(): int
+ {
+ return (int) $this->id;
+ }
+
+ public function getName(): string
+ {
+ return $this->name;
+ }
+
+ public function getShopGroupId(): int
+ {
+ return (int) $this->id_shop_group;
+ }
+
+ public function getCategoryId(): int
+ {
+ return (int) $this->id_category;
+ }
+
+ public function getThemeName(): string
+ {
+ return $this->theme_name;
+ }
+
+ public function getColor(): string
+ {
+ return $this->color;
+ }
+
+ public function isActive(): bool
+ {
+ return (bool) $this->active;
+ }
+
+ public function getPhysicalUri(): string
+ {
+ return $this->physical_uri;
+ }
+
+ public function getVirtualUri(): string
+ {
+ return $this->virtual_uri;
+ }
+
+ public function getDomain(): string
+ {
+ return $this->domain;
+ }
+
+ public function getDomainSSL(): string
+ {
+ return $this->domain_ssl;
+ }
}
diff --git a/classes/stock/Stock.php b/classes/stock/Stock.php
index fdd505a73e8ac..bd8e1f3af4f92 100644
--- a/classes/stock/Stock.php
+++ b/classes/stock/Stock.php
@@ -28,6 +28,7 @@
* Represents the products kept in warehouses.
*
* @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0, stock is now managed by new logic
*/
class StockCore extends ObjectModel
{
diff --git a/classes/stock/StockAvailable.php b/classes/stock/StockAvailable.php
index e354df31cdcd1..5bbfa06d8211b 100644
--- a/classes/stock/StockAvailable.php
+++ b/classes/stock/StockAvailable.php
@@ -50,8 +50,8 @@ class StockAvailableCore extends ObjectModel
public $quantity = 0;
/**
- * @deprecated since 1.7.8
- * This property was only relevant to advanced stock management and that feature is not maintained anymore
+ * @deprecated since 1.7.8 and will be removed in future version.
+ * This property was only relevant to advanced stock management and that feature is not maintained anymore.
*
* @var bool determine if the available stock value depends on physical stock
*/
@@ -111,14 +111,6 @@ class StockAvailableCore extends ObjectModel
*/
public function updateWs()
{
- if ($this->depends_on_stock) {
- return WebserviceRequest::getInstance()->setError(
- 500,
- $this->trans('You cannot update the available stock when it depends on stock.', [], 'Admin.Catalog.Notification'),
- 133
- );
- }
-
return $this->update();
}
@@ -146,193 +138,17 @@ public static function getStockAvailableIdByProductId($id_product, $id_product_a
* For a given id_product, synchronizes StockAvailable::quantity with Stock::usable_quantity.
*
* @param int $id_product
- */
- public static function synchronize($id_product, $order_id_shop = null)
- {
- if (!Validate::isUnsignedId($id_product)) {
- return false;
- }
-
- //if product is pack sync recursivly product in pack
- if (Pack::isPack($id_product)) {
- if (Validate::isLoadedObject($product = new Product((int) $id_product))) {
- if ($product->pack_stock_type == Pack::STOCK_TYPE_PRODUCTS_ONLY
- || $product->pack_stock_type == Pack::STOCK_TYPE_PACK_BOTH
- || ($product->pack_stock_type == Pack::STOCK_TYPE_DEFAULT
- && Configuration::get('PS_PACK_STOCK_TYPE') > 0)
- ) {
- $products_pack = Pack::getItems($id_product, (int) Configuration::get('PS_LANG_DEFAULT'));
- foreach ($products_pack as $product_pack) {
- StockAvailable::synchronize($product_pack->id, $order_id_shop);
- }
- }
- } else {
- return false;
- }
- }
-
- // gets warehouse ids grouped by shops
- $ids_warehouse = Warehouse::getWarehousesGroupedByShops();
- $order_warehouses = [];
- if ($order_id_shop !== null) {
- $wh = Warehouse::getWarehouses(false, (int) $order_id_shop);
- foreach ($wh as $warehouse) {
- $order_warehouses[] = $warehouse['id_warehouse'];
- }
- }
-
- // gets all product attributes ids
- $ids_product_attribute = [];
- foreach (Product::getProductAttributesIds($id_product) as $id_product_attribute) {
- $ids_product_attribute[] = $id_product_attribute['id_product_attribute'];
- }
-
- // Allow to order the product when out of stock?
- $out_of_stock = StockAvailable::outOfStock($id_product);
-
- $manager = StockManagerFactory::getManager();
- // loops on $ids_warehouse to synchronize quantities
- foreach ($ids_warehouse as $id_shop => $warehouses) {
- // first, checks if the product depends on stock for the given shop $id_shop
- if (StockAvailable::dependsOnStock($id_product, $id_shop)) {
- // init quantity
- $product_quantity = 0;
-
- // if it's a simple product
- if (empty($ids_product_attribute)) {
- $allowed_warehouse_for_product = Warehouse::getProductWarehouseList((int) $id_product, 0, (int) $id_shop);
- $allowed_warehouse_for_product_clean = [];
- foreach ($allowed_warehouse_for_product as $warehouse) {
- $allowed_warehouse_for_product_clean[] = (int) $warehouse['id_warehouse'];
- }
- $allowed_warehouse_for_product_clean = array_intersect($allowed_warehouse_for_product_clean, $warehouses);
- if ($order_id_shop != null && !count(array_intersect($allowed_warehouse_for_product_clean, $order_warehouses))) {
- continue;
- }
-
- $product_quantity = $manager->getProductRealQuantities($id_product, 0, $allowed_warehouse_for_product_clean, true);
-
- Hook::exec(
- 'actionUpdateQuantity',
- [
- 'id_product' => $id_product,
- 'id_product_attribute' => 0,
- 'quantity' => $product_quantity,
- 'id_shop' => $id_shop,
- ]
- );
- } else {
- // else this product has attributes, hence loops on $ids_product_attribute
- foreach ($ids_product_attribute as $id_product_attribute) {
- $allowed_warehouse_for_combination = Warehouse::getProductWarehouseList((int) $id_product, (int) $id_product_attribute, (int) $id_shop);
- $allowed_warehouse_for_combination_clean = [];
- foreach ($allowed_warehouse_for_combination as $warehouse) {
- $allowed_warehouse_for_combination_clean[] = (int) $warehouse['id_warehouse'];
- }
- $allowed_warehouse_for_combination_clean = array_intersect($allowed_warehouse_for_combination_clean, $warehouses);
- if ($order_id_shop != null && !count(array_intersect($allowed_warehouse_for_combination_clean, $order_warehouses))) {
- continue;
- }
-
- $quantity = $manager->getProductRealQuantities($id_product, $id_product_attribute, $allowed_warehouse_for_combination_clean, true);
-
- $query = new DbQuery();
- $query->select('COUNT(*)');
- $query->from('stock_available');
- $query->where('id_product = ' . (int) $id_product . ' AND id_product_attribute = ' . (int) $id_product_attribute .
- StockAvailable::addSqlShopRestriction(null, $id_shop));
-
- if ((int) Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query)) {
- $query = [
- 'table' => 'stock_available',
- 'data' => ['quantity' => $quantity],
- 'where' => 'id_product = ' . (int) $id_product . ' AND id_product_attribute = ' . (int) $id_product_attribute .
- StockAvailable::addSqlShopRestriction(null, $id_shop),
- ];
- Db::getInstance()->update($query['table'], $query['data'], $query['where']);
- } else {
- $query = [
- 'table' => 'stock_available',
- 'data' => [
- 'quantity' => $quantity,
- 'depends_on_stock' => 1,
- 'out_of_stock' => $out_of_stock,
- 'id_product' => (int) $id_product,
- 'id_product_attribute' => (int) $id_product_attribute,
- ],
- ];
- StockAvailable::addSqlShopParams($query['data'], $id_shop);
- Db::getInstance()->insert($query['table'], $query['data']);
- }
-
- $product_quantity += $quantity;
-
- Hook::exec(
- 'actionUpdateQuantity',
- [
- 'id_product' => $id_product,
- 'id_product_attribute' => $id_product_attribute,
- 'quantity' => $quantity,
- 'id_shop' => $id_shop,
- ]
- );
- }
- }
- // updates
- // if $id_product has attributes, it also updates the sum for all attributes
- if (($order_id_shop != null && array_intersect($warehouses, $order_warehouses)) || $order_id_shop == null) {
- $query = [
- 'table' => 'stock_available',
- 'data' => ['quantity' => $product_quantity],
- 'where' => 'id_product = ' . (int) $id_product . ' AND id_product_attribute = 0' .
- StockAvailable::addSqlShopRestriction(null, $id_shop),
- ];
- Db::getInstance()->update($query['table'], $query['data'], $query['where']);
- }
- }
- }
- // In case there are no warehouses, removes product from StockAvailable
- if (count($ids_warehouse) == 0 && StockAvailable::dependsOnStock((int) $id_product)) {
- Db::getInstance()->update('stock_available', ['quantity' => 0], 'id_product = ' . (int) $id_product);
- }
-
- Cache::clean('StockAvailable::getQuantityAvailableByProduct_' . (int) $id_product . '*');
- }
-
- /**
- * For a given id_product, sets if stock available depends on stock.
*
- * @param int $id_product
- * @param bool $depends_on_stock Optional : true by default
- * @param int $id_shop Optional : gets context by default
+ * @deprecated Since 9.0 and will be removed in 10.0
*/
- public static function setProductDependsOnStock($id_product, $depends_on_stock = true, $id_shop = null, $id_product_attribute = 0)
+ public static function synchronize($id_product, $order_id_shop = null)
{
- if (!Validate::isUnsignedId($id_product)) {
- return false;
- }
-
- $existing_id = StockAvailable::getStockAvailableIdByProductId((int) $id_product, (int) $id_product_attribute, $id_shop);
- if ($existing_id > 0) {
- Db::getInstance()->update('stock_available', [
- 'depends_on_stock' => (int) $depends_on_stock,
- ], 'id_stock_available = ' . (int) $existing_id);
- } else {
- $params = [
- 'depends_on_stock' => (int) $depends_on_stock,
- 'id_product' => (int) $id_product,
- 'id_product_attribute' => (int) $id_product_attribute,
- ];
+ @trigger_error(sprintf(
+ '%s is deprecated since 9.0 and will be removed in 10.0.',
+ __METHOD__
+ ), E_USER_DEPRECATED);
- StockAvailable::addSqlShopParams($params, $id_shop);
-
- Db::getInstance()->insert('stock_available', $params);
- }
-
- // depends on stock.. hence synchronizes
- if ($depends_on_stock) {
- StockAvailable::synchronize($id_product);
- }
+ return true;
}
/**
@@ -536,7 +352,7 @@ public function postSave()
* If $avoid_parent_pack_update is true, then packs containing the given product won't be updated.
*
* @param int $id_product
- * @param int $id_product_attribute Optional
+ * @param int|null $id_product_attribute Optional
* @param int $delta_quantity The delta quantity to update
* @param int $id_shop Optional
* @param bool $add_movement Optional
@@ -579,61 +395,59 @@ public static function setQuantity($id_product, $id_product_attribute, $quantity
if ($id_shop === null && Shop::getContext() != Shop::CONTEXT_GROUP) {
$id_shop = (int) $context->shop->id;
}
- $depends_on_stock = StockAvailable::dependsOnStock($id_product);
+
//Try to set available quantity if product does not depend on physical stock
- if (!$depends_on_stock) {
- $stockManager = ServiceLocator::get('\\PrestaShop\\PrestaShop\\Core\\Stock\\StockManager');
+ $stockManager = ServiceLocator::get('\\PrestaShop\\PrestaShop\\Core\\Stock\\StockManager');
- $id_stock_available = (int) StockAvailable::getStockAvailableIdByProductId($id_product, $id_product_attribute, $id_shop);
- if ($id_stock_available) {
- $stock_available = new StockAvailable($id_stock_available);
+ $id_stock_available = (int) StockAvailable::getStockAvailableIdByProductId($id_product, $id_product_attribute, $id_shop);
+ if ($id_stock_available) {
+ $stock_available = new StockAvailable($id_stock_available);
- $deltaQuantity = (int) $quantity - (int) $stock_available->quantity;
+ $deltaQuantity = (int) $quantity - (int) $stock_available->quantity;
- $stock_available->quantity = (int) $quantity;
- $stock_available->update();
+ $stock_available->quantity = (int) $quantity;
+ $stock_available->update();
- if (true === $add_movement && 0 != $deltaQuantity) {
- $stockManager->saveMovement($id_product, $id_product_attribute, $deltaQuantity);
- }
+ if (true === $add_movement && 0 != $deltaQuantity) {
+ $stockManager->saveMovement($id_product, $id_product_attribute, $deltaQuantity);
+ }
+ } else {
+ $out_of_stock = StockAvailable::outOfStock($id_product, $id_shop);
+ $stock_available = new StockAvailable();
+ $stock_available->out_of_stock = (int) $out_of_stock;
+ $stock_available->id_product = (int) $id_product;
+ $stock_available->id_product_attribute = (int) $id_product_attribute;
+ $stock_available->quantity = (int) $quantity;
+ if ($id_shop === null) {
+ $shop_group = Shop::getContextShopGroup();
} else {
- $out_of_stock = StockAvailable::outOfStock($id_product, $id_shop);
- $stock_available = new StockAvailable();
- $stock_available->out_of_stock = (int) $out_of_stock;
- $stock_available->id_product = (int) $id_product;
- $stock_available->id_product_attribute = (int) $id_product_attribute;
- $stock_available->quantity = (int) $quantity;
- if ($id_shop === null) {
- $shop_group = Shop::getContextShopGroup();
- } else {
- $shop_group = new ShopGroup((int) Shop::getGroupFromShop((int) $id_shop));
- }
- // if quantities are shared between shops of the group
- if ($shop_group->share_stock) {
- $stock_available->id_shop = 0;
- $stock_available->id_shop_group = (int) $shop_group->id;
- } else {
- $stock_available->id_shop = (int) $id_shop;
- $stock_available->id_shop_group = 0;
- }
- $stock_available->add();
-
- if (true === $add_movement && 0 != $quantity) {
- $stockManager->saveMovement($id_product, $id_product_attribute, (int) $quantity);
- }
+ $shop_group = new ShopGroup((int) Shop::getGroupFromShop((int) $id_shop));
+ }
+ // if quantities are shared between shops of the group
+ if ($shop_group->share_stock) {
+ $stock_available->id_shop = 0;
+ $stock_available->id_shop_group = (int) $shop_group->id;
+ } else {
+ $stock_available->id_shop = (int) $id_shop;
+ $stock_available->id_shop_group = 0;
}
+ $stock_available->add();
- Hook::exec(
- 'actionUpdateQuantity',
- [
- 'id_product' => $id_product,
- 'id_product_attribute' => $id_product_attribute,
- 'quantity' => $stock_available->quantity,
- 'delta_quantity' => $deltaQuantity ?? null,
- 'id_shop' => $id_shop,
- ]
- );
+ if (true === $add_movement && 0 != $quantity) {
+ $stockManager->saveMovement($id_product, $id_product_attribute, (int) $quantity);
+ }
}
+
+ Hook::exec(
+ 'actionUpdateQuantity',
+ [
+ 'id_product' => $id_product,
+ 'id_product_attribute' => $id_product_attribute,
+ 'quantity' => $stock_available->quantity,
+ 'delta_quantity' => $deltaQuantity ?? null,
+ 'id_shop' => $id_shop,
+ ]
+ );
Cache::clean('StockAvailable::getQuantityAvailableByProduct_' . (int) $id_product . '*');
}
@@ -726,38 +540,13 @@ public static function resetProductFromStockAvailableByShopGroup(ShopGroup $shop
return Db::getInstance()->update('stock_available', ['quantity' => 0], 'id_shop_group = ' . $shop_group->id);
}
- /**
- * For a given product, tells if it depends on the physical (usable) stock.
- *
- * @param int $id_product
- * @param int $id_shop Optional : gets context if null @see Context::getContext()
- *
- * @return bool : depends on stock @see $depends_on_stock
- */
- public static function dependsOnStock($id_product, $id_shop = null)
- {
- if (!Validate::isUnsignedId($id_product)) {
- return false;
- }
-
- $query = new DbQuery();
- $query->select('depends_on_stock');
- $query->from('stock_available');
- $query->where('id_product = ' . (int) $id_product);
- $query->where('id_product_attribute = 0');
-
- $query = StockAvailable::addSqlShopRestriction($query, $id_shop);
-
- return (bool) Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query);
- }
-
/**
* For a given product, get its "out of stock" flag.
*
* @param int $id_product
* @param int|null $id_shop Optional : gets context if null @see Context::getContext()
*
- * @return int|bool : depends on stock @see $depends_on_stock
+ * @return int|bool out_of_stock flag
*/
public static function outOfStock($id_product, $id_shop = null)
{
diff --git a/classes/stock/StockManager.php b/classes/stock/StockManager.php
index 1b4b9e3ddd22c..f5c2dd2c88cce 100644
--- a/classes/stock/StockManager.php
+++ b/classes/stock/StockManager.php
@@ -28,6 +28,7 @@
* StockManager : implementation of StockManagerInterface.
*
* @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0, stock is now managed by new logic
*/
class StockManagerCore implements StockManagerInterface
{
@@ -241,33 +242,6 @@ public function removeProduct(
// Special case of a pack
if (Pack::isPack((int) $id_product) && !$ignore_pack) {
if (Validate::isLoadedObject($product = new Product((int) $id_product))) {
- // Gets items
- if ($product->pack_stock_type == Pack::STOCK_TYPE_PRODUCTS_ONLY
- || $product->pack_stock_type == Pack::STOCK_TYPE_PACK_BOTH
- || ($product->pack_stock_type == Pack::STOCK_TYPE_DEFAULT
- && Configuration::get('PS_PACK_STOCK_TYPE') > 0)
- ) {
- $products_pack = Pack::getItems((int) $id_product, (int) Configuration::get('PS_LANG_DEFAULT'));
- // Foreach item
- foreach ($products_pack as $product_pack) {
- if ($product_pack->advanced_stock_management == 1) {
- $product_warehouses = Warehouse::getProductWarehouseList($product_pack->id, $product_pack->id_pack_product_attribute);
- $warehouse_stock_found = false;
- foreach ($product_warehouses as $product_warehouse) {
- if (!$warehouse_stock_found) {
- if (Warehouse::exists($product_warehouse['id_warehouse'])) {
- $current_warehouse = new Warehouse($product_warehouse['id_warehouse']);
- $return[] = $this->removeProduct($product_pack->id, $product_pack->id_pack_product_attribute, $current_warehouse, $product_pack->pack_quantity * $quantity, $id_stock_mvt_reason, $is_usable, $id_order, $ignore_pack, $employee);
-
- // The product was found on this warehouse. Stop the stock searching.
- $warehouse_stock_found = !empty($return[count($return) - 1]);
- }
- }
- }
- }
- }
- }
-
if ($product->pack_stock_type == Pack::STOCK_TYPE_PACK_ONLY
|| $product->pack_stock_type == Pack::STOCK_TYPE_PACK_BOTH
|| (
@@ -488,21 +462,6 @@ public function removeProduct(
$stock_available_quantity = $quantity_in_stock - $quantity;
$max_pack_quantity = max([0, floor($stock_available_quantity / $quantity_by_pack)]);
$quantity_delta = Pack::getQuantity($pack->id) - $max_pack_quantity;
-
- if ($pack->advanced_stock_management == 1 && $quantity_delta > 0) {
- $product_warehouses = Warehouse::getPackWarehouses($pack->id);
- $warehouse_stock_found = false;
- foreach ($product_warehouses as $product_warehouse) {
- if (!$warehouse_stock_found) {
- if (Warehouse::exists($product_warehouse)) {
- $current_warehouse = new Warehouse($product_warehouse);
- $return[] = $this->removeProduct($pack->id, null, $current_warehouse, $quantity_delta, $id_stock_mvt_reason, $is_usable, $id_order, 1);
- // The product was found on this warehouse. Stop the stock searching.
- $warehouse_stock_found = !empty($return[count($return) - 1]);
- }
- }
- }
- }
}
}
}
diff --git a/classes/stock/StockManagerFactory.php b/classes/stock/StockManagerFactory.php
index fd66ed4e37e3a..65ec8547242dc 100644
--- a/classes/stock/StockManagerFactory.php
+++ b/classes/stock/StockManagerFactory.php
@@ -24,9 +24,11 @@
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/
-/*
+/**
* StockManagerFactory : factory of stock manager
+ *
* @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0, stock is now managed by new logic
*/
class StockManagerFactoryCore
{
diff --git a/classes/stock/StockManagerInterface.php b/classes/stock/StockManagerInterface.php
index b62e377de55b4..c2c5036ae4ff0 100644
--- a/classes/stock/StockManagerInterface.php
+++ b/classes/stock/StockManagerInterface.php
@@ -28,6 +28,7 @@
* StockManagerInterface : defines a way to manage stock.
*
* @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0, stock is now managed by new logic
*/
interface StockManagerInterface
{
diff --git a/classes/stock/StockManagerModule.php b/classes/stock/StockManagerModule.php
index 443745f195bd3..03acda35645ee 100644
--- a/classes/stock/StockManagerModule.php
+++ b/classes/stock/StockManagerModule.php
@@ -26,6 +26,7 @@
/**
* @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0, stock is now managed by new logic
*/
abstract class StockManagerModuleCore extends Module
{
diff --git a/classes/stock/StockMvt.php b/classes/stock/StockMvt.php
index f21922b20bfab..0bd748159c3b5 100644
--- a/classes/stock/StockMvt.php
+++ b/classes/stock/StockMvt.php
@@ -25,7 +25,8 @@
*/
/**
- * @since 1.5.0 It now defines stock movements when the advanced stock management system is available
+ * @since 1.5.0 Defines stock movements
+ * @deprecated since 9.0 and will be removed in 10.0, this object model is no longer needed
*/
class StockMvtCore extends ObjectModel
{
diff --git a/classes/stock/StockMvtReason.php b/classes/stock/StockMvtReason.php
index 501295a43d8c3..aecda5f2cb4e2 100644
--- a/classes/stock/StockMvtReason.php
+++ b/classes/stock/StockMvtReason.php
@@ -23,6 +23,10 @@
* @copyright Since 2007 PrestaShop SA and Contributors
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/
+
+/**
+ * @deprecated since 9.0 and will be removed in 10.0, this object model is no longer needed
+ */
class StockMvtReasonCore extends ObjectModel
{
/** @var int identifier of the movement reason */
diff --git a/classes/stock/StockMvtWS.php b/classes/stock/StockMvtWS.php
index 88c445d34543f..99c7dee0804b1 100644
--- a/classes/stock/StockMvtWS.php
+++ b/classes/stock/StockMvtWS.php
@@ -28,6 +28,7 @@
* Webservice entity for stock movements.
*
* @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0, this object model is no longer needed
*/
class StockMvtWSCore extends ObjectModelCore
{
diff --git a/classes/stock/SupplyOrder.php b/classes/stock/SupplyOrder.php
index 47f3e8e5bc949..dc49ffa2f87f8 100644
--- a/classes/stock/SupplyOrder.php
+++ b/classes/stock/SupplyOrder.php
@@ -26,6 +26,7 @@
/**
* @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0
*/
class SupplyOrderCore extends ObjectModel
{
diff --git a/classes/stock/SupplyOrderDetail.php b/classes/stock/SupplyOrderDetail.php
index a37c775980038..c574d249584ee 100644
--- a/classes/stock/SupplyOrderDetail.php
+++ b/classes/stock/SupplyOrderDetail.php
@@ -28,6 +28,7 @@
* Represents one product ordered.
*
* @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0
*/
class SupplyOrderDetailCore extends ObjectModel
{
diff --git a/classes/stock/SupplyOrderHistory.php b/classes/stock/SupplyOrderHistory.php
index 78d1ee16a619c..bc669bfc2ad65 100644
--- a/classes/stock/SupplyOrderHistory.php
+++ b/classes/stock/SupplyOrderHistory.php
@@ -26,6 +26,7 @@
/**
* @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0
*/
class SupplyOrderHistoryCore extends ObjectModel
{
diff --git a/classes/stock/SupplyOrderReceiptHistory.php b/classes/stock/SupplyOrderReceiptHistory.php
index bc3771463adda..499df27a9abbc 100644
--- a/classes/stock/SupplyOrderReceiptHistory.php
+++ b/classes/stock/SupplyOrderReceiptHistory.php
@@ -28,6 +28,7 @@
* History of receipts.
*
* @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0
*/
class SupplyOrderReceiptHistoryCore extends ObjectModel
{
diff --git a/classes/stock/SupplyOrderState.php b/classes/stock/SupplyOrderState.php
index b4a504951f781..4336c0d033b81 100644
--- a/classes/stock/SupplyOrderState.php
+++ b/classes/stock/SupplyOrderState.php
@@ -26,6 +26,7 @@
/**
* @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0
*/
class SupplyOrderStateCore extends ObjectModel
{
diff --git a/classes/stock/Warehouse.php b/classes/stock/Warehouse.php
index 0033d14894f10..9c97f3fec6620 100644
--- a/classes/stock/Warehouse.php
+++ b/classes/stock/Warehouse.php
@@ -28,6 +28,7 @@
* Holds Stock.
*
* @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0
*/
class WarehouseCore extends ObjectModel
{
@@ -306,7 +307,6 @@ public static function getProductLocation($id_product, $id_product_attribute, $i
*/
public static function getProductWarehouseList($id_product, $id_product_attribute = 0, $id_shop = null)
{
- // if it's a pack, returns warehouses if and only if some products use the advanced stock management
$share_stock = false;
if ($id_shop === null) {
if (Shop::getContext() == Shop::CONTEXT_GROUP) {
@@ -522,8 +522,6 @@ public static function getPackWarehouses($id_product, $id_shop = null)
// warehouses of the pack
$pack_warehouses = WarehouseProductLocation::getCollection((int) $id_product);
- // products in the pack
- $products = Pack::getItems((int) $id_product, Configuration::get('PS_LANG_DEFAULT'));
// array with all warehouses id to check
$list = [];
@@ -534,34 +532,26 @@ public static function getPackWarehouses($id_product, $id_shop = null)
$list['pack_warehouses'][] = (int) $pack_warehouse->id_warehouse;
}
- // for each products in the pack
- foreach ($products as $product) {
- if ($product->advanced_stock_management) {
- // gets the warehouses of one product
- $product_warehouses = Warehouse::getProductWarehouseList((int) $product->id, (int) $product->cache_default_attribute, (int) $id_shop);
- $list[(int) $product->id] = [];
- // fills array with warehouses for this product
- foreach ($product_warehouses as $product_warehouse) {
- $list[(int) $product->id][] = $product_warehouse['id_warehouse'];
- }
- }
- }
-
$res = false;
// returns final list
- if (count($list) > 1) {
+ if (!empty($list)) {
$res = call_user_func_array('array_intersect', $list);
}
return $res;
}
+ /**
+ * @deprecated Since 9.0 and will be removed in 10.0
+ */
public function resetStockAvailable()
{
- $products = WarehouseProductLocation::getProducts((int) $this->id);
- foreach ($products as $product) {
- StockAvailable::synchronize((int) $product['id_product']);
- }
+ @trigger_error(sprintf(
+ '%s is deprecated since 9.0 and will be removed in 10.0.',
+ __METHOD__
+ ), E_USER_DEPRECATED);
+
+ return true;
}
/*********************************\
diff --git a/classes/stock/WarehouseProductLocation.php b/classes/stock/WarehouseProductLocation.php
index 2d35d3658c437..150be6cb35be0 100644
--- a/classes/stock/WarehouseProductLocation.php
+++ b/classes/stock/WarehouseProductLocation.php
@@ -25,6 +25,7 @@
*/
/**
* @since 1.5.0
+ * @deprecated since 9.0 and will be removed in 10.0
*/
class WarehouseProductLocationCore extends ObjectModel
{
diff --git a/classes/tax/Tax.php b/classes/tax/Tax.php
index 5996e8de0e5fa..eadf2fee7af24 100644
--- a/classes/tax/Tax.php
+++ b/classes/tax/Tax.php
@@ -81,18 +81,7 @@ public function delete()
*/
public function historize()
{
- $this->deleted = true;
-
- return parent::update();
- }
-
- public function toggleStatus()
- {
- if (parent::toggleStatus()) {
- return $this->_onStatusChange();
- }
-
- return false;
+ return $this->softDelete();
}
public function update($null_values = false)
@@ -110,21 +99,12 @@ public function update($null_values = false)
return $res;
} elseif (parent::update($null_values)) {
- return $this->_onStatusChange();
+ return true;
}
return false;
}
- protected function _onStatusChange()
- {
- if (!$this->active) {
- return TaxRule::deleteTaxRuleByIdTax($this->id);
- }
-
- return true;
- }
-
/**
* Returns true if the tax is used in an order details.
*
diff --git a/classes/tax/TaxRulesGroup.php b/classes/tax/TaxRulesGroup.php
index 31c5d9066b287..78baf15a0a7c0 100644
--- a/classes/tax/TaxRulesGroup.php
+++ b/classes/tax/TaxRulesGroup.php
@@ -93,9 +93,7 @@ public function update($null_values = false)
*/
public function historize(TaxRulesGroup $tax_rules_group)
{
- $this->deleted = true;
-
- return parent::update() &&
+ return $this->softDelete() &&
Db::getInstance()->execute('
INSERT INTO ' . _DB_PREFIX_ . 'tax_rule
(id_tax_rules_group, id_country, id_state, zipcode_from, zipcode_to, id_tax, behavior, description)
@@ -195,11 +193,12 @@ private static function getTaxRulesGroupsData($onlyActive = true, bool $includeR
INNER JOIN ' . _DB_PREFIX_ . 'tax_rule tr
ON g.id_tax_rules_group = tr.id_tax_rules_group
INNER JOIN ' . _DB_PREFIX_ . 'tax t
- ON tr.id_tax = t.id_tax
+ ON (tr.id_tax = t.id_tax AND t.active = 1)
';
}
$sql .= Shop::addSqlAssociation('tax_rules_group', 'g') . ' WHERE g.deleted = 0'
+ . ($onlyActive ? ' AND g.`active` = 1' : '')
. ($onlyActive ? ' AND g.`active` = 1' : '')
. ' ORDER BY name ASC';
diff --git a/classes/webservice/WebserviceRequest.php b/classes/webservice/WebserviceRequest.php
index ee2a809ff18d7..6819b7447b26b 100644
--- a/classes/webservice/WebserviceRequest.php
+++ b/classes/webservice/WebserviceRequest.php
@@ -312,6 +312,7 @@ public static function getResources()
'order_invoices' => ['description' => 'The Order invoices', 'class' => 'OrderInvoice'],
'orders' => ['description' => 'The Customers orders', 'class' => 'Order'],
'order_payments' => ['description' => 'The Order payments', 'class' => 'OrderPayment'],
+ 'order_returns' => ['description' => 'The Customers orders returns', 'class' => 'OrderReturn'],
'order_states' => ['description' => 'The Order statuses', 'class' => 'OrderState'],
'order_slip' => ['description' => 'The Order slips', 'class' => 'OrderSlip'],
'price_ranges' => ['description' => 'Price ranges', 'class' => 'RangePrice'],
@@ -338,12 +339,6 @@ public static function getResources()
'warehouses' => ['description' => 'Warehouses', 'class' => 'Warehouse', 'forbidden_method' => ['DELETE']],
'stocks' => ['description' => 'Stocks', 'class' => 'Stock', 'forbidden_method' => ['PUT', 'POST', 'PATCH', 'DELETE']],
'stock_availables' => ['description' => 'Available quantities', 'class' => 'StockAvailable', 'forbidden_method' => ['POST', 'DELETE']],
- 'warehouse_product_locations' => ['description' => 'Location of products in warehouses', 'class' => 'WarehouseProductLocation', 'forbidden_method' => ['PUT', 'POST', 'PATCH', 'DELETE']],
- 'supply_orders' => ['description' => 'Supply Orders', 'class' => 'SupplyOrder', 'forbidden_method' => ['PUT', 'POST', 'PATCH', 'DELETE']],
- 'supply_order_details' => ['description' => 'Supply Order Details', 'class' => 'SupplyOrderDetail', 'forbidden_method' => ['PUT', 'POST', 'PATCH', 'DELETE']],
- 'supply_order_states' => ['description' => 'Supply Order Statuses', 'class' => 'SupplyOrderState', 'forbidden_method' => ['PUT', 'POST', 'PATCH', 'DELETE']],
- 'supply_order_histories' => ['description' => 'Supply Order Histories', 'class' => 'SupplyOrderHistory', 'forbidden_method' => ['PUT', 'POST', 'PATCH', 'DELETE']],
- 'supply_order_receipt_histories' => ['description' => 'Supply Order Receipt Histories', 'class' => 'SupplyOrderReceiptHistory', 'forbidden_method' => ['PUT', 'POST', 'PATCH', 'DELETE']],
'product_suppliers' => ['description' => 'Product Suppliers', 'class' => 'ProductSupplier'],
'tax_rules' => ['description' => 'Tax rules entity', 'class' => 'TaxRule'],
'tax_rule_groups' => ['description' => 'Tax rule groups', 'class' => 'TaxRulesGroup'],
@@ -353,6 +348,9 @@ public static function getResources()
'product_customization_fields' => ['description' => 'Customization Field', 'class' => 'CustomizationField'],
'customizations' => ['description' => 'Customization values', 'class' => 'Customization'],
];
+
+ // An array [module_name => module_output] will be returned
+ // Hook call is ignoring exceptions set in the backoffice
$extra_resources = Hook::exec('addWebserviceResources', ['resources' => $resources], null, true, false);
if (is_countable($extra_resources) && count($extra_resources)) {
foreach ($extra_resources as $new_resources) {
diff --git a/composer.json b/composer.json
index b2e3c75e436a8..d90b88b444704 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
},
{
"name": "PrestaShop Community",
- "homepage": "https://contributors.prestashop.com/"
+ "homepage": "https://contributors.prestashop-project.org/"
}
],
"require": {
@@ -41,14 +41,12 @@
"friendsofsymfony/jsrouting-bundle": "^3.2.1",
"geoip2/geoip2": "~2.4.2",
"greenlion/php-sql-parser": "^4.3",
- "guzzlehttp/guzzle": "^7.5",
"incenteev/composer-parameter-handler": "~2.0",
"ircmaxell/password-compat": "^1.0.4",
"ircmaxell/random-lib": "^1.2.0",
"jakeasmith/http_build_url": "^1",
"lcobucci/jwt": "^5.0.0",
"league/oauth2-server": "^8.3",
- "league/tactician-bundle": "^1.4",
"martinlindhe/php-mb-helpers": "^0.1.6",
"matthiasmullie/minify": "~1.3.0",
"mobiledetect/mobiledetectlib": "^3.74.0",
@@ -127,7 +125,7 @@
"prestashop/statssales": "^2",
"prestashop/statssearch": "^2",
"prestashop/statsstock": "^2",
- "prestashop/translationtools-bundle": "^5.0",
+ "prestashop/translationtools-bundle": "^6",
"sensio/framework-extra-bundle": "^5.1",
"smarty/smarty": "^4.3.1",
"soundasleep/html2text": "^2.1.0",
@@ -136,7 +134,7 @@
"symfony/config": "5.4.*",
"symfony/console": "5.4.*",
"symfony/dependency-injection": "5.4.*",
- "symfony/doctrine-messenger": "^5.4",
+ "symfony/doctrine-messenger": "5.4.*",
"symfony/dom-crawler": "5.4.*",
"symfony/dotenv": "5.4.*",
"symfony/error-handler": "5.4.*",
@@ -148,14 +146,12 @@
"symfony/http-client": "5.4.*",
"symfony/http-foundation": "5.4.*",
"symfony/http-kernel": "5.4.*",
- "symfony/inflector": "5.4.*",
"symfony/intl": "5.4.*",
"symfony/lock": "5.4.*",
"symfony/mailer": "5.4.*",
"symfony/messenger": "5.4.*",
"symfony/mime": "5.4.*",
"symfony/monolog-bundle": "^3.7.0",
- "symfony/notifier": "5.4.*",
"symfony/options-resolver": "5.4.*",
"symfony/password-hasher": "5.4.*",
"symfony/polyfill-php73": "^1.10",
@@ -164,28 +160,27 @@
"symfony/property-info": "5.4.*",
"symfony/proxy-manager-bridge": "5.4.*",
"symfony/psr-http-message-bridge": "^2.1",
- "symfony/rate-limiter": "5.4.*",
"symfony/routing": "5.4.*",
"symfony/security-bundle": "5.4.*",
"symfony/security-core": "5.4.*",
"symfony/security-csrf": "5.4.*",
"symfony/security-guard": "5.4.*",
"symfony/security-http": "5.4.*",
- "symfony/semaphore": "5.4.*",
"symfony/serializer": "5.4.*",
"symfony/string": "5.4.*",
"symfony/templating": "5.4.*",
"symfony/translation": "5.4.*",
"symfony/twig-bundle": "5.4.*",
- "symfony/uid": "5.4.*",
+ "symfony/ux-twig-component": "^2.9",
"symfony/validator": "5.4.*",
"symfony/var-dumper": "5.4.*",
"symfony/var-exporter": "5.4.*",
"symfony/web-link": "5.4.*",
- "symfony/workflow": "5.4.*",
"symfony/yaml": "5.4.*",
"tecnickcom/tcpdf": "^6.2.12",
"tijsverkoyen/css-to-inline-styles": "^2.2",
+ "twig/extra-bundle": "^3.6",
+ "twig/string-extra": "^3.6",
"twig/twig": "^3.0"
},
"require-dev": {
@@ -197,6 +192,7 @@
"phpstan/extension-installer": "^1.2",
"phpstan/phpstan": "^1.9.3",
"phpunit/phpunit": "~9.6.7",
+ "rector/rector": "^0.15.17",
"spaze/phpstan-disallowed-calls": "^2.10",
"symfony/browser-kit": "5.4.*",
"symfony/css-selector": "5.4.*",
@@ -241,6 +237,8 @@
},
"classmap": [
"app/AppKernel.php",
+ "app/AdminKernel.php",
+ "app/FrontKernel.php",
"app/AppCache.php"
]
},
diff --git a/composer.lock b/composer.lock
index 939c59fc0fe0e..8d1612349a604 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "2af9c8d5f804d5b155630f3a5ac5e9d4",
+ "content-hash": "60fdd414e98620e1f4a41b8cf8ff8198",
"packages": [
{
"name": "api-platform/core",
@@ -345,7 +345,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/ca-bundle/issues",
- "source": "https://github.com/composer/ca-bundle/tree/1.3.1"
+ "source": "https://github.com/composer/ca-bundle/tree/1.3.4"
},
"funding": [
{
@@ -510,25 +510,25 @@
},
{
"name": "cssjanus/cssjanus",
- "version": "v2.1.0",
+ "version": "v2.1.1",
"source": {
"type": "git",
- "url": "https://github.com/cssjanus/php-cssjanus.git",
- "reference": "de7483c0805750a6462b372eab55d022d555df02"
+ "url": "https://github.com/wikimedia/php-cssjanus.git",
+ "reference": "befd1eb7b1e70ee2cd71cd5b9a86ff250d2e8423"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cssjanus/php-cssjanus/zipball/de7483c0805750a6462b372eab55d022d555df02",
- "reference": "de7483c0805750a6462b372eab55d022d555df02",
+ "url": "https://api.github.com/repos/wikimedia/php-cssjanus/zipball/befd1eb7b1e70ee2cd71cd5b9a86ff250d2e8423",
+ "reference": "befd1eb7b1e70ee2cd71cd5b9a86ff250d2e8423",
"shasum": ""
},
"require": {
- "php": ">=7.2.0"
+ "php": ">=7.4.0"
},
"require-dev": {
- "mediawiki/mediawiki-phan-config": "0.10.6",
+ "mediawiki/mediawiki-phan-config": "0.12.0",
"php-parallel-lint/php-parallel-lint": "^1.3.0",
- "phpunit/phpunit": "^8.5.15",
+ "phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "^3.6.0"
},
"type": "library",
@@ -553,11 +553,11 @@
}
],
"description": "Convert CSS stylesheets between left-to-right and right-to-left.",
+ "homepage": "https://www.mediawiki.org/wiki/CSSJanus",
"support": {
- "issues": "https://github.com/cssjanus/php-cssjanus/issues",
- "source": "https://github.com/cssjanus/php-cssjanus/tree/v2.1.0"
+ "source": "https://github.com/wikimedia/php-cssjanus/tree/v2.1.1"
},
- "time": "2021-09-09T17:58:26+00:00"
+ "time": "2023-01-08T17:45:35+00:00"
},
{
"name": "curl/curl",
@@ -619,16 +619,16 @@
},
{
"name": "defuse/php-encryption",
- "version": "v2.3.1",
+ "version": "v2.4.0",
"source": {
"type": "git",
"url": "https://github.com/defuse/php-encryption.git",
- "reference": "77880488b9954b7884c25555c2a0ea9e7053f9d2"
+ "reference": "f53396c2d34225064647a05ca76c1da9d99e5828"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/defuse/php-encryption/zipball/77880488b9954b7884c25555c2a0ea9e7053f9d2",
- "reference": "77880488b9954b7884c25555c2a0ea9e7053f9d2",
+ "url": "https://api.github.com/repos/defuse/php-encryption/zipball/f53396c2d34225064647a05ca76c1da9d99e5828",
+ "reference": "f53396c2d34225064647a05ca76c1da9d99e5828",
"shasum": ""
},
"require": {
@@ -637,7 +637,8 @@
"php": ">=5.6.0"
},
"require-dev": {
- "phpunit/phpunit": "^4|^5|^6|^7|^8|^9"
+ "phpunit/phpunit": "^5|^6|^7|^8|^9|^10",
+ "yoast/phpunit-polyfills": "^2.0.0"
},
"bin": [
"bin/generate-defuse-key"
@@ -679,9 +680,9 @@
],
"support": {
"issues": "https://github.com/defuse/php-encryption/issues",
- "source": "https://github.com/defuse/php-encryption/tree/v2.3.1"
+ "source": "https://github.com/defuse/php-encryption/tree/v2.4.0"
},
- "time": "2021-04-09T23:57:26+00:00"
+ "time": "2023-06-19T06:10:36+00:00"
},
{
"name": "doctrine/annotations",
@@ -2249,22 +2250,22 @@
},
{
"name": "guzzlehttp/guzzle",
- "version": "7.5.0",
+ "version": "7.7.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba"
+ "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba",
- "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/fb7566caccf22d74d1ab270de3551f72a58399f5",
+ "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5",
"shasum": ""
},
"require": {
"ext-json": "*",
- "guzzlehttp/promises": "^1.5",
- "guzzlehttp/psr7": "^1.9 || ^2.4",
+ "guzzlehttp/promises": "^1.5.3 || ^2.0",
+ "guzzlehttp/psr7": "^1.9.1 || ^2.4.5",
"php": "^7.2.5 || ^8.0",
"psr/http-client": "^1.0",
"symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -2275,7 +2276,8 @@
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.1",
"ext-curl": "*",
- "php-http/client-integration-tests": "^3.0",
+ "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
+ "php-http/message-factory": "^1.1",
"phpunit/phpunit": "^8.5.29 || ^9.5.23",
"psr/log": "^1.1 || ^2.0 || ^3.0"
},
@@ -2289,9 +2291,6 @@
"bamarni-bin": {
"bin-links": true,
"forward-command": false
- },
- "branch-alias": {
- "dev-master": "7.5-dev"
}
},
"autoload": {
@@ -2357,7 +2356,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
- "source": "https://github.com/guzzle/guzzle/tree/7.5.0"
+ "source": "https://github.com/guzzle/guzzle/tree/7.7.0"
},
"funding": [
{
@@ -2373,38 +2372,37 @@
"type": "tidelift"
}
],
- "time": "2022-08-28T15:39:27+00:00"
+ "time": "2023-05-21T14:04:53+00:00"
},
{
"name": "guzzlehttp/promises",
- "version": "1.5.2",
+ "version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
- "reference": "b94b2807d85443f9719887892882d0329d1e2598"
+ "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
- "reference": "b94b2807d85443f9719887892882d0329d1e2598",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/3a494dc7dc1d7d12e511890177ae2d0e6c107da6",
+ "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6",
"shasum": ""
},
"require": {
- "php": ">=5.5"
+ "php": "^7.2.5 || ^8.0"
},
"require-dev": {
- "symfony/phpunit-bridge": "^4.4 || ^5.1"
+ "bamarni/composer-bin-plugin": "^1.8.1",
+ "phpunit/phpunit": "^8.5.29 || ^9.5.23"
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-master": "1.5-dev"
+ "bamarni-bin": {
+ "bin-links": true,
+ "forward-command": false
}
},
"autoload": {
- "files": [
- "src/functions_include.php"
- ],
"psr-4": {
"GuzzleHttp\\Promise\\": "src/"
}
@@ -2441,7 +2439,7 @@
],
"support": {
"issues": "https://github.com/guzzle/promises/issues",
- "source": "https://github.com/guzzle/promises/tree/1.5.2"
+ "source": "https://github.com/guzzle/promises/tree/2.0.0"
},
"funding": [
{
@@ -2457,26 +2455,26 @@
"type": "tidelift"
}
],
- "time": "2022-08-28T14:55:35+00:00"
+ "time": "2023-05-21T13:50:22+00:00"
},
{
"name": "guzzlehttp/psr7",
- "version": "2.4.5",
+ "version": "2.5.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "0454e12ef0cd597ccd2adb036f7bda4e7fface66"
+ "reference": "b635f279edd83fc275f822a1188157ffea568ff6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/0454e12ef0cd597ccd2adb036f7bda4e7fface66",
- "reference": "0454e12ef0cd597ccd2adb036f7bda4e7fface66",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6",
+ "reference": "b635f279edd83fc275f822a1188157ffea568ff6",
"shasum": ""
},
"require": {
"php": "^7.2.5 || ^8.0",
"psr/http-factory": "^1.0",
- "psr/http-message": "^1.0",
+ "psr/http-message": "^1.1 || ^2.0",
"ralouphie/getallheaders": "^3.0"
},
"provide": {
@@ -2557,7 +2555,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
- "source": "https://github.com/guzzle/psr7/tree/2.4.5"
+ "source": "https://github.com/guzzle/psr7/tree/2.5.0"
},
"funding": [
{
@@ -2573,7 +2571,7 @@
"type": "tidelift"
}
],
- "time": "2023-04-17T16:00:45+00:00"
+ "time": "2023-04-17T16:11:26+00:00"
},
{
"name": "incenteev/composer-parameter-handler",
@@ -2591,12 +2589,12 @@
},
"require": {
"php": ">=5.3.3",
- "symfony/yaml": "^2.3 || ^3.0 || ^4.0 || ^5.0"
+ "symfony/yaml": "^2.3 || ^3.0 || ^4.0 || ^5.0 || ^6.0"
},
"require-dev": {
"composer/composer": "^1.0@dev",
- "symfony/filesystem": "^2.3 || ^3 || ^4 || ^5",
- "symfony/phpunit-bridge": "^4.0 || ^5.0"
+ "symfony/filesystem": "^2.3 || ^3 || ^4 || ^5 || ^6.0",
+ "symfony/phpunit-bridge": "^3.4.47 || ^4.4.41 || ^5.4.8 || ^6.0"
},
"type": "library",
"extra": {
@@ -2626,7 +2624,7 @@
],
"support": {
"issues": "https://github.com/Incenteev/ParameterHandler/issues",
- "source": "https://github.com/Incenteev/ParameterHandler/tree/v2.1.4"
+ "source": "https://github.com/Incenteev/ParameterHandler/tree/v2.1.5"
},
"time": "2020-03-17T21:10:00+00:00"
},
@@ -2883,69 +2881,6 @@
},
"time": "2017-05-01T15:36:40+00:00"
},
- {
- "name": "laminas/laminas-code",
- "version": "4.11.0",
- "source": {
- "type": "git",
- "url": "https://github.com/laminas/laminas-code.git",
- "reference": "169123b3ede20a9193480c53de2a8194f8c073ec"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-code/zipball/169123b3ede20a9193480c53de2a8194f8c073ec",
- "reference": "169123b3ede20a9193480c53de2a8194f8c073ec",
- "shasum": ""
- },
- "require": {
- "php": "~8.1.0 || ~8.2.0"
- },
- "require-dev": {
- "doctrine/annotations": "^2.0.0",
- "ext-phar": "*",
- "laminas/laminas-coding-standard": "^2.3.0",
- "laminas/laminas-stdlib": "^3.6.1",
- "phpunit/phpunit": "^10.0.9",
- "psalm/plugin-phpunit": "^0.18.4",
- "vimeo/psalm": "^5.7.1"
- },
- "suggest": {
- "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
- "laminas/laminas-stdlib": "Laminas\\Stdlib component"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Laminas\\Code\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "description": "Extensions to the PHP Reflection API, static code scanning, and code generation",
- "homepage": "https://laminas.dev",
- "keywords": [
- "code",
- "laminas",
- "laminasframework"
- ],
- "support": {
- "chat": "https://laminas.dev/chat",
- "docs": "https://docs.laminas.dev/laminas-code/",
- "forum": "https://discourse.laminas.dev",
- "issues": "https://github.com/laminas/laminas-code/issues",
- "rss": "https://github.com/laminas/laminas-code/releases.atom",
- "source": "https://github.com/laminas/laminas-code"
- },
- "funding": [
- {
- "url": "https://funding.communitybridge.org/projects/laminas-project",
- "type": "community_bridge"
- }
- ],
- "time": "2023-05-14T12:05:38+00:00"
- },
{
"name": "lcobucci/clock",
"version": "3.0.0",
@@ -3141,35 +3076,34 @@
},
{
"name": "league/oauth2-server",
- "version": "8.5.1",
+ "version": "8.5.3",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/oauth2-server.git",
- "reference": "43cd4d406906c6be5c8de2cee9bd3ad3753544ef"
+ "reference": "eb91b4190e7f6169053ebf8ffa352d47e756b2ce"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/43cd4d406906c6be5c8de2cee9bd3ad3753544ef",
- "reference": "43cd4d406906c6be5c8de2cee9bd3ad3753544ef",
+ "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/eb91b4190e7f6169053ebf8ffa352d47e756b2ce",
+ "reference": "eb91b4190e7f6169053ebf8ffa352d47e756b2ce",
"shasum": ""
},
"require": {
"defuse/php-encryption": "^2.3",
- "ext-json": "*",
"ext-openssl": "*",
"lcobucci/clock": "^2.2 || ^3.0",
"lcobucci/jwt": "^4.3 || ^5.0",
"league/event": "^2.2",
"league/uri": "^6.7",
"php": "^8.0",
- "psr/http-message": "^1.0.1"
+ "psr/http-message": "^1.0.1 || ^2.0"
},
"replace": {
"league/oauth2server": "*",
"lncd/oauth2": "*"
},
"require-dev": {
- "laminas/laminas-diactoros": "^2.24.0",
+ "laminas/laminas-diactoros": "^3.0.0",
"phpstan/phpstan": "^0.12.57",
"phpstan/phpstan-phpunit": "^0.12.16",
"phpunit/phpunit": "^9.6.6",
@@ -3218,7 +3152,7 @@
],
"support": {
"issues": "https://github.com/thephpleague/oauth2-server/issues",
- "source": "https://github.com/thephpleague/oauth2-server/tree/8.5.1"
+ "source": "https://github.com/thephpleague/oauth2-server/tree/8.5.3"
},
"funding": [
{
@@ -3226,255 +3160,7 @@
"type": "github"
}
],
- "time": "2023-04-04T10:20:16+00:00"
- },
- {
- "name": "league/tactician",
- "version": "v1.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/thephpleague/tactician.git",
- "reference": "e79f763170f3d5922ec29e85cffca0bac5cd8975"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/thephpleague/tactician/zipball/e79f763170f3d5922ec29e85cffca0bac5cd8975",
- "reference": "e79f763170f3d5922ec29e85cffca0bac5cd8975",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1"
- },
- "require-dev": {
- "mockery/mockery": "^1.3",
- "phpunit/phpunit": "^7.5.20 || ^9.3.8",
- "squizlabs/php_codesniffer": "^3.5.8"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "League\\Tactician\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Ross Tuck",
- "homepage": "http://tactician.thephpleague.com"
- }
- ],
- "description": "A small, flexible command bus. Handy for building service layers.",
- "keywords": [
- "command",
- "command bus",
- "service layer"
- ],
- "support": {
- "issues": "https://github.com/thephpleague/tactician/issues",
- "source": "https://github.com/thephpleague/tactician/tree/v1.1.0"
- },
- "time": "2021-02-14T15:29:04+00:00"
- },
- {
- "name": "league/tactician-bundle",
- "version": "v1.4.0",
- "source": {
- "type": "git",
- "url": "https://github.com/thephpleague/tactician-bundle.git",
- "reference": "8340e83ded7c804d2b2c417a0f697fac9c15e520"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/thephpleague/tactician-bundle/zipball/8340e83ded7c804d2b2c417a0f697fac9c15e520",
- "reference": "8340e83ded7c804d2b2c417a0f697fac9c15e520",
- "shasum": ""
- },
- "require": {
- "league/tactician": "^1.0",
- "league/tactician-container": "^2.0|^3.0",
- "league/tactician-logger": "^0.10|^0.11",
- "php": ">=7.2",
- "symfony/config": "^3.4|^4.4|^5.0|^6.0",
- "symfony/dependency-injection": "^3.4|^4.4|^5.0|^6.0",
- "symfony/http-kernel": "^3.4|^4.4|^5.0|^6.0",
- "symfony/yaml": "^3.4|^4.4|^5.0|^6.0"
- },
- "require-dev": {
- "matthiasnoback/symfony-config-test": "^4.2.1",
- "matthiasnoback/symfony-dependency-injection-test": "^4.2.1",
- "mockery/mockery": "~1.0",
- "phpunit/phpunit": "~8.5",
- "symfony/console": "^3.4|^4.4|^5.0|^6.0",
- "symfony/framework-bundle": "^3.4.31|^4.4|^5.0|^6.0",
- "symfony/security-bundle": "^3.4|^4.4|^5.0|^6.0",
- "symfony/security-core": "^3.4|^4.4|^5.0|^6.0",
- "symfony/validator": "^3.4|^4.4|^5.0|^6.0"
- },
- "suggest": {
- "league/tactician-doctrine": "For doctrine transaction middleware",
- "symfony/console": "For debugging command-to-handler routing using the tactician:debug console command",
- "symfony/security": "For command security middleware",
- "symfony/validator": "For command validator middleware"
- },
- "type": "symfony-bundle",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "League\\Tactician\\Bundle\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Rafael Dohms",
- "homepage": "http://doh.ms"
- },
- {
- "name": "Richard Tuin",
- "homepage": "http://www.rtuin.nl/"
- },
- {
- "name": "Xander Smalbil",
- "email": "xander@videofunk.nl"
- },
- {
- "name": "Ross Tuck",
- "email": "me@rosstuck.com"
- }
- ],
- "description": "Bundle to integrate Tactician with Symfony projects",
- "keywords": [
- "bundle",
- "symfony",
- "tactician"
- ],
- "support": {
- "issues": "https://github.com/thephpleague/tactician-bundle/issues",
- "source": "https://github.com/thephpleague/tactician-bundle/tree/v1.4.0"
- },
- "time": "2022-06-15T06:56:49+00:00"
- },
- {
- "name": "league/tactician-container",
- "version": "2.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/thephpleague/tactician-container.git",
- "reference": "d1a5d884e072b8cafbff802d07766076eb2ffcb0"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/thephpleague/tactician-container/zipball/d1a5d884e072b8cafbff802d07766076eb2ffcb0",
- "reference": "d1a5d884e072b8cafbff802d07766076eb2ffcb0",
- "shasum": ""
- },
- "require": {
- "league/tactician": "^1.0",
- "php": ">=5.5",
- "psr/container": "^1.0"
- },
- "require-dev": {
- "league/container": "~2.3",
- "phpunit/phpunit": "~4.3",
- "squizlabs/php_codesniffer": "~2.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "League\\Tactician\\Container\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nigel Greenway",
- "homepage": "http://futurepixels.co.uk"
- }
- ],
- "description": "Tactician integration for any container implementing PSR-11",
- "keywords": [
- "container",
- "container-interop",
- "di",
- "interoperable",
- "league",
- "tactician"
- ],
- "support": {
- "issues": "https://github.com/thephpleague/tactician-container/issues",
- "source": "https://github.com/thephpleague/tactician-container/tree/master"
- },
- "time": "2017-04-13T06:27:12+00:00"
- },
- {
- "name": "league/tactician-logger",
- "version": "v0.10.0",
- "source": {
- "type": "git",
- "url": "https://github.com/thephpleague/tactician-logger.git",
- "reference": "3ff9ee04e4cbec100af827f829ed4c7ff7c08442"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/thephpleague/tactician-logger/zipball/3ff9ee04e4cbec100af827f829ed4c7ff7c08442",
- "reference": "3ff9ee04e4cbec100af827f829ed4c7ff7c08442",
- "shasum": ""
- },
- "require": {
- "league/tactician": "^1.0",
- "php": ">=5.5.0",
- "psr/log": "~1.0"
- },
- "require-dev": {
- "mockery/mockery": "^0.9",
- "phpunit/phpunit": "4.*",
- "squizlabs/php_codesniffer": "~2.3"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "League\\Tactician\\Logger\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Ross Tuck"
- }
- ],
- "description": "Adds PSR-3 logging support to the Tactician command bus",
- "homepage": "https://github.com/thephpleague/tactician-logger",
- "keywords": [
- "log",
- "logging",
- "tactician"
- ],
- "support": {
- "issues": "https://github.com/thephpleague/tactician-logger/issues",
- "source": "https://github.com/thephpleague/tactician-logger/tree/master"
- },
- "time": "2016-08-23T05:50:38+00:00"
+ "time": "2023-07-05T23:01:32+00:00"
},
{
"name": "league/uri",
@@ -3989,7 +3675,7 @@
],
"support": {
"issues": "https://github.com/matthiasmullie/minify/issues",
- "source": "https://github.com/matthiasmullie/minify/tree/1.3.68"
+ "source": "https://github.com/matthiasmullie/minify/tree/1.3.69"
},
"funding": [
{
@@ -4881,6 +4567,7 @@
"issues": "https://github.com/php-http/message-factory/issues",
"source": "https://github.com/php-http/message-factory/tree/master"
},
+ "abandoned": "psr/http-factory",
"time": "2015-12-19T14:08:53+00:00"
},
{
@@ -5042,16 +4729,16 @@
},
{
"name": "prestashop/autoload",
- "version": "v1.0.0",
+ "version": "v1.0.1",
"source": {
"type": "git",
"url": "https://github.com/PrestaShop/autoload.git",
- "reference": "9b057242f67076a50e55e7cb77a65d595bfb15b4"
+ "reference": "b84a116564d624e3db04fce648dbfee135df87c0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PrestaShop/autoload/zipball/9b057242f67076a50e55e7cb77a65d595bfb15b4",
- "reference": "9b057242f67076a50e55e7cb77a65d595bfb15b4",
+ "url": "https://api.github.com/repos/PrestaShop/autoload/zipball/b84a116564d624e3db04fce648dbfee135df87c0",
+ "reference": "b84a116564d624e3db04fce648dbfee135df87c0",
"shasum": ""
},
"require": {
@@ -5087,9 +4774,9 @@
],
"description": "PrestaShop legacy autoloading",
"support": {
- "source": "https://github.com/PrestaShop/autoload/tree/v1.0.0"
+ "source": "https://github.com/PrestaShop/autoload/tree/v1.0.1"
},
- "time": "2022-11-29T16:54:18+00:00"
+ "time": "2023-07-07T13:49:33+00:00"
},
{
"name": "prestashop/blockreassurance",
@@ -5141,20 +4828,20 @@
},
{
"name": "prestashop/blockwishlist",
- "version": "v3.0.0",
+ "version": "v3.0.1",
"source": {
"type": "git",
"url": "https://github.com/PrestaShop/blockwishlist.git",
- "reference": "d42091134c5b7060e195fa9d60dda63396c06d64"
+ "reference": "75c39bc12648cba4e09d870479e7857fd06eee79"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PrestaShop/blockwishlist/zipball/d42091134c5b7060e195fa9d60dda63396c06d64",
- "reference": "d42091134c5b7060e195fa9d60dda63396c06d64",
+ "url": "https://api.github.com/repos/PrestaShop/blockwishlist/zipball/75c39bc12648cba4e09d870479e7857fd06eee79",
+ "reference": "75c39bc12648cba4e09d870479e7857fd06eee79",
"shasum": ""
},
"require-dev": {
- "prestashop/php-dev-tools": "~3.0"
+ "prestashop/php-dev-tools": "^4.3"
},
"type": "prestashop-module",
"autoload": {
@@ -5180,9 +4867,9 @@
"description": "PrestaShop module blockwishlist",
"homepage": "https://github.com/PrestaShop/blockwishlist",
"support": {
- "source": "https://github.com/PrestaShop/blockwishlist/tree/v3.0.0"
+ "source": "https://github.com/PrestaShop/blockwishlist/tree/v3.0.1"
},
- "time": "2023-02-23T10:22:22+00:00"
+ "time": "2023-08-11T10:08:33+00:00"
},
{
"name": "prestashop/circuit-breaker",
@@ -5381,9 +5068,15 @@
"php": ">=5.4"
},
"require-dev": {
- "prestashop/php-dev-tools": "^3.4"
+ "prestashop/php-dev-tools": "~3.0"
},
"type": "prestashop-module",
+ "autoload": {
+ "classmap": [
+ "dashgoals.php",
+ "controllers/"
+ ]
+ },
"notification-url": "https://packagist.org/downloads/",
"license": [
"AFL-3.0"
@@ -5418,6 +5111,9 @@
"require": {
"php": ">=5.4"
},
+ "require-dev": {
+ "prestashop/php-dev-tools": "^3.4"
+ },
"type": "prestashop-module",
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -5438,16 +5134,16 @@
},
{
"name": "prestashop/dashtrends",
- "version": "v2.1.1",
+ "version": "v2.1.2",
"source": {
"type": "git",
"url": "https://github.com/PrestaShop/dashtrends.git",
- "reference": "c0ffb850abf1896ae8650522c8c8f4cff1c1dd80"
+ "reference": "e2cbdb088241a17118a8c4424b468a36216f8316"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PrestaShop/dashtrends/zipball/c0ffb850abf1896ae8650522c8c8f4cff1c1dd80",
- "reference": "c0ffb850abf1896ae8650522c8c8f4cff1c1dd80",
+ "url": "https://api.github.com/repos/PrestaShop/dashtrends/zipball/e2cbdb088241a17118a8c4424b468a36216f8316",
+ "reference": "e2cbdb088241a17118a8c4424b468a36216f8316",
"shasum": ""
},
"require": {
@@ -5475,9 +5171,9 @@
"description": "PrestaShop module dashtrends",
"homepage": "https://github.com/PrestaShop/dashtrends",
"support": {
- "source": "https://github.com/PrestaShop/dashtrends/tree/v2.1.1"
+ "source": "https://github.com/PrestaShop/dashtrends/tree/v2.1.2"
},
- "time": "2023-03-24T13:19:08+00:00"
+ "time": "2023-06-19T13:25:37+00:00"
},
{
"name": "prestashop/decimal",
@@ -5652,43 +5348,113 @@
"time": "2023-04-05T13:04:34+00:00"
},
{
- "name": "prestashop/pagesnotfound",
- "version": "v2.0.2",
+ "name": "prestashop/laminas-code-lts",
+ "version": "dev-4.5-lts",
"source": {
"type": "git",
- "url": "https://github.com/PrestaShop/pagesnotfound.git",
- "reference": "ac5b640daa39356c8ca96679cbe58e83964b41d2"
+ "url": "https://github.com/PrestaShop/laminas-code-lts.git",
+ "reference": "c22c7aee2092bcec532b910a1f4dbac0ce6a3bbf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PrestaShop/pagesnotfound/zipball/ac5b640daa39356c8ca96679cbe58e83964b41d2",
- "reference": "ac5b640daa39356c8ca96679cbe58e83964b41d2",
+ "url": "https://api.github.com/repos/PrestaShop/laminas-code-lts/zipball/c22c7aee2092bcec532b910a1f4dbac0ce6a3bbf",
+ "reference": "c22c7aee2092bcec532b910a1f4dbac0ce6a3bbf",
"shasum": ""
},
"require": {
- "php": ">=5.3.2"
+ "php": ">=7.2, <8.2"
},
- "type": "prestashop-module",
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "AFL-3.0"
- ],
- "authors": [
- {
- "name": "PrestaShop SA",
- "email": "contact@prestashop.com"
- }
- ],
- "description": "PrestaShop module pagesnotfound",
- "homepage": "https://github.com/PrestaShop/pagesnotfound",
- "support": {
- "source": "https://github.com/PrestaShop/pagesnotfound/tree/v2.0.2"
+ "replace": {
+ "laminas/laminas-code": "^4.5"
},
- "time": "2022-01-11T07:53:21+00:00"
- },
- {
- "name": "prestashop/productcomments",
- "version": "v5.0.3",
+ "require-dev": {
+ "doctrine/annotations": "^1.13.2",
+ "ext-phar": "*",
+ "laminas/laminas-coding-standard": "^2.1.0",
+ "laminas/laminas-stdlib": "^3.2.1",
+ "phpunit/phpunit": "^8.5.26",
+ "psalm/plugin-phpunit": "^0.16.1",
+ "vimeo/psalm": "^4.13.1"
+ },
+ "suggest": {
+ "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
+ "laminas/laminas-stdlib": "Laminas\\Stdlib component"
+ },
+ "default-branch": true,
+ "type": "library",
+ "extra": {
+ "thanks": {
+ "name": "laminas/laminas-code",
+ "url": "https://github.com/laminas/laminas-code"
+ }
+ },
+ "autoload": {
+ "files": [
+ "polyfill/ReflectionEnumPolyfill.php"
+ ],
+ "psr-4": {
+ "Laminas\\Code\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "Adding support for a wider range of PHP versions to laminas/laminas-code",
+ "homepage": "https://github.com/prestashop/laminas-code-lts",
+ "keywords": [
+ "code",
+ "laminas",
+ "laminasframework"
+ ],
+ "support": {
+ "chat": "https://laminas.dev/chat",
+ "docs": "https://docs.laminas.dev/laminas-code/",
+ "forum": "https://discourse.laminas.dev",
+ "issues": "https://github.com/laminas/laminas-code/issues",
+ "rss": "https://github.com/laminas/laminas-code/releases.atom",
+ "source": "https://github.com/laminas/laminas-code"
+ },
+ "time": "2023-06-13T07:18:53+00:00"
+ },
+ {
+ "name": "prestashop/pagesnotfound",
+ "version": "v2.0.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/PrestaShop/pagesnotfound.git",
+ "reference": "ac5b640daa39356c8ca96679cbe58e83964b41d2"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/PrestaShop/pagesnotfound/zipball/ac5b640daa39356c8ca96679cbe58e83964b41d2",
+ "reference": "ac5b640daa39356c8ca96679cbe58e83964b41d2",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.2"
+ },
+ "type": "prestashop-module",
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "AFL-3.0"
+ ],
+ "authors": [
+ {
+ "name": "PrestaShop SA",
+ "email": "contact@prestashop.com"
+ }
+ ],
+ "description": "PrestaShop module pagesnotfound",
+ "homepage": "https://github.com/PrestaShop/pagesnotfound",
+ "support": {
+ "source": "https://github.com/PrestaShop/pagesnotfound/tree/v2.0.2"
+ },
+ "time": "2022-01-11T07:53:21+00:00"
+ },
+ {
+ "name": "prestashop/productcomments",
+ "version": "v5.0.3",
"source": {
"type": "git",
"url": "https://github.com/PrestaShop/productcomments.git",
@@ -6365,16 +6131,16 @@
},
{
"name": "prestashop/ps_emailalerts",
- "version": "v2.4.1",
+ "version": "v2.4.2",
"source": {
"type": "git",
"url": "https://github.com/PrestaShop/ps_emailalerts.git",
- "reference": "3145d0c9beef7576bf056b22ac63a125e0c063ac"
+ "reference": "fa6011032236e48c8cdbc7ba64dd340d737d75ef"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PrestaShop/ps_emailalerts/zipball/3145d0c9beef7576bf056b22ac63a125e0c063ac",
- "reference": "3145d0c9beef7576bf056b22ac63a125e0c063ac",
+ "url": "https://api.github.com/repos/PrestaShop/ps_emailalerts/zipball/fa6011032236e48c8cdbc7ba64dd340d737d75ef",
+ "reference": "fa6011032236e48c8cdbc7ba64dd340d737d75ef",
"shasum": ""
},
"require": {
@@ -6397,9 +6163,9 @@
"description": "PrestaShop module ps_emailalerts",
"homepage": "https://github.com/PrestaShop/ps_emailalerts",
"support": {
- "source": "https://github.com/PrestaShop/ps_emailalerts/tree/v2.4.1"
+ "source": "https://github.com/PrestaShop/ps_emailalerts/tree/v2.4.2"
},
- "time": "2023-03-22T16:42:26+00:00"
+ "time": "2023-09-02T00:56:29+00:00"
},
{
"name": "prestashop/ps_emailsubscription",
@@ -6446,16 +6212,16 @@
},
{
"name": "prestashop/ps_facetedsearch",
- "version": "v3.12.1",
+ "version": "v3.13.1",
"source": {
"type": "git",
"url": "https://github.com/PrestaShop/ps_facetedsearch.git",
- "reference": "25d0a3fb8707632f865a9311dadaf5c0db307215"
+ "reference": "02ccda6023bcaa6a6e2c5851b9c22be13a983db9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PrestaShop/ps_facetedsearch/zipball/25d0a3fb8707632f865a9311dadaf5c0db307215",
- "reference": "25d0a3fb8707632f865a9311dadaf5c0db307215",
+ "url": "https://api.github.com/repos/PrestaShop/ps_facetedsearch/zipball/02ccda6023bcaa6a6e2c5851b9c22be13a983db9",
+ "reference": "02ccda6023bcaa6a6e2c5851b9c22be13a983db9",
"shasum": ""
},
"require": {
@@ -6491,9 +6257,9 @@
"description": "PrestaShop module ps_facetedsearch",
"homepage": "https://github.com/PrestaShop/ps_facetedsearch",
"support": {
- "source": "https://github.com/PrestaShop/ps_facetedsearch/tree/v3.12.1"
+ "source": "https://github.com/PrestaShop/ps_facetedsearch/tree/v3.13.1"
},
- "time": "2023-03-22T16:15:40+00:00"
+ "time": "2023-08-09T15:47:34+00:00"
},
{
"name": "prestashop/ps_faviconnotificationbo",
@@ -6630,23 +6396,23 @@
},
{
"name": "prestashop/ps_imageslider",
- "version": "v3.1.2",
+ "version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/PrestaShop/ps_imageslider.git",
- "reference": "c5980fe4e99ba6aa5139b4e0755540be42c52b88"
+ "reference": "36f848c1943f84f1dc0c41813f07c0e9b70ae8b0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PrestaShop/ps_imageslider/zipball/c5980fe4e99ba6aa5139b4e0755540be42c52b88",
- "reference": "c5980fe4e99ba6aa5139b4e0755540be42c52b88",
+ "url": "https://api.github.com/repos/PrestaShop/ps_imageslider/zipball/36f848c1943f84f1dc0c41813f07c0e9b70ae8b0",
+ "reference": "36f848c1943f84f1dc0c41813f07c0e9b70ae8b0",
"shasum": ""
},
"require": {
"php": ">=5.4.0"
},
"require-dev": {
- "prestashop/php-dev-tools": "^3.4"
+ "prestashop/php-dev-tools": "^4.3"
},
"type": "prestashop-module",
"autoload": {
@@ -6667,9 +6433,9 @@
"description": "PrestaShop - Image slider",
"homepage": "https://github.com/PrestaShop/ps_imageslider",
"support": {
- "source": "https://github.com/PrestaShop/ps_imageslider/tree/v3.1.2"
+ "source": "https://github.com/PrestaShop/ps_imageslider/tree/v3.1.3"
},
- "time": "2023-03-15T17:45:19+00:00"
+ "time": "2023-06-08T12:48:16+00:00"
},
{
"name": "prestashop/ps_languageselector",
@@ -6717,16 +6483,16 @@
},
{
"name": "prestashop/ps_linklist",
- "version": "v6.0.2",
+ "version": "v6.0.4",
"source": {
"type": "git",
"url": "https://github.com/PrestaShop/ps_linklist.git",
- "reference": "66bd879f99c665f1fac8aab820f02b17c64df7c9"
+ "reference": "f4048a33e3cfc06a76e68d40cb77425103f0124e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PrestaShop/ps_linklist/zipball/66bd879f99c665f1fac8aab820f02b17c64df7c9",
- "reference": "66bd879f99c665f1fac8aab820f02b17c64df7c9",
+ "url": "https://api.github.com/repos/PrestaShop/ps_linklist/zipball/f4048a33e3cfc06a76e68d40cb77425103f0124e",
+ "reference": "f4048a33e3cfc06a76e68d40cb77425103f0124e",
"shasum": ""
},
"require": {
@@ -6758,9 +6524,9 @@
"description": "PrestaShop - Link list",
"homepage": "https://github.com/PrestaShop/ps_linklist",
"support": {
- "source": "https://github.com/PrestaShop/ps_linklist/tree/v6.0.2"
+ "source": "https://github.com/PrestaShop/ps_linklist/tree/v6.0.4"
},
- "time": "2023-05-23T17:09:26+00:00"
+ "time": "2023-09-05T12:44:43+00:00"
},
{
"name": "prestashop/ps_mainmenu",
@@ -7901,33 +7667,32 @@
},
{
"name": "prestashop/translationtools-bundle",
- "version": "v5.0.4",
+ "version": "v6.0.0",
"source": {
"type": "git",
"url": "https://github.com/PrestaShop/TranslationToolsBundle.git",
- "reference": "4aaef89ee0b4913157a76559bed52f4f35b2fb70"
+ "reference": "74d39adb54490e54ef9bd2d1dc98a9fad15dba85"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PrestaShop/TranslationToolsBundle/zipball/4aaef89ee0b4913157a76559bed52f4f35b2fb70",
- "reference": "4aaef89ee0b4913157a76559bed52f4f35b2fb70",
+ "url": "https://api.github.com/repos/PrestaShop/TranslationToolsBundle/zipball/74d39adb54490e54ef9bd2d1dc98a9fad15dba85",
+ "reference": "74d39adb54490e54ef9bd2d1dc98a9fad15dba85",
"shasum": ""
},
"require": {
"nikic/php-parser": "^4",
- "php": ">=7.2",
+ "php": ">=8.1",
"smarty/smarty": "^3.1 || ^4.0",
"symfony/twig-bridge": "^3.4 || ^4.4 || ^5.0",
"twig/twig": "^1.38 || ^2.7 || ^3.0"
},
"require-dev": {
- "doctrine/common": "^2.10.0",
+ "doctrine/common": "^3",
"friendsofphp/php-cs-fixer": "^3.2",
- "phpunit/phpunit": "^7.5 || ^8.5",
+ "phpunit/phpunit": "~9.5.10",
"symfony/framework-bundle": "^3.4 || ^4.4 || ^5.0",
- "symfony/symfony": "^4",
- "symfony/translation": "^3.4 || ^4.4 || ^5.0",
- "symfony/twig-bundle": "^4"
+ "symfony/symfony": "^5.4",
+ "symfony/translation": "^3.4 || ^4.4 || ^5.0"
},
"type": "bundle",
"autoload": {
@@ -7957,9 +7722,9 @@
],
"support": {
"issues": "https://github.com/PrestaShop/TranslationToolsBundle/issues",
- "source": "https://github.com/PrestaShop/TranslationToolsBundle/tree/v5.0.4"
+ "source": "https://github.com/PrestaShop/TranslationToolsBundle/tree/v6.0.0"
},
- "time": "2022-09-01T08:33:26+00:00"
+ "time": "2023-05-30T08:46:24+00:00"
},
{
"name": "psr/cache",
@@ -8158,21 +7923,21 @@
},
{
"name": "psr/http-client",
- "version": "1.0.1",
+ "version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-client.git",
- "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
+ "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
- "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+ "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31",
+ "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31",
"shasum": ""
},
"require": {
"php": "^7.0 || ^8.0",
- "psr/http-message": "^1.0"
+ "psr/http-message": "^1.0 || ^2.0"
},
"type": "library",
"extra": {
@@ -8192,7 +7957,7 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
"description": "Common interface for HTTP clients",
@@ -8204,27 +7969,27 @@
"psr-18"
],
"support": {
- "source": "https://github.com/php-fig/http-client/tree/master"
+ "source": "https://github.com/php-fig/http-client/tree/1.0.2"
},
- "time": "2020-06-29T06:28:15+00:00"
+ "time": "2023-04-10T20:12:12+00:00"
},
{
"name": "psr/http-factory",
- "version": "1.0.1",
+ "version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-factory.git",
- "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
+ "reference": "e616d01114759c4c489f93b099585439f795fe35"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
- "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+ "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
+ "reference": "e616d01114759c4c489f93b099585439f795fe35",
"shasum": ""
},
"require": {
"php": ">=7.0.0",
- "psr/http-message": "^1.0"
+ "psr/http-message": "^1.0 || ^2.0"
},
"type": "library",
"extra": {
@@ -8244,7 +8009,7 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
"description": "Common interfaces for PSR-7 HTTP message factories",
@@ -8259,9 +8024,9 @@
"response"
],
"support": {
- "source": "https://github.com/php-fig/http-factory/tree/master"
+ "source": "https://github.com/php-fig/http-factory/tree/1.0.2"
},
- "time": "2019-04-30T12:38:16+00:00"
+ "time": "2023-04-10T20:10:41+00:00"
},
{
"name": "psr/http-message",
@@ -9423,16 +9188,16 @@
},
{
"name": "symfony/deprecation-contracts",
- "version": "v3.2.1",
+ "version": "v3.3.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
- "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e"
+ "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e",
- "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e",
+ "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
+ "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
"shasum": ""
},
"require": {
@@ -9441,7 +9206,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.3-dev"
+ "dev-main": "3.4-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -9470,7 +9235,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.1"
+ "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0"
},
"funding": [
{
@@ -9486,7 +9251,7 @@
"type": "tidelift"
}
],
- "time": "2023-03-01T10:25:55+00:00"
+ "time": "2023-05-23T14:45:45+00:00"
},
{
"name": "symfony/doctrine-bridge",
@@ -10859,79 +10624,6 @@
],
"time": "2023-04-28T13:29:52+00:00"
},
- {
- "name": "symfony/inflector",
- "version": "v5.4.21",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/inflector.git",
- "reference": "d56964e2b19253ba331a829c20d911dd27aa61b6"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/inflector/zipball/d56964e2b19253ba331a829c20d911dd27aa61b6",
- "reference": "d56964e2b19253ba331a829c20d911dd27aa61b6",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2.5",
- "symfony/deprecation-contracts": "^2.1|^3",
- "symfony/polyfill-php80": "^1.16",
- "symfony/string": "^5.3.10|^6.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\Inflector\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Bernhard Schussek",
- "email": "bschussek@gmail.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Converts words between their singular and plural forms (English only)",
- "homepage": "https://symfony.com",
- "keywords": [
- "inflection",
- "pluralize",
- "singularize",
- "string",
- "symfony",
- "words"
- ],
- "support": {
- "source": "https://github.com/symfony/inflector/tree/v5.4.21"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "abandoned": "EnglishInflector from the String component",
- "time": "2023-02-14T08:03:56+00:00"
- },
{
"name": "symfony/intl",
"version": "v5.4.23",
@@ -11177,16 +10869,16 @@
},
{
"name": "symfony/messenger",
- "version": "v5.4.23",
+ "version": "v5.4.25",
"source": {
"type": "git",
"url": "https://github.com/symfony/messenger.git",
- "reference": "f81b9dab3d9a2f0519a4e1d077a0d40f8978bcb0"
+ "reference": "e3ba2b2fa84bf54923fe71bd8725968ecaaf117c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/messenger/zipball/f81b9dab3d9a2f0519a4e1d077a0d40f8978bcb0",
- "reference": "f81b9dab3d9a2f0519a4e1d077a0d40f8978bcb0",
+ "url": "https://api.github.com/repos/symfony/messenger/zipball/e3ba2b2fa84bf54923fe71bd8725968ecaaf117c",
+ "reference": "e3ba2b2fa84bf54923fe71bd8725968ecaaf117c",
"shasum": ""
},
"require": {
@@ -11247,7 +10939,7 @@
"description": "Helps applications send and receive messages to/from other applications or via message queues",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/messenger/tree/v5.4.23"
+ "source": "https://github.com/symfony/messenger/tree/v5.4.25"
},
"funding": [
{
@@ -11263,7 +10955,7 @@
"type": "tidelift"
}
],
- "time": "2023-04-18T12:56:00+00:00"
+ "time": "2023-06-14T08:23:01+00:00"
},
{
"name": "symfony/mime",
@@ -11514,101 +11206,6 @@
],
"time": "2022-05-10T14:24:36+00:00"
},
- {
- "name": "symfony/notifier",
- "version": "v5.4.22",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/notifier.git",
- "reference": "5ea626671ee3875f32c887467a47697bed83e6d4"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/notifier/zipball/5ea626671ee3875f32c887467a47697bed83e6d4",
- "reference": "5ea626671ee3875f32c887467a47697bed83e6d4",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2.5",
- "psr/log": "^1|^2|^3",
- "symfony/polyfill-php80": "^1.15"
- },
- "conflict": {
- "symfony/discord-notifier": "<5.3",
- "symfony/esendex-notifier": "<5.3",
- "symfony/firebase-notifier": "<5.3",
- "symfony/free-mobile-notifier": "<5.3",
- "symfony/google-chat-notifier": "<5.3",
- "symfony/http-kernel": "<4.4",
- "symfony/infobip-notifier": "<5.3",
- "symfony/linked-in-notifier": "<5.3",
- "symfony/mattermost-notifier": "<5.3",
- "symfony/mobyt-notifier": "<5.3",
- "symfony/nexmo-notifier": "<5.3",
- "symfony/ovh-cloud-notifier": "<5.3",
- "symfony/rocket-chat-notifier": "<5.3",
- "symfony/sendinblue-notifier": "<5.3",
- "symfony/sinch-notifier": "<5.3",
- "symfony/slack-notifier": "<5.3",
- "symfony/sms77-notifier": "<5.3",
- "symfony/smsapi-notifier": "<5.3",
- "symfony/telegram-notifier": "<5.3",
- "symfony/twilio-notifier": "<5.3",
- "symfony/zulip-notifier": "<5.3"
- },
- "require-dev": {
- "symfony/event-dispatcher-contracts": "^2|^3",
- "symfony/http-client-contracts": "^2|^3",
- "symfony/messenger": "^4.4|^5.0|^6.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\Notifier\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Sends notifications via one or more channels (email, SMS, ...)",
- "homepage": "https://symfony.com",
- "keywords": [
- "notification",
- "notifier"
- ],
- "support": {
- "source": "https://github.com/symfony/notifier/tree/v5.4.22"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2023-03-10T09:58:14+00:00"
- },
{
"name": "symfony/options-resolver",
"version": "v5.4.21",
@@ -12573,45 +12170,31 @@
"time": "2022-11-03T14:55:06+00:00"
},
{
- "name": "symfony/polyfill-uuid",
- "version": "v1.27.0",
+ "name": "symfony/process",
+ "version": "v5.4.23",
"source": {
"type": "git",
- "url": "https://github.com/symfony/polyfill-uuid.git",
- "reference": "f3cf1a645c2734236ed1e2e671e273eeb3586166"
+ "url": "https://github.com/symfony/process.git",
+ "reference": "4b842fc4b61609e0a155a114082bd94e31e98287"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/f3cf1a645c2734236ed1e2e671e273eeb3586166",
- "reference": "f3cf1a645c2734236ed1e2e671e273eeb3586166",
+ "url": "https://api.github.com/repos/symfony/process/zipball/4b842fc4b61609e0a155a114082bd94e31e98287",
+ "reference": "4b842fc4b61609e0a155a114082bd94e31e98287",
"shasum": ""
},
"require": {
- "php": ">=7.1"
- },
- "provide": {
- "ext-uuid": "*"
- },
- "suggest": {
- "ext-uuid": "For best performance"
+ "php": ">=7.2.5",
+ "symfony/polyfill-php80": "^1.16"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "1.27-dev"
- },
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- },
"autoload": {
- "files": [
- "bootstrap.php"
- ],
"psr-4": {
- "Symfony\\Polyfill\\Uuid\\": ""
- }
+ "Symfony\\Component\\Process\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -12619,83 +12202,15 @@
],
"authors": [
{
- "name": "Grégoire Pineau",
- "email": "lyrixx@lyrixx.info"
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony polyfill for uuid functions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "uuid"
- ],
- "support": {
- "source": "https://github.com/symfony/polyfill-uuid/tree/v1.27.0"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2022-11-03T14:55:06+00:00"
- },
- {
- "name": "symfony/process",
- "version": "v5.4.23",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/process.git",
- "reference": "4b842fc4b61609e0a155a114082bd94e31e98287"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/4b842fc4b61609e0a155a114082bd94e31e98287",
- "reference": "4b842fc4b61609e0a155a114082bd94e31e98287",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2.5",
- "symfony/polyfill-php80": "^1.16"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\Process\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Executes commands in sub-processes",
+ "description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/process/tree/v5.4.23"
@@ -13043,76 +12558,6 @@
],
"time": "2022-09-05T10:34:54+00:00"
},
- {
- "name": "symfony/rate-limiter",
- "version": "v5.4.21",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/rate-limiter.git",
- "reference": "342acb2d23f6012f6150e7a8b167bf9cd931c0f8"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/rate-limiter/zipball/342acb2d23f6012f6150e7a8b167bf9cd931c0f8",
- "reference": "342acb2d23f6012f6150e7a8b167bf9cd931c0f8",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2.5",
- "symfony/lock": "^5.2|^6.0",
- "symfony/options-resolver": "^5.1|^6.0"
- },
- "require-dev": {
- "psr/cache": "^1.0|^2.0|^3.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\RateLimiter\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Wouter de Jong",
- "email": "wouter@wouterj.nl"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Provides a Token Bucket implementation to rate limit input and output in your application",
- "homepage": "https://symfony.com",
- "keywords": [
- "limiter",
- "rate-limiter"
- ],
- "support": {
- "source": "https://github.com/symfony/rate-limiter/tree/v5.4.21"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2023-02-21T19:46:44+00:00"
- },
{
"name": "symfony/redis-messenger",
"version": "v5.4.23",
@@ -13689,78 +13134,6 @@
],
"time": "2023-04-21T11:34:27+00:00"
},
- {
- "name": "symfony/semaphore",
- "version": "v5.4.21",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/semaphore.git",
- "reference": "f268ab07e2c7c2e8572d8cef4db8580b3620a3f3"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/semaphore/zipball/f268ab07e2c7c2e8572d8cef4db8580b3620a3f3",
- "reference": "f268ab07e2c7c2e8572d8cef4db8580b3620a3f3",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2.5",
- "psr/log": "^1|^2|^3"
- },
- "require-dev": {
- "predis/predis": "~1.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\Semaphore\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Grégoire Pineau",
- "email": "lyrixx@lyrixx.info"
- },
- {
- "name": "Jérémy Derussé",
- "email": "jeremy@derusse.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony Semaphore Component",
- "homepage": "https://symfony.com",
- "keywords": [
- "semaphore"
- ],
- "support": {
- "source": "https://github.com/symfony/semaphore/tree/v5.4.21"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2023-02-16T09:33:00+00:00"
- },
{
"name": "symfony/serializer",
"version": "v5.4.23",
@@ -14487,62 +13860,68 @@
"time": "2023-02-14T08:03:56+00:00"
},
{
- "name": "symfony/uid",
- "version": "v5.4.21",
+ "name": "symfony/ux-twig-component",
+ "version": "v2.9.1",
"source": {
"type": "git",
- "url": "https://github.com/symfony/uid.git",
- "reference": "a30744506976aafc807ccb0d4f95865c0a690d02"
+ "url": "https://github.com/symfony/ux-twig-component.git",
+ "reference": "4d664e8dd058b4ebc6ae329d89a1aa8348ef06d0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/uid/zipball/a30744506976aafc807ccb0d4f95865c0a690d02",
- "reference": "a30744506976aafc807ccb0d4f95865c0a690d02",
+ "url": "https://api.github.com/repos/symfony/ux-twig-component/zipball/4d664e8dd058b4ebc6ae329d89a1aa8348ef06d0",
+ "reference": "4d664e8dd058b4ebc6ae329d89a1aa8348ef06d0",
"shasum": ""
},
"require": {
- "php": ">=7.2.5",
- "symfony/polyfill-uuid": "^1.15"
+ "php": ">=8.0",
+ "symfony/dependency-injection": "^5.4|^6.0",
+ "symfony/deprecation-contracts": "^2.2|^3.0",
+ "symfony/event-dispatcher": "^5.4|^6.0",
+ "symfony/property-access": "^5.4|^6.0",
+ "twig/twig": "^2.0|^3.0"
+ },
+ "conflict": {
+ "symfony/config": "<5.4.0"
},
"require-dev": {
- "symfony/console": "^4.4|^5.0|^6.0"
+ "symfony/framework-bundle": "^5.4|^6.0",
+ "symfony/phpunit-bridge": "^6.0",
+ "symfony/stimulus-bundle": "^2.9.1",
+ "symfony/twig-bundle": "^5.4|^6.0",
+ "symfony/webpack-encore-bundle": "^1.15"
+ },
+ "type": "symfony-bundle",
+ "extra": {
+ "thanks": {
+ "name": "symfony/ux",
+ "url": "https://github.com/symfony/ux"
+ }
},
- "type": "library",
"autoload": {
"psr-4": {
- "Symfony\\Component\\Uid\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
+ "Symfony\\UX\\TwigComponent\\": "src/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
- {
- "name": "Grégoire Pineau",
- "email": "lyrixx@lyrixx.info"
- },
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Provides an object-oriented API to generate and represent UIDs",
+ "description": "Twig components for Symfony",
"homepage": "https://symfony.com",
"keywords": [
- "UID",
- "ulid",
- "uuid"
+ "components",
+ "symfony-ux",
+ "twig"
],
"support": {
- "source": "https://github.com/symfony/uid/tree/v5.4.21"
+ "source": "https://github.com/symfony/ux-twig-component/tree/v2.9.1"
},
"funding": [
{
@@ -14558,7 +13937,7 @@
"type": "tidelift"
}
],
- "time": "2023-02-14T08:03:56+00:00"
+ "time": "2023-05-30T16:00:59+00:00"
},
{
"name": "symfony/validator",
@@ -14922,88 +14301,6 @@
],
"time": "2023-02-14T08:03:56+00:00"
},
- {
- "name": "symfony/workflow",
- "version": "v5.4.21",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/workflow.git",
- "reference": "96ec1843a27c7d3574bd521b807aa18101e31764"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/workflow/zipball/96ec1843a27c7d3574bd521b807aa18101e31764",
- "reference": "96ec1843a27c7d3574bd521b807aa18101e31764",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2.5",
- "symfony/polyfill-php80": "^1.15"
- },
- "conflict": {
- "symfony/event-dispatcher": "<4.4"
- },
- "require-dev": {
- "psr/log": "^1|^2|^3",
- "symfony/dependency-injection": "^4.4|^5.0|^6.0",
- "symfony/event-dispatcher": "^4.4|^5.0|^6.0",
- "symfony/expression-language": "^4.4|^5.0|^6.0",
- "symfony/security-core": "^4.4|^5.0|^6.0",
- "symfony/validator": "^4.4|^5.0|^6.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\Workflow\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Grégoire Pineau",
- "email": "lyrixx@lyrixx.info"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Provides tools for managing a workflow or finite state machine",
- "homepage": "https://symfony.com",
- "keywords": [
- "petrinet",
- "place",
- "state",
- "statemachine",
- "transition",
- "workflow"
- ],
- "support": {
- "source": "https://github.com/symfony/workflow/tree/v5.4.21"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2023-02-24T08:13:13+00:00"
- },
{
"name": "symfony/yaml",
"version": "v5.4.23",
@@ -15200,7 +14497,7 @@
"homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
"support": {
"issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues",
- "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.4"
+ "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.5"
},
"time": "2021-12-08T09:12:39+00:00"
},
@@ -15261,6 +14558,147 @@
},
"time": "2018-01-15T15:26:51+00:00"
},
+ {
+ "name": "twig/extra-bundle",
+ "version": "v3.6.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/twigphp/twig-extra-bundle.git",
+ "reference": "802cc2dd46ec88285d6c7fa85c26ab7f2cd5bc49"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/twigphp/twig-extra-bundle/zipball/802cc2dd46ec88285d6c7fa85c26ab7f2cd5bc49",
+ "reference": "802cc2dd46ec88285d6c7fa85c26ab7f2cd5bc49",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.2.5",
+ "symfony/framework-bundle": "^4.4|^5.0|^6.0",
+ "symfony/twig-bundle": "^4.4|^5.0|^6.0",
+ "twig/twig": "^2.7|^3.0"
+ },
+ "require-dev": {
+ "league/commonmark": "^1.0|^2.0",
+ "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0",
+ "twig/cache-extra": "^3.0",
+ "twig/cssinliner-extra": "^2.12|^3.0",
+ "twig/html-extra": "^2.12|^3.0",
+ "twig/inky-extra": "^2.12|^3.0",
+ "twig/intl-extra": "^2.12|^3.0",
+ "twig/markdown-extra": "^2.12|^3.0",
+ "twig/string-extra": "^2.12|^3.0"
+ },
+ "type": "symfony-bundle",
+ "autoload": {
+ "psr-4": {
+ "Twig\\Extra\\TwigExtraBundle\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com",
+ "homepage": "http://fabien.potencier.org",
+ "role": "Lead Developer"
+ }
+ ],
+ "description": "A Symfony bundle for extra Twig extensions",
+ "homepage": "https://twig.symfony.com",
+ "keywords": [
+ "bundle",
+ "extra",
+ "twig"
+ ],
+ "support": {
+ "source": "https://github.com/twigphp/twig-extra-bundle/tree/v3.6.1"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/twig/twig",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2023-05-06T11:11:46+00:00"
+ },
+ {
+ "name": "twig/string-extra",
+ "version": "v3.6.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/twigphp/string-extra.git",
+ "reference": "fab682645b3f8730fbdb7bf9ec8fe668d6f76638"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/twigphp/string-extra/zipball/fab682645b3f8730fbdb7bf9ec8fe668d6f76638",
+ "reference": "fab682645b3f8730fbdb7bf9ec8fe668d6f76638",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.2.5",
+ "symfony/string": "^5.0|^6.0",
+ "symfony/translation-contracts": "^1.1|^2|^3",
+ "twig/twig": "^2.7|^3.0"
+ },
+ "require-dev": {
+ "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Twig\\Extra\\String\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com",
+ "homepage": "http://fabien.potencier.org",
+ "role": "Lead Developer"
+ }
+ ],
+ "description": "A Twig extension for Symfony String",
+ "homepage": "https://twig.symfony.com",
+ "keywords": [
+ "html",
+ "string",
+ "twig",
+ "unicode"
+ ],
+ "support": {
+ "source": "https://github.com/twigphp/string-extra/tree/v3.6.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/twig/twig",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2023-02-09T06:45:16+00:00"
+ },
{
"name": "twig/twig",
"version": "v3.5.1",
@@ -17145,6 +16583,61 @@
],
"time": "2023-06-11T06:13:56+00:00"
},
+ {
+ "name": "rector/rector",
+ "version": "0.15.17",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/rectorphp/rector.git",
+ "reference": "7f6ee7974175138864d3b50c28ea73a7b0fd4e2d"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/rectorphp/rector/zipball/7f6ee7974175138864d3b50c28ea73a7b0fd4e2d",
+ "reference": "7f6ee7974175138864d3b50c28ea73a7b0fd4e2d",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.2|^8.0",
+ "phpstan/phpstan": "^1.9.14"
+ },
+ "conflict": {
+ "rector/rector-doctrine": "*",
+ "rector/rector-downgrade-php": "*",
+ "rector/rector-phpunit": "*",
+ "rector/rector-symfony": "*"
+ },
+ "bin": [
+ "bin/rector"
+ ],
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-main": "0.15-dev"
+ }
+ },
+ "autoload": {
+ "files": [
+ "bootstrap.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "description": "Instant Upgrade and Automated Refactoring of any PHP code",
+ "support": {
+ "issues": "https://github.com/rectorphp/rector/issues",
+ "source": "https://github.com/rectorphp/rector/tree/0.15.17"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/tomasvotruba",
+ "type": "github"
+ }
+ ],
+ "time": "2023-02-17T20:34:07+00:00"
+ },
{
"name": "sebastian/cli-parser",
"version": "1.0.1",
@@ -18619,5 +18112,5 @@
"platform-overrides": {
"php": "8.1.0"
},
- "plugin-api-version": "2.3.0"
+ "plugin-api-version": "2.6.0"
}
diff --git a/config/smarty.config.inc.php b/config/smarty.config.inc.php
index 2c6992fa12c9e..2904c1781dab2 100644
--- a/config/smarty.config.inc.php
+++ b/config/smarty.config.inc.php
@@ -24,6 +24,10 @@
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/
+use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
+
global $smarty;
if (Configuration::get('PS_SMARTY_LOCAL')) {
$smarty = new SmartyCustom();
@@ -34,19 +38,19 @@
}
$smarty->setConfigDir([]);
-$smarty->setCompileDir(_PS_CACHE_DIR_.'smarty/compile');
-$smarty->setCacheDir(_PS_CACHE_DIR_.'smarty/cache');
+$smarty->setCompileDir(_PS_CACHE_DIR_ . 'smarty/compile');
+$smarty->setCacheDir(_PS_CACHE_DIR_ . 'smarty/cache');
$smarty->use_sub_dirs = true;
$smarty->caching = Smarty::CACHING_OFF;
/* @phpstan-ignore-next-line */
if (_PS_SMARTY_CACHING_TYPE_ == 'mysql') {
- include _PS_CLASS_DIR_.'Smarty/SmartyCacheResourceMysql.php';
+ include _PS_CLASS_DIR_ . 'Smarty/SmartyCacheResourceMysql.php';
$smarty->caching_type = 'mysql';
}
$smarty->force_compile = Configuration::get('PS_SMARTY_FORCE_COMPILE') == _PS_SMARTY_FORCE_COMPILE_;
$smarty->compile_check = (Configuration::get('PS_SMARTY_FORCE_COMPILE') >= _PS_SMARTY_CHECK_COMPILE_) ? Smarty::COMPILECHECK_ON : Smarty::COMPILECHECK_OFF;
-$smarty->debug_tpl = _PS_ALL_THEMES_DIR_.'debug.tpl';
+$smarty->debug_tpl = _PS_ALL_THEMES_DIR_ . 'debug.tpl';
/* Use this constant if you want to load smarty without all PrestaShop functions */
if (defined('_PS_SMARTY_FAST_LOAD_') && _PS_SMARTY_FAST_LOAD_) {
@@ -54,12 +58,12 @@
}
if (defined('_PS_ADMIN_DIR_')) {
- require_once dirname(__FILE__).'/smartyadmin.config.inc.php';
+ require_once dirname(__FILE__) . '/smartyadmin.config.inc.php';
} else {
- require_once dirname(__FILE__).'/smartyfront.config.inc.php';
+ require_once dirname(__FILE__) . '/smartyfront.config.inc.php';
}
-require_once SMARTY_PLUGINS_DIR.'modifier.truncate.php';
+require_once SMARTY_PLUGINS_DIR . 'modifier.truncate.php';
// This escape modifier is required for invoice PDF generation
function smartyEscape($string, $esc_type = 'html', $char_set = null, $double_encode = true)
@@ -81,6 +85,7 @@ function smartyEscape($string, $esc_type = 'html', $char_set = null, $double_enc
}
}
+// PrestaShop & Smarty functions
smartyRegisterFunction($smarty, 'modifier', 'escape', 'smartyEscape');
smartyRegisterFunction($smarty, 'modifier', 'truncate', 'smarty_modifier_truncate');
smartyRegisterFunction($smarty, 'function', 'l', 'smartyTranslate', false);
@@ -92,32 +97,44 @@ function smartyEscape($string, $esc_type = 'html', $char_set = null, $double_enc
smartyRegisterFunction($smarty, 'modifier', 'classnames', 'smartyClassnames');
smartyRegisterFunction($smarty, 'function', 'url', array('Link', 'getUrlSmarty'));
smartyRegisterFunction($smarty, 'modifier', 'array_to_data_attributes', ['Tools', 'makeHtmlDataAttributes']);
+smartyRegisterFunction($smarty, 'function', 'render_template', 'renderTemplate');
-// Native PHP Functions
+// Native PHP functions
smartyRegisterFunction($smarty, 'modifier', 'addcslashes', 'addcslashes');
smartyRegisterFunction($smarty, 'modifier', 'addslashes', 'addslashes');
-smartyRegisterFunction($smarty, 'modifier', 'date','date');
+smartyRegisterFunction($smarty, 'modifier', 'date', 'date');
smartyRegisterFunction($smarty, 'modifier', 'end', 'smarty_endWithoutReference');
+smartyRegisterFunction($smarty, 'modifier', 'explode', 'explode');
smartyRegisterFunction($smarty, 'modifier', 'floatval', 'floatval');
smartyRegisterFunction($smarty, 'modifier', 'htmlentities', 'htmlentities');
smartyRegisterFunction($smarty, 'modifier', 'intval', 'intval');
smartyRegisterFunction($smarty, 'modifier', 'json_decode', 'json_decode');
smartyRegisterFunction($smarty, 'modifier', 'json_encode', 'json_encode');
-smartyRegisterFunction($smarty, 'modifier', 'mt_rand','mt_rand');
-smartyRegisterFunction($smarty, 'modifier', 'rand','rand');
-smartyRegisterFunction($smarty, 'modifier', 'strtolower','strtolower');
-smartyRegisterFunction($smarty, 'modifier', 'str_replace','str_replace');
-smartyRegisterFunction($smarty, 'modifier', 'strval','strval');
+smartyRegisterFunction($smarty, 'modifier', 'mt_rand', 'mt_rand');
+smartyRegisterFunction($smarty, 'modifier', 'rand', 'rand');
+smartyRegisterFunction($smarty, 'modifier', 'strtolower', 'strtolower');
+smartyRegisterFunction($smarty, 'modifier', 'str_replace', 'str_replace');
+smartyRegisterFunction($smarty, 'modifier', 'strval', 'strval');
smartyRegisterFunction($smarty, 'modifier', 'trim', 'trim');
smartyRegisterFunction($smarty, 'modifier', 'ucfirst', 'ucfirst');
-smartyRegisterFunction($smarty, 'modifier', 'urlencode','urlencode');
-smartyRegisterFunction($smarty, 'modifier', 'htmlspecialchars','htmlspecialchars');
+smartyRegisterFunction($smarty, 'modifier', 'urlencode', 'urlencode');
+smartyRegisterFunction($smarty, 'modifier', 'htmlspecialchars', 'htmlspecialchars');
smartyRegisterFunction($smarty, 'modifier', 'implode', 'implode');
smartyRegisterFunction($smarty, 'modifier', 'explode', 'explode');
smartyRegisterFunction($smarty, 'modifier', 'print_r', 'print_r');
smartyRegisterFunction($smarty, 'modifier', 'var_dump', 'var_dump');
smartyRegisterFunction($smarty, 'modifier', 'lcfirst', 'lcfirst');
smartyRegisterFunction($smarty, 'modifier', 'nl2br', 'nl2br');
+smartyRegisterFunction($smarty, 'modifier', 'sizeof', 'sizeof');
+smartyRegisterFunction($smarty, 'modifier', 'in_array', 'in_array');
+smartyRegisterFunction($smarty, 'modifier', 'substr', 'substr');
+smartyRegisterFunction($smarty, 'modifier', 'intval', 'intval');
+smartyRegisterFunction($smarty, 'modifier', 'date', 'date');
+smartyRegisterFunction($smarty, 'modifier', 'trim', 'trim');
+smartyRegisterFunction($smarty, 'modifier', 'json_encode', 'json_encode');
+smartyRegisterFunction($smarty, 'modifier', 'in_array', 'in_array');
+smartyRegisterFunction($smarty, 'modifier', 'stripslashes', 'stripslashes');
+smartyRegisterFunction($smarty, 'modifier', 'md5', 'md5');
function smarty_modifier_htmlentitiesUTF8($string)
{
@@ -203,7 +220,7 @@ function smartyCleanHtml($data)
function smartyClassname(string $classname)
{
$classname = Tools::replaceAccentedChars(strtolower($classname));
- $classname = preg_replace(['/[^A-Za-z0-9-_]/', '/-{3,}/', '/-+$/'], ['-', '-', ''] , $classname);
+ $classname = preg_replace(['/[^A-Za-z0-9-_]/', '/-{3,}/', '/-+$/'], ['-', '-', ''], $classname);
return $classname;
}
@@ -230,3 +247,24 @@ function smarty_endWithoutReference($arrayValue)
{
return end($arrayValue);
}
+
+function renderTemplate(array $params) {
+ $twigTemplate = $params['twig_template'];
+ unset($params['twig_template']);
+ $smartyTemplate = $params['smarty_template'];
+ unset($params['smarty_template']);
+
+ if (
+ SymfonyContainer::getInstance()
+ ->get(FeatureFlagStateCheckerInterface::class)
+ ->isEnabled(FeatureFlagSettings::FEATURE_FLAG_SYMFONY_LAYOUT)
+ ) {
+ /** @var Twig\Environment $twig */
+ $twig = SymfonyContainer::getInstance()->get('twig');
+ return $twig->render($twigTemplate, $params);
+ } else {
+ global $smarty;
+ $smarty->display($smartyTemplate);
+ }
+
+}
diff --git a/config/smartyadmin.config.inc.php b/config/smartyadmin.config.inc.php
index aa5f2144ee6fa..90f8f25a41856 100644
--- a/config/smartyadmin.config.inc.php
+++ b/config/smartyadmin.config.inc.php
@@ -77,7 +77,7 @@ function smartyTranslate($params, $smarty)
$sprintf = $params['sprintf'];
}
- if ($isInPDF) {
+ if ($isInPDF && empty($params['d'])) {
return Translate::postProcessTranslation(
Translate::getPdfTranslation(
$params['s'],
@@ -88,7 +88,7 @@ function smartyTranslate($params, $smarty)
}
// If the template is part of a module
- if ($isInModule) {
+ if ($isInModule && empty($params['d'])) {
return Translate::postProcessTranslation(
Translate::getModuleTranslation(
$params['mod'],
diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php
index 57890fec49fcf..6b6f777c7b8a8 100644
--- a/controllers/admin/AdminCarriersController.php
+++ b/controllers/admin/AdminCarriersController.php
@@ -497,21 +497,6 @@ public function postProcess()
$this->processIsFree();
} else {
- // if deletion : removes the carrier from the warehouse/carrier association
- if (Tools::isSubmit('delete' . $this->table)) {
- $id = (int) Tools::getValue('id_' . $this->table);
- // Delete from the reference_id and not from the carrier id
- $carrier = new Carrier((int) $id);
- Warehouse::removeCarrier($carrier->id_reference);
- } elseif (Tools::isSubmit($this->table . 'Box') && count(Tools::getValue($this->table . 'Box', [])) > 0) {
- $ids = Tools::getValue($this->table . 'Box');
- array_walk($ids, 'intval');
- foreach ($ids as $id) {
- // Delete from the reference_id and not from the carrier id
- $carrier = new Carrier((int) $id);
- Warehouse::removeCarrier($carrier->id_reference);
- }
- }
parent::postProcess();
Carrier::cleanPositions();
}
diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index 6038c5cf171ab..78f44ac7af84e 100644
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -24,8 +24,6 @@
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/
-use PrestaShop\PrestaShop\Core\Localization\Exception\LocalizationException;
-
/**
* @property Cart $object
*/
@@ -219,700 +217,12 @@ public function renderKpis()
return $helper->generate();
}
- /**
- * @return string|void
- *
- * @throws PrestaShopDatabaseException
- * @throws PrestaShopException
- * @throws LocalizationException
- */
- public function renderView()
- {
- if (!($cart = $this->loadObject(true))) {
- return;
- }
- /** @var Cart $cart */
- $customer = new Customer($cart->id_customer);
- $currency = new Currency($cart->id_currency);
- $this->context->cart = $cart;
- $this->context->currency = $currency;
- $this->context->customer = $customer;
- $this->toolbar_title = $this->trans('Cart #%ID%', ['%ID%' => $this->context->cart->id], 'Admin.Orderscustomers.Feature');
- $products = $cart->getProducts();
- $summary = $cart->getSummaryDetails();
-
- /* Display order information */
- $id_order = (int) Order::getIdByCartId($cart->id);
- $order = new Order($id_order);
- if (Validate::isLoadedObject($order)) {
- $tax_calculation_method = $order->getTaxCalculationMethod();
- $id_shop = (int) $order->id_shop;
- } else {
- $id_shop = (int) $cart->id_shop;
- $tax_calculation_method = Group::getPriceDisplayMethod(Group::getCurrent()->id);
- }
-
- if ($tax_calculation_method == PS_TAX_EXC) {
- $total_products = $summary['total_products'];
- $total_discounts = $summary['total_discounts_tax_exc'];
- $total_wrapping = $summary['total_wrapping_tax_exc'];
- $total_price = $summary['total_price_without_tax'];
- $total_shipping = $summary['total_shipping_tax_exc'];
- } else {
- $total_products = $summary['total_products_wt'];
- $total_discounts = $summary['total_discounts'];
- $total_wrapping = $summary['total_wrapping'];
- $total_price = $summary['total_price'];
- $total_shipping = $summary['total_shipping'];
- }
- foreach ($products as &$product) {
- if ($tax_calculation_method == PS_TAX_EXC) {
- $product['product_price'] = $product['price'];
- $product['product_total'] = $product['total'];
- } else {
- $product['product_price'] = $product['price_wt'];
- $product['product_total'] = $product['total_wt'];
- }
- $image = [];
- if (isset($product['id_product_attribute']) && (int) $product['id_product_attribute']) {
- $image = Db::getInstance()->getRow('SELECT id_image FROM ' . _DB_PREFIX_ . 'product_attribute_image WHERE id_product_attribute = ' . (int) $product['id_product_attribute']);
- }
- if (!isset($image['id_image'])) {
- $image = Db::getInstance()->getRow('SELECT id_image FROM ' . _DB_PREFIX_ . 'image WHERE id_product = ' . (int) $product['id_product'] . ' AND cover = 1');
- }
-
- $product['qty_in_stock'] = StockAvailable::getQuantityAvailableByProduct($product['id_product'], isset($product['id_product_attribute']) ? $product['id_product_attribute'] : null, (int) $id_shop);
-
- $image_product = new Image($image['id_image']);
- $product['image'] = (isset($image['id_image']) ? ImageManager::thumbnail(_PS_IMG_DIR_ . 'p/' . $image_product->getExistingImgPath() . '.jpg', 'product_mini_' . (int) $product['id_product'] . (isset($product['id_product_attribute']) ? '_' . (int) $product['id_product_attribute'] : '') . '.jpg', 45, 'jpg') : '--');
-
- $customized_datas = Product::getAllCustomizedDatas($this->context->cart->id, null, true, null, (int) $product['id_customization']);
- $this->context->cart->setProductCustomizedDatas($product, $customized_datas);
- }
-
- $helper = new HelperKpi();
- $helper->id = 'box-kpi-cart';
- $helper->icon = 'icon-shopping-cart';
- $helper->color = 'color1';
- $helper->title = $this->trans('Total cart', [], 'Admin.Orderscustomers.Feature');
- $helper->subtitle = $this->trans('Cart #%ID%', ['%ID%' => $cart->id], 'Admin.Orderscustomers.Feature');
- $helper->value = $this->context->getCurrentLocale()->formatPrice($total_price, $currency->iso_code);
- $kpi = $helper->generate();
-
- $this->tpl_view_vars = [
- 'kpi' => $kpi,
- 'products' => $products,
- 'discounts' => $cart->getCartRules(),
- 'order' => $order,
- 'cart' => $cart,
- 'currency' => $currency,
- 'customer' => $customer,
- 'customer_stats' => $customer->getStats(),
- 'total_products' => $total_products,
- 'total_discounts' => $total_discounts,
- 'total_wrapping' => $total_wrapping,
- 'total_price' => $total_price,
- 'total_shipping' => $total_shipping,
- 'tax_calculation_method' => $tax_calculation_method,
- ];
-
- return parent::renderView();
- }
-
- public function ajaxPreProcess()
- {
- if ($this->access('edit')) {
- $id_customer = (int) Tools::getValue('id_customer');
- $customer = new Customer((int) $id_customer);
- $this->context->customer = $customer;
- $id_cart = (int) Tools::getValue('id_cart');
- if (!$id_cart) {
- $id_cart = $customer->getLastEmptyCart(false);
- }
- $this->context->cart = new Cart((int) $id_cart);
-
- if (!$this->context->cart->id) {
- $this->context->cart->recyclable = false;
- $this->context->cart->gift = false;
- }
-
- if (!$this->context->cart->id_customer) {
- $this->context->cart->id_customer = $id_customer;
- }
- if (Validate::isLoadedObject($this->context->cart) && $this->context->cart->OrderExists()) {
- return;
- }
- if (!$this->context->cart->secure_key) {
- $this->context->cart->secure_key = $this->context->customer->secure_key;
- }
- if (!$this->context->cart->id_shop) {
- $this->context->cart->id_shop = (int) $this->context->shop->id;
- }
- if (!$this->context->cart->id_lang) {
- $this->context->cart->id_lang = (($id_lang = (int) Tools::getValue('id_lang')) ? $id_lang : Configuration::get('PS_LANG_DEFAULT'));
- }
- if (!$this->context->cart->id_currency) {
- $this->context->cart->id_currency = (($id_currency = (int) Tools::getValue('id_currency')) ? $id_currency : Currency::getDefaultCurrencyId());
- }
-
- $addresses = $customer->getAddresses((int) $this->context->cart->id_lang);
- $id_address_delivery = (int) Tools::getValue('id_address_delivery');
- $id_address_invoice = (int) Tools::getValue('id_address_delivery');
-
- if (!$this->context->cart->id_address_invoice && isset($addresses[0])) {
- $this->context->cart->id_address_invoice = (int) $addresses[0]['id_address'];
- } elseif ($id_address_invoice) {
- $this->context->cart->id_address_invoice = (int) $id_address_invoice;
- }
- if (!$this->context->cart->id_address_delivery && isset($addresses[0])) {
- $this->context->cart->id_address_delivery = $addresses[0]['id_address'];
- } elseif ($id_address_delivery) {
- $this->context->cart->id_address_delivery = (int) $id_address_delivery;
- }
- $this->context->cart->setNoMultishipping();
- $this->context->cart->save();
- $currency = new Currency((int) $this->context->cart->id_currency);
- $this->context->currency = $currency;
- }
- }
-
- public function ajaxProcessDeleteProduct()
- {
- if ($this->access('edit')) {
- $errors = [];
- if ((!$id_product = (int) Tools::getValue('id_product')) || !Validate::isInt($id_product)) {
- $errors[] = $this->trans('Invalid product', [], 'Admin.Catalog.Notification');
- }
- if (($id_product_attribute = (int) Tools::getValue('id_product_attribute')) && !Validate::isInt($id_product_attribute)) {
- $errors[] = $this->trans('Invalid combination', [], 'Admin.Catalog.Notification');
- }
- if (count($errors)) {
- die(json_encode($errors));
- }
- if ($this->context->cart->deleteProduct($id_product, $id_product_attribute, (int) Tools::getValue('id_customization'))) {
- echo json_encode($this->ajaxReturnVars());
- }
- }
- }
-
- public function ajaxProcessUpdateCustomizationFields()
- {
- $errors = [];
- if ($this->access('edit')) {
- $errors = [];
- if (Tools::getValue('only_display') != 1) {
- if (!$this->context->cart->id || (!$id_product = (int) Tools::getValue('id_product'))) {
- return;
- }
- $product = new Product((int) $id_product);
- if (!$customization_fields = $product->getCustomizationFieldIds()) {
- return;
- }
- foreach ($customization_fields as $customization_field) {
- $field_id = 'customization_' . $id_product . '_' . $customization_field['id_customization_field'];
- if ($customization_field['type'] == Product::CUSTOMIZE_TEXTFIELD) {
- if (!Tools::getValue($field_id)) {
- if ($customization_field['required']) {
- $errors[] = $this->trans('Please fill in all the required fields.', [], 'Admin.Notifications.Error');
- }
-
- continue;
- }
- if (!Validate::isMessage(Tools::getValue($field_id))) {
- $errors[] = $this->trans('Invalid message.', [], 'Admin.Notifications.Error');
- }
- $this->context->cart->addTextFieldToProduct((int) $product->id, (int) $customization_field['id_customization_field'], Product::CUSTOMIZE_TEXTFIELD, Tools::getValue($field_id));
- } elseif ($customization_field['type'] == Product::CUSTOMIZE_FILE) {
- if (!isset($_FILES[$field_id]) || !isset($_FILES[$field_id]['tmp_name']) || empty($_FILES[$field_id]['tmp_name'])) {
- if ($customization_field['required']) {
- $errors[] = $this->trans('Please fill in all the required fields.', [], 'Admin.Notifications.Error');
- }
-
- continue;
- }
- if ($error = ImageManager::validateUpload($_FILES[$field_id], (int) Configuration::get('PS_PRODUCT_PICTURE_MAX_SIZE'))) {
- $errors[] = $error;
- }
- if (!($tmp_name = tempnam(_PS_TMP_IMG_DIR_, 'PS')) || !move_uploaded_file($_FILES[$field_id]['tmp_name'], $tmp_name)) {
- $errors[] = $this->trans('An error occurred during the image upload process.', [], 'Admin.Catalog.Notification');
- }
- $file_name = md5(uniqid((string) mt_rand(0, mt_getrandmax()), true));
- if (!ImageManager::resize($tmp_name, _PS_UPLOAD_DIR_ . $file_name)) {
- continue;
- } elseif (!ImageManager::resize($tmp_name, _PS_UPLOAD_DIR_ . $file_name . '_small', (int) Configuration::get('PS_PRODUCT_PICTURE_WIDTH'), (int) Configuration::get('PS_PRODUCT_PICTURE_HEIGHT'))) {
- $errors[] = $this->trans('An error occurred during the image upload process.', [], 'Admin.Catalog.Notification');
- } else {
- $this->context->cart->addPictureToProduct((int) $product->id, (int) $customization_field['id_customization_field'], Product::CUSTOMIZE_FILE, $file_name);
- }
- unlink($tmp_name);
- }
- }
- }
- $this->setMedia(false);
- $this->initFooter();
- $this->context->smarty->assign(['customization_errors' => implode('
', $errors), - 'css_files' => $this->css_files, ]); - - return $this->smartyOutputContent('controllers/orders/form_customization_feedback.tpl'); - } - } - - public function ajaxProcessUpdateQty() - { - if ($this->access('edit')) { - $errors = []; - if (!$this->context->cart->id) { - return; - } - $qty = Tools::getValue('qty'); - $id_product = (int) Tools::getValue('id_product'); - if ($this->context->cart->OrderExists()) { - $errors[] = $this->trans('An order has already been placed with this cart.', [], 'Admin.Catalog.Notification'); - } elseif (!$id_product || !Validate::isLoadedObject($product = new Product((int) $id_product, true, $this->context->language->id))) { - $errors[] = $this->trans('Invalid product', [], 'Admin.Catalog.Notification'); - } elseif (!$qty || $qty == 0) { - $errors[] = $this->trans('Invalid quantity', [], 'Admin.Catalog.Notification'); - } - - // Don't try to use a product if not instanciated before due to errors - $id_customization = (int) Tools::getValue('id_customization', 0); - $id_product_attribute = Tools::getValue('id_product_attribute'); - if (isset($product) && $product->id) { - if ($id_product_attribute != 0) { - if (!Product::isAvailableWhenOutOfStock($product->out_of_stock) && !ProductAttribute::checkAttributeQty((int) $id_product_attribute, (int) $qty)) { - $errors[] = $this->trans('There are not enough products in stock.', [], 'Admin.Catalog.Notification'); - } - } elseif (!$product->checkQty((int) $qty)) { - $errors[] = $this->trans('There are not enough products in stock.', [], 'Admin.Catalog.Notification'); - } - if (!$id_customization && !$product->hasAllRequiredCustomizableFields()) { - $errors[] = $this->trans('Please fill in all the required fields.', [], 'Admin.Notifications.Error'); - } - $this->context->cart->save(); - } else { - $errors[] = $this->trans('This product cannot be added to the cart.', [], 'Admin.Catalog.Notification'); - } - - if (!count($errors)) { - if ((int) $qty < 0) { - $qty = str_replace('-', '', $qty); - $operator = 'down'; - } else { - $operator = 'up'; - } - - if (!($qty_upd = $this->context->cart->updateQty($qty, $id_product, (int) $id_product_attribute, $id_customization, $operator))) { - $errors[] = $this->trans('You already have the maximum quantity available for this product.', [], 'Admin.Catalog.Notification'); - } elseif ($qty_upd < 0 && isset($product)) { - $minimal_qty = $id_product_attribute ? ProductAttribute::getAttributeMinimalQty((int) $id_product_attribute) : $product->minimal_quantity; - $errors[] = $this->trans('You must add a minimum quantity of %d', [$minimal_qty], 'Admin.Orderscustomers.Notification'); - } - } - - echo json_encode(array_merge($this->ajaxReturnVars(), ['errors' => $errors])); - } - } - - public function ajaxProcessUpdateDeliveryOption() - { - if ($this->access('edit')) { - $delivery_option = Tools::getValue('delivery_option'); - if ($delivery_option !== false) { - $this->context->cart->setDeliveryOption([$this->context->cart->id_address_delivery => $delivery_option]); - } - $recyclable = (int) Tools::getValue('recyclable'); - if (Validate::isBool($recyclable)) { - $this->context->cart->recyclable = $recyclable; - } - $gift = (int) Tools::getValue('gift'); - if (Validate::isBool($gift)) { - $this->context->cart->gift = $gift; - } - if (Validate::isMessage(($gift_message = pSQL(Tools::getValue('gift_message'))))) { - $this->context->cart->gift_message = $gift_message; - } - $this->context->cart->save(); - echo json_encode($this->ajaxReturnVars()); - } - } - - public function ajaxProcessUpdateOrderMessage() - { - if ($this->access('edit')) { - $id_message = false; - if ($old_message = Message::getMessageByCartId((int) $this->context->cart->id)) { - $id_message = $old_message['id_message']; - } - $message = new Message((int) $id_message); - if ($message_content = Tools::getValue('message')) { - if (Validate::isMessage($message_content)) { - $message->message = $message_content; - $message->id_cart = (int) $this->context->cart->id; - $message->id_customer = (int) $this->context->cart->id_customer; - $message->save(); - } - } elseif (Validate::isLoadedObject($message)) { - $message->delete(); - } - echo json_encode($this->ajaxReturnVars()); - } - } - - public function ajaxProcessUpdateCurrency() - { - if ($this->access('edit')) { - $currency = new Currency((int) Tools::getValue('id_currency')); - if (Validate::isLoadedObject($currency) && !$currency->deleted && $currency->active) { - $this->context->cart->id_currency = (int) $currency->id; - $this->context->currency = $currency; - $this->context->cart->save(); - } - echo json_encode($this->ajaxReturnVars()); - } - } - - public function ajaxProcessUpdateLang() - { - if ($this->access('edit')) { - $lang = new Language((int) Tools::getValue('id_lang')); - if (Validate::isLoadedObject($lang) && $lang->active) { - $this->context->cart->id_lang = (int) $lang->id; - $this->context->cart->save(); - } - echo json_encode($this->ajaxReturnVars()); - } - } - - public function ajaxProcessDuplicateOrder() - { - if ($this->access('edit')) { - $errors = []; - if (!$id_order = Tools::getValue('id_order')) { - $errors[] = $this->trans('Invalid order', [], 'Admin.Orderscustomers.Notification'); - } - $cart = Cart::getCartByOrderId($id_order); - $new_cart = $cart->duplicate(); - if (!$new_cart || !Validate::isLoadedObject($new_cart['cart'])) { - $errors[] = $this->trans('The order cannot be renewed.', [], 'Admin.Orderscustomers.Notification'); - } elseif (!$new_cart['success']) { - $errors[] = $this->trans('The order cannot be renewed.', [], 'Admin.Orderscustomers.Notification'); - } else { - $this->context->cart = $new_cart['cart']; - echo json_encode($this->ajaxReturnVars()); - } - } - } - - public function ajaxProcessDeleteVoucher() - { - if ($this->access('edit')) { - if ($this->context->cart->removeCartRule((int) Tools::getValue('id_cart_rule'))) { - echo json_encode($this->ajaxReturnVars()); - } - } - } - - public function ajaxProcessupdateFreeShipping() - { - if ($this->access('edit')) { - if (!$id_cart_rule = CartRule::getIdByCode(CartRule::BO_ORDER_CODE_PREFIX . (int) $this->context->cart->id)) { - $cart_rule = new CartRule(); - $cart_rule->code = CartRule::BO_ORDER_CODE_PREFIX . (int) $this->context->cart->id; - $cart_rule->name = [Configuration::get('PS_LANG_DEFAULT') => $this->trans('Free Shipping', [], 'Admin.Orderscustomers.Feature')]; - $cart_rule->id_customer = (int) $this->context->cart->id_customer; - $cart_rule->free_shipping = true; - $cart_rule->quantity = 1; - $cart_rule->quantity_per_user = 1; - $cart_rule->minimum_amount_currency = (int) $this->context->cart->id_currency; - $cart_rule->reduction_currency = (int) $this->context->cart->id_currency; - $cart_rule->date_from = date('Y-m-d H:i:s', time()); - $cart_rule->date_to = date('Y-m-d H:i:s', time() + 24 * 36000); - $cart_rule->active = true; - $cart_rule->add(); - } else { - $cart_rule = new CartRule((int) $id_cart_rule); - } - - $this->context->cart->removeCartRule((int) $cart_rule->id); - if (Tools::getValue('free_shipping')) { - $this->context->cart->addCartRule((int) $cart_rule->id); - } - - echo json_encode($this->ajaxReturnVars()); - } - } - - public function ajaxProcessAddVoucher() - { - if ($this->access('edit')) { - $errors = []; - $id_cart_rule = Tools::getValue('id_cart_rule'); - if (!$id_cart_rule) { - $errors[] = $this->trans('Invalid voucher.', [], 'Admin.Catalog.Notification'); - } else { - $cart_rule = new CartRule((int) $id_cart_rule); - if (!Validate::isLoadedObject($cart_rule)) { - $errors[] = $this->trans('Invalid voucher.', [], 'Admin.Catalog.Notification'); - } elseif ($err = $cart_rule->checkValidity($this->context)) { - $errors[] = $err; - } - if (!count($errors)) { - if (!$this->context->cart->addCartRule((int) $cart_rule->id)) { - $errors[] = $this->trans('Can\'t add the voucher.', [], 'Admin.Advparameters.Notification'); - } - } - } - echo json_encode(array_merge($this->ajaxReturnVars(), ['errors' => $errors])); - } - } - - public function ajaxProcessUpdateAddress() - { - if ($this->access('edit')) { - echo json_encode(['addresses' => $this->context->customer->getAddresses((int) $this->context->cart->id_lang)]); - } - } - - public function ajaxProcessUpdateAddresses() - { - if ($this->access('edit')) { - if (($id_address_delivery = (int) Tools::getValue('id_address_delivery')) && - Validate::isLoadedObject($address_delivery = new Address((int) $id_address_delivery)) && - $address_delivery->id_customer == $this->context->cart->id_customer) { - $this->context->cart->id_address_delivery = (int) $address_delivery->id; - } - - if (($id_address_invoice = (int) Tools::getValue('id_address_invoice')) && - Validate::isLoadedObject($address_invoice = new Address((int) $id_address_invoice)) && - $address_invoice->id_customer = $this->context->cart->id_customer) { - $this->context->cart->id_address_invoice = (int) $address_invoice->id; - } - $this->context->cart->save(); - - echo json_encode($this->ajaxReturnVars()); - } - } - - protected function getCartSummary() - { - $summary = $this->context->cart->getSummaryDetails(null, true); - $currency = Context::getContext()->currency; - if (count($summary['products'])) { - foreach ($summary['products'] as &$product) { - $product['numeric_price'] = $product['price']; - $product['numeric_total'] = $product['total']; - $product['price'] = str_replace($currency->symbol, '', $this->context->getCurrentLocale()->formatPrice($product['price'], $currency->iso_code)); - $product['total'] = str_replace($currency->symbol, '', $this->context->getCurrentLocale()->formatPrice($product['total'], $currency->iso_code)); - $product['image_link'] = $this->context->link->getImageLink($product['link_rewrite'], $product['id_image'], 'small_default'); - if (!isset($product['attributes_small'])) { - $product['attributes_small'] = ''; - } - $product['customized_datas'] = Product::getAllCustomizedDatas((int) $this->context->cart->id, null, true, null, (int) $product['id_customization']); - } - } - if (count($summary['discounts'])) { - foreach ($summary['discounts'] as &$voucher) { - $voucher['value_real'] = $this->context->getCurrentLocale()->formatPrice($voucher['value_real'], $currency->iso_code); - } - } - - if (isset($summary['gift_products']) && count($summary['gift_products'])) { - foreach ($summary['gift_products'] as &$product) { - $product['image_link'] = $this->context->link->getImageLink($product['link_rewrite'], $product['id_image'], 'small_default'); - if (!isset($product['attributes_small'])) { - $product['attributes_small'] = ''; - } - } - } - - return $summary; - } - - protected function getDeliveryOptionList() - { - $delivery_option_list_formated = []; - $delivery_option_list = $this->context->cart->getDeliveryOptionList(); - - if (!count($delivery_option_list)) { - return []; - } - - $id_default_carrier = (int) Configuration::get('PS_CARRIER_DEFAULT'); - foreach (current($delivery_option_list) as $key => $delivery_option) { - $name = ''; - $first = true; - $id_default_carrier_delivery = false; - foreach ($delivery_option['carrier_list'] as $carrier) { - if (!$first) { - $name .= ', '; - } else { - $first = false; - } - - $name .= $carrier['instance']->name; - - if ($delivery_option['unique_carrier']) { - $name .= ' - ' . $carrier['instance']->delay[$this->context->employee->id_lang]; - } - - if (!$id_default_carrier_delivery) { - $id_default_carrier_delivery = (int) $carrier['instance']->id; - } - if ($carrier['instance']->id == $id_default_carrier) { - $id_default_carrier_delivery = $id_default_carrier; - } - if (!$this->context->cart->id_carrier) { - $this->context->cart->setDeliveryOption([$this->context->cart->id_address_delivery => (int) $carrier['instance']->id . ',']); - $this->context->cart->save(); - } - } - $delivery_option_list_formated[] = ['name' => $name, 'key' => $key]; - } - - return $delivery_option_list_formated; - } - - public function displayAjaxSearchCarts() - { - $id_customer = (int) Tools::getValue('id_customer'); - $carts = Cart::getCustomerCarts((int) $id_customer, false); - $orders = Order::getCustomerOrders((int) $id_customer); - - if (count($carts)) { - foreach ($carts as $key => &$cart) { - $cart_obj = new Cart((int) $cart['id_cart']); - if ($cart['id_cart'] == $this->context->cart->id) { - unset($carts[$key]); - - continue; - } - $currency = new Currency((int) $cart['id_currency']); - $cart['total_price'] = $this->context->getCurrentLocale()->formatPrice($cart_obj->getOrderTotal(), $currency->iso_code); - } - } - if (count($orders)) { - foreach ($orders as &$order) { - $currency = new Currency((int) $order['id_currency']); - $order['total_paid_real'] = $this->context->getCurrentLocale()->formatPrice($order['total_paid_real'], $currency->iso_code); - } - } - if ($orders || $carts) { - $to_return = array_merge( - $this->ajaxReturnVars(), - [ - 'carts' => $carts, - 'orders' => $orders, - 'found' => true, - ] - ); - } else { - $to_return = array_merge($this->ajaxReturnVars(), ['found' => false]); - } - - echo json_encode($to_return); - } - - public function ajaxReturnVars() - { - $id_cart = (int) $this->context->cart->id; - $message_content = ''; - if ($message = Message::getMessageByCartId((int) $this->context->cart->id)) { - $message_content = $message['message']; - } - $cart_rules = $this->context->cart->getCartRules(CartRule::FILTER_ACTION_SHIPPING); - - $free_shipping = false; - if (count($cart_rules)) { - foreach ($cart_rules as $cart_rule) { - if ($cart_rule['id_cart_rule'] == CartRule::getIdByCode(CartRule::BO_ORDER_CODE_PREFIX . (int) $this->context->cart->id)) { - $free_shipping = true; - - break; - } - } - } - - $addresses = $this->context->customer->getAddresses((int) $this->context->cart->id_lang); - - foreach ($addresses as &$data) { - $address = new Address((int) $data['id_address']); - $data['formated_address'] = AddressFormat::generateAddress($address, [], '
'); - } - - return [ - 'summary' => $this->getCartSummary(), - 'delivery_option_list' => $this->getDeliveryOptionList(), - 'cart' => $this->context->cart, - 'currency' => new Currency($this->context->cart->id_currency), - 'addresses' => $addresses, - 'id_cart' => $id_cart, - 'order_message' => $message_content, - 'link_order' => $this->context->link->getPageLink( - 'order', - false, - (int) $this->context->cart->id_lang, - 'step=3&recover_cart=' . $id_cart . '&token_cart=' . md5(_COOKIE_KEY_ . 'recover_cart_' . $id_cart) - ), - 'free_shipping' => (int) $free_shipping, - ]; - } - public function initToolbar() { parent::initToolbar(); unset($this->toolbar_btn['new']); } - /** - * Display an image as a download. - */ - public function displayAjaxCustomizationImage() - { - if (!Tools::isSubmit('img') || !Tools::isSubmit('name')) { - return; - } - - $img = Tools::getValue('img'); - $name = Tools::getValue('name'); - $path = _PS_UPLOAD_DIR_ . $img; - - if (Validate::isMd5($img) && Validate::isGenericName($path)) { - header('Content-type: image/jpeg'); - header('Content-Disposition: attachment; filename="' . $name . '.jpg"'); - readfile($path); - } - } - - public function displayAjaxGetSummary() - { - echo json_encode($this->ajaxReturnVars()); - } - - public function ajaxProcessUpdateProductPrice() - { - if ($this->access('edit')) { - SpecificPrice::deleteByIdCart((int) $this->context->cart->id, (int) Tools::getValue('id_product'), (int) Tools::getValue('id_product_attribute')); - $specific_price = new SpecificPrice(); - $specific_price->id_cart = (int) $this->context->cart->id; - $specific_price->id_shop = 0; - $specific_price->id_shop_group = 0; - $specific_price->id_currency = 0; - $specific_price->id_country = 0; - $specific_price->id_group = 0; - $specific_price->id_customer = (int) $this->context->customer->id; - $specific_price->id_product = (int) Tools::getValue('id_product'); - $specific_price->id_product_attribute = (int) Tools::getValue('id_product_attribute'); - $specific_price->price = (float) Tools::getValue('price'); - $specific_price->from_quantity = 1; - $specific_price->reduction = 0; - $specific_price->reduction_type = 'amount'; - $specific_price->from = '0000-00-00 00:00:00'; - $specific_price->to = '0000-00-00 00:00:00'; - $specific_price->add(); - echo json_encode($this->ajaxReturnVars()); - } - } - public static function getOrderTotalUsingTaxCalculationMethod($id_cart) { $context = Context::getContext(); diff --git a/controllers/admin/AdminCountriesController.php b/controllers/admin/AdminCountriesController.php index d6f8b82c4d43d..9a6ed94762f56 100644 --- a/controllers/admin/AdminCountriesController.php +++ b/controllers/admin/AdminCountriesController.php @@ -493,7 +493,6 @@ protected function displayValidFields() { /* The following translations are needed later - don't remove the comments! $this->trans('Customer', [], 'Admin.Global'); - $this->trans('Warehouse', [], 'Admin.Global'); $this->trans('Country', [], 'Admin.Global'); $this->trans('State', [], 'Admin.Global'); $this->trans('Address', [], 'Admin.Global'); diff --git a/controllers/admin/AdminDashboardController.php b/controllers/admin/AdminDashboardController.php index 5fb0b20d67b55..3a125543c6059 100644 --- a/controllers/admin/AdminDashboardController.php +++ b/controllers/admin/AdminDashboardController.php @@ -405,6 +405,8 @@ public function ajaxProcessRefreshDashboard() 'extra' => (int) Tools::getValue('extra'), ]; + // Hook called only for the module concerned + // An array [module_name => module_output] will be returned die(json_encode(Hook::exec('dashboardData', $params, $id_module, true))); } diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php deleted file mode 100644 index 615a3c5af4d4e..0000000000000 --- a/controllers/admin/AdminFeaturesController.php +++ /dev/null @@ -1,661 +0,0 @@ - - * @copyright Since 2007 PrestaShop SA and Contributors - * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) - */ - -/** - * @property FeatureValue $object - */ -class AdminFeaturesControllerCore extends AdminController -{ - /** @var bool */ - public $bootstrap = true; - /** @var string */ - protected $position_identifier = 'id_feature'; - protected $feature_name; - - public function __construct() - { - $this->table = 'feature'; - $this->className = 'Feature'; - $this->list_id = 'feature'; - $this->identifier = 'id_feature'; - $this->lang = true; - - parent::__construct(); - - $this->fields_list = [ - 'id_feature' => [ - 'title' => $this->trans('ID', [], 'Admin.Global'), - 'align' => 'center', - 'class' => 'fixed-width-xs', - ], - 'name' => [ - 'title' => $this->trans('Name', [], 'Admin.Global'), - 'width' => 'auto', - 'filter_key' => 'b!name', - ], - 'value' => [ - 'title' => $this->trans('Values', [], 'Admin.Global'), - 'orderby' => false, - 'search' => false, - 'align' => 'center', - 'class' => 'fixed-width-xs', - ], - 'position' => [ - 'title' => $this->trans('Position', [], 'Admin.Global'), - 'filter_key' => 'a!position', - 'align' => 'center', - 'class' => 'fixed-width-xs', - 'position' => 'position', - ], - ]; - - $this->bulk_actions = [ - 'delete' => [ - 'text' => $this->trans('Delete selected', [], 'Admin.Actions'), - 'icon' => 'icon-trash', - 'confirm' => $this->trans('Delete selected items?', [], 'Admin.Notifications.Warning'), - ], - ]; - } - - /** - * AdminController::renderList() override. - * - * @see AdminController::renderList() - */ - public function renderList() - { - $this->addRowAction('view'); - $this->addRowAction('edit'); - $this->addRowAction('delete'); - - return parent::renderList(); - } - - /** - * Change object type to feature value (use when processing a feature value). - */ - protected function setTypeValue() - { - $this->table = 'feature_value'; - $this->className = 'FeatureValue'; - $this->identifier = 'id_feature_value'; - } - - /** - * Change object type to feature (use when processing a feature). - */ - protected function setTypeFeature() - { - $this->table = 'feature'; - $this->className = 'Feature'; - $this->identifier = 'id_feature'; - } - - /** - * @return false|string|void - * - * @throws PrestaShopDatabaseException - * @throws PrestaShopException - */ - public function renderView() - { - if ($id = (int) Tools::getValue('id_feature')) { - $this->setTypeValue(); - $this->list_id = 'feature_value'; - $this->lang = true; - - // Action for list - $this->addRowAction('edit'); - $this->addRowAction('delete'); - - if (!Validate::isLoadedObject($obj = new Feature((int) $id))) { - $this->errors[] = $this->trans('An error occurred while updating the status for an object.', [], 'Admin.Notifications.Error') . ' ' . $this->table . ' ' . $this->trans('(cannot load object)', [], 'Admin.Notifications.Error'); - - return; - } - - $this->feature_name = $obj->name; - $this->toolbar_title = $this->feature_name[$this->context->employee->id_lang]; - $this->fields_list = [ - 'id_feature_value' => [ - 'title' => $this->trans('ID', [], 'Admin.Global'), - 'align' => 'center', - 'class' => 'fixed-width-xs', - ], - 'value' => [ - 'title' => $this->trans('Value', [], 'Admin.Global'), - ], - ]; - - $this->_where = sprintf('AND `id_feature` = %d', (int) $id); - self::$currentIndex = self::$currentIndex . '&id_feature=' . (int) $id . '&viewfeature'; - $this->processFilter(); - - return parent::renderList(); - } - } - - /** - * AdminController::renderForm() override. - * - * @see AdminController::renderForm() - */ - public function renderForm() - { - $this->toolbar_title = $this->trans('Add a new feature', [], 'Admin.Catalog.Feature'); - $this->fields_form = [ - 'legend' => [ - 'title' => $this->trans('Feature', [], 'Admin.Catalog.Feature'), - 'icon' => 'icon-info-sign', - ], - 'input' => [ - [ - 'type' => 'text', - 'label' => $this->trans('Name', [], 'Admin.Global'), - 'name' => 'name', - 'lang' => true, - 'size' => 33, - 'hint' => $this->trans('Invalid characters:', [], 'Admin.Notifications.Info') . ' <>;=#{}', - 'required' => true, - ], - ], - ]; - - if (Shop::isFeatureActive()) { - $this->fields_form['input'][] = [ - 'type' => 'shop', - 'label' => $this->trans('Store association', [], 'Admin.Global'), - 'name' => 'checkBoxShopAsso', - ]; - } - - $this->fields_form['submit'] = [ - 'title' => $this->trans('Save', [], 'Admin.Actions'), - ]; - - return parent::renderForm(); - } - - public function initPageHeaderToolbar() - { - if (Feature::isFeatureActive()) { - if (empty($this->display)) { - $this->page_header_toolbar_btn['new_feature'] = [ - 'href' => self::$currentIndex . '&addfeature&token=' . $this->token, - 'desc' => $this->trans('Add new feature', [], 'Admin.Catalog.Feature'), - 'icon' => 'process-icon-new', - ]; - - $this->page_header_toolbar_btn['new_feature_value'] = [ - 'href' => self::$currentIndex . '&addfeature_value&id_feature=' . (int) Tools::getValue('id_feature') . '&token=' . $this->token, - 'desc' => $this->trans('Add new feature value', [], 'Admin.Catalog.Help'), - 'icon' => 'process-icon-new', - ]; - } - } - - if ($this->display == 'view') { - $this->page_header_toolbar_btn['new_feature_value'] = [ - 'href' => self::$currentIndex . '&addfeature_value&id_feature=' . (int) Tools::getValue('id_feature') . '&token=' . $this->token, - 'desc' => $this->trans('Add new feature value', [], 'Admin.Catalog.Help'), - 'icon' => 'process-icon-new', - ]; - } - - parent::initPageHeaderToolbar(); - } - - /** - * AdminController::initToolbar() override. - * - * @see AdminController::initToolbar() - */ - public function initToolbar() - { - switch ($this->display) { - case 'editFeatureValue': - case 'add': - case 'edit': - $this->toolbar_btn['save'] = [ - 'href' => '#', - 'desc' => $this->trans('Save', [], 'Admin.Actions'), - ]; - - if ($this->display == 'editFeatureValue') { - $this->toolbar_btn['save-and-stay'] = [ - 'short' => 'SaveAndStay', - 'href' => '#', - 'desc' => $this->trans('Save and add another value', [], 'Admin.Catalog.Help'), - 'force_desc' => true, - ]; - } - - // Default cancel button - like old back link - $back = Tools::safeOutput(Tools::getValue('back', '')); - if (empty($back)) { - $back = self::$currentIndex . '&token=' . $this->token; - } - - $this->toolbar_btn['back'] = [ - 'href' => $back, - 'desc' => $this->trans('Back to the list', [], 'Admin.Catalog.Help'), - ]; - - break; - case 'view': - $this->toolbar_btn['newAttributes'] = [ - 'href' => self::$currentIndex . '&addfeature_value&id_feature=' . (int) Tools::getValue('id_feature') . '&token=' . $this->token, - 'desc' => $this->trans('Add new feature values', [], 'Admin.Catalog.Help'), - ]; - $this->toolbar_btn['back'] = [ - 'href' => self::$currentIndex . '&token=' . $this->token, - 'desc' => $this->trans('Back to the list', [], 'Admin.Catalog.Help'), - ]; - - break; - default: - parent::initToolbar(); - } - } - - public function initToolbarTitle() - { - $bread_extended = $this->breadcrumbs; - - switch ($this->display) { - case 'edit': - $bread_extended[] = $this->trans('Edit New Feature', [], 'Admin.Catalog.Feature'); - $this->addMetaTitle($bread_extended[count($bread_extended) - 1]); - - break; - - case 'add': - $bread_extended[] = $this->trans('Add New Feature', [], 'Admin.Catalog.Feature'); - $this->addMetaTitle($bread_extended[count($bread_extended) - 1]); - - break; - - case 'view': - $bread_extended[] = $this->feature_name[$this->context->employee->id_lang] ?? null; - $this->addMetaTitle($bread_extended[count($bread_extended) - 1]); - - break; - - case 'editFeatureValue': - if (Tools::getValue('id_feature_value')) { - if (($id = (int) Tools::getValue('id_feature'))) { - if (Validate::isLoadedObject($obj = new Feature((int) $id))) { - $bread_extended[] = '' . $obj->name[$this->context->employee->id_lang] . ''; - } - - if (Validate::isLoadedObject($obj = new FeatureValue((int) Tools::getValue('id_feature_value')))) { - $bread_extended[] = $this->trans('Edit: %value%', ['%value%' => $obj->value[$this->context->employee->id_lang]], 'Admin.Catalog.Feature'); - } - } else { - $bread_extended[] = $this->trans('Edit value', [], 'Admin.Catalog.Feature'); - } - } else { - $bread_extended[] = $this->trans('Add new value', [], 'Admin.Catalog.Feature'); - } - - if (count($bread_extended) > 0) { - $this->addMetaTitle($bread_extended[count($bread_extended) - 1]); - } - - break; - } - - $this->toolbar_title = $bread_extended; - } - - /** - * AdminController::renderForm() override. - * - * @see AdminController::renderForm() - */ - public function initFormFeatureValue() - { - $this->setTypeValue(); - - $this->fields_form[0]['form'] = [ - 'legend' => [ - 'title' => $this->trans('Feature value', [], 'Admin.Catalog.Feature'), - 'icon' => 'icon-info-sign', - ], - 'input' => [ - [ - 'type' => 'select', - 'label' => $this->trans('Feature', [], 'Admin.Catalog.Feature'), - 'name' => 'id_feature', - 'options' => [ - 'query' => Feature::getFeatures($this->context->language->id), - 'id' => 'id_feature', - 'name' => 'name', - ], - 'required' => true, - ], - [ - 'type' => 'text', - 'label' => $this->trans('Value', [], 'Admin.Global'), - 'name' => 'value', - 'lang' => true, - 'size' => 33, - 'hint' => $this->trans('Invalid characters:', [], 'Admin.Notifications.Info') . ' <>;=#{}', - 'required' => true, - ], - ], - 'submit' => [ - 'title' => $this->trans('Save', [], 'Admin.Actions'), - ], - 'buttons' => [ - 'save-and-stay' => [ - 'title' => $this->trans('Save then add another value', [], 'Admin.Catalog.Feature'), - 'name' => 'submitAdd' . $this->table . 'AndStay', - 'type' => 'submit', - 'class' => 'btn btn-default pull-right', - 'icon' => 'process-icon-save', - ], - ], - ]; - - $this->fields_value['id_feature'] = (int) Tools::getValue('id_feature'); - - // Create Object FeatureValue - $feature_value = new FeatureValue(Tools::getValue('id_feature_value')); - - $this->getlanguages(); - $helper = new HelperForm(); - $helper->show_cancel_button = true; - - $back = Tools::safeOutput(Tools::getValue('back', '')); - if (empty($back)) { - $back = self::$currentIndex . '&token=' . $this->token; - } - if (!Validate::isCleanHtml($back)) { - die(Tools::displayError()); - } - - $helper->back_url = $back; - $helper->currentIndex = self::$currentIndex; - $helper->token = $this->token; - $helper->table = $this->table; - $helper->identifier = $this->identifier; - $helper->override_folder = 'feature_value/'; - $helper->id = $feature_value->id; - $helper->toolbar_scroll = false; - $helper->tpl_vars = [ - 'feature_value' => $feature_value, - ]; - $helper->languages = $this->_languages; - $helper->default_form_language = $this->default_form_language; - $helper->allow_employee_form_lang = $this->allow_employee_form_lang; - $helper->fields_value = $this->getFieldsValue($feature_value); - $helper->toolbar_btn = $this->toolbar_btn; - $helper->title = $this->trans('Add a new feature value', [], 'Admin.Catalog.Feature'); - $this->content .= $helper->generateForm($this->fields_form); - } - - /** - * AdminController::initContent() override. - * - * @see AdminController::initContent() - */ - public function initContent() - { - if (Feature::isFeatureActive()) { - if ($this->display == 'edit' || $this->display == 'add') { - if (!$this->loadObject(true)) { - return; - } - $this->content .= $this->renderForm(); - } elseif ($this->display == 'view') { - // Some controllers use the view action without an object - if ($this->className) { - $this->loadObject(true); - } - $this->content .= $this->renderView(); - } elseif ($this->display == 'editFeatureValue') { - $this->object = new FeatureValue((int) Tools::getValue('id_feature_value')); - $this->content .= $this->initFormFeatureValue(); - } elseif ($this->display != 'view' && !$this->ajax) { - // If a feature value was saved, we need to reset the values to display the list - $this->setTypeFeature(); - $this->content .= $this->renderList(); - /* reset all attributes filter */ - if (!Tools::getValue('submitFilterfeature_value', 0) && !Tools::getIsset('id_feature_value')) { - $this->processResetFilters('feature_value'); - } - } - } else { - $adminPerformanceUrl = $this->context->link->getAdminLink('AdminPerformance'); - $url = '' . $this->trans('Performance', [], 'Admin.Global') . ''; - $this->displayWarning($this->trans('This feature has been disabled. You can activate it here: %url%.', ['%url%' => $url], 'Admin.Catalog.Notification')); - } - - $this->context->smarty->assign([ - 'content' => $this->content, - ]); - } - - public function initProcess() - { - // Are we working on feature values? - if ((Tools::getValue('id_feature_value') && !Tools::getValue('id_feature')) - || Tools::isSubmit('deletefeature_value') - || Tools::isSubmit('submitAddfeature_value') - || Tools::isSubmit('addfeature_value') - || Tools::isSubmit('updatefeature_value') - || Tools::isSubmit('submitBulkdeletefeature_value')) { - $this->setTypeValue(); - } - - if (Tools::getIsset('viewfeature')) { - $this->list_id = 'feature_value'; - - if (isset($_POST['submitReset' . $this->list_id])) { - $this->processResetFilters(); - } - } else { - $this->list_id = 'feature'; - $this->_defaultOrderBy = 'position'; - $this->_defaultOrderWay = 'ASC'; - } - - parent::initProcess(); - } - - public function postProcess() - { - if (!Feature::isFeatureActive()) { - return; - } - - /* set location with current index */ - if (Tools::getIsset('id_feature') && Tools::getIsset('viewfeature')) { - self::$currentIndex = self::$currentIndex . '&id_feature=' . Tools::getValue('id_feature', 0) . '&viewfeature'; - } - - if ($this->table == 'feature_value' && ($this->action == 'save' || $this->action == 'delete' || $this->action == 'bulkDelete')) { - Hook::exec( - 'displayFeatureValuePostProcess', - ['errors' => &$this->errors] - ); - } // send errors as reference to allow displayFeatureValuePostProcess to stop saving process - else { - Hook::exec( - 'displayFeaturePostProcess', - ['errors' => &$this->errors] - ); - } // send errors as reference to allow displayFeaturePostProcess to stop saving process - - parent::postProcess(); - - if ($this->table == 'feature_value' && ($this->display == 'edit' || $this->display == 'add')) { - $this->display = 'editFeatureValue'; - } - } - - /** - * Override processAdd to change SaveAndStay button action. - * - * @see classes/AdminControllerCore::processAdd() - */ - public function processAdd() - { - $object = parent::processAdd(); - - if (Tools::isSubmit('submitAdd' . $this->table . 'AndStay') && !count($this->errors)) { - if ($this->table == 'feature_value' && ($this->display == 'edit' || $this->display == 'add')) { - $this->redirect_after = self::$currentIndex . '&addfeature_value&id_feature=' . (int) Tools::getValue('id_feature') . '&conf=3&token=' . $this->token; - } else { - $this->redirect_after = self::$currentIndex . '&' . $this->identifier . '=&conf=3&update' . $this->table . '&token=' . $this->token; - } - } elseif (Tools::isSubmit('submitAdd' . $this->table . 'AndStay') && count($this->errors)) { - $this->display = 'editFeatureValue'; - } - - return $object; - } - - /** - * Override processUpdate to change SaveAndStay button action. - * - * @see classes/AdminControllerCore::processUpdate() - */ - public function processUpdate() - { - $object = parent::processUpdate(); - - if (Tools::isSubmit('submitAdd' . $this->table . 'AndStay') && !count($this->errors)) { - $this->redirect_after = self::$currentIndex . '&' . $this->identifier . '=&conf=3&update' . $this->table . '&token=' . $this->token; - } - - return $object; - } - - /** - * Call the right method for creating or updating object. - * - * @return mixed - */ - public function processSave() - { - if ($this->table == 'feature') { - $id_feature = (int) Tools::getValue('id_feature'); - // Adding last position to the feature if not exist - if ($id_feature <= 0) { - $sql = 'SELECT `position`+1 - FROM `' . _DB_PREFIX_ . 'feature` - ORDER BY position DESC'; - // set the position of the new feature in $_POST for postProcess() method - $_POST['position'] = Db::getInstance()->getValue($sql); - } - // clean \n\r characters - foreach ($_POST as $key => $value) { - if (preg_match('/^name_/Ui', $key)) { - $_POST[$key] = str_replace('\n', '', str_replace('\r', '', $value)); - } - } - } - - return parent::processSave(); - } - - /** - * AdminController::getList() override. - * - * @see AdminController::getList() - * - * @param int $id_lang - * @param string|null $order_by - * @param string|null $order_way - * @param int $start - * @param int|null $limit - * @param int|bool $id_lang_shop - * - * @throws PrestaShopException - */ - public function getList($id_lang, $order_by = null, $order_way = null, $start = 0, $limit = null, $id_lang_shop = false) - { - if ($this->table == 'feature_value') { - $this->_where .= ' AND (a.custom = 0 OR a.custom IS NULL)'; - } - - parent::getList($id_lang, $order_by, $order_way, $start, $limit, $id_lang_shop); - - if ($this->table == 'feature') { - $nb_items = count($this->_list); - for ($i = 0; $i < $nb_items; ++$i) { - $item = &$this->_list[$i]; - - $query = new DbQuery(); - $query->select('COUNT(fv.id_feature_value) as count_values'); - $query->from('feature_value', 'fv'); - $query->where('fv.id_feature =' . (int) $item['id_feature']); - $query->where('(fv.custom=0 OR fv.custom IS NULL)'); - $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query); - $item['value'] = (int) $res; - unset($query); - } - } - } - - public function ajaxProcessUpdatePositions() - { - if ($this->access('edit')) { - $way = (bool) Tools::getValue('way'); - $id_feature = (int) Tools::getValue('id'); - $positions = Tools::getValue('feature'); - - $new_positions = []; - foreach ($positions as $v) { - if (!empty($v)) { - $new_positions[] = $v; - } - } - - foreach ($new_positions as $position => $value) { - $pos = explode('_', $value); - - if (isset($pos[2]) && (int) $pos[2] === $id_feature) { - $feature = new Feature((int) $pos[2]); - if (Validate::isLoadedObject($feature)) { - if ($feature->updatePosition($way, $position, $id_feature)) { - echo 'ok position ' . (int) $position . ' for feature ' . (int) $pos[1] . '\r\n'; - } else { - echo '{"hasError" : true, "errors" : "Can not update feature ' . (int) $id_feature . ' to position ' . (int) $position . ' "}'; - } - } else { - echo '{"hasError" : true, "errors" : "This feature (' . (int) $id_feature . ') can t be loaded"}'; - } - - break; - } - } - } - } -} diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php deleted file mode 100644 index d8709f3544901..0000000000000 --- a/controllers/admin/AdminGendersController.php +++ /dev/null @@ -1,251 +0,0 @@ - - * @copyright Since 2007 PrestaShop SA and Contributors - * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) - */ - -use PrestaShop\PrestaShop\Core\Domain\Title\ValueObject\Gender as ValueObjectGender; - -/** - * @property Gender $object - */ -class AdminGendersControllerCore extends AdminController -{ - /** - * @var int - */ - public $default_image_height; - - /** - * @var int - */ - public $default_image_width; - - public function __construct() - { - $this->bootstrap = true; - $this->table = 'gender'; - $this->className = 'Gender'; - $this->lang = true; - $this->addRowAction('edit'); - $this->addRowAction('delete'); - - parent::__construct(); - - if (!Tools::getValue('realedit')) { - $this->deleted = false; - } - - $this->bulk_actions = [ - 'delete' => [ - 'text' => $this->trans('Delete selected', [], 'Admin.Actions'), - 'confirm' => $this->trans('Delete selected items?', [], 'Admin.Notifications.Warning'), - 'icon' => 'icon-trash', - ], - ]; - - $this->default_image_height = 16; - $this->default_image_width = 16; - - $this->fieldImageSettings = [ - 'name' => 'image', - 'dir' => 'genders', - ]; - - $this->fields_list = [ - 'id_gender' => [ - 'title' => $this->trans('ID', [], 'Admin.Global'), - 'align' => 'center', - 'class' => 'fixed-width-xs', - ], - 'name' => [ - 'title' => $this->trans('Social title', [], 'Admin.Shopparameters.Feature'), - 'filter_key' => 'b!name', - ], - 'type' => [ - 'title' => $this->trans('Gender', [], 'Admin.Global'), - 'orderby' => false, - 'type' => 'select', - 'list' => [ - 0 => $this->trans('Male', [], 'Admin.Shopparameters.Feature'), - 1 => $this->trans('Female', [], 'Admin.Shopparameters.Feature'), - 2 => $this->trans('Neutral', [], 'Admin.Shopparameters.Feature'), - ], - 'filter_key' => 'a!type', - 'callback' => 'displayGenderType', - 'callback_object' => $this, - ], - 'image' => [ - 'title' => $this->trans('Image', [], 'Admin.Global'), - 'align' => 'center', - 'image' => 'genders', - 'orderby' => false, - 'search' => false, - ], - ]; - } - - public function initPageHeaderToolbar() - { - if (empty($this->display)) { - $this->page_header_toolbar_btn['new_gender'] = [ - 'href' => self::$currentIndex . '&addgender&token=' . $this->token, - 'desc' => $this->trans('Add new social title', [], 'Admin.Shopparameters.Feature'), - 'icon' => 'process-icon-new', - ]; - } - - parent::initPageHeaderToolbar(); - } - - /** - * @return string|void - * - * @throws SmartyException - */ - public function renderForm() - { - $this->fields_form = [ - 'legend' => [ - 'title' => $this->trans('Social titles', [], 'Admin.Shopparameters.Feature'), - 'icon' => 'icon-male', - ], - 'input' => [ - [ - 'type' => 'text', - 'label' => $this->trans('Social title', [], 'Admin.Global'), - 'name' => 'name', - 'lang' => true, - 'col' => 4, - 'hint' => $this->trans('Invalid characters:', [], 'Admin.Shopparameters.Help') . ' <>;=#{}', - 'required' => true, - ], - [ - 'type' => 'radio', - 'label' => $this->trans('Gender', [], 'Admin.Global'), - 'name' => 'type', - 'required' => false, - 'class' => 't', - 'values' => [ - [ - 'id' => 'type_male', - 'value' => ValueObjectGender::TYPE_MALE, - 'label' => $this->trans('Male', [], 'Admin.Shopparameters.Feature'), - ], - [ - 'id' => 'type_female', - 'value' => ValueObjectGender::TYPE_FEMALE, - 'label' => $this->trans('Female', [], 'Admin.Shopparameters.Feature'), - ], - [ - 'id' => 'type_neutral', - 'value' => ValueObjectGender::TYPE_OTHER, - 'label' => $this->trans('Neutral', [], 'Admin.Shopparameters.Feature'), - ], - ], - ], - [ - 'type' => 'file', - 'label' => $this->trans('Image', [], 'Admin.Global'), - 'name' => 'image', - 'col' => 6, - 'value' => true, - ], - [ - 'type' => 'text', - 'label' => $this->trans('Image width', [], 'Admin.Shopparameters.Feature'), - 'name' => 'img_width', - 'col' => 2, - 'hint' => $this->trans('Image width in pixels. Enter "0" to use the original size.', [], 'Admin.Shopparameters.Help'), - ], - [ - 'type' => 'text', - 'label' => $this->trans('Image height', [], 'Admin.Shopparameters.Feature'), - 'name' => 'img_height', - 'col' => 2, - 'hint' => $this->trans('Image height in pixels. Enter "0" to use the original size.', [], 'Admin.Shopparameters.Help'), - ], - ], - 'submit' => [ - 'title' => $this->trans('Save', [], 'Admin.Actions'), - ], - ]; - - /** @var Gender|false $obj */ - $obj = $this->loadObject(true); - if (!$obj) { - return; - } - - $this->fields_value = [ - 'img_width' => $this->default_image_width, - 'img_height' => $this->default_image_height, - 'image' => $obj->getImage(), - ]; - - return parent::renderForm(); - } - - public function displayGenderType($value, $tr) - { - return $this->fields_list['type']['list'][$value]; - } - - protected function postImage($id) - { - if (isset($this->fieldImageSettings['name'], $this->fieldImageSettings['dir'])) { - if (!Validate::isInt(Tools::getValue('img_width')) || !Validate::isInt(Tools::getValue('img_height'))) { - $this->errors[] = $this->trans('Width and height must be numeric values.', [], 'Admin.Shopparameters.Notification'); - } else { - if ((int) Tools::getValue('img_width') > 0 && (int) Tools::getValue('img_height') > 0) { - $width = (int) Tools::getValue('img_width'); - $height = (int) Tools::getValue('img_height'); - } else { - $width = null; - $height = null; - } - - return $this->uploadImage($id, $this->fieldImageSettings['name'], $this->fieldImageSettings['dir'] . '/', false, $width, $height); - } - } - - return !count($this->errors); - } - - protected function afterImageUpload() - { - parent::afterImageUpload(); - - if (($id_gender = (int) Tools::getValue('id_gender')) - && count($_FILES) - && file_exists(_PS_GENDERS_DIR_ . $id_gender . '.jpg')) { - $current_file = _PS_TMP_IMG_DIR_ . 'gender_mini_' . $id_gender . '_' . $this->context->shop->id . '.jpg'; - - if (file_exists($current_file)) { - unlink($current_file); - } - } - - return true; - } -} diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php index 533916e6249f1..297e9a31fb210 100644 --- a/controllers/admin/AdminImagesController.php +++ b/controllers/admin/AdminImagesController.php @@ -25,8 +25,8 @@ */ use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings; +use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface; use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration; -use PrestaShopBundle\Entity\Repository\FeatureFlagRepository; /** * @property ImageType $object @@ -83,17 +83,23 @@ public function init() parent::init(); $this->canGenerateAvif = $this->get('PrestaShop\PrestaShop\Core\Image\AvifExtensionChecker')->isAvailable(); - $this->isMultipleImageFormatFeatureEnabled = $this->get(FeatureFlagRepository::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT); + $this->isMultipleImageFormatFeatureEnabled = $this->get(FeatureFlagStateCheckerInterface::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT); $this->imageFormatConfiguration = $this->get('PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration'); $formFields = []; if ($this->isMultipleImageFormatFeatureEnabled) { + /* We will disable few image formats + * Base JPG is mandatory, see https://github.com/PrestaShop/PrestaShop/issues/30944 + * AVIF support depends on platform - PHP version and required libraries available + */ $imageFormatsDisabled = []; - $imageFormatsDisabled['jpg'] = true; // jpg is mandatory, see https://github.com/PrestaShop/PrestaShop/issues/30944 - if (false === $this->canGenerateAvif) { + $imageFormatsDisabled['jpg'] = true; + if (!$this->canGenerateAvif) { $imageFormatsDisabled['avif'] = true; } + + // Load configured formats to see what to check $configuredImageFormats = $this->imageFormatConfiguration->getGenerationFormats(); $fields = [ @@ -441,6 +447,19 @@ public function initModal(): void ]; } + public function beforeUpdateOptions() + { + // Unset AVIF if not supported, add JPG if missing + foreach ($_POST['PS_IMAGE_FORMAT'] as $k => $v) { + if ($v == 'avif' && !$this->canGenerateAvif) { + unset($_POST['PS_IMAGE_FORMAT'][$k]); + } + } + if (!in_array('jpg', $_POST['PS_IMAGE_FORMAT'])) { + $_POST['PS_IMAGE_FORMAT'][] = 'jpg'; + } + } + public function updateOptionPsImageFormat($value): void { if ($this->access('edit') != '1') { diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 5a0c885117bcb..ac2783718d032 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -111,15 +111,6 @@ public function __construct() ]; // @since 1.5.0 - if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) { - $this->entities = array_merge( - $this->entities, - [ - $this->trans('Supply Orders', [], 'Admin.Advparameters.Feature'), - $this->trans('Supply Order Details', [], 'Admin.Advparameters.Feature'), - ] - ); - } $this->entities = array_flip($this->entities); @@ -164,18 +155,6 @@ public function __construct() 'label' => $this->trans('ID / Name of the store', [], 'Admin.Advparameters.Feature'), 'help' => $this->trans('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, the default store will be used.', [], 'Admin.Advparameters.Help'), ], - 'advanced_stock_management' => [ - 'label' => $this->trans('Advanced Stock Management', [], 'Admin.Advparameters.Feature'), - 'help' => $this->trans('Enable advanced stock management on product (0 = No, 1 = Yes)', [], 'Admin.Advparameters.Help'), - ], - 'depends_on_stock' => [ - 'label' => $this->trans('Depends on stock', [], 'Admin.Advparameters.Feature'), - 'help' => $this->trans('0 = Use quantity set in product, 1 = Use quantity from warehouse.', [], 'Admin.Advparameters.Help'), - ], - 'warehouse' => [ - 'label' => $this->trans('Warehouse', [], 'Admin.Advparameters.Feature'), - 'help' => $this->trans('ID of the warehouse to set as storage.', [], 'Admin.Advparameters.Help'), - ], ]; self::$default_values = [ @@ -193,8 +172,6 @@ public function __construct() 'low_stock_alert' => false, 'weight' => 0, 'default_on' => null, - 'advanced_stock_management' => 0, - 'depends_on_stock' => 0, 'available_date' => date('Y-m-d'), ]; @@ -326,18 +303,6 @@ public function __construct() 'label' => $this->trans('ID / Name of the store', [], 'Admin.Advparameters.Feature'), 'help' => $this->trans('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, the default store will be used.', [], 'Admin.Advparameters.Help'), ], - 'advanced_stock_management' => [ - 'label' => $this->trans('Advanced Stock Management', [], 'Admin.Advparameters.Feature'), - 'help' => $this->trans('Enable advanced stock management on product (0 = No, 1 = Yes).', [], 'Admin.Advparameters.Help'), - ], - 'depends_on_stock' => [ - 'label' => $this->trans('Depends on stock', [], 'Admin.Advparameters.Feature'), - 'help' => $this->trans('0 = Use quantity set in product, 1 = Use quantity from warehouse.', [], 'Admin.Advparameters.Help'), - ], - 'warehouse' => [ - 'label' => $this->trans('Warehouse', [], 'Admin.Advparameters.Feature'), - 'help' => $this->trans('ID of the warehouse to set as storage.', [], 'Admin.Advparameters.Help'), - ], 'accessories' => ['label' => $this->trans('Accessories (x,y,z...)', [], 'Admin.Advparameters.Feature')], ]; @@ -368,8 +333,6 @@ public function __construct() 'customizable' => 0, 'uploadable_files' => 0, 'text_fields' => 0, - 'advanced_stock_management' => 0, - 'depends_on_stock' => 0, 'is_virtual' => 0, ]; @@ -550,68 +513,6 @@ public function __construct() break; } - // @since 1.5.0 - if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) { - switch ((int) Tools::getValue('entity')) { - case $this->entities[$this->trans('Supply Orders', [], 'Admin.Advparameters.Feature')]: - // required fields - $this->required_fields = [ - 'id_supplier', - 'id_warehouse', - 'reference', - 'date_delivery_expected', - ]; - // available fields - $this->available_fields = [ - 'no' => ['label' => $this->trans('Ignore this column', [], 'Admin.Advparameters.Feature')], - 'id' => ['label' => $this->trans('ID', [], 'Admin.Global')], - 'id_supplier' => ['label' => $this->trans('Supplier ID *', [], 'Admin.Advparameters.Feature')], - 'id_lang' => ['label' => $this->trans('Lang ID', [], 'Admin.Advparameters.Feature')], - 'id_warehouse' => ['label' => $this->trans('Warehouse ID *', [], 'Admin.Advparameters.Feature')], - 'id_currency' => ['label' => $this->trans('Currency ID *', [], 'Admin.Advparameters.Feature')], - 'reference' => ['label' => $this->trans('Supply Order Reference *', [], 'Admin.Advparameters.Feature')], - 'date_delivery_expected' => ['label' => $this->trans('Delivery Date (Y-M-D)*', [], 'Admin.Advparameters.Feature')], - 'discount_rate' => ['label' => $this->trans('Discount rate', [], 'Admin.Advparameters.Feature')], - 'is_template' => ['label' => $this->trans('Template', [], 'Admin.Advparameters.Feature')], - ]; - // default values - self::$default_values = [ - 'id_lang' => (int) Configuration::get('PS_LANG_DEFAULT'), - 'id_currency' => Currency::getDefaultCurrency()->id, - 'discount_rate' => '0', - 'is_template' => '0', - ]; - - break; - case $this->entities[$this->trans('Supply Order Details', [], 'Admin.Advparameters.Feature')]: - // required fields - $this->required_fields = [ - 'supply_order_reference', - 'id_product', - 'unit_price_te', - 'quantity_expected', - ]; - // available fields - $this->available_fields = [ - 'no' => ['label' => $this->trans('Ignore this column', [], 'Admin.Advparameters.Feature')], - 'supply_order_reference' => ['label' => $this->trans('Supply Order Reference *', [], 'Admin.Advparameters.Feature')], - 'id_product' => ['label' => $this->trans('Product ID *', [], 'Admin.Advparameters.Feature')], - 'id_product_attribute' => ['label' => $this->trans('Product Attribute ID', [], 'Admin.Advparameters.Feature')], - 'unit_price_te' => ['label' => $this->trans('Unit Price (tax excl.)*', [], 'Admin.Advparameters.Feature')], - 'quantity_expected' => ['label' => $this->trans('Quantity Expected *', [], 'Admin.Advparameters.Feature')], - 'discount_rate' => ['label' => $this->trans('Discount Rate', [], 'Admin.Advparameters.Feature')], - 'tax_rate' => ['label' => $this->trans('Tax Rate', [], 'Admin.Advparameters.Feature')], - ]; - // default values - self::$default_values = [ - 'discount_rate' => '0', - 'tax_rate' => '0', - ]; - - break; - } - } - $this->separator = ($separator = Tools::substr((string) (trim(Tools::getValue('separator'))), 0, 1)) ? $separator : ';'; $this->convert = false; $this->multiple_value_separator = ($separator = Tools::substr((string) (trim(Tools::getValue('multiple_value_separator'))), 0, 1)) ? $separator : ','; @@ -774,7 +675,6 @@ public function renderForm() 'id_language' => ($id_lang_selected) ? $id_lang_selected : $this->context->language->id, 'available_fields' => $this->getAvailableFields(), 'truncateAuthorized' => (Shop::isFeatureActive() && $this->context->employee->isSuperAdmin()) || !Shop::isFeatureActive(), - 'PS_ADVANCED_STOCK_MANAGEMENT' => Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'), ]; return parent::renderForm(); @@ -1650,10 +1550,8 @@ protected function productImportOne($info, $default_language_id, $id_lang, $forc return; } - $update_advanced_stock_management_value = false; if (isset($product->id) && $product->id && Product::existsInDatabase((int) $product->id, 'product')) { $product->loadStockData(); - $update_advanced_stock_management_value = true; $category_data = Product::getProductCategories((int) $product->id); if (is_array($category_data)) { @@ -2206,124 +2104,7 @@ protected function productImportOne($info, $default_language_id, $id_lang, $forc // clean feature positions to avoid conflict Feature::cleanPositions(); - // set advanced stock managment if (!$validateOnly) { - /* @phpstan-ignore-next-line Data from the property `advanced_stock_management` come from the database */ - if ($product->advanced_stock_management != 1 && $product->advanced_stock_management != 0) { - $this->warnings[] = $this->trans( - 'Advanced stock management has incorrect value. Not set for product %name%', - [ - '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language_id]), - ], - 'Admin.Advparameters.Notification' - ); - } elseif (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $product->advanced_stock_management == 1) { - $this->warnings[] = $this->trans( - 'Advanced stock management is not enabled, cannot enable on product %name%', - [ - '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language_id]), - ], - 'Admin.Advparameters.Notification' - ); - } elseif ($update_advanced_stock_management_value) { - $product->setAdvancedStockManagement($product->advanced_stock_management); - } - // automaticly disable depends on stock, if a_s_m set to disabled - if (StockAvailable::dependsOnStock($product->id) == 1 && $product->advanced_stock_management == 0) { - StockAvailable::setProductDependsOnStock($product->id, false); - } - } - - // Check if warehouse exists - if (isset($product->warehouse) && $product->warehouse) { - if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) { - $this->warnings[] = $this->trans( - 'Advanced stock management is not enabled, warehouse not set on product %name%', - [ - '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language_id]), - ], - 'Admin.Advparameters.Notification' - ); - } elseif (!$validateOnly) { - if (Warehouse::exists($product->warehouse)) { - // Get already associated warehouses - $associated_warehouses_collection = WarehouseProductLocation::getCollection($product->id); - // Delete any entry in warehouse for this product - foreach ($associated_warehouses_collection as $awc) { - $awc->delete(); - } - $warehouse_location_entity = new WarehouseProductLocation(); - $warehouse_location_entity->id_product = $product->id; - $warehouse_location_entity->id_product_attribute = 0; - $warehouse_location_entity->id_warehouse = $product->warehouse; - if (WarehouseProductLocation::getProductLocation($product->id, 0, $product->warehouse) !== false) { - $warehouse_location_entity->update(); - } else { - $warehouse_location_entity->save(); - } - StockAvailable::synchronize($product->id); - } else { - $this->warnings[] = $this->trans( - 'Warehouse did not exist, cannot set on product %name%.', - [ - '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language_id]), - ], - 'Admin.Advparameters.Notification' - ); - } - } - } - - // stock available - if (isset($product->depends_on_stock)) { - /* @phpstan-ignore-next-line Data from the property `depends_on_stock` come from the database */ - if ($product->depends_on_stock != 0 && $product->depends_on_stock != 1) { - $this->warnings[] = $this->trans( - 'Incorrect value for "Depends on stock" for product %name%', - [ - '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language_id]), - ], - 'Admin.Advparameters.Notification' - ); - /* @phpstan-ignore-next-line Data from properties `advanced_stock_management` & `depends_on_stock` come from the database */ - } elseif ((!$product->advanced_stock_management || $product->advanced_stock_management == 0) && $product->depends_on_stock == 1) { - $this->warnings[] = $this->trans( - 'Advanced stock management is not enabled, cannot set "Depends on stock" for product %name%', - [ - '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language_id]), - ], - 'Admin.Advparameters.Notification' - ); - } elseif (!$validateOnly) { - StockAvailable::setProductDependsOnStock($product->id, $product->depends_on_stock); - } - - // This code allows us to set qty and disable depends on stock - if (!$validateOnly) { - // if depends on stock and quantity, add quantity to stock - if ($product->depends_on_stock == 1) { - $stock_manager = StockManagerFactory::getManager(); - $price = str_replace(',', '.', (string) $product->wholesale_price); - if ($price == '0') { - $price = 0.000001; - } - $price = round((float) $price, 6); - $warehouse = new Warehouse($product->warehouse); - if ($stock_manager->addProduct((int) $product->id, 0, $warehouse, (int) $product->quantity, 1, $price, true)) { - StockAvailable::synchronize((int) $product->id); - } - } else { - if ($shop_is_feature_active) { - foreach ($shops as $shop) { - StockAvailable::setQuantity((int) $product->id, 0, (int) $product->quantity, (int) $shop); - } - } else { - StockAvailable::setQuantity((int) $product->id, 0, (int) $product->quantity, (int) $this->context->shop->id); - } - } - } - } elseif (!$validateOnly) { - // if not depends_on_stock set, use normal qty if ($shop_is_feature_active) { foreach ($shops as $shop) { StockAvailable::setQuantity((int) $product->id, 0, (int) $product->quantity, (int) $shop); @@ -2800,114 +2581,8 @@ protected function attributeImportOne($info, $default_language, &$groups, &$attr } } - // set advanced stock managment - if (isset($info['advanced_stock_management'])) { - if ($info['advanced_stock_management'] != 1 && $info['advanced_stock_management'] != 0) { - $this->warnings[] = $this->trans( - 'Advanced stock management has incorrect value. Not set for product with id %id%.', - [ - '%id%' => Tools::htmlentitiesUTF8($product->id), - ], - 'Admin.Advparameters.Notification' - ); - } elseif (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $info['advanced_stock_management'] == 1) { - $this->warnings[] = $this->trans( - 'Advanced stock management is not enabled, cannot enable on product with id %id%.', - [ - '%id%' => Tools::htmlentitiesUTF8($product->id), - ], - 'Admin.Advparameters.Notification' - ); - } elseif (!$validateOnly) { - $product->setAdvancedStockManagement($info['advanced_stock_management']); - } - // automaticly disable depends on stock, if a_s_m set to disabled - if (!$validateOnly && StockAvailable::dependsOnStock($product->id) == 1 && $info['advanced_stock_management'] == 0) { - StockAvailable::setProductDependsOnStock($product->id, false, null, $id_product_attribute); - } - } - - // Check if warehouse exists - if (isset($info['warehouse']) && $info['warehouse']) { - if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) { - $this->warnings[] = $this->trans( - 'Advanced stock management is not enabled, warehouse is not set on product with id %id%.', - ['%id%' => Tools::htmlentitiesUTF8($product->id)], - 'Admin.Advparameters.Notification' - ); - } else { - if (Warehouse::exists($info['warehouse'])) { - $warehouse_location_entity = new WarehouseProductLocation(); - $warehouse_location_entity->id_product = $product->id; - $warehouse_location_entity->id_product_attribute = $id_product_attribute; - $warehouse_location_entity->id_warehouse = $info['warehouse']; - if (!$validateOnly) { - if (WarehouseProductLocation::getProductLocation($product->id, $id_product_attribute, $info['warehouse']) !== false) { - $warehouse_location_entity->update(); - } else { - $warehouse_location_entity->save(); - } - StockAvailable::synchronize($product->id); - } - } else { - $this->warnings[] = $this->trans( - 'Warehouse did not exist, cannot set on product %name%.', - [ - '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language]), - ], - 'Admin.Advparameters.Notification' - ); - } - } - } - // stock available - if (isset($info['depends_on_stock'])) { - if ($info['depends_on_stock'] != 0 && $info['depends_on_stock'] != 1) { - $this->warnings[] = $this->trans( - 'Incorrect value for "Depends on stock" for product %name%', - [ - '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language]), - ], - 'Admin.Notifications.Error' - ); - } elseif ((!$info['advanced_stock_management'] || $info['advanced_stock_management'] == 0) && $info['depends_on_stock'] == 1) { - $this->warnings[] = $this->trans( - 'Advanced stock management is not enabled, cannot set "Depends on stock" for product %name%', - [ - '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language]), - ], - 'Admin.Advparameters.Notification' - ); - } elseif (!$validateOnly) { - StockAvailable::setProductDependsOnStock($product->id, $info['depends_on_stock'], null, $id_product_attribute); - } - - // This code allows us to set qty and disable depends on stock - if (isset($info['quantity'])) { - // if depends on stock and quantity, add quantity to stock - if ($info['depends_on_stock'] == 1) { - $stock_manager = StockManagerFactory::getManager(); - $price = str_replace(',', '.', $info['wholesale_price']); - if ($price == '0') { - $price = 0.000001; - } - $price = round((float) $price, 6); - $warehouse = new Warehouse($info['warehouse']); - if (!$validateOnly && $stock_manager->addProduct((int) $product->id, $id_product_attribute, $warehouse, (int) $info['quantity'], 1, $price, true)) { - StockAvailable::synchronize((int) $product->id); - } - } elseif (!$validateOnly) { - if ($shop_is_feature_active) { - foreach ($id_shop_list as $shop) { - StockAvailable::setQuantity((int) $product->id, $id_product_attribute, (int) $info['quantity'], (int) $shop); - } - } else { - StockAvailable::setQuantity((int) $product->id, $id_product_attribute, (int) $info['quantity'], $this->context->shop->id); - } - } - } - } elseif (!$validateOnly) { // if not depends_on_stock set, use normal qty + if (!$validateOnly) { if ($shop_is_feature_active) { foreach ($id_shop_list as $shop) { StockAvailable::setQuantity((int) $product->id, $id_product_attribute, (int) $info['quantity'], (int) $shop); @@ -3996,305 +3671,29 @@ public function storeContactImportOne($info, $shop_is_feature_active, $regenerat /** * @since 1.5.0 + * @deprecated Since 9.0 and will be removed in 10.0 */ public function supplyOrdersImport($offset = false, $limit = false, $validateOnly = false) { - // opens CSV & sets locale - $this->receiveTab(); - $handle = $this->openCsvFile($offset); - if (!$handle) { - return false; - } - - AdminImportController::setLocale(); - - $force_ids = Tools::getValue('forceIDs'); - - // main loop, for each supply orders to import - $line_count = 0; - for ($current_line = 0; ($line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator)) && (!$limit || $current_line < $limit); ++$current_line) { - ++$line_count; - if ($this->convert) { - $line = $this->utf8EncodeArray($line); - } - $info = AdminImportController::getMaskedRow($line); - - $this->supplyOrdersImportOne( - $info, - $force_ids, - $current_line, - $validateOnly - ); - } - // closes - $this->closeCsvFile($handle); - - return $line_count; - } - - protected function supplyOrdersImportOne($info, $force_ids, $current_line, $validateOnly = false) - { - // sets default values if needed - AdminImportController::setDefaultValues($info); + @trigger_error(sprintf( + '%s is deprecated since 9.0 and will be removed in 10.0.', + __METHOD__ + ), E_USER_DEPRECATED); - // if an id is set, instanciates a supply order with this id if possible - if (array_key_exists('id', $info) && (int) $info['id'] && SupplyOrder::exists((int) $info['id'])) { - $supply_order = new SupplyOrder((int) $info['id']); - } elseif (array_key_exists('reference', $info) && $info['reference'] && SupplyOrder::exists(pSQL($info['reference']))) { - $supply_order = SupplyOrder::getSupplyOrderByReference(pSQL($info['reference'])); - } else { // new supply order - $supply_order = new SupplyOrder(); - } - - // gets parameters - $id_supplier = (int) $info['id_supplier']; - $id_lang = (int) $info['id_lang']; - $id_warehouse = (int) $info['id_warehouse']; - $id_currency = (int) $info['id_currency']; - $reference = pSQL($info['reference']); - $date_delivery_expected = pSQL($info['date_delivery_expected']); - $discount_rate = (float) $info['discount_rate']; - $is_template = (bool) $info['is_template']; - - $error = ''; - // checks parameters - if (!Supplier::supplierExists($id_supplier)) { - $error = $this->trans('Supplier ID (%id%) is not valid (at line %line%).', ['%id%' => $id_supplier, '%line%' => $current_line + 1], 'Admin.Advparameters.Notification'); - } - if (!Language::getLanguage($id_lang)) { - $error = $this->trans('Lang ID (%id%) is not valid (at line %line%).', ['%id%' => $id_lang, '%line%' => $current_line + 1], 'Admin.Advparameters.Notification'); - } - if (!Warehouse::exists($id_warehouse)) { - $error = $this->trans('Warehouse ID (%id%) is not valid (at line %line%).', ['%id%' => $id_warehouse, '%line%' => $current_line + 1], 'Admin.Advparameters.Notification'); - } - if (!Currency::getCurrency($id_currency)) { - $error = $this->trans('Currency ID (%id%) is not valid (at line %line%).', ['%id%' => $id_currency, '%line%' => $current_line + 1], 'Admin.Advparameters.Notification'); - } - if (empty($supply_order->reference) && SupplyOrder::exists($reference)) { - $error = $this->trans('Reference (%ref%) already exists (at line %line%).', ['%ref%' => $reference, '%line%' => $current_line + 1], 'Admin.Advparameters.Notification'); - } - if (!empty($supply_order->reference) && ($supply_order->reference != $reference && SupplyOrder::exists($reference))) { - $error = $this->trans('Reference (%ref%) already exists (at line %line%).', ['%ref%' => $reference, '%line%' => $current_line + 1], 'Admin.Advparameters.Notification'); - } - if (!Validate::isDateFormat($date_delivery_expected)) { - $error = $this->trans('Date format (%date%) is not valid (at line %line%). It should be: %date_format%.', ['%date%' => $date_delivery_expected, '%line%' => $current_line + 1, '%date_format%' => $this->trans('YYYY-MM-DD', [], 'Admin.Advparameters.Notification')], 'Admin.Advparameters.Notification'); - } elseif (new DateTime($date_delivery_expected) <= new DateTime('yesterday')) { - $error = $this->trans('Date (%date%) cannot be in the past (at line %line%). Format: %date_format%.', ['%date%' => $date_delivery_expected, '%line%' => $current_line + 1, '%date_format%' => $this->trans('YYYY-MM-DD', [], 'Admin.Advparameters.Notification')], 'Admin.Advparameters.Notification'); - } - if ($discount_rate < 0 || $discount_rate > 100) { - $error = $this->trans( - 'Discount rate (%rate%) is not valid (at line %line%). %format%.', - ['%rate%' => $discount_rate, '%line%' => $current_line + 1, '%format%' => $this->trans('Format: Between 0 and 100', [], 'Admin.Advparameters.Notification')], - 'Admin.Advparameters.Notification' - ); - } - if ($supply_order->id > 0 && !$supply_order->isEditable()) { - $error = $this->trans('Supply Order (%id%) is not editable (at line %line%).', ['%id%' => $supply_order->id, '%line%' => $current_line + 1], 'Admin.Advparameters.Notification'); - } - - // if no errors, sets supply order - if (empty($error)) { - // adds parameters - $info['id_ref_currency'] = (int) Currency::getDefaultCurrency()->id; - $info['supplier_name'] = pSQL(Supplier::getNameById($id_supplier)); - if ($supply_order->id > 0) { - $info['id_supply_order_state'] = (int) $supply_order->id_supply_order_state; - $info['id'] = (int) $supply_order->id; - } else { - $info['id_supply_order_state'] = 1; - } - - // sets parameters - AdminImportController::arrayWalk($info, ['AdminImportController', 'fillInfo'], $supply_order); - - /** @var SupplyOrder $supply_order */ - if ((int) $supply_order->id && ($supply_order->exists((int) $supply_order->id) || $supply_order->exists($supply_order->reference))) { - $res = ($validateOnly || $supply_order->update()); - } else { - $supply_order->force_id = (bool) $force_ids; - $res = ($validateOnly || $supply_order->add()); - } - - // errors - if (!$res) { - $this->errors[] = $this->trans('Supply Order could not be saved (at line %line%).', ['%line%' => $current_line + 1], 'Admin.Advparameters.Notification'); - } - } else { - $this->errors[] = $error; - } + return 0; } + /** + * @deprecated Since 9.0 and will be removed in 10.0 + */ public function supplyOrdersDetailsImport($offset = false, $limit = false, &$crossStepsVariables = false, $validateOnly = false) { - // opens CSV & sets locale - $this->receiveTab(); - $handle = $this->openCsvFile($offset); - if (!$handle) { - return false; - } - - AdminImportController::setLocale(); - - $products = []; - $reset = true; - if ($crossStepsVariables !== false && array_key_exists('products', $crossStepsVariables)) { - $products = $crossStepsVariables['products']; - } - if ($crossStepsVariables !== false && array_key_exists('reset', $crossStepsVariables)) { - $reset = $crossStepsVariables['reset']; - } - - $force_ids = Tools::getValue('forceIDs'); - - // main loop, for each supply orders details to import - $line_count = 0; - for ($current_line = 0; ($line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator)) && (!$limit || $current_line < $limit); ++$current_line) { - ++$line_count; - if ($this->convert) { - $line = $this->utf8EncodeArray($line); - } - $info = AdminImportController::getMaskedRow($line); - - $this->supplyOrdersDetailsImportOne( - $info, - $products, // by ref - $reset, // by ref - $force_ids, - $current_line, - $validateOnly - ); - } - // closes - $this->closeCsvFile($handle); - - if ($crossStepsVariables !== false) { - $crossStepsVariables['products'] = $products; - $crossStepsVariables['reset'] = $reset; - } - - return $line_count; - } - - protected function supplyOrdersDetailsImportOne($info, &$products, &$reset, $force_ids, $current_line, $validateOnly = false) - { - // sets default values if needed - AdminImportController::setDefaultValues($info); - - // gets the supply order - if (array_key_exists('supply_order_reference', $info) && pSQL($info['supply_order_reference']) && SupplyOrder::exists(pSQL($info['supply_order_reference']))) { - $supply_order = SupplyOrder::getSupplyOrderByReference(pSQL($info['supply_order_reference'])); - } else { - $this->errors[] = sprintf( - $this->trans('Supply Order (%s) could not be loaded (at line %d).', [], 'Admin.Advparameters.Notification'), - Tools::htmlentitiesUTF8($info['supply_order_reference']), - $current_line + 1 - ); + @trigger_error(sprintf( + '%s is deprecated since 9.0 and will be removed in 10.0.', + __METHOD__ + ), E_USER_DEPRECATED); - return; - } - - // sets parameters - $id_product = (int) $info['id_product']; - if (empty($info['id_product_attribute'])) { - $info['id_product_attribute'] = 0; - } - $id_product_attribute = (int) $info['id_product_attribute']; - $unit_price_te = (float) $info['unit_price_te']; - $quantity_expected = (int) $info['quantity_expected']; - $discount_rate = (float) $info['discount_rate']; - $tax_rate = (float) $info['tax_rate']; - - // checks if one product/attribute is there only once - if (isset($products[$id_product][$id_product_attribute])) { - $this->errors[] = sprintf( - $this->trans('Product/Attribute (%d/%d) cannot be added twice (at line %d).', [], 'Admin.Advparameters.Notification'), - $id_product, - $id_product_attribute, - $current_line + 1 - ); - } else { - $products[$id_product][$id_product_attribute] = $quantity_expected; - } - - // checks parameters - $supplier_reference = ProductSupplier::getProductSupplierReference($id_product, $id_product_attribute, $supply_order->id_supplier); - if (false === $supplier_reference) { - $this->errors[] = sprintf( - $this->trans('Product (%d/%d) is not available for this order (at line %d).', [], 'Admin.Advparameters.Notification'), - $id_product, - $id_product_attribute, - $current_line + 1 - ); - } - if ($unit_price_te < 0) { - $this->errors[] = sprintf($this->trans('Unit Price (tax excl.) (%d) is not valid (at line %d).', [], 'Admin.Advparameters.Notification'), $unit_price_te, $current_line + 1); - } - if ($quantity_expected < 0) { - $this->errors[] = sprintf($this->trans('Quantity Expected (%d) is not valid (at line %d).', [], 'Admin.Advparameters.Notification'), $quantity_expected, $current_line + 1); - } - if ($discount_rate < 0 || $discount_rate > 100) { - $this->errors[] = sprintf( - $this->trans('Discount rate (%d) is not valid (at line %d). %s.', [], 'Admin.Advparameters.Notification'), - $discount_rate, - $current_line + 1, - $this->trans('Format: Between 0 and 100', [], 'Admin.Advparameters.Notification') - ); - } - if ($tax_rate < 0 || $tax_rate > 100) { - $this->errors[] = sprintf( - $this->trans('Quantity Expected (%d) is not valid (at line %d).', [], 'Admin.Advparameters.Notification'), - $tax_rate, - $current_line + 1, - $this->trans('Format: Between 0 and 100', [], 'Admin.Advparameters.Notification') - ); - } - - // if no errors, sets supply order details - if (empty($this->errors)) { - // resets order if needed - if (!$validateOnly && $reset) { - $supply_order->resetProducts(); - $reset = false; - } - - // creates new product - $supply_order_detail = new SupplyOrderDetail(); - AdminImportController::arrayWalk($info, ['AdminImportController', 'fillInfo'], $supply_order_detail); - - /* @var SupplyOrderDetail $supply_order_detail */ - - // sets parameters - $supply_order_detail->id_supply_order = $supply_order->id; - $currency = new Currency($supply_order->id_ref_currency); - $supply_order_detail->id_currency = $currency->id; - $supply_order_detail->exchange_rate = $currency->conversion_rate; - $supply_order_detail->supplier_reference = $supplier_reference; - $supply_order_detail->name = Product::getProductName($id_product, $id_product_attribute, $supply_order->id_lang); - - // gets ean13 / ref / upc - $query = new DbQuery(); - $query->select(' - IFNULL(pa.reference, IFNULL(p.reference, \'\')) as reference, - IFNULL(pa.ean13, IFNULL(p.ean13, \'\')) as ean13, - IFNULL(pa.upc, IFNULL(p.upc, \'\')) as upc - '); - $query->from('product', 'p'); - $query->leftJoin('product_attribute', 'pa', 'pa.id_product = p.id_product AND id_product_attribute = ' . (int) $id_product_attribute); - $query->where('p.id_product = ' . (int) $id_product); - $query->where('p.is_virtual = 0 AND p.cache_is_pack = 0'); - $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); - $product_infos = $res['0']; - - $supply_order_detail->reference = $product_infos['reference']; - $supply_order_detail->ean13 = $product_infos['ean13']; - $supply_order_detail->upc = $product_infos['upc']; - $supply_order_detail->force_id = (bool) $force_ids; - if (!$validateOnly) { - $supply_order_detail->add(); - $supply_order->update(); - } - unset($supply_order_detail); - } + return 0; } public function utf8EncodeArray($array) @@ -4439,13 +3838,11 @@ protected function truncateTables($case) Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'product_group_reduction_cache`'); Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'product_sale`'); Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'product_supplier`'); - Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'warehouse_product_location`'); Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'stock`'); Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'stock_available`'); Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'stock_mvt`'); Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'customization`'); Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'customization_field`'); - Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'supply_order_detail`'); Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'product_attribute`'); Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'product_attribute_shop`'); Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'product_attribute_combination`'); @@ -4651,18 +4048,6 @@ public function importByGroups($offset = false, $limit = false, &$results = null break; } - // @since 1.5.0 - if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) { - switch ((int) Tools::getValue('entity')) { - case $this->entities[$import_type = $this->trans('Supply Orders', [], 'Admin.Advparameters.Feature')]: - $doneCount += $this->supplyOrdersImport($offset, $limit, $validateOnly); - break; - case $this->entities[$import_type = $this->trans('Supply Order Details', [], 'Admin.Advparameters.Feature')]: - $doneCount += $this->supplyOrdersDetailsImport($offset, $limit, $crossStepsVariables, $validateOnly); - break; - } - } - if ($results !== null) { $results['isFinished'] = ($doneCount < $limit); if ($results['isFinished'] && $clearCache && !$validateOnly) { diff --git a/controllers/admin/AdminLegacyLayoutController.php b/controllers/admin/AdminLegacyLayoutController.php index 487ca1aeee6ac..5bb26062825e2 100644 --- a/controllers/admin/AdminLegacyLayoutController.php +++ b/controllers/admin/AdminLegacyLayoutController.php @@ -1,4 +1,9 @@ $this->useRegularH1Structure, // legacy context selector is hidden on migrated pages when multistore feature is used 'hideLegacyStoreContextSelector' => $this->isMultistoreEnabled(), + 'locked_to_all_shop_context' => $this->lockedToAllShopContext, ]; if ($this->helpLink === false || !empty($this->helpLink)) { @@ -230,5 +236,17 @@ public function display() parent::display(); $this->outPutHtml = ob_get_contents(); ob_end_clean(); + + // We push notifications from the legacy controller but only in migrated page for now (that's why it is done here and ont in AdminController) + // and of course only if the Symfony layout is enabled This will mostly be useful when legacy pages are rendered by Symfony layout + if ($this->get(FeatureFlagStateCheckerInterface::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_SYMFONY_LAYOUT)) { + foreach (['errors', 'warnings', 'informations', 'confirmations'] as $type) { + /** @var AddFlashMessage $addFlashMessage */ + $addFlashMessage = $this->get(AddFlashMessage::class); + foreach ($this->$type as $message) { + $addFlashMessage->addMessage($type, $message); + } + } + } } } diff --git a/controllers/admin/AdminPdfController.php b/controllers/admin/AdminPdfController.php index 79dd8ad9c4b55..23f202290625e 100644 --- a/controllers/admin/AdminPdfController.php +++ b/controllers/admin/AdminPdfController.php @@ -158,20 +158,16 @@ public function processGenerateDeliverySlipsPDF() $this->generatePDF($order_invoice_collection, PDF::TEMPLATE_DELIVERY_SLIP); } + /** + * @deprecated Since 9.0 and will be removed in 10.0 + */ public function processGenerateSupplyOrderFormPDF() { - if (!Tools::isSubmit('id_supply_order')) { - die($this->trans('The supply order ID is missing.', [], 'Admin.Orderscustomers.Notification')); - } - - $id_supply_order = (int) Tools::getValue('id_supply_order'); - $supply_order = new SupplyOrder($id_supply_order); - - if (!Validate::isLoadedObject($supply_order)) { - die($this->trans('The supply order cannot be found within your database.', [], 'Admin.Orderscustomers.Notification')); - } - - $this->generatePDF($supply_order, PDF::TEMPLATE_SUPPLY_ORDER_FORM); + @trigger_error(sprintf( + '%s is deprecated since 9.0 and will be removed in 10.0.', + __METHOD__ + ), E_USER_DEPRECATED); + die; } public function generateDeliverySlipPDFByIdOrderInvoice($id_order_invoice) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 49ec7142fd53d..5a31ad4411eba 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -23,8 +23,12 @@ * @copyright Since 2007 PrestaShop SA and Contributors * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) */ + +use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater; use PrestaShop\PrestaShop\Adapter\SymfonyContainer; +use PrestaShop\PrestaShop\Core\Exception\CoreException; use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings; +use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface; use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration; /** @@ -597,21 +601,6 @@ public function processDelete() if (isset($object->noZeroObject) && count($taxes = call_user_func([$this->className, $object->noZeroObject])) <= 1) { $this->errors[] = $this->trans('You need at least one object.', [], 'Admin.Notifications.Error') . ' ' . $this->table . '
' . $this->trans('You cannot delete all of the items.', [], 'Admin.Notifications.Error'); } else { - /* - * @since 1.5.0 - * It is NOT possible to delete a product if there are currently: - * - physical stock for this product - * - supply order(s) for this product - */ - if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $object->advanced_stock_management) { - $stock_manager = StockManagerFactory::getManager(); - $physical_quantity = $stock_manager->getProductPhysicalQuantities($object->id, 0); - $real_quantity = $stock_manager->getProductRealQuantities($object->id, 0); - if ($physical_quantity > 0 || $real_quantity > $physical_quantity) { - $this->errors[] = $this->trans('You cannot delete this product because there is physical stock left.', [], 'Admin.Catalog.Notification'); - } - } - if (!count($this->errors)) { if ($object->delete()) { $id_category = (int) Tools::getValue('id_category'); @@ -687,25 +676,8 @@ protected function processBulkDelete() ini_set('max_execution_time', (string) round($count * 1.5)); } - if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) { - $stock_manager = StockManagerFactory::getManager(); - } - foreach ($products as $id_product) { $product = new Product((int) $id_product); - /* - * @since 1.5.0 - * It is NOT possible to delete a product if there are currently: - * - physical stock for this product - * - supply order(s) for this product - */ - if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $product->advanced_stock_management && isset($stock_manager)) { // @phpstan-ignore-line - $physical_quantity = $stock_manager->getProductPhysicalQuantities($product->id, 0); - $real_quantity = $stock_manager->getProductRealQuantities($product->id, 0); - if ($physical_quantity > 0 || $real_quantity > $physical_quantity) { - $this->errors[] = $this->trans('You cannot delete the product #%d because there is physical stock left.', [$product->id], 'Admin.Catalog.Notification'); - } - } if (!count($this->errors)) { if ($product->delete()) { PrestaShopLogger::addLog(sprintf('%s deletion', $this->className), 1, null, $this->className, (int) $product->id, true, (int) $this->context->employee->id); @@ -818,7 +790,6 @@ public function processProductAttribute() Tools::getValue('attribute_low_stock_alert'), Tools::getValue('attribute_mpn') ); - StockAvailable::setProductDependsOnStock((int) $product->id, $product->depends_on_stock, null, (int) $id_product_attribute); StockAvailable::setProductOutOfStock((int) $product->id, $product->out_of_stock, null, (int) $id_product_attribute); } } else { @@ -852,7 +823,6 @@ public function processProductAttribute() Tools::getValue('attribute_low_stock_alert'), Tools::getValue('attribute_mpn') ); - StockAvailable::setProductDependsOnStock((int) $product->id, $product->depends_on_stock, null, (int) $id_product_attribute); StockAvailable::setProductOutOfStock((int) $product->id, $product->out_of_stock, null, (int) $id_product_attribute); } } else { @@ -1066,10 +1036,15 @@ public function processSpecificPricePriorities() if (!$priorities = Tools::getValue('specificPricePriority')) { $this->errors[] = $this->trans('Please specify priorities.', [], 'Admin.Catalog.Notification'); } elseif (Tools::isSubmit('specificPricePriorityToAll') && Tools::getValue('specificPricePriorityToAll')) { - if (!SpecificPrice::setPriorities($priorities)) { - $this->errors[] = $this->trans('An error occurred while updating priorities.', [], 'Admin.Catalog.Notification'); - } else { + $sfContainer = SymfonyContainer::getInstance(); + /** @var SpecificPricePriorityUpdater $specificPricePriorityUpdater */ + $specificPricePriorityUpdater = $sfContainer->get(SpecificPricePriorityUpdater::class); + + try { + $specificPricePriorityUpdater->updateDefaultPriorities($priorities); $this->confirmations[] = 'The price rule has successfully updated'; + } catch (CoreException $e) { + $this->errors[] = $this->trans('An error occurred while updating priorities.', [], 'Admin.Catalog.Notification'); } } elseif (!SpecificPrice::setSpecificPriority((int) $obj->id, $priorities)) { $this->errors[] = $this->trans('An error occurred while setting priorities.', [], 'Admin.Catalog.Notification'); @@ -1360,34 +1335,20 @@ public function ajaxProcessDeleteProductAttribute() $id_product_attribute = (int) Tools::getValue('id_product_attribute'); if ($id_product && Validate::isUnsignedId($id_product) && Validate::isLoadedObject($product = new Product($id_product))) { - if (($depends_on_stock = StockAvailable::dependsOnStock($id_product)) && StockAvailable::getQuantityAvailableByProduct($id_product, $id_product_attribute)) { - $json = [ - 'status' => 'error', - 'message' => 'It is not possible to delete a combination while it still has some quantities in the Advanced Stock Management. You must delete its stock first.', - ]; + $product->deleteAttributeCombination((int) $id_product_attribute); + $product->checkDefaultAttributes(); + if (!$product->hasAttributes()) { + $product->cache_default_attribute = 0; + $product->update(); } else { - $product->deleteAttributeCombination((int) $id_product_attribute); - $product->checkDefaultAttributes(); - if (!$product->hasAttributes()) { - $product->cache_default_attribute = 0; - $product->update(); - } else { - Product::updateDefaultAttribute($id_product); - } - - if ($depends_on_stock && !Stock::deleteStockByIds($id_product, $id_product_attribute)) { - $json = [ - 'status' => 'error', - 'message' => 'Error while deleting the stock', - ]; - } else { - $json = [ - 'status' => 'ok', - 'message' => $this->_conf[1], - 'id_product_attribute' => (int) $id_product_attribute, - ]; - } + Product::updateDefaultAttribute($id_product); } + + $json = [ + 'status' => 'ok', + 'message' => $this->_conf[1], + 'id_product_attribute' => (int) $id_product_attribute, + ]; } else { $json = [ 'status' => 'error', @@ -1760,15 +1721,6 @@ public function processAdd() $this->updatePackItems($this->object); $this->updateDownloadProduct($this->object); - if (Configuration::get('PS_FORCE_ASM_NEW_PRODUCT') && Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $this->object->getType() != Product::PTYPE_VIRTUAL) { - $this->object->advanced_stock_management = 1; - $this->object->save(); - $id_shops = Shop::getContextListShopID(); - foreach ($id_shops as $id_shop) { - StockAvailable::setProductDependsOnStock($this->object->id, true, (int) $id_shop, 0); - } - } - if (empty($this->errors)) { $languages = Language::getLanguages(false); if ($this->isProductFieldUpdated('category_box') && !$this->object->updateCategories(Tools::getValue('categoryBox'))) { @@ -1788,15 +1740,6 @@ public function processAdd() } } - if (Configuration::get('PS_DEFAULT_WAREHOUSE_NEW_PRODUCT') != 0 && Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) { - $warehouse_location_entity = new WarehouseProductLocation(); - $warehouse_location_entity->id_product = $this->object->id; - $warehouse_location_entity->id_product_attribute = 0; - $warehouse_location_entity->id_warehouse = (int) Configuration::get('PS_DEFAULT_WAREHOUSE_NEW_PRODUCT'); - $warehouse_location_entity->location = ''; - $warehouse_location_entity->save(); - } - // Apply groups reductions $this->object->setGroupReduction(); @@ -1899,6 +1842,16 @@ public function processUpdate() if (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_SHOP) { $values = (array) Tools::getValue('multishop_check', []); $values['state'] = Product::STATE_SAVED; + $values['id_manufacturer'] = true; + $values['ean13'] = true; + $values['mpn'] = true; + $values['isbn'] = true; + $values['upc'] = true; + $values['reference'] = true; + $values['weight'] = true; + $values['depth'] = true; + $values['width'] = true; + $values['height'] = true; $object->setFieldsToUpdate($values); } @@ -1928,9 +1881,7 @@ public function processUpdate() // If the product doesn't exist in the current shop but exists in another shop if (Shop::getContext() == Shop::CONTEXT_SHOP && !$existing_product->isAssociatedToShop($this->context->shop->id)) { $out_of_stock = StockAvailable::outOfStock($existing_product->id, $existing_product->id_shop_default); - $depends_on_stock = StockAvailable::dependsOnStock($existing_product->id, $existing_product->id_shop_default); StockAvailable::setProductOutOfStock((int) $this->object->id, $out_of_stock, $this->context->shop->id); - StockAvailable::setProductDependsOnStock((int) $this->object->id, $depends_on_stock, $this->context->shop->id); } PrestaShopLogger::addLog(sprintf('%s modification', $this->className), 1, null, $this->className, (int) $this->object->id, true, (int) $this->context->employee->id); @@ -1965,10 +1916,6 @@ public function processUpdate() } $this->updatePackItems($object); - // Disallow avanced stock management if the product become a pack - if ($product_type_before == Product::PTYPE_SIMPLE && $object->getType() == Product::PTYPE_PACK) { - StockAvailable::setProductDependsOnStock((int) $object->id, false); - } $this->updateDownloadProduct($object, 1); $this->updateTags(Language::getLanguages(false), $object); @@ -1983,9 +1930,6 @@ public function processUpdate() } } - if ($this->isTabSubmitted('Warehouses')) { - $this->processWarehouses(); - } if (empty($this->errors)) { if (in_array($object->visibility, ['both', 'search']) && Configuration::get('PS_SEARCH_INDEXATION')) { Search::indexation(false, $object->id); @@ -2597,79 +2541,6 @@ public function processSuppliers($id_product = null) } } - /** - * Post treatment for warehouses. - */ - public function processWarehouses() - { - if ((int) Tools::getValue('warehouse_loaded') === 1 && Validate::isLoadedObject($product = new Product((int) $id_product = Tools::getValue('id_product')))) { - // Get all id_product_attribute - $attributes = $product->getAttributesResume($this->context->language->id); - if (empty($attributes)) { - $attributes[] = [ - 'id_product_attribute' => 0, - 'attribute_designation' => '', - ]; - } - - // Get all available warehouses - $warehouses = Warehouse::getWarehouses(true); - - // Get already associated warehouses - $associated_warehouses_collection = WarehouseProductLocation::getCollection($product->id); - - $elements_to_manage = []; - - // get form information - foreach ($attributes as $attribute) { - foreach ($warehouses as $warehouse) { - $key = $warehouse['id_warehouse'] . '_' . $product->id . '_' . $attribute['id_product_attribute']; - - // get elements to manage - if (Tools::isSubmit('check_warehouse_' . $key)) { - $location = Tools::getValue('location_warehouse_' . $key, ''); - $elements_to_manage[$key] = $location; - } - } - } - - // Delete entry if necessary - foreach ($associated_warehouses_collection as $awc) { - /** @var WarehouseProductLocation $awc */ - if (!array_key_exists($awc->id_warehouse . '_' . $awc->id_product . '_' . $awc->id_product_attribute, $elements_to_manage)) { - $awc->delete(); - } - } - - // Manage locations - foreach ($elements_to_manage as $key => $location) { - $params = explode('_', $key); - - $wpl_id = (int) WarehouseProductLocation::getIdByProductAndWarehouse((int) $params[1], (int) $params[2], (int) $params[0]); - - if (empty($wpl_id)) { - //create new record - $warehouse_location_entity = new WarehouseProductLocation(); - $warehouse_location_entity->id_product = (int) $params[1]; - $warehouse_location_entity->id_product_attribute = (int) $params[2]; - $warehouse_location_entity->id_warehouse = (int) $params[0]; - $warehouse_location_entity->location = pSQL($location); - $warehouse_location_entity->save(); - } else { - $warehouse_location_entity = new WarehouseProductLocation((int) $wpl_id); - - $location = pSQL($location); - - if ($location != $warehouse_location_entity->location) { - $warehouse_location_entity->location = pSQL($location); - $warehouse_location_entity->update(); - } - } - } - StockAvailable::synchronize((int) $id_product); - } - } - /** * Get an array of pack items for display from the product object if specified, else from POST/GET values. * @@ -2883,7 +2754,7 @@ public function ajaxProcessaddProductImage($idProduct = null, $inputFileName = ' * * In case of .jpg images, the actual format inside is decided by ImageManager. */ - if ($sfContainer->get('prestashop.core.admin.feature_flag.repository')->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) { + if ($sfContainer->get(FeatureFlagStateCheckerInterface::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) { $configuredImageFormats = $sfContainer->get(ImageFormatConfiguration::class)->getGenerationFormats(); } else { $configuredImageFormats = ['jpg']; @@ -2960,41 +2831,6 @@ public function ajaxProcessProductQuantity() $product = new Product((int) Tools::getValue('id_product'), true); switch (Tools::getValue('actionQty')) { - case 'depends_on_stock': - if (Tools::getValue('value') === false) { - die(json_encode(['error' => 'Undefined value'])); - } - if ((int) Tools::getValue('value') != 0 && (int) Tools::getValue('value') != 1) { - die(json_encode(['error' => 'Incorrect value'])); - } - if (!$product->advanced_stock_management && (int) Tools::getValue('value') == 1) { - die(json_encode(['error' => 'Not possible if advanced stock management is disabled.'])); - } - if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') - && (int) Tools::getValue('value') == 1 - && ( - Pack::isPack($product->id) - && !Pack::allUsesAdvancedStockManagement($product->id) - && ( - $product->pack_stock_type == Pack::STOCK_TYPE_PACK_BOTH - || $product->pack_stock_type == Pack::STOCK_TYPE_PRODUCTS_ONLY - || ( - $product->pack_stock_type == Pack::STOCK_TYPE_DEFAULT - && (Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PRODUCTS_ONLY - || Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PACK_BOTH) - ) - ) - ) - ) { - die(json_encode(['error' => 'You cannot use advanced stock management for this pack because' . '
' . - '- advanced stock management is not enabled for these products' . '
' . - '- you have chosen to decrement products quantities.', ])); - } - - StockAvailable::setProductDependsOnStock($product->id, (bool) Tools::getValue('value')); - - break; - case 'pack_stock_type': $value = Tools::getValue('value'); if ($value === false) { @@ -3004,22 +2840,6 @@ public function ajaxProcessProductQuantity() && (int) $value != 2 && (int) $value != 3) { die(json_encode(['error' => 'Incorrect value'])); } - if ($product->depends_on_stock - && !Pack::allUsesAdvancedStockManagement($product->id) - && ( - (int) $value == 1 - || (int) $value == 2 - || ( - (int) $value == 3 - && (Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PRODUCTS_ONLY - || Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PACK_BOTH) - ) - ) - ) { - die(json_encode(['error' => 'You cannot use this stock management option because:' . '
' . - '- advanced stock management is not enabled for these products' . '
' . - '- advanced stock management is enabled for the pack', ])); - } Product::setPackStockType($product->id, $value); @@ -3056,23 +2876,6 @@ public function ajaxProcessProductQuantity() die(json_encode(['error' => $error])); } - break; - case 'advanced_stock_management': - if (Tools::getValue('value') === false) { - die(json_encode(['error' => 'Undefined value'])); - } - if ((int) Tools::getValue('value') != 1 && (int) Tools::getValue('value') != 0) { - die(json_encode(['error' => 'Incorrect value'])); - } - if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && (int) Tools::getValue('value') == 1) { - die(json_encode(['error' => 'Not possible if advanced stock management is disabled. '])); - } - - $product->setAdvancedStockManagement((bool) Tools::getValue('value')); - if (StockAvailable::dependsOnStock($product->id) == 1 && (int) Tools::getValue('value') == 0) { - StockAvailable::setProductDependsOnStock($product->id, false); - } - break; } die(json_encode(['error' => false])); diff --git a/controllers/admin/AdminSearchController.php b/controllers/admin/AdminSearchController.php index b7d8d4304d7e7..76fd3b981e45f 100644 --- a/controllers/admin/AdminSearchController.php +++ b/controllers/admin/AdminSearchController.php @@ -306,8 +306,9 @@ public function searchFeatures() } $sfRouteParams = (!empty($row['route_name'])) ? ['route' => $row['route_name']] : []; + $params = ['bo_query' => $this->query]; $this->_list['features'][$row['name']][] = [ - 'link' => Context::getContext()->link->getAdminLink((string) $row['class_name'], true, $sfRouteParams), + 'link' => Context::getContext()->link->getAdminLink((string) $row['class_name'], true, $sfRouteParams, $params), ]; } } @@ -503,6 +504,7 @@ protected function getSearchPanels(string $searchedExpression): void ); // Get additional search panels from hooks + // An array [module_name => module_output] will be returned $alternativeSearchPanelsFromModules = Hook::exec( 'actionGetAlternativeSearchPanels', [ @@ -528,6 +530,7 @@ protected function getSearchPanels(string $searchedExpression): void 'title' => $searchPanel->getTitle(), 'button_label' => $searchPanel->getButtonLabel(), 'link' => $searchPanel->getLink(), + 'is_external_link' => $searchPanel->isExternalLink(), ]; } } diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php index 3adf35b18c710..bed57835c44b9 100644 --- a/controllers/admin/AdminShopController.php +++ b/controllers/admin/AdminShopController.php @@ -585,7 +585,6 @@ public function renderForm() 'product_attribute' => $this->trans('Product combinations', [], 'Admin.Advparameters.Feature'), 'stock_available' => $this->trans('Available quantities for sale', [], 'Admin.Advparameters.Feature'), 'store' => $this->trans('Stores', [], 'Admin.Global'), - 'warehouse' => $this->trans('Warehouses', [], 'Admin.Advparameters.Feature'), 'webservice_account' => $this->trans('Webservice accounts', [], 'Admin.Advparameters.Feature'), 'attribute_group' => $this->trans('Attribute groups', [], 'Admin.Advparameters.Feature'), 'feature' => $this->trans('Features', [], 'Admin.Global'), diff --git a/controllers/admin/AdminShopUrlController.php b/controllers/admin/AdminShopUrlController.php index e81ceccbe7296..596ef84b594cc 100644 --- a/controllers/admin/AdminShopUrlController.php +++ b/controllers/admin/AdminShopUrlController.php @@ -106,7 +106,8 @@ public function viewAccess($disable = false) public function renderList() { - $this->addRowActionSkipList('delete', [1]); + // We will hide "delete" action for all URLs that are set as main ones for the store + $this->addRowActionSkipList('delete', $this->getUnremovableUrls()); $this->addRowAction('edit'); $this->addRowAction('delete'); @@ -122,6 +123,19 @@ public function renderList() return parent::renderList(); } + /** + * Returns a list of URLs that are selected as main ones for some store. + * + * @return array of URLs that are selected as main + */ + protected function getUnremovableUrls() + { + return array_column( + Db::getInstance()->executeS('SELECT id_shop_url FROM ' . _DB_PREFIX_ . 'shop_url WHERE main = 1'), + 'id_shop_url' + ); + } + /** * @return string|void * diff --git a/controllers/admin/AdminStatsTabController.php b/controllers/admin/AdminStatsTabController.php index 2cac7921f5976..ddd057760e14d 100644 --- a/controllers/admin/AdminStatsTabController.php +++ b/controllers/admin/AdminStatsTabController.php @@ -208,6 +208,7 @@ public function displayStats() } if ($module_instance && $module_instance->active) { + // Hook called only for the module concerned $hook = Hook::exec('displayAdminStatsModules', [], $module_instance->id); } } diff --git a/controllers/admin/AdminStatusesController.php b/controllers/admin/AdminStatusesController.php deleted file mode 100644 index 53bdf8d2389a6..0000000000000 --- a/controllers/admin/AdminStatusesController.php +++ /dev/null @@ -1,771 +0,0 @@ - - * @copyright Since 2007 PrestaShop SA and Contributors - * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) - */ - -/** - * @property OrderState $object - */ -class AdminStatusesControllerCore extends AdminController -{ - public function __construct() - { - $this->bootstrap = true; - $this->table = 'order_state'; - $this->className = 'OrderState'; - $this->lang = true; - $this->deleted = true; - $this->colorOnBackground = false; - $this->multishop_context = Shop::CONTEXT_ALL; - $this->imageType = 'gif'; - $this->fieldImageSettings = [ - 'name' => 'icon', - 'dir' => 'os', - ]; - - parent::__construct(); - - $this->bulk_actions = ['delete' => ['text' => $this->trans('Delete selected', [], 'Admin.Actions'), 'confirm' => $this->trans('Delete selected items?', [], 'Admin.Notifications.Warning')]]; - } - - public function init() - { - if (Tools::isSubmit('addorder_return_state')) { - $this->display = 'add'; - } - if (Tools::isSubmit('updateorder_return_state')) { - $this->display = 'edit'; - } - - return parent::init(); - } - - /** - * init all variables to render the order status list. - */ - protected function initOrderStatusList(): void - { - $this->table = 'order_state'; - $this->className = 'OrderState'; - $this->_defaultOrderBy = $this->identifier = 'id_order_state'; - $this->list_id = 'order_state'; - $this->deleted = true; - $this->_orderBy = null; - $this->fields_list = [ - 'id_order_state' => [ - 'title' => $this->trans('ID', [], 'Admin.Global'), - 'align' => 'text-center', - 'class' => 'fixed-width-xs', - ], - 'name' => [ - 'title' => $this->trans('Name', [], 'Admin.Global'), - 'width' => 'auto', - 'color' => 'color', - ], - 'logo' => [ - 'title' => $this->trans('Icon', [], 'Admin.Shopparameters.Feature'), - 'align' => 'text-center', - 'image' => 'os', - 'orderby' => false, - 'search' => false, - 'class' => 'fixed-width-xs', - ], - 'send_email' => [ - 'title' => $this->trans('Send email to customer', [], 'Admin.Shopparameters.Feature'), - 'align' => 'text-center', - 'active' => 'sendEmail', - 'type' => 'bool', - 'ajax' => true, - 'orderby' => false, - 'class' => 'fixed-width-sm', - ], - 'delivery' => [ - 'title' => $this->trans('Delivery', [], 'Admin.Global'), - 'align' => 'text-center', - 'active' => 'delivery', - 'type' => 'bool', - 'ajax' => true, - 'orderby' => false, - 'class' => 'fixed-width-sm', - ], - 'invoice' => [ - 'title' => $this->trans('Invoice', [], 'Admin.Global'), - 'align' => 'text-center', - 'active' => 'invoice', - 'type' => 'bool', - 'ajax' => true, - 'orderby' => false, - 'class' => 'fixed-width-sm', - ], - 'template' => [ - 'title' => $this->trans('Email template', [], 'Admin.Shopparameters.Feature'), - ], - ]; - } - - /** - * Init all variables to render the order status list. - * - * @deprecated Use `initOrderStatusList` - */ - protected function initOrderStatutsList() - { - $this->initOrderStatusList(); - } - - /** - * init all variables to render the order return list. - */ - protected function initOrdersReturnsList() - { - $this->table = 'order_return_state'; - $this->className = 'OrderReturnState'; - $this->_defaultOrderBy = $this->identifier = 'id_order_return_state'; - $this->list_id = 'order_return_state'; - $this->deleted = false; - $this->_orderBy = null; - - $this->fields_list = [ - 'id_order_return_state' => [ - 'title' => $this->trans('ID', [], 'Admin.Global'), - 'align' => 'center', - 'class' => 'fixed-width-xs', - ], - 'name' => [ - 'title' => $this->trans('Name', [], 'Admin.Global'), - 'align' => 'left', - 'width' => 'auto', - 'color' => 'color', - ], - ]; - } - - protected function initOrderReturnsForm() - { - $id_order_return_state = (int) Tools::getValue('id_order_return_state'); - - // Create Object OrderReturnState - $order_return_state = new OrderReturnState($id_order_return_state); - - //init field form variable for order return form - $this->fields_form = []; - - //$this->initToolbar(); - $this->getlanguages(); - $helper = new HelperForm(); - $helper->currentIndex = self::$currentIndex; - $helper->token = $this->token; - $helper->table = 'order_return_state'; - $helper->identifier = 'id_order_return_state'; - $helper->id = $order_return_state->id; - $helper->toolbar_scroll = false; - $helper->languages = $this->_languages; - $helper->default_form_language = $this->default_form_language; - $helper->allow_employee_form_lang = $this->allow_employee_form_lang; - - if ($order_return_state->id) { - $helper->fields_value = [ - 'name' => $this->getFieldValue($order_return_state, 'name'), - 'color' => $this->getFieldValue($order_return_state, 'color'), - ]; - } else { - $helper->fields_value = [ - 'name' => $this->getFieldValue($order_return_state, 'name'), - 'color' => '#ffffff', - ]; - } - - $helper->toolbar_btn = $this->toolbar_btn; - $helper->title = $this->trans('Edit return status', [], 'Admin.Shopparameters.Feature'); - - return $helper; - } - - public function initPageHeaderToolbar() - { - if (empty($this->display)) { - $this->page_header_toolbar_btn['new_order_state'] = [ - 'href' => self::$currentIndex . '&addorder_state&token=' . $this->token, - 'desc' => $this->trans('Add new order status', [], 'Admin.Shopparameters.Feature'), - 'icon' => 'process-icon-new', - ]; - $this->page_header_toolbar_btn['new_order_return_state'] = [ - 'href' => self::$currentIndex . '&addorder_return_state&token=' . $this->token, - 'desc' => $this->trans('Add new order return status', [], 'Admin.Shopparameters.Feature'), - 'icon' => 'process-icon-new', - ]; - } - - parent::initPageHeaderToolbar(); - } - - /** - * Function used to render the list to display for this controller. - */ - public function renderList() - { - //init and render the first list - $this->addRowAction('edit'); - $this->addRowAction('delete'); - $this->addRowActionSkipList('delete', $this->getUnremovableStatuses()); - $this->bulk_actions = [ - 'delete' => [ - 'text' => $this->trans('Delete selected', [], 'Admin.Actions'), - 'confirm' => $this->trans('Delete selected items?', [], 'Admin.Notifications.Warning'), - 'icon' => 'icon-trash', - ], - ]; - $this->initOrderStatusList(); - $lists = parent::renderList(); - - //init and render the second list - $this->list_skip_actions = []; - $this->_filter = false; - $this->addRowActionSkipList('delete', [1, 2, 3, 4, 5]); - $this->initOrdersReturnsList(); - $this->checkFilterForOrdersReturnsList(); - - // call postProcess() to take care of actions and filters - $this->postProcess(); - $this->toolbar_title = $this->trans('Return statuses', [], 'Admin.Shopparameters.Feature'); - - parent::initToolbar(); - $lists .= parent::renderList(); - - return $lists; - } - - protected function getUnremovableStatuses() - { - return array_map(function ($row) { - return (int) $row['id_order_state']; - }, Db::getInstance()->executeS('SELECT id_order_state FROM ' . _DB_PREFIX_ . 'order_state WHERE unremovable = 1')); - } - - protected function checkFilterForOrdersReturnsList() - { - // test if a filter is applied for this list - if (Tools::isSubmit('submitFilter' . $this->table) || $this->context->cookie->{'submitFilter' . $this->table} !== false) { - $this->filter = true; - } - - // test if a filter reset request is required for this list - if (isset($_POST['submitReset' . $this->table])) { - $this->action = 'reset_filters'; - } else { - $this->action = ''; - } - } - - public function renderForm() - { - $this->fields_form = [ - 'tinymce' => true, - 'legend' => [ - 'title' => $this->trans('Order status', [], 'Admin.Shopparameters.Feature'), - 'icon' => 'icon-time', - ], - 'input' => [ - [ - 'type' => 'text', - 'label' => $this->trans('Status name', [], 'Admin.Shopparameters.Feature'), - 'name' => 'name', - 'lang' => true, - 'required' => true, - 'hint' => [ - $this->trans('Order status (e.g. \'Pending\').', [], 'Admin.Shopparameters.Help'), - $this->trans('Invalid characters: numbers and', [], 'Admin.Shopparameters.Help') . ' !<>,;?=+()@#"{}_$%:', - ], - ], - [ - 'type' => 'file', - 'label' => $this->trans('Icon', [], 'Admin.Shopparameters.Feature'), - 'name' => 'icon', - 'hint' => $this->trans('Upload an icon from your computer (File type: .gif, suggested size: 16x16).', [], 'Admin.Shopparameters.Help'), - ], - [ - 'type' => 'color', - 'label' => $this->trans('Color', [], 'Admin.Shopparameters.Feature'), - 'name' => 'color', - 'hint' => $this->trans('Status will be highlighted in this color. HTML colors only.', [], 'Admin.Shopparameters.Help') . ' "lightblue", "#CC6600")', - ], - [ - 'type' => 'checkbox', - 'name' => 'logable', - 'values' => [ - 'query' => [ - ['id' => 'on', 'name' => $this->trans('Consider the associated order as validated.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'], - ], - 'id' => 'id', - 'name' => 'name', - ], - ], - [ - 'type' => 'checkbox', - 'name' => 'invoice', - 'values' => [ - 'query' => [ - ['id' => 'on', 'name' => $this->trans('Allow a customer to download and view PDF versions of their invoices.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'], - ], - 'id' => 'id', - 'name' => 'name', - ], - ], - [ - 'type' => 'checkbox', - 'name' => 'hidden', - 'values' => [ - 'query' => [ - ['id' => 'on', 'name' => $this->trans('Hide this status in all customer orders.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'], - ], - 'id' => 'id', - 'name' => 'name', - ], - ], - [ - 'type' => 'checkbox', - 'name' => 'send_email', - 'values' => [ - 'query' => [ - ['id' => 'on', 'name' => $this->trans('Send an email to the customer when their order status has changed.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'], - ], - 'id' => 'id', - 'name' => 'name', - ], - ], - [ - 'type' => 'checkbox', - 'name' => 'pdf_invoice', - 'values' => [ - 'query' => [ - ['id' => 'on', 'name' => $this->trans('Attach invoice PDF to email.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'], - ], - 'id' => 'id', - 'name' => 'name', - ], - ], - [ - 'type' => 'checkbox', - 'name' => 'pdf_delivery', - 'values' => [ - 'query' => [ - ['id' => 'on', 'name' => $this->trans('Attach delivery slip PDF to email.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'], - ], - 'id' => 'id', - 'name' => 'name', - ], - ], - [ - 'type' => 'checkbox', - 'name' => 'shipped', - 'values' => [ - 'query' => [ - ['id' => 'on', 'name' => $this->trans('Set the order as shipped.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'], - ], - 'id' => 'id', - 'name' => 'name', - ], - ], - [ - 'type' => 'checkbox', - 'name' => 'paid', - 'values' => [ - 'query' => [ - ['id' => 'on', 'name' => $this->trans('Set the order as paid.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'], - ], - 'id' => 'id', - 'name' => 'name', - ], - ], - [ - 'type' => 'checkbox', - 'name' => 'delivery', - 'values' => [ - 'query' => [ - ['id' => 'on', 'name' => $this->trans('Show delivery PDF.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'], - ], - 'id' => 'id', - 'name' => 'name', - ], - ], - [ - 'type' => 'select_template', - 'label' => $this->trans('Template', [], 'Admin.Shopparameters.Feature'), - 'name' => 'template', - 'lang' => true, - 'options' => [ - 'query' => $this->getTemplates(), - 'id' => 'id', - 'name' => 'name', - 'folder' => 'folder', - ], - 'hint' => [ - $this->trans('Only letters, numbers and underscores ("_") are allowed.', [], 'Admin.Shopparameters.Help'), - $this->trans('Email template for both .html and .txt.', [], 'Admin.Shopparameters.Help'), - ], - ], - ], - 'submit' => [ - 'title' => $this->trans('Save', [], 'Admin.Actions'), - ], - ]; - - if (Tools::isSubmit('updateorder_state') || Tools::isSubmit('addorder_state')) { - return $this->renderOrderStatusForm(); - } elseif (Tools::isSubmit('updateorder_return_state') || Tools::isSubmit('addorder_return_state')) { - return $this->renderOrderReturnsForm(); - } else { - return parent::renderForm(); - } - } - - protected function renderOrderStatusForm() - { - if (!($obj = $this->loadObject(true))) { - return; - } - - $this->fields_value = [ - 'logable_on' => $this->getFieldValue($obj, 'logable'), - 'invoice_on' => $this->getFieldValue($obj, 'invoice'), - 'hidden_on' => $this->getFieldValue($obj, 'hidden'), - 'send_email_on' => $this->getFieldValue($obj, 'send_email'), - 'shipped_on' => $this->getFieldValue($obj, 'shipped'), - 'paid_on' => $this->getFieldValue($obj, 'paid'), - 'delivery_on' => $this->getFieldValue($obj, 'delivery'), - 'pdf_delivery_on' => $this->getFieldValue($obj, 'pdf_delivery'), - 'pdf_invoice_on' => $this->getFieldValue($obj, 'pdf_invoice'), - ]; - - if ($this->getFieldValue($obj, 'color') !== false) { - $this->fields_value['color'] = $this->getFieldValue($obj, 'color'); - } else { - $this->fields_value['color'] = '#ffffff'; - } - - return parent::renderForm(); - } - - protected function renderOrderReturnsForm() - { - $helper = $this->initOrderReturnsForm(); - $helper->show_cancel_button = true; - - $back = Tools::safeOutput(Tools::getValue('back', '')); - if (empty($back)) { - $back = self::$currentIndex . '&token=' . $this->token; - } - if (!Validate::isCleanHtml($back)) { - die(Tools::displayError()); - } - - $helper->back_url = $back; - - $this->fields_form[0]['form'] = [ - 'tinymce' => true, - 'legend' => [ - 'title' => $this->trans('Return status', [], 'Admin.Shopparameters.Feature'), - 'icon' => 'icon-time', - ], - 'input' => [ - [ - 'type' => 'text', - 'label' => $this->trans('Status name', [], 'Admin.Shopparameters.Feature'), - 'name' => 'name', - 'lang' => true, - 'required' => true, - 'hint' => [ - $this->trans('Order\'s return status name.', [], 'Admin.Shopparameters.Help'), - $this->trans('Invalid characters: numbers and', [], 'Admin.Shopparameters.Help') . ' !<>,;?=+()@#"�{}_$%:', - ], - ], - [ - 'type' => 'color', - 'label' => $this->trans('Color', [], 'Admin.Shopparameters.Feature'), - 'name' => 'color', - 'hint' => $this->trans('Status will be highlighted in this color. HTML colors only.', [], 'Admin.Shopparameters.Help') . ' "lightblue", "#CC6600")', - ], - ], - 'submit' => [ - 'title' => $this->trans('Save', [], 'Admin.Actions'), - ], - ]; - - return $helper->generateForm($this->fields_form); - } - - protected function getTemplates() - { - $default_path = '../mails/'; - // Mail templates can also be found in the theme folder - $theme_path = '../themes/' . $this->context->shop->theme->getName() . '/mails/'; - - $array = []; - foreach (Language::getLanguages(false) as $language) { - $iso_code = $language['iso_code']; - - // If there is no folder for the given iso_code in /mails or in /themes/[theme_name]/mails, we bypass this language - if (!@filemtime(_PS_ADMIN_DIR_ . '/' . $default_path . $iso_code) && !@filemtime(_PS_ADMIN_DIR_ . '/' . $theme_path . $iso_code)) { - continue; - } - - $theme_templates_dir = _PS_ADMIN_DIR_ . '/' . $theme_path . $iso_code; - $theme_templates = is_dir($theme_templates_dir) ? scandir($theme_templates_dir, SCANDIR_SORT_NONE) : []; - // We merge all available emails in one array - $templates = array_unique(array_merge(scandir(_PS_ADMIN_DIR_ . '/' . $default_path . $iso_code, SCANDIR_SORT_NONE), $theme_templates)); - foreach ($templates as $key => $template) { - if (!strncmp(strrev($template), 'lmth.', 5)) { - $search_result = array_search($template, $theme_templates); - $array[$iso_code][] = [ - 'id' => substr($template, 0, -5), - 'name' => substr($template, 0, -5), - 'folder' => ((!empty($search_result) ? $theme_path : $default_path)), - ]; - } - } - } - - return $array; - } - - public function postProcess() - { - if (Tools::isSubmit($this->table . 'Orderby') || Tools::isSubmit($this->table . 'Orderway')) { - $this->filter = true; - } - - if (Tools::isSubmit('submitAddorder_return_state')) { - if (!$this->access('add')) { - return; - } - - $id_order_return_state = Tools::getValue('id_order_return_state'); - - // Create Object OrderReturnState - $order_return_state = new OrderReturnState((int) $id_order_return_state); - - $order_return_state->color = Tools::getValue('color'); - $order_return_state->name = []; - foreach (Language::getIDs(false) as $id_lang) { - $order_return_state->name[$id_lang] = Tools::getValue('name_' . $id_lang); - } - - // Update object - if (!$order_return_state->save()) { - $this->errors[] = $this->trans('An error has occurred: Can\'t save the current order\'s return status.', [], 'Admin.Orderscustomers.Notification'); - } else { - Tools::redirectAdmin(self::$currentIndex . '&conf=4&token=' . $this->token); - } - } - - if (Tools::isSubmit('submitBulkdeleteorder_return_state')) { - if (!$this->access('delete')) { - return; - } - - $this->className = 'OrderReturnState'; - $this->table = 'order_return_state'; - $this->boxes = Tools::getValue('order_return_stateBox'); - $this->deleted = false; - parent::processBulkDelete(); - } - - if (Tools::isSubmit('deleteorder_return_state')) { - if (!$this->access('delete')) { - return; - } - - $id_order_return_state = Tools::getValue('id_order_return_state'); - - // Create Object OrderReturnState - $order_return_state = new OrderReturnState((int) $id_order_return_state); - - if (!$order_return_state->delete()) { - $this->errors[] = $this->trans('An error has occurred: Can\'t delete the current order\'s return status.', [], 'Admin.Orderscustomers.Notification'); - } else { - Tools::redirectAdmin(self::$currentIndex . '&conf=1&token=' . $this->token); - } - } - - if (Tools::isSubmit('submitAdd' . $this->table)) { - if (!$this->access('add')) { - return; - } - - $langIds = Language::getIDs(false); - $langDefault = (int) Configuration::get('PS_LANG_DEFAULT'); - foreach ($langIds as $id_lang) { - $name = (string) Tools::getValue('name_' . $id_lang); - if (empty($name)) { - $name = (string) Tools::getValue('name_' . $langDefault); - } - - $exists = OrderState::existsLocalizedNameInDatabase( - $name, - (int) $id_lang, - Tools::getIsset('id_order_state') ? (int) Tools::getValue('id_order_state') : null - ); - if ($exists) { - $this->errors[] = $this->trans('This name already exists.', [], 'Admin.Design.Notification'); - break; - } - } - - $this->deleted = false; // Disabling saving historisation - $_POST['invoice'] = (int) Tools::getValue('invoice_on'); - $_POST['logable'] = (int) Tools::getValue('logable_on'); - $_POST['send_email'] = (int) Tools::getValue('send_email_on'); - $_POST['hidden'] = (int) Tools::getValue('hidden_on'); - $_POST['shipped'] = (int) Tools::getValue('shipped_on'); - $_POST['paid'] = (int) Tools::getValue('paid_on'); - $_POST['delivery'] = (int) Tools::getValue('delivery_on'); - $_POST['pdf_delivery'] = (int) Tools::getValue('pdf_delivery_on'); - $_POST['pdf_invoice'] = (int) Tools::getValue('pdf_invoice_on'); - if (!$_POST['send_email']) { - foreach ($langIds as $id_lang) { - $_POST['template_' . $id_lang] = ''; - } - } - - return parent::postProcess(); - } elseif (Tools::isSubmit('delete' . $this->table)) { - if (!$this->access('delete')) { - return; - } - - $order_state = new OrderState(Tools::getValue('id_order_state'), $this->context->language->id); - if (!$order_state->isRemovable()) { - $this->errors[] = $this->trans('For security reasons, you cannot delete default order statuses.', [], 'Admin.Shopparameters.Notification'); - } else { - return parent::postProcess(); - } - } elseif (Tools::isSubmit('submitBulkdelete' . $this->table)) { - if (!$this->access('delete')) { - return; - } - - foreach (Tools::getValue($this->table . 'Box', []) as $selection) { - $order_state = new OrderState((int) $selection, $this->context->language->id); - if (!$order_state->isRemovable()) { - $this->errors[] = $this->trans('For security reasons, you cannot delete default order statuses.', [], 'Admin.Shopparameters.Notification'); - - break; - } - } - - if (!count($this->errors)) { - return parent::postProcess(); - } - } else { - return parent::postProcess(); - } - } - - protected function filterToField($key, $filter) - { - if ($this->table == 'order_state') { - $this->initOrderStatusList(); - } elseif ($this->table == 'order_return_state') { - $this->initOrdersReturnsList(); - } - - return parent::filterToField($key, $filter); - } - - protected function afterImageUpload() - { - parent::afterImageUpload(); - - if (($id_order_state = (int) Tools::getValue('id_order_state')) - && count($_FILES) - && file_exists(_PS_ORDER_STATE_IMG_DIR_ . $id_order_state . '.gif')) { - $current_file = _PS_TMP_IMG_DIR_ . 'order_state_mini_' . $id_order_state . '_' . $this->context->shop->id . '.gif'; - - if (file_exists($current_file)) { - unlink($current_file); - } - } - - return true; - } - - public function ajaxProcessSendEmailOrderState() - { - if ($this->access('edit') != '1') { - echo json_encode(['success' => 0, 'text' => $this->trans('You do not have permission to edit this.', [], 'Admin.Notifications.Error')]); - - return; - } - - $id_order_state = (int) Tools::getValue('id_order_state'); - - $sql = 'UPDATE ' . _DB_PREFIX_ . 'order_state SET `send_email`= NOT `send_email` WHERE id_order_state=' . $id_order_state; - $result = Db::getInstance()->execute($sql); - - if ($result) { - echo json_encode(['success' => 1, 'text' => $this->trans('The status has been updated successfully.', [], 'Admin.Notifications.Success')]); - } else { - echo json_encode(['success' => 0, 'text' => $this->trans('An error occurred while updating the status.', [], 'Admin.Notifications.Error')]); - } - } - - public function ajaxProcessDeliveryOrderState() - { - if ($this->access('edit') != '1') { - echo json_encode(['success' => 0, 'text' => $this->trans('You do not have permission to edit this.', [], 'Admin.Notifications.Error')]); - - return; - } - - $id_order_state = (int) Tools::getValue('id_order_state'); - - $sql = 'UPDATE ' . _DB_PREFIX_ . 'order_state SET `delivery`= NOT `delivery` WHERE id_order_state=' . $id_order_state; - $result = Db::getInstance()->execute($sql); - - if ($result) { - echo json_encode(['success' => 1, 'text' => $this->trans('The status has been updated successfully.', [], 'Admin.Notifications.Success')]); - } else { - echo json_encode(['success' => 0, 'text' => $this->trans('An error occurred while updating the status.', [], 'Admin.Notifications.Error')]); - } - } - - public function ajaxProcessInvoiceOrderState() - { - if ($this->access('edit') != '1') { - echo json_encode(['success' => 0, 'text' => $this->trans('You do not have permission to edit this.', [], 'Admin.Notifications.Error')]); - - return; - } - $id_order_state = (int) Tools::getValue('id_order_state'); - - $sql = 'UPDATE ' . _DB_PREFIX_ . 'order_state SET `invoice`= NOT `invoice` WHERE id_order_state=' . $id_order_state; - $result = Db::getInstance()->execute($sql); - - if ($result) { - echo json_encode(['success' => 1, 'text' => $this->trans('The status has been updated successfully.', [], 'Admin.Notifications.Success')]); - } else { - echo json_encode(['success' => 0, 'text' => $this->trans('An error occurred while updating the status.', [], 'Admin.Notifications.Error')]); - } - } -} diff --git a/controllers/admin/AdminStoresController.php b/controllers/admin/AdminStoresController.php index dbf7007240aef..99dadf130f287 100644 --- a/controllers/admin/AdminStoresController.php +++ b/controllers/admin/AdminStoresController.php @@ -24,6 +24,11 @@ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) */ +use PrestaShop\PrestaShop\Adapter\SymfonyContainer; +use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings; +use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface; +use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration; + /** * @property Store $object */ @@ -414,15 +419,35 @@ protected function postImage($id) { $ret = parent::postImage($id); + /* + * Let's resolve which formats we will use for image generation. + * In new image system, it's multiple formats. In case of legacy, it's only .jpg. + * + * In case of .jpg images, the actual format inside is decided by ImageManager. + */ + $sfContainer = SymfonyContainer::getInstance(); + if ($sfContainer->get(FeatureFlagStateCheckerInterface::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) { + $configuredImageFormats = $sfContainer->get(ImageFormatConfiguration::class)->getGenerationFormats(); + } else { + $configuredImageFormats = ['jpg']; + } + if (($id_store = (int) Tools::getValue('id_store')) && count($_FILES) && file_exists(_PS_STORE_IMG_DIR_ . $id_store . '.jpg')) { $images_types = ImageType::getImagesTypes('stores'); foreach ($images_types as $image_type) { - ImageManager::resize( - _PS_STORE_IMG_DIR_ . $id_store . '.jpg', - _PS_STORE_IMG_DIR_ . $id_store . '-' . stripslashes($image_type['name']) . '.jpg', - (int) $image_type['width'], - (int) $image_type['height'] - ); + foreach ($configuredImageFormats as $imageFormat) { + // For JPG images, we let Imagemanager decide what to do and choose between JPG/PNG. + // For webp and avif extensions, we want it to follow our command and ignore the original format. + $forceFormat = ($imageFormat !== 'jpg'); + ImageManager::resize( + _PS_STORE_IMG_DIR_ . $id_store . '.jpg', + _PS_STORE_IMG_DIR_ . $id_store . '-' . stripslashes($image_type['name']) . '.' . $imageFormat, + (int) $image_type['width'], + (int) $image_type['height'], + $imageFormat, + $forceFormat + ); + } } } diff --git a/controllers/admin/AdminSuppliersController.php b/controllers/admin/AdminSuppliersController.php index 8c03736ccd74c..3ddf04b211dd2 100644 --- a/controllers/admin/AdminSuppliersController.php +++ b/controllers/admin/AdminSuppliersController.php @@ -98,7 +98,6 @@ public function initPageHeaderToolbar() */ public function renderForm() { - // loads current warehouse if (!($obj = $this->loadObject(true))) { return; } @@ -531,8 +530,6 @@ public function postProcess() } elseif (Tools::isSubmit('delete' . $this->table)) { if (!($obj = $this->loadObject(true))) { return; - } elseif (SupplyOrder::supplierHasPendingOrders($obj->id)) { - $this->errors[] = $this->trans('It is not possible to delete a supplier if there are pending supplier orders.', [], 'Admin.Catalog.Notification'); } else { //delete all product_supplier linked to this supplier Db::getInstance()->execute('DELETE FROM `' . _DB_PREFIX_ . 'product_supplier` WHERE `id_supplier`=' . (int) $obj->id); diff --git a/controllers/admin/AdminTaxRulesGroupController.php b/controllers/admin/AdminTaxRulesGroupController.php index e1feb1487c4d1..5d43a6d22c2b5 100644 --- a/controllers/admin/AdminTaxRulesGroupController.php +++ b/controllers/admin/AdminTaxRulesGroupController.php @@ -153,7 +153,7 @@ public function initRulesList($id_group) LEFT JOIN `' . _DB_PREFIX_ . 'state` s ON (a.`id_state` = s.`id_state`) LEFT JOIN `' . _DB_PREFIX_ . 'tax` t - ON (a.`id_tax` = t.`id_tax`)'; + ON (a.`id_tax` = t.`id_tax` AND t.active = 1)'; $this->_where = 'AND `id_tax_rules_group` = ' . (int) $id_group; $this->_use_found_rows = false; diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index 830f8d2062104..7130ff1cd8f81 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -806,6 +806,9 @@ protected function findAndWriteTranslationsIntoFile($file_name, $files, $theme_n $array_check_duplicate = []; } + $module_name_lowercase = strtolower($module_name); + $theme_name_lowercase = strtolower((string) $theme_name); + foreach ($files as $file) { if (preg_match('/^(.*)\.(tpl|php)$/', $file) && Tools::file_exists_cache($dir . $file) && !in_array($file, self::$ignore_folder)) { // Get content for this file @@ -817,16 +820,19 @@ protected function findAndWriteTranslationsIntoFile($file_name, $files, $theme_n // Parse this content $matches = $this->userParseFile($content, $this->type_selected, $type_file, $module_name); + unset($content); + // Write each translation on its module file - $template_name = substr(basename($file), 0, -4); + $template_name = strtolower(substr(basename($file), 0, -4)); foreach ($matches as $key) { + $key_md5 = md5($key); if ($theme_name) { - $post_key = md5(strtolower($module_name) . '_' . strtolower($theme_name) . '_' . strtolower($template_name) . '_' . md5($key)); - $pattern = '\'<{' . strtolower($module_name) . '}' . strtolower($theme_name) . '>' . strtolower($template_name) . '_' . md5($key) . '\''; + $post_key = md5($module_name_lowercase . '_' . $theme_name_lowercase . '_' . $template_name . '_' . $key_md5); + $pattern = '\'<{' . $module_name_lowercase . '}' . $theme_name_lowercase . '>' . $template_name . '_' . $key_md5 . '\''; } else { - $post_key = md5(strtolower($module_name) . '_' . strtolower($template_name) . '_' . md5($key)); - $pattern = '\'<{' . strtolower($module_name) . '}prestashop>' . strtolower($template_name) . '_' . md5($key) . '\''; + $post_key = md5($module_name_lowercase . '_' . $template_name . '_' . $key_md5); + $pattern = '\'<{' . $module_name_lowercase . '}prestashop>' . $template_name . '_' . $key_md5 . '\''; } if (array_key_exists($post_key, $_POST) && !in_array($pattern, $array_check_duplicate)) { @@ -913,12 +919,14 @@ protected function findAndFillTranslations($files, $theme_name, $module_name, $d // Parse this content $matches = $this->userParseFile($content, $this->type_selected, $type_file, $module_name); + unset($content); + // Write each translation on its module file $template_name = substr(basename($file), 0, -4); foreach ($matches as $key) { $md5_key = md5($key); - $module_key = '<{' . Tools::strtolower($module_name) . '}' . strtolower($theme_name) . '>' . Tools::strtolower($template_name) . '_' . $md5_key; + $module_key = '<{' . Tools::strtolower($module_name) . '}' . strtolower((string) $theme_name) . '>' . Tools::strtolower($template_name) . '_' . $md5_key; $default_key = '<{' . Tools::strtolower($module_name) . '}prestashop>' . Tools::strtolower($template_name) . '_' . $md5_key; // to avoid duplicate entry if (!in_array($module_key, $array_check_duplicate)) { @@ -3113,7 +3121,7 @@ public static function getEmailHTML($email) $email_file = _PS_ROOT_DIR_ . $email; } - if (file_exists($email_file)) { + if (strpos(realpath($email_file), _PS_ROOT_DIR_) === 0 && file_exists($email_file)) { $email_html = file_get_contents($email_file); } else { $email_html = ''; diff --git a/controllers/admin/DummyAdminController.php b/controllers/admin/DummyAdminController.php index 9b841a857001f..6ea1b1a2a7d28 100644 --- a/controllers/admin/DummyAdminController.php +++ b/controllers/admin/DummyAdminController.php @@ -92,10 +92,7 @@ protected function redirect() return ''; } - /** - * @return ContainerInterface|null - */ - protected function buildContainer() + protected function buildContainer(): ContainerInterface { return SymfonyContainer::getInstance(); } diff --git a/controllers/front/AttachmentController.php b/controllers/front/AttachmentController.php index c13d177381391..92d810bb918e5 100644 --- a/controllers/front/AttachmentController.php +++ b/controllers/front/AttachmentController.php @@ -50,7 +50,7 @@ public function postProcess() /** * @see http://ca2.php.net/manual/en/function.readfile.php#54295 */ - public function readfileChunked($filename, $retbytes = true) + public function readfileChunked(string $filename, bool $retbytes = true) { // how many bytes per chunk $chunksize = 1 * (1024 * 1024); diff --git a/controllers/front/CartController.php b/controllers/front/CartController.php index 7d3820356907a..980df8983934b 100644 --- a/controllers/front/CartController.php +++ b/controllers/front/CartController.php @@ -56,7 +56,7 @@ class CartControllerCore extends FrontController * * @param string $canonicalURL */ - public function canonicalRedirection($canonicalURL = '') + public function canonicalRedirection(string $canonicalURL = '') { } @@ -334,13 +334,13 @@ protected function processDeleteProductInCart() 'id_address_delivery' => (int) $this->id_address_delivery, ]; + // An array [module_name => module_output] will be returned (no effect) Hook::exec('actionObjectProductInCartDeleteBefore', $data, null, true); if ($this->context->cart->deleteProduct( $this->id_product, $this->id_product_attribute, - $this->customization_id, - $this->id_address_delivery + $this->customization_id )) { Hook::exec('actionObjectProductInCartDeleteAfter', $data); @@ -495,7 +495,7 @@ protected function processChangeProductInCart() $this->id_product_attribute, $this->customization_id, Tools::getValue('op', 'up'), - $this->id_address_delivery, + 0, null, true, true @@ -538,7 +538,7 @@ protected function processChangeProductInCart() * * @return bool */ - public function productInCartMatchesCriteria($productInCart) + public function productInCartMatchesCriteria(array $productInCart) { return ( !isset($this->id_product_attribute) || @@ -582,7 +582,7 @@ public function getTemplateVarPage() * * @return bool */ - protected function shouldAvailabilityErrorBeRaised($product, $qtyToCheck) + protected function shouldAvailabilityErrorBeRaised(Product $product, int $qtyToCheck) { if (($this->id_product_attribute)) { return !Product::isAvailableWhenOutOfStock($product->out_of_stock) diff --git a/controllers/front/CmsController.php b/controllers/front/CmsController.php index 774eeae6d7745..3b2d18d2d6e85 100644 --- a/controllers/front/CmsController.php +++ b/controllers/front/CmsController.php @@ -45,7 +45,7 @@ class CmsControllerCore extends FrontController /** @var bool */ public $ssl = false; - public function canonicalRedirection($canonicalURL = '') + public function canonicalRedirection(string $canonicalURL = '') { if (Validate::isLoadedObject($this->cms) && ($canonicalURL = $this->context->link->getCMSLink($this->cms, $this->cms->link_rewrite, $this->ssl))) { parent::canonicalRedirection($canonicalURL); @@ -102,15 +102,16 @@ public function initContent() if ($this->assignCase == self::CMS_CASE_PAGE) { $cmsVar = $this->objectPresenter->present($this->cms); + // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter $filteredCmsContent = Hook::exec( 'filterCmsContent', ['object' => $cmsVar], - $id_module = null, - $array_return = false, - $check_exceptions = true, - $use_push = false, - $id_shop = null, - $chain = true + null, + false, + true, + false, + null, + true ); if (!empty($filteredCmsContent['object'])) { $cmsVar = $filteredCmsContent['object']; @@ -131,15 +132,16 @@ public function initContent() } elseif ($this->assignCase == self::CMS_CASE_CATEGORY) { $cmsCategoryVar = $this->getTemplateVarCategoryCms(); + // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter $filteredCmsCategoryContent = Hook::exec( 'filterCmsCategoryContent', ['object' => $cmsCategoryVar], - $id_module = null, - $array_return = false, - $check_exceptions = true, - $use_push = false, - $id_shop = null, - $chain = true + null, + false, + true, + false, + null, + true ); if (!empty($filteredCmsCategoryContent['object'])) { $cmsCategoryVar = $filteredCmsCategoryContent['object']; diff --git a/controllers/front/DiscountController.php b/controllers/front/DiscountController.php index 82c6c0633fd18..bf982fea7d8a8 100644 --- a/controllers/front/DiscountController.php +++ b/controllers/front/DiscountController.php @@ -104,7 +104,7 @@ public function getBreadcrumbLinks() * * @return mixed */ - protected function getCombinableVoucherTranslation($voucher) + protected function getCombinableVoucherTranslation(array $voucher) { if ($voucher['cart_rule_restriction']) { $combinableVoucherTranslation = $this->trans('No', [], 'Shop.Theme.Global'); @@ -116,13 +116,15 @@ protected function getCombinableVoucherTranslation($voucher) } /** + * Formats a value of a voucher with fixed reduction + * * @param bool $hasTaxIncluded * @param float $amount * @param int $currencyId * * @return string */ - protected function formatReductionAmount($hasTaxIncluded, $amount, $currencyId) + protected function formatReductionAmount(bool $hasTaxIncluded, float $amount, int $currencyId) { if ($hasTaxIncluded) { $taxTranslation = $this->trans('Tax included', [], 'Shop.Theme.Checkout'); @@ -137,32 +139,36 @@ protected function formatReductionAmount($hasTaxIncluded, $amount, $currencyId) } /** + * Formats a value of a voucher with percentage reduction + * * @param float $percentage * * @return string */ - protected function formatReductionInPercentage($percentage) + protected function formatReductionInPercentage(float $percentage) { - return sprintf('%s%%', $percentage); + return sprintf('%s%%', $this->context->getCurrentLocale()->formatNumber($percentage)); } /** + * Formats all reductions and benefits of a voucher. (One voucher can provide a discount and gift at the same time.) + * * @param array $voucher * * @return array */ - protected function accumulateCartRuleValue($voucher) + protected function accumulateCartRuleValue(array $voucher) { $cartRuleValue = []; if ($voucher['reduction_percent'] > 0) { - $cartRuleValue[] = $this->formatReductionInPercentage($voucher['reduction_percent']); + $cartRuleValue[] = $this->formatReductionInPercentage((float) $voucher['reduction_percent']); } if ($voucher['reduction_amount'] > 0) { $cartRuleValue[] = $this->formatReductionAmount( - $voucher['reduction_tax'], - $voucher['reduction_amount'], + (bool) $voucher['reduction_tax'], + (float) $voucher['reduction_amount'], $voucher['reduction_currency'] ); } @@ -182,6 +188,8 @@ protected function accumulateCartRuleValue($voucher) } /** + * Prepares a single row of voucher table to show it to customer. + * * @param array $voucher * * @return array @@ -201,8 +209,11 @@ protected function buildCartRuleFromVoucher(array $voucher): array $voucher['voucher_cumulable'] = $this->getCombinableVoucherTranslation($voucher); + // Get all benefits of this voucher into array (discount, gift, free shipping etc.) $cartRuleValues = $this->accumulateCartRuleValue($voucher); + // And combine them into a string + // If for some magical reason the voucher has no benefit (should not be achievable in BO), we display a dash if (0 === count($cartRuleValues)) { $voucher['value'] = '-'; } else { diff --git a/controllers/front/GetFileController.php b/controllers/front/GetFileController.php index c0588e3cd9b1a..7fcc88e147b82 100644 --- a/controllers/front/GetFileController.php +++ b/controllers/front/GetFileController.php @@ -336,7 +336,7 @@ private function getMimeType(string $file, string $filename): string * * @param string $msg */ - protected function displayCustomError($msg) + protected function displayCustomError(string $msg) { $translations = [ 'Invalid key.' => $this->trans('Invalid key.', [], 'Shop.Notifications.Error'), diff --git a/controllers/front/HistoryController.php b/controllers/front/HistoryController.php index 427fa1aa4a44c..b1d8c4801a29e 100644 --- a/controllers/front/HistoryController.php +++ b/controllers/front/HistoryController.php @@ -85,7 +85,7 @@ public function getTemplateVarOrders() * * @return string */ - public static function getUrlToInvoice($order, $context) + public static function getUrlToInvoice(Order $order, Context $context) { $url_to_invoice = ''; @@ -109,7 +109,7 @@ public static function getUrlToInvoice($order, $context) * * @return string */ - public static function getUrlToReorder($id_order, $context) + public static function getUrlToReorder(int $id_order, Context $context) { $url_to_reorder = ''; if (!(bool) Configuration::get('PS_DISALLOW_HISTORY_REORDERING')) { diff --git a/controllers/front/OrderConfirmationController.php b/controllers/front/OrderConfirmationController.php index 8953b8ab0e791..59abfae0b8606 100644 --- a/controllers/front/OrderConfirmationController.php +++ b/controllers/front/OrderConfirmationController.php @@ -232,19 +232,20 @@ public function initContent() /** * Execute the hook displayPaymentReturn. */ - public function displayPaymentReturn($order) + public function displayPaymentReturn(Order $order) { if (!Validate::isUnsignedId($this->id_module)) { return false; } + // Hook called only for the module concerned return Hook::exec('displayPaymentReturn', ['order' => $order], $this->id_module); } /** * Execute the hook displayOrderConfirmation. */ - public function displayOrderConfirmation($order) + public function displayOrderConfirmation(Order $order) { return Hook::exec('displayOrderConfirmation', ['order' => $order]); } diff --git a/controllers/front/OrderReturnController.php b/controllers/front/OrderReturnController.php index 3c266e1aaaf8b..125c842ff6966 100644 --- a/controllers/front/OrderReturnController.php +++ b/controllers/front/OrderReturnController.php @@ -92,7 +92,7 @@ public function initContent() $this->setTemplate('customer/order-return'); } - public function getTemplateVarOrderReturn($orderReturn) + public function getTemplateVarOrderReturn(OrderReturn $orderReturn) { $orderReturns = OrderReturn::getOrdersReturn($orderReturn->id_customer, $orderReturn->id_order, false, null, $orderReturn->id); @@ -108,7 +108,7 @@ public function getTemplateVarOrderReturn($orderReturn) return $orderReturnPresenter->present(array_shift($orderReturns)); } - public function getTemplateVarProducts($order_return_id, $order) + public function getTemplateVarProducts(int $order_return_id, Order $order) { $products = []; $return_products = OrderReturn::getOrdersReturnProducts((int) $order_return_id, $order); diff --git a/controllers/front/PageNotFoundController.php b/controllers/front/PageNotFoundController.php index 4f9b81f6a87a9..e3b2390870c13 100644 --- a/controllers/front/PageNotFoundController.php +++ b/controllers/front/PageNotFoundController.php @@ -46,7 +46,7 @@ public function initContent() $this->setTemplate('errors/404'); } - protected function canonicalRedirection($canonical_url = '') + protected function canonicalRedirection(string $canonical_url = '') { // 404 - no need to redirect to the canonical url } diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index 198a8bf98a8d7..43bcecc515383 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -74,7 +74,7 @@ class ProductControllerCore extends ProductPresentingFrontControllerCore */ protected $isPreview = false; - public function canonicalRedirection($canonical_url = '') + public function canonicalRedirection(string $canonical_url = '') { // This is there to prevent error, because this function is also called // in parent front controller before we have even loaded our data. @@ -423,6 +423,7 @@ public function initContent() $product_for_template = $this->getTemplateVarProduct(); + // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter $filteredProduct = Hook::exec( 'filterProductContent', ['object' => $product_for_template], @@ -437,11 +438,22 @@ public function initContent() $product_for_template = $filteredProduct['object']; } - $manufacturerPresenter = new ManufacturerPresenter($this->context->link); - $productManufacturer = $manufacturerPresenter->present( - new Manufacturer((int) $this->product->id_manufacturer, $this->context->language->id), - $this->context->language - ); + // Prepare information about product manufacturer + $productManufacturer = null; + $manufacturerImageUrl = null; + $productBrandUrl = null; + + if (!empty($this->product->id_manufacturer)) { + $manufacturerPresenter = new ManufacturerPresenter($this->context->link); + $productManufacturer = $manufacturerPresenter->present( + new Manufacturer((int) $this->product->id_manufacturer, $this->context->language->id), + $this->context->language + ); + + // These two variables are deprecated are kept just for backward compatibility and will be removed in v10 + $manufacturerImageUrl = $productManufacturer['image']['small']['url']; + $productBrandUrl = $productManufacturer['url']; + } $this->context->smarty->assign([ 'priceDisplay' => $priceDisplay, @@ -452,8 +464,8 @@ public function initContent() 'product' => $product_for_template, 'displayUnitPrice' => !empty($this->product->unity) && $this->product->unit_price > 0.000000, 'product_manufacturer' => $productManufacturer, - 'manufacturer_image_url' => $productManufacturer['image']['small']['url'], - 'product_brand_url' => $productManufacturer['url'], + 'manufacturer_image_url' => $manufacturerImageUrl, + 'product_brand_url' => $productBrandUrl, ]); // Assign attribute groups to the template @@ -601,7 +613,7 @@ protected function assignPriceAndTax() /** * Assign template vars related to attribute groups and colors. */ - protected function assignAttributesGroups($product_for_template = null) + protected function assignAttributesGroups(ProductLazyArray|null $product_for_template = null) { $colors = []; $groups = []; @@ -876,7 +888,7 @@ protected function assignCategory() } } - protected function transformDescriptionWithImg($desc) + protected function transformDescriptionWithImg(string $desc) { $reg = '/\[img\-([0-9]+)\-(left|right)\-([a-zA-Z0-9-_]+)\]/'; while (preg_match($reg, $desc, $matches)) { @@ -966,7 +978,7 @@ protected function textRecord() * * @return array */ - protected function formatQuantityDiscounts($specific_prices, $price, $tax_rate, $ecotax_amount) + protected function formatQuantityDiscounts(array $specific_prices, float $price, float $tax_rate, float $ecotax_amount) { $priceCalculationMethod = Group::getPriceDisplayMethod(Group::getCurrent()->id); $isTaxIncluded = false; @@ -1058,7 +1070,7 @@ private function getIdProductAttributeByGroupOrRequestOrDefault() * * @return int */ - protected function tryToGetAvailableIdProductAttribute($checkedIdProductAttribute) + protected function tryToGetAvailableIdProductAttribute(int $checkedIdProductAttribute) { if (!Configuration::get('PS_DISP_UNAVAILABLE_ATTR')) { $productCombinations = $this->product->getAttributeCombinations(); @@ -1220,7 +1232,7 @@ public function getTemplateVarProduct() * * @return int */ - protected function getProductMinimalQuantity($product) + protected function getProductMinimalQuantity(ProductLazyArray|array $product) { $minimal_quantity = 1; @@ -1272,7 +1284,7 @@ protected function getProductEcotax(array $product): float * * @return ProductController|null */ - public function findProductCombinationById($combinationId) + public function findProductCombinationById(int $combinationId) { $combinations = $this->product->getAttributesGroups($this->context->language->id, $combinationId); @@ -1288,7 +1300,7 @@ public function findProductCombinationById($combinationId) * * @return int */ - protected function getRequiredQuantity($product) + protected function getRequiredQuantity(array $product) { $requiredQuantity = (int) Tools::getValue('quantity_wanted', $this->getProductMinimalQuantity($product)); if ($requiredQuantity < $product['minimal_quantity']) { @@ -1499,7 +1511,7 @@ private function getProductPageTitle(array $meta = null) * * @return bool */ - protected function isValidCombination($productAttributeId, $productId) + protected function isValidCombination(int $productAttributeId, int $productId) { if ($productAttributeId > 0 && $productId > 0) { $combination = new Combination($productAttributeId); diff --git a/controllers/front/SitemapController.php b/controllers/front/SitemapController.php index 93c6d2596cf34..7c87282d5c9f9 100644 --- a/controllers/front/SitemapController.php +++ b/controllers/front/SitemapController.php @@ -60,13 +60,7 @@ public function initContent() */ Hook::exec( 'actionModifyFrontendSitemap', - ['urls' => &$sitemapUrls], - null, - false, - true, - false, - null, - true + ['urls' => &$sitemapUrls] ); /* @@ -107,11 +101,14 @@ protected function getPagesLinks() $cms = CMSCategory::getRecurseCategory($this->context->language->id, 1, 1, 1); $links = $this->getCmsTree($cms); - $links[] = [ - 'id' => 'stores-page', - 'label' => $this->trans('Our stores', [], 'Shop.Theme.Global'), - 'url' => $this->context->link->getPageLink('stores'), - ]; + // We hide stores page, if there is no page configured + if (Store::atLeastOneStoreExists()) { + $links[] = [ + 'id' => 'stores-page', + 'label' => $this->trans('Our stores', [], 'Shop.Theme.Global'), + 'url' => $this->context->link->getPageLink('stores'), + ]; + } $links[] = [ 'id' => 'contact-page', diff --git a/controllers/front/StoresController.php b/controllers/front/StoresController.php index 1ac0d1817b9ee..7e79823adc800 100644 --- a/controllers/front/StoresController.php +++ b/controllers/front/StoresController.php @@ -33,117 +33,6 @@ class StoresControllerCore extends FrontController /** @var StorePresenter */ protected $storePresenter; - /** - * Get formatted string address. - * - * @param array $store - * - * @return string - */ - protected function processStoreAddress($store) - { - $ignore_field = [ - 'firstname', - 'lastname', - ]; - - $out_datas = []; - - $address_datas = AddressFormat::getOrderedAddressFields($store['id_country'], false, true); - $state = (isset($store['id_state'])) ? new State($store['id_state']) : null; - - foreach ($address_datas as $data_line) { - $data_fields = explode(' ', $data_line); - $addr_out = []; - - $data_fields_mod = false; - foreach ($data_fields as $field_item) { - $field_item = trim($field_item); - if (!in_array($field_item, $ignore_field) && !empty($store[$field_item])) { - $addr_out[] = ($field_item == 'city' && $state && !empty($state->iso_code)) ? - $store[$field_item] . ', ' . $state->iso_code : $store[$field_item]; - $data_fields_mod = true; - } - } - if ($data_fields_mod) { - $out_datas[] = implode(' ', $addr_out); - } - } - - $out = implode('
', $out_datas); - - return $out; - } - - public function getStoresForXml() - { - $distance_unit = Configuration::get('PS_DISTANCE_UNIT'); - if (!in_array($distance_unit, ['km', 'mi'])) { - $distance_unit = 'km'; - } - - $distance = (int) Tools::getValue('radius', 100); - $multiplicator = ($distance_unit == 'km' ? 6371 : 3959); - - $langId = (int) Tools::getValue('lang', Configuration::get('PS_LANG_DEFAULT')); - - $stores = Db::getInstance()->executeS(' - SELECT s.*, sl.*, cl.name country, st.iso_code state, - (' . (int) $multiplicator . ' - * acos( - cos(radians(' . (float) Tools::getValue('latitude') . ')) - * cos(radians(latitude)) - * cos(radians(longitude) - radians(' . (float) Tools::getValue('longitude') . ')) - + sin(radians(' . (float) Tools::getValue('latitude') . ')) - * sin(radians(latitude)) - ) - ) distance, - cl.id_country id_country - FROM ' . _DB_PREFIX_ . 'store s - LEFT JOIN ' . _DB_PREFIX_ . 'country_lang cl ON (cl.id_country = s.id_country AND cl.id_lang = ' . (int) $langId . ') - LEFT JOIN ' . _DB_PREFIX_ . 'store_lang sl ON (sl.id_store = s.id_store AND sl.id_lang = ' . (int) $langId . ') - LEFT JOIN ' . _DB_PREFIX_ . 'state st ON (st.id_state = s.id_state) - WHERE s.active = 1 - HAVING distance < ' . (int) $distance . ' - ORDER BY distance ASC - LIMIT 0,20'); - - return $stores; - } - - /** - * Display the Xml for showing the nodes in the google map. - */ - protected function displayAjax() - { - $stores = $this->getStoresForXml(); - $parnode = new SimpleXMLElement('
', ' ', $address))); - $newnode->addAttribute('address', $address); - $newnode->addAttribute('hours', trim($store['hours'])); - $newnode->addAttribute('phone', $store['phone']); - $newnode->addAttribute('fax', $store['fax']); - $newnode->addAttribute('note', $store['note']); - $newnode->addAttribute('id_store', (string) (int) $store['id_store']); - $newnode->addAttribute('has_store_picture', (string) file_exists(_PS_STORE_IMG_DIR_ . (int) $store['id_store'] . '.jpg')); - $newnode->addAttribute('lat', (string) (float) $store['latitude']); - $newnode->addAttribute('lng', (string) (float) $store['longitude']); - if (isset($store['distance'])) { - $newnode->addAttribute('distance', (string) (int) $store['distance']); - } - } - - header('Content-type: text/xml'); - - $this->ajaxRender($parnode->asXML()); - } - /** * Initialize stores controller. * @@ -172,15 +61,23 @@ public function initContent() $distance_unit = 'km'; } - $this->context->smarty->assign([ - 'mediumSize' => Image::getSize(ImageType::getFormattedName('medium')), - 'searchUrl' => $this->context->link->getPageLink('stores'), - 'distance_unit' => $distance_unit, - 'stores' => $this->getTemplateVarStores(), - ]); - - parent::initContent(); - $this->setTemplate('cms/stores'); + // Load stores and present them + $stores = $this->getTemplateVarStores(); + + // If no stores are configured, we hide this page + if (!empty($stores)) { + $this->context->smarty->assign([ + 'mediumSize' => Image::getSize(ImageType::getFormattedName('medium')), + 'searchUrl' => $this->context->link->getPageLink('stores'), + 'distance_unit' => $distance_unit, + 'stores' => $stores, + ]); + parent::initContent(); + $this->setTemplate('cms/stores'); + } else { + $this->redirect_after = '404'; + $this->redirect(); + } } public function getTemplateVarStores() diff --git a/controllers/front/listing/CategoryController.php b/controllers/front/listing/CategoryController.php index 7915a9568192b..be9834d89204d 100644 --- a/controllers/front/listing/CategoryController.php +++ b/controllers/front/listing/CategoryController.php @@ -25,6 +25,7 @@ */ use PrestaShop\PrestaShop\Adapter\Category\CategoryProductSearchProvider; use PrestaShop\PrestaShop\Adapter\Image\ImageRetriever; +use PrestaShop\PrestaShop\Adapter\Presenter\Category\CategoryPresenter; use PrestaShop\PrestaShop\Core\Product\Search\ProductSearchQuery; use PrestaShop\PrestaShop\Core\Product\Search\SortOrder; @@ -44,7 +45,10 @@ class CategoryControllerCore extends ProductListingFrontController */ protected $category; - public function canonicalRedirection($canonicalURL = '') + /** @var CategoryPresenter */ + protected $categoryPresenter; + + public function canonicalRedirection(string $canonicalURL = '') { if (Validate::isLoadedObject($this->category)) { parent::canonicalRedirection($this->context->link->getCategoryLink($this->category)); @@ -98,24 +102,11 @@ public function init() return; } - $categoryVar = $this->getTemplateVarCategory(); - - $filteredCategory = Hook::exec( - 'filterCategoryContent', - ['object' => $categoryVar], - $id_module = null, - $array_return = false, - $check_exceptions = true, - $use_push = false, - $id_shop = null, - $chain = true - ); - if (!empty($filteredCategory['object'])) { - $categoryVar = $filteredCategory['object']; - } + // Initialize presenter, we will use it for all cases + $this->categoryPresenter = new CategoryPresenter($this->context->link); $this->context->smarty->assign([ - 'category' => $categoryVar, + 'category' => $this->getTemplateVarCategory(), 'subcategories' => $this->getTemplateVarSubCategories(), ]); } @@ -201,38 +192,46 @@ protected function getDefaultProductSearchProvider() protected function getTemplateVarCategory() { - $category = $this->objectPresenter->present($this->category); - $category['image'] = $this->getImage( + $categoryVar = $this->categoryPresenter->present( $this->category, - $this->category->id_image + $this->context->language + ); + + $filteredCategory = Hook::exec( + 'filterCategoryContent', + ['object' => $categoryVar], + $id_module = null, + $array_return = false, + $check_exceptions = true, + $use_push = false, + $id_shop = null, + $chain = true ); + if (!empty($filteredCategory['object'])) { + $categoryVar = $filteredCategory['object']; + } - return $category; + return $categoryVar; } protected function getTemplateVarSubCategories() { - return array_map(function (array $category) { - $object = new Category( - $category['id_category'], - $this->context->language->id - ); + $subcategories = $this->category->getSubCategories($this->context->language->id); - $category['image'] = $this->getImage( - $object, - $object->id_image - ); - - $category['url'] = $this->context->link->getCategoryLink( - $category['id_category'], - $category['link_rewrite'] + foreach ($subcategories as &$subcategory) { + $subcategory = $this->categoryPresenter->present( + $subcategory, + $this->context->language ); + } - return $category; - }, $this->category->getSubCategories($this->context->language->id)); + return $subcategories; } - protected function getImage($object, $id_image) + /** + * @deprecated since 9.0.0 and will be removed in 10.0.0 + */ + protected function getImage(Category $object, int $id_image) { $retriever = new ImageRetriever( $this->context->link diff --git a/controllers/front/listing/ManufacturerController.php b/controllers/front/listing/ManufacturerController.php index b64708c381448..d23188dae0e15 100644 --- a/controllers/front/listing/ManufacturerController.php +++ b/controllers/front/listing/ManufacturerController.php @@ -40,7 +40,7 @@ class ManufacturerControllerCore extends ProductListingFrontController /** @var ManufacturerPresenter */ protected $manufacturerPresenter; - public function canonicalRedirection($canonicalURL = '') + public function canonicalRedirection(string $canonicalURL = '') { if (Validate::isLoadedObject($this->manufacturer)) { parent::canonicalRedirection($this->context->link->getManufacturerLink($this->manufacturer)); @@ -167,6 +167,7 @@ protected function assignManufacturer() $this->context->language ); + // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter $filteredManufacturer = Hook::exec( 'filterManufacturerContent', ['object' => $manufacturerVar], @@ -195,6 +196,7 @@ protected function assignAll() if (!empty($manufacturersVar)) { foreach ($manufacturersVar as $k => $manufacturer) { + // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter $filteredManufacturer = Hook::exec( 'filterManufacturerContent', ['object' => $manufacturer], diff --git a/controllers/front/listing/SupplierController.php b/controllers/front/listing/SupplierController.php index 61fe5e75f3403..d25e2f22b3408 100644 --- a/controllers/front/listing/SupplierController.php +++ b/controllers/front/listing/SupplierController.php @@ -23,22 +23,24 @@ * @copyright Since 2007 PrestaShop SA and Contributors * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) */ +use PrestaShop\PrestaShop\Adapter\Presenter\Supplier\SupplierPresenter; use PrestaShop\PrestaShop\Adapter\Supplier\SupplierProductSearchProvider; use PrestaShop\PrestaShop\Core\Product\Search\ProductSearchQuery; use PrestaShop\PrestaShop\Core\Product\Search\SortOrder; class SupplierControllerCore extends ProductListingFrontController { - /** - * @var string - */ + /** @var string */ public $php_self = 'supplier'; /** @var Supplier|null */ protected $supplier; protected $label; - public function canonicalRedirection($canonicalURL = '') + /** @var SupplierPresenter */ + protected $supplierPresenter; + + public function canonicalRedirection(string $canonicalURL = '') { if (Validate::isLoadedObject($this->supplier)) { parent::canonicalRedirection($this->context->link->getSupplierLink($this->supplier)); @@ -79,6 +81,9 @@ public function init() } } + // Initialize presenter, we will use it for all cases + $this->supplierPresenter = new SupplierPresenter($this->context->link); + parent::init(); } @@ -155,17 +160,21 @@ protected function getDefaultProductSearchProvider() */ protected function assignSupplier() { - $supplierVar = $this->objectPresenter->present($this->supplier); + $supplierVar = $this->supplierPresenter->present( + $this->supplier, + $this->context->language + ); + // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter $filteredSupplier = Hook::exec( 'filterSupplierContent', ['object' => $supplierVar], - $id_module = null, - $array_return = false, - $check_exceptions = true, - $use_push = false, - $id_shop = null, - $chain = true + null, + false, + true, + false, + null, + true ); if (!empty($filteredSupplier['object'])) { $supplierVar = $filteredSupplier['object']; @@ -185,15 +194,16 @@ protected function assignAll() if (!empty($suppliersVar)) { foreach ($suppliersVar as $k => $supplier) { + // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter $filteredSupplier = Hook::exec( 'filterSupplierContent', ['object' => $supplier], - $id_module = null, - $array_return = false, - $check_exceptions = true, - $use_push = false, - $id_shop = null, - $chain = true + null, + false, + true, + false, + null, + true ); if (!empty($filteredSupplier['object'])) { $suppliersVar[$k] = $filteredSupplier['object']; @@ -202,26 +212,22 @@ protected function assignAll() } $this->context->smarty->assign([ - 'brands' => $suppliersVar, + 'suppliers' => $suppliersVar, ]); } public function getTemplateVarSuppliers() { $suppliers = Supplier::getSuppliers(true, $this->context->language->id, true); - $suppliers_for_display = []; - - foreach ($suppliers as $supplier) { - $suppliers_for_display[$supplier['id_supplier']] = $supplier; - $suppliers_for_display[$supplier['id_supplier']]['text'] = $supplier['description']; - $suppliers_for_display[$supplier['id_supplier']]['image'] = $this->context->link->getSupplierImageLink($supplier['id_supplier'], 'small_default'); - $suppliers_for_display[$supplier['id_supplier']]['url'] = $this->context->link->getSupplierLink($supplier['id_supplier']); - $suppliers_for_display[$supplier['id_supplier']]['nb_products'] = $supplier['nb_products'] > 1 - ? $this->trans('%number% products', ['%number%' => $supplier['nb_products']], 'Shop.Theme.Catalog') - : $this->trans('%number% product', ['%number%' => $supplier['nb_products']], 'Shop.Theme.Catalog'); + + foreach ($suppliers as &$supplier) { + $supplier = $this->supplierPresenter->present( + $supplier, + $this->context->language + ); } - return $suppliers_for_display; + return $suppliers; } public function getListingLabel() @@ -232,9 +238,8 @@ public function getListingLabel() public function getBreadcrumbLinks() { $breadcrumb = parent::getBreadcrumbLinks(); - $breadcrumb['links'][] = [ - 'title' => $this->trans('All suppliers', [], 'Shop.Theme.Catalog'), + 'title' => $this->trans('Suppliers', [], 'Shop.Theme.Catalog'), 'url' => $this->context->link->getPageLink('supplier', true), ]; diff --git a/docker-compose.yml b/docker-compose.yml index d0ef4bd97ac28..7aec666dc9354 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,6 +39,7 @@ services: - VERSION=${VERSION:-8.1-apache} - USER_ID=${USER_ID:-1000} - GROUP_ID=${GROUP_ID:-1000} + - NODE_VERSION=${NODE_VERSION:-16.20.1} environment: DISABLE_MAKE: ${DISABLE_MAKE:-0} PS_INSTALL_AUTO: ${PS_INSTALL_AUTO:-1} diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index d4875dc692807..12cec23a5c9c7 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -23,6 +23,101 @@ needs please refer to https://devdocs.prestashop.com/ for more information. Changelog for PrestaShop 8 +#################################### +# v8.1.1 - (2023-07-20) +#################################### + +- Back Office: + - Improvement: + - #33278: Update dependencies (by @mflasquin) + - #32894: Admin search - Transmit the search query param (by @sowbiba) + - #32789: Warning on Modules List page when Distribution API cannot be contacted (by @0x346e3730) + - GHSA-gf46-prm4-56pc Protect from writing files on server through SQL form (by @Matthieu Rolland) + - GHSA-m9r4-3fg7-pqm2 Protect file name from path traversal attack (by @Matthieu Rolland) + - GHSA-75p5-jwx4-qw9h Escape variable to prevent sql injection (by @Matthieu Rolland) + - GHSA-hpf4-v7v2-95p2 Protect translation file reading form path traversal attack (by @Matthieu Rolland) + - GHSA-2rf5-3fw8-qm47 Keep file name from containing path traversal (by @Matthieu Rolland) + - GHSA-v4gr-v679-42p7 Keep file name from containing path traversal (by @Matthieu Rolland) + - Bug fix: + - #32493: Fix: When updating object images, old thumbnails are not deleted and updated (by @Codencode) + - #33255: Prevent deleting main URL of a store (by @Hlavtox) + - #33008: Fix 'New' Translation domain (by @mflasquin) + - #33124: Fix issue when disable tax, do not delete tax rules (by @mflasquin) + - #33236: Module manager - Empty category - Add raw filter to display html content (by @sowbiba) + - #33164: Fix authorized application column length (by @mflasquin) + - #33151: Fix for product editor is not storing some fields in multi shop context conservative fix for 8.1.x (by @cruftex) + - #33120: Fix bad display alert when changing product combination quantity (by @fatm-dev) + - #33107: Fix new file button target in product attachment form; (by @fatm-dev) + - #33048: Add string casting for boolean fields (by @nicosomb) + - #32662: Remove module list item when force deletion (by @M0rgan01) + - #32906: Fix clear filter options on missing category (by @FabienPapet) + - #32615: Update ImageGenerator resize destination path (by @M0rgan01) + - #31379: Fix disabling a module for a specific shop applied to all shops (by @matthieu-rolland) + - #32790: Fix PDF translations in backoffice (by @mflasquin) + - #32715: Fix: [BO] : Error notification displayed in Multistore page (by @Codencode) + - #32656: Fix: Warning on the Cart Rules creation/editing page (by @Codencode) +- Front Office: + - Bug fix: + - #32597: Update checkOrGenerateImageType $sourceFilePath (by @M0rgan01) + - #33156: Check if product is active and orderable during checkout (by @Hlavtox) + - #33043: Fix wrong discount amount displayed (by @boherm) + - #32596: Fix availability display logic (by @mflasquin) +- Core: + - Bug fix: + - #33136: Register commonly used deprecated modifiers to Smarty config (by @kpodemski) + - #33148: Update autoload library to v1.0.1 (by @jolelievre) + - #33133: Fix for child themes/multishop themes translations (by @kpodemski) + - Improvement: + - GHSA-xw2r-f8xv-c8xp Add missing html attributes (by @Matthieu Rolland) +- Installer: + - Improvement: + - #32752: Update default catalog 8.1.x (by @ps-jarvis) +- Web Services: + - Bug fix: + - #32842: Changed error code when access token is invalid (by @nicosomb) +- Tests: + - Improvement: + - #33312: Nightly : 8.1.x - Multistore (Removed Delete shop url) (by @Progi1984) + - #31275: Functional Tests : Added deprecated as errors (by @Progi1984) + - #32769: Functional Tests : API : External Auth Server - Resource Endpoint (by @Progi1984) + - #32756: Functional Tests : Faceted search module - Uninstall and delete module (by @Progi1984) + - #32666: Functional Tests : BO - Design - Image Settings - Check base image format (by @Progi1984) + - #32668: Functional Tests : Cash on delivery (COD) module - Reset module (by @Progi1984) + - #32674: Functional Tests : Hummingbird : FO - Login : Login in FO (by @Progi1984) + - Bug fix: + - #33279: Nightly : 8.0.x : Unskip test for the issue 32914 (by @Progi1984) + - #33281: Nightly : 8.1.x : Unskip test for the issue 32914 (by @Progi1984) + - #33130: Nightly : 8.1.x : Fixed error in filterTaxes (by @Progi1984) + - #33131: Nightly : 8.0.x : Fixed error in filterTaxes (by @Progi1984) + - #33033: Nightly : Fixed install Node 14 (by @Progi1984) + - #33023: Nightly : Fixed install Node 14 (by @Progi1984) + - #33011: Nightly : Fixed mocha loader (8.1.x) (by @Progi1984) + - #33012: Nightly : Fixed mocha loader (8.0.x) (by @Progi1984) + - #32849: Nightly : Fixed functional/BO/04*/01*/08* (by @Progi1984) + - #32835: Nightly : 8.1.x : Fixed error in package.json (by @Progi1984) + - #32834: Nightly : 8.0.x : Fixed error in package.json (by @Progi1984) + - #32829: Nightly : Fixed functional/BO/02*/01*/viewAndEditOrder/11* (by @Progi1984) + - #32706: Nightly : Fixed check of shipping price (by @Progi1984) + - Refactoring: + - #33228: Nightly : 8.1.x - Skip test for the issue 32914 (by @Progi1984) + - #33230: Nightly : 8.0.x - Skip test for the issue 32914 (by @Progi1984) + - #33174: Sanity Tests - Fix bug in product V2 tests (by @nesrineabdmouleh) + - #33146: Product V2 tests - Fix bug in product V2 tests (Sanity & Functional campaigns) (by @nesrineabdmouleh) + - #32859: Refacto WS tests countries (by @boubkerbribri) + - #32792: Functional tests - Add new test 'Design > Position > Filter module' (by @nesrineabdmouleh) + - #32782: Functional tests - Add new tests 'Stock > Sort and pagination movements table' (by @nesrineabdmouleh) + - #32718: Functional tests - Add some tests in 'FO > Carts' page (by @nesrineabdmouleh) + - #32598: Functional tests - Add some tests in "Module manager > Alerts tab" (by @nesrineabdmouleh) + - #32640: Fix nightly 18-05 - Add reset filter step to products table (by @nesrineabdmouleh) + +#################################### +# v8.1.0 - (2023-06-20) +#################################### + +- Back Office: + - Bug fix: + - #31379: Fix disabling a module for a specific shop applied to all shops (by @matthieu-rolland and @FabienPapet) + #################################### # v8.1-rc.1 - (2023-05-22) #################################### @@ -239,6 +334,41 @@ Changelog for PrestaShop 8 - #31389: Functional tests - Add scripts to run each test less than 30 minutes (by @nesrineabdmouleh) - #31357: Functional tests - Add new test 'FO > checkout page > Select carrier' (by @nesrineabdmouleh) +#################################### +# v8.0.5 - (2023-07-19) +#################################### + +- Core: + - Improvement: + - GHSA-xw2r-f8xv-c8xp add missing html attributes (by @matthieu-rolland) +- Back Office: + - Improvement: + - #33276: Add file headers and bump some dependencies (by @mflasquin) + - GHSA-gf46-prm4-56pc protect from writing files on server through SQL form (by @matthieu-rolland) + - Bug fix: + - #33234: Update module's information cache and add clear cache for doctrine (by @M0rgan01) + - #33008: Fix 'New' Translation domain (by @mflasquin) + - #33124: Fix issue when disable tax, do not delete tax rules (by @mflasquin) + - #33048: Add string casting for boolean fields (by @nicosomb) + - #31379: Fix disabling a module for a specific shop applied to all shops (by @matthieu-rolland) + - #32790: Fix PDF translations in backoffice (by @mflasquin) + - #32715: Fix: [BO] : Error notification displayed in Multistore page (by @Codencode) +- Front Office: + - Bug fix: + - #32596: Fix availability display logic (by @mflasquin) + - #32345: Hide vouchers with no available quantities (by @tleon) +- Tests: + - Bug fix: + - #33279: Nightly : 8.0.x : Unskip test for the issue 32914 (by @Progi1984) + - #33131: Nightly : 8.0.x : Fixed error in filterTaxes (by @Progi1984) + - #33033: Nightly : Fixed install Node 14 (by @Progi1984) + - #33012: Nightly : Fixed mocha loader (8.0.x) (by @Progi1984) + - #32834: Nightly : 8.0.x : Fixed error in package.json (by @Progi1984) + - #32829: Nightly : Fixed functional/BO/02*/01*/viewAndEditOrder/11* (by @Progi1984) + - Refactoring: + - #33230: Nightly : 8.0.x - Skip test for the issue 32914 (by @Progi1984) + - #33174: Sanity Tests - Fix bug in product V2 tests (by @nesrineabdmouleh) + #################################### # v8.0.4 - (2023-04-13) #################################### diff --git a/index.php b/index.php index b08bc1ba7d79e..48c25857d02e4 100644 --- a/index.php +++ b/index.php @@ -24,5 +24,49 @@ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) */ -require dirname(__FILE__).'/config/config.inc.php'; +use Symfony\Component\Dotenv\Dotenv; +use Symfony\Component\ErrorHandler\Debug; +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; +use Symfony\Component\HttpKernel\HttpKernelInterface; + +// Set front dir constant to use after +if (!defined('_PS_FRONT_DIR_')) { + define('_PS_FRONT_DIR_', dirname(__FILE__)); +} + +// Include some configurations & composer autoload +require_once _PS_FRONT_DIR_ . '/config/config.inc.php'; +require_once _PS_FRONT_DIR_ . '/vendor/autoload.php'; + +// Load .env file from the root of project if present +(new Dotenv(false))->loadEnv(_PS_FRONT_DIR_ . '/.env'); + +// If we want to use new container access in front (Warning: Experimental feature from now!) +if (isset($_ENV['PS_FF_FRONT_CONTAINER_V2']) && filter_var($_ENV['PS_FF_FRONT_CONTAINER_V2'], \FILTER_VALIDATE_BOOL)) { + // Activate Symfony's debug if we need it + if (_PS_MODE_DEV_) { + Debug::enable(); + } + + // Starting Kernel + $kernel = new FrontKernel(_PS_ENV_, _PS_MODE_DEV_); + $request = Request::createFromGlobals(); + + // Try to handle request + try { + $response = $kernel->handle($request, HttpKernelInterface::MASTER_REQUEST, false); + $response->send(); + define('FRONT_LEGACY_CONTEXT', false); + $kernel->terminate($request, $response); + } catch (NotFoundHttpException|Exception $exception) { + // correct Apache charset (except if it's too late) + if (!headers_sent()) { + header('Content-Type: text/html; charset=utf-8'); + } + } +} + +// Prepare and trigger LEGACY front dispatcher +define('FRONT_LEGACY_CONTEXT', true); Dispatcher::getInstance()->dispatch(); diff --git a/install-dev/classes/datas.php b/install-dev/classes/datas.php index 350dc7caf4548..d3c0bfff2c34d 100644 --- a/install-dev/classes/datas.php +++ b/install-dev/classes/datas.php @@ -40,7 +40,6 @@ * @property string $database_prefix * @property string $database_engine * @property string $shop_name - * @property int $shop_activity * @property string $shop_country * @property string $admin_firstname * @property string $admin_lastname @@ -140,11 +139,6 @@ class Datas 'validate' => 'isGenericName', 'default' => 'PrestaShop', ], - 'shop_activity' => [ - 'name' => 'activity', - 'default' => 0, - 'validate' => 'isInt', - ], 'shop_country' => [ 'name' => 'country', 'validate' => 'isLanguageIsoCode', diff --git a/install-dev/classes/session.php b/install-dev/classes/session.php index 8bb39cd4e50d3..4b607c429460d 100644 --- a/install-dev/classes/session.php +++ b/install-dev/classes/session.php @@ -41,7 +41,6 @@ * @property string $database_engine * @property string $shop_name * @property array $xml_loader_ids - * @property int $shop_activity * @property string $shop_country * @property string $admin_firstname * @property string $admin_lastname diff --git a/install-dev/controllers/console/process.php b/install-dev/controllers/console/process.php index 260ac7940dc67..df9116a37949e 100644 --- a/install-dev/controllers/console/process.php +++ b/install-dev/controllers/console/process.php @@ -262,7 +262,6 @@ public function processConfigureShop() return $this->model_install->configureShop([ 'shop_name' => $this->datas->shop_name, - 'shop_activity' => $this->datas->shop_activity, 'shop_country' => $this->datas->shop_country, 'shop_timezone' => $this->datas->timezone, 'use_smtp' => false, @@ -305,7 +304,7 @@ public function processInstallFixtures() } $this->model_install->xml_loader_ids = $this->datas->xml_loader_ids; - $result = $this->model_install->installFixtures(null, ['shop_activity' => $this->datas->shop_activity, 'shop_country' => $this->datas->shop_country]); + $result = $this->model_install->installFixtures(null, ['shop_country' => $this->datas->shop_country]); $this->datas->xml_loader_ids = $this->model_install->xml_loader_ids; return $result; @@ -364,7 +363,7 @@ private function initKernel() require_once _PS_CORE_DIR_ . '/config/bootstrap.php'; global $kernel; - $kernel = new AppKernel(_PS_ENV_, _PS_MODE_DEV_); + $kernel = new AdminKernel(_PS_ENV_, _PS_MODE_DEV_); $kernel->boot(); } diff --git a/install-dev/controllers/http/configure.php b/install-dev/controllers/http/configure.php index 0dadd4eaed43a..0fe8417d1ffa8 100644 --- a/install-dev/controllers/http/configure.php +++ b/install-dev/controllers/http/configure.php @@ -29,10 +29,6 @@ */ class InstallControllerHttpConfigure extends InstallControllerHttp implements HttpConfigureInterface { - /** - * @var array - */ - public $list_activities = []; /** * @var array */ @@ -54,7 +50,6 @@ public function processNextStep(): void if (Tools::isSubmit('shop_name')) { // Save shop configuration $this->session->shop_name = trim(Tools::getValue('shop_name')); - $this->session->shop_activity = Tools::getValue('shop_activity'); $this->session->enable_ssl = (bool) Tools::getValue('enable_ssl'); $this->session->shop_country = Tools::getValue('shop_country'); $this->session->shop_timezone = Tools::getValue('shop_timezone'); @@ -197,33 +192,6 @@ public function getTimezoneByIso($iso): string */ public function display(): void { - // List of activities - $list_activities = [ - 1 => $this->translator->trans('Lingerie and Adult', [], 'Install'), - 2 => $this->translator->trans('Animals and Pets', [], 'Install'), - 3 => $this->translator->trans('Art and Culture', [], 'Install'), - 4 => $this->translator->trans('Babies', [], 'Install'), - 5 => $this->translator->trans('Beauty and Personal Care', [], 'Install'), - 6 => $this->translator->trans('Cars', [], 'Install'), - 7 => $this->translator->trans('Computer Hardware and Software', [], 'Install'), - 8 => $this->translator->trans('Download', [], 'Install'), - 9 => $this->translator->trans('Fashion and Accessories', [], 'Install'), - 10 => $this->translator->trans('Flowers, Gifts and Crafts', [], 'Install'), - 11 => $this->translator->trans('Food and beverage', [], 'Install'), - 12 => $this->translator->trans('HiFi, Photo and Video', [], 'Install'), - 13 => $this->translator->trans('Home and Garden', [], 'Install'), - 14 => $this->translator->trans('Home Appliances', [], 'Install'), - 15 => $this->translator->trans('Jewelry', [], 'Install'), - 16 => $this->translator->trans('Mobile and Telecom', [], 'Install'), - 17 => $this->translator->trans('Services', [], 'Install'), - 18 => $this->translator->trans('Shoes and accessories', [], 'Install'), - 19 => $this->translator->trans('Sports and Entertainment', [], 'Install'), - 20 => $this->translator->trans('Travel', [], 'Install'), - ]; - - asort($list_activities); - $this->list_activities = $list_activities; - // Countries list $this->list_countries = []; $countries = $this->language->getCountries(); diff --git a/install-dev/controllers/http/process.php b/install-dev/controllers/http/process.php index 10b43ae0ea8f7..996b9d88bfd1c 100644 --- a/install-dev/controllers/http/process.php +++ b/install-dev/controllers/http/process.php @@ -212,7 +212,6 @@ public function processConfigureShop() $success = $this->model_install->configureShop([ 'shop_name' => $this->session->shop_name, - 'shop_activity' => $this->session->shop_activity, 'shop_country' => $this->session->shop_country, 'shop_timezone' => $this->session->shop_timezone, 'admin_firstname' => $this->session->admin_firstname, @@ -274,7 +273,7 @@ public function processInstallFixtures() $this->initializeContext(); $this->model_install->xml_loader_ids = $this->session->xml_loader_ids; - if (!$this->model_install->installFixtures(Tools::getValue('entity', null), ['shop_activity' => $this->session->shop_activity, 'shop_country' => $this->session->shop_country]) || $this->model_install->getErrors()) { + if (!$this->model_install->installFixtures(Tools::getValue('entity', null), ['shop_country' => $this->session->shop_country]) || $this->model_install->getErrors()) { $this->ajaxJsonAnswer(false, $this->model_install->getErrors()); } $this->session->xml_loader_ids = $this->model_install->xml_loader_ids; diff --git a/install-dev/controllers/http/system.php b/install-dev/controllers/http/system.php index f428cf9428e92..7cfad76148b30 100644 --- a/install-dev/controllers/http/system.php +++ b/install-dev/controllers/http/system.php @@ -95,6 +95,7 @@ public function display(): void 'gd' => $this->translator->trans('GD library is not installed', [], 'Install'), 'json' => $this->translator->trans('JSON extension is not loaded', [], 'Install'), 'openssl' => $this->translator->trans('PHP OpenSSL extension is not loaded', [], 'Install'), + 'openssl_key_generation' => $this->translator->trans('Unable to generate private keys using openssl_pkey_new. Check your OpenSSL configuration, especially the path to openssl.cafile.', [], 'Install'), 'pdo_mysql' => $this->translator->trans('PDO MySQL extension is not loaded', [], 'Install'), 'simplexml' => $this->translator->trans('SimpleXML extension is not loaded', [], 'Install'), 'zip' => $this->translator->trans('ZIP extension is not enabled', [], 'Install'), diff --git a/install-dev/data/xml/access.xml b/install-dev/data/xml/access.xml index f82b8f8fb591f..7e77d51ed9e55 100644 --- a/install-dev/data/xml/access.xml +++ b/install-dev/data/xml/access.xml @@ -249,10 +249,6 @@
0
-
- 3
-
id_group;id_currency;id_country;id_shop
@@ -449,42 +446,25 @@
0
-
+
+
+
1
-
+
2
-
- 0
-
-
- 7
-
-
- 6
-
-
- 0
-
-
- 8
-
-
- 9
-
- 10
+ 3
- 11
+ 4
- 12
-
-
- 3
+ 5
+
+
1
@@ -494,6 +474,10 @@
3
+
+
+ 0
+
0
@@ -712,9 +696,6 @@ Country
1
-
- Animaux
-
logo.png
diff --git a/install-dev/data/xml/feature_flag.xml b/install-dev/data/xml/feature_flag.xml
index dc0b86a6bbe95..50624bd0f29ae 100644
--- a/install-dev/data/xml/feature_flag.xml
+++ b/install-dev/data/xml/feature_flag.xml
@@ -2,6 +2,7 @@
-
diff --git a/install-dev/data/xml/hook.xml b/install-dev/data/xml/hook.xml
index 1d54094025e34..05bf6dd09ca84 100644
--- a/install-dev/data/xml/hook.xml
+++ b/install-dev/data/xml/hook.xml
@@ -2146,6 +2146,16 @@
Order Return Presenter
This hook is called before an order return is presented
+
+ actionPresentSupplier
+ Supplier Presenter
+ This hook is called before a supplier is presented
+
+
+ actionPresentManufacturer
+ Manufacturer Presenter
+ This hook is called before a manufacturer is presented
+
actionPresentProduct
Product Presenter
@@ -2156,6 +2166,11 @@
Store Presenter
This hook is called before a store is presented
+
+ actionPresentCategory
+ Category Presenter
+ This hook is called before a category is presented
+
actionAdminAdminPreferencesControllerPostProcessBefore
On post-process in Admin Preferences
@@ -4509,5 +4524,10 @@
Modify back office breadcrumb
This hook allows modifying back office breadcrumb
+
+ actionLanguageLinkParameters
+ Add parameters to language link
+ Allows modules to provide proper parameters for links in other languages.
+
diff --git a/install-dev/data/xml/stock_mvt_reason.xml b/install-dev/data/xml/stock_mvt_reason.xml
index ce8467acb6eea..0497166b96482 100644
--- a/install-dev/data/xml/stock_mvt_reason.xml
+++ b/install-dev/data/xml/stock_mvt_reason.xml
@@ -4,17 +4,15 @@
-
diff --git a/install-dev/data/xml/supply_order_state.xml b/install-dev/data/xml/supply_order_state.xml
deleted file mode 100644
index f7a0299d3e8d5..0000000000000
--- a/install-dev/data/xml/supply_order_state.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
diff --git a/install-dev/data/xml/tab.xml b/install-dev/data/xml/tab.xml
index 49c329dd42c4e..6645e1907f2ee 100644
--- a/install-dev/data/xml/tab.xml
+++ b/install-dev/data/xml/tab.xml
@@ -24,198 +24,165 @@
Admin.Navigation.Menu
-
-
- AdminParentOrders
- Orders
- Admin.Navigation.Menu
-
-
-
- AdminOrders
- Orders
- Admin.Navigation.Menu
-
-
- AdminInvoices
- Invoices
- Admin.Navigation.Menu
-
-
- AdminSlip
- Credit Slips
- Admin.Navigation.Menu
-
-
- AdminDeliverySlip
- Delivery Slips
- Admin.Navigation.Menu
-
-
- AdminCarts
- Shopping Carts
- Admin.Navigation.Menu
-
-
-
-
- AdminCatalog
- Catalog
- Admin.Navigation.Menu
-
-
-
- AdminProducts
- Products
- Admin.Navigation.Menu
-
-
- AdminCategories
- Categories
- Admin.Navigation.Menu
-
-
- AdminTracking
- Monitoring
- Admin.Navigation.Menu
-
-
- AdminParentAttributesGroups
- Attributes & Features
- Admin.Navigation.Menu
-
-
-
- AdminAttributesGroups
- Attributes
- Admin.Navigation.Menu
-
-
- AdminFeatures
- Features
- Admin.Navigation.Menu
-
-
-
- AdminParentManufacturers
- Brands & Suppliers
- Admin.Navigation.Menu
-
-
-
- AdminManufacturers
- Brands
- Admin.Navigation.Menu
-
-
- AdminSuppliers
- Suppliers
- Admin.Navigation.Menu
-
-
-
- AdminAttachments
- Files
- Admin.Navigation.Menu
-
-
- AdminParentCartRules
- Discounts
- Admin.Navigation.Menu
-
-
-
- AdminCartRules
- Cart Rules
- Admin.Navigation.Menu
-
-
- AdminSpecificPriceRule
- Catalog Price Rules
- Admin.Navigation.Menu
-
-
- AdminStockManagement
- Stock
- Admin.Navigation.Menu
-
-
-
-
- AdminParentCustomer
- Customers
- Admin.Navigation.Menu
-
-
-
- AdminCustomers
- Customers
- Admin.Navigation.Menu
-
-
- AdminAddresses
- Addresses
- Admin.Navigation.Menu
-
-
- AdminOutstanding
- Outstanding
- Admin.Navigation.Menu
-
-
-
-
- AdminParentCustomerThreads
- Customer Service
- Admin.Navigation.Menu
-
-
-
- AdminCustomerThreads
- Customer Service
- Admin.Navigation.Menu
-
-
- AdminOrderMessage
- Order Messages
- Admin.Navigation.Menu
-
-
- AdminReturn
- Merchandise Returns
- Admin.Navigation.Menu
-
+
+
+ AdminParentOrders
+ Orders
+ Admin.Navigation.Menu
+
+
+ AdminOrders
+ Orders
+ Admin.Navigation.Menu
+
+
+ AdminInvoices
+ Invoices
+ Admin.Navigation.Menu
+
+
+ AdminSlip
+ Credit Slips
+ Admin.Navigation.Menu
+
+
+ AdminDeliverySlip
+ Delivery Slips
+ Admin.Navigation.Menu
+
+
+ AdminCarts
+ Shopping Carts
+ Admin.Navigation.Menu
+
-
-
- AdminStats
- Stats
- Admin.Navigation.Menu
-
+
+
+ AdminCatalog
+ Catalog
+ Admin.Navigation.Menu
+
+
+ AdminProducts
+ Products
+ Admin.Navigation.Menu
+
+
+ AdminCategories
+ Categories
+ Admin.Navigation.Menu
+
+
+ AdminTracking
+ Monitoring
+ Admin.Navigation.Menu
+
+
+ AdminParentAttributesGroups
+ Attributes & Features
+ Admin.Navigation.Menu
+
+
+ AdminAttributesGroups
+ Attributes
+ Admin.Navigation.Menu
+
+
+ AdminFeatures
+ Features
+ Admin.Navigation.Menu
+
+
+ AdminParentManufacturers
+ Brands & Suppliers
+ Admin.Navigation.Menu
+
+
+ AdminManufacturers
+ Brands
+ Admin.Navigation.Menu
+
+
+ AdminSuppliers
+ Suppliers
+ Admin.Navigation.Menu
+
+
+ AdminAttachments
+ Files
+ Admin.Navigation.Menu
+
+
+ AdminParentCartRules
+ Discounts
+ Admin.Navigation.Menu
+
+
+ AdminCartRules
+ Cart Rules
+ Admin.Navigation.Menu
+
+
+ AdminSpecificPriceRule
+ Catalog Price Rules
+ Admin.Navigation.Menu
+
+
+ AdminStockManagement
+ Stock
+ Admin.Navigation.Menu
+
-
-
- AdminStock
-
+
+
+ AdminParentCustomer
+ Customers
+ Admin.Navigation.Menu
+
+
+ AdminCustomers
+ Customers
+ Admin.Navigation.Menu
+
+
+ AdminAddresses
+ Addresses
+ Admin.Navigation.Menu
+
+
+ AdminOutstanding
+ Outstanding
+ Admin.Navigation.Menu
+
-
- AdminWarehouses
- Warehouses
- Admin.Navigation.Menu
-
-
- AdminParentStockManagement
- Stock Management
- Admin.Navigation.Menu
-
+
+
+ AdminParentCustomerThreads
+ Customer Service
+ Admin.Navigation.Menu
+
+
+ AdminCustomerThreads
+ Customer Service
+ Admin.Navigation.Menu
+
+
+ AdminOrderMessage
+ Order Messages
+ Admin.Navigation.Menu
+
+
+ AdminReturn
+ Merchandise Returns
+ Admin.Navigation.Menu
+
-
- AdminStockManagement
- Stock Management
- Admin.Navigation.Menu
-
+
+
+ AdminStats
+ Stats
+ Admin.Navigation.Menu
+
@@ -224,182 +191,170 @@
Admin.Navigation.Menu
-
-
- AdminParentModulesSf
- Modules
- Admin.Navigation.Menu
-
-
- AdminModulesSf
- Module Manager
- Admin.Navigation.Menu
-
-
- AdminModulesManage
- Modules
- Admin.Navigation.Menu
-
-
- AdminModulesNotifications
- Alerts
- Admin.Navigation.Menu
-
-
- AdminModulesUpdates
- Updates
- Admin.Navigation.Menu
-
-
-
- AdminParentThemes
- Design
- Admin.Navigation.Menu
-
-
-
- AdminThemes
- Theme & Logo
- Admin.Navigation.Menu
-
-
- AdminParentMailTheme
- Email Theme
- Admin.Navigation.Menu
-
-
- AdminMailTheme
- Email Theme
- Admin.Navigation.Menu
-
-
-
- AdminCmsContent
- Pages
- Admin.Navigation.Menu
-
-
- AdminModulesPositions
- Positions
- Admin.Navigation.Menu
-
-
- AdminImages
- Image Settings
- Admin.Navigation.Menu
-
-
-
- AdminParentShipping
- Shipping
- Admin.Navigation.Menu
-
-
-
- AdminCarriers
- Carriers
- Admin.Navigation.Menu
-
-
- AdminShipping
- Preferences
- Admin.Navigation.Menu
-
-
-
- AdminParentPayment
- Payment
- Admin.Navigation.Menu
-
-
-
- AdminPayment
- Payment Methods
- Admin.Navigation.Menu
-
-
- AdminPaymentPreferences
- Preferences
- Admin.Navigation.Menu
-
-
-
-
- AdminInternational
- International
- Admin.Navigation.Menu
-
-
-
- AdminParentLocalization
- Localization
- Admin.Navigation.Menu
-
-
-
- AdminLocalization
- Localization
- Admin.Navigation.Menu
-
-
- AdminLanguages
- Languages
- Admin.Navigation.Menu
-
-
- AdminCurrencies
- Currencies
- Admin.Navigation.Menu
-
-
- AdminGeolocation
- Geolocation
- Admin.Navigation.Menu
-
-
-
- AdminParentCountries
- Locations
- Admin.Navigation.Menu
-
-
- AdminZones
- Zones
- Admin.Navigation.Menu
-
-
- AdminCountries
- Countries
- Admin.Navigation.Menu
-
-
- AdminStates
- States
- Admin.Navigation.Menu
-
-
-
- AdminParentTaxes
- Taxes
- Admin.Navigation.Menu
-
-
-
- AdminTaxes
- Taxes
- Admin.Navigation.Menu
-
-
- AdminTaxRulesGroup
- Tax Rules
- Admin.Navigation.Menu
-
+
+
+ AdminParentModulesSf
+ Modules
+ Admin.Navigation.Menu
+
+
+ AdminModulesSf
+ Module Manager
+ Admin.Navigation.Menu
+
+
+ AdminModulesManage
+ Modules
+ Admin.Navigation.Menu
+
+
+ AdminModulesNotifications
+ Alerts
+ Admin.Navigation.Menu
+
+
+ AdminModulesUpdates
+ Updates
+ Admin.Navigation.Menu
+
+
+
+ AdminParentThemes
+ Design
+ Admin.Navigation.Menu
+
+
+ AdminThemes
+ Theme & Logo
+ Admin.Navigation.Menu
+
+
+ AdminParentMailTheme
+ Email Theme
+ Admin.Navigation.Menu
+
+
+ AdminMailTheme
+ Email Theme
+ Admin.Navigation.Menu
+
+
+ AdminCmsContent
+ Pages
+ Admin.Navigation.Menu
+
+
+ AdminModulesPositions
+ Positions
+ Admin.Navigation.Menu
+
+
+ AdminImages
+ Image Settings
+ Admin.Navigation.Menu
+
+
+ AdminParentShipping
+ Shipping
+ Admin.Navigation.Menu
+
+
+ AdminCarriers
+ Carriers
+ Admin.Navigation.Menu
+
+
+ AdminShipping
+ Preferences
+ Admin.Navigation.Menu
+
+
+ AdminParentPayment
+ Payment
+ Admin.Navigation.Menu
+
+
+ AdminPayment
+ Payment Methods
+ Admin.Navigation.Menu
+
+
+ AdminPaymentPreferences
+ Preferences
+ Admin.Navigation.Menu
+
-
- AdminTranslations
- Translations
- Admin.Navigation.Menu
-
+
+
+ AdminInternational
+ International
+ Admin.Navigation.Menu
+
+
+ AdminParentLocalization
+ Localization
+ Admin.Navigation.Menu
+
+
+ AdminLocalization
+ Localization
+ Admin.Navigation.Menu
+
+
+ AdminLanguages
+ Languages
+ Admin.Navigation.Menu
+
+
+ AdminCurrencies
+ Currencies
+ Admin.Navigation.Menu
+
+
+ AdminGeolocation
+ Geolocation
+ Admin.Navigation.Menu
+
+
+ AdminParentCountries
+ Locations
+ Admin.Navigation.Menu
+
+
+ AdminZones
+ Zones
+ Admin.Navigation.Menu
+
+
+ AdminCountries
+ Countries
+ Admin.Navigation.Menu
+
+
+ AdminStates
+ States
+ Admin.Navigation.Menu
+
+
+ AdminParentTaxes
+ Taxes
+ Admin.Navigation.Menu
+
+
+ AdminTaxes
+ Taxes
+ Admin.Navigation.Menu
+
+
+ AdminTaxRulesGroup
+ Tax Rules
+ Admin.Navigation.Menu
+
+
+ AdminTranslations
+ Translations
+ Admin.Navigation.Menu
+
@@ -408,261 +363,247 @@
Admin.Navigation.Menu
-
-
- ShopParameters
- Shop Parameters
- Admin.Navigation.Menu
-
-
-
- AdminParentPreferences
- General
- Admin.Navigation.Menu
-
-
-
- AdminPreferences
- General
- Admin.Navigation.Menu
-
-
- AdminMaintenance
- Maintenance
- Admin.Navigation.Menu
-
-
-
- AdminParentOrderPreferences
- Order Settings
- Admin.Navigation.Menu
-
-
-
- AdminOrderPreferences
- Order Settings
- Admin.Navigation.Menu
-
-
- AdminStatuses
- Statuses
- Admin.Navigation.Menu
-
-
-
- AdminPPreferences
- Product Settings
- Admin.Navigation.Menu
-
-
- AdminParentCustomerPreferences
- Customer Settings
- Admin.Navigation.Menu
-
-
-
- AdminCustomerPreferences
- Customer Settings
- Admin.Navigation.Menu
-
-
- AdminGroups
- Groups
- Admin.Navigation.Menu
-
-
- AdminGenders
- Titles
- Admin.Navigation.Menu
-
-
-
- AdminParentStores
- Contact
- Admin.Navigation.Menu
-
-
-
- AdminContacts
- Contacts
- Admin.Navigation.Menu
-
-
- AdminStores
- Stores
- Admin.Navigation.Menu
-
-
-
- AdminParentMeta
- Traffic & SEO
- Admin.Navigation.Menu
-
-
-
- AdminMeta
- SEO & URLs
- Admin.Navigation.Menu
-
-
- AdminSearchEngines
- Search Engines
- Admin.Navigation.Menu
-
-
-
- AdminParentSearchConf
- Search
- Admin.Navigation.Menu
-
-
-
- AdminSearchConf
- Search
- Admin.Navigation.Menu
-
-
- AdminTags
- Tags
- Admin.Navigation.Menu
-
-
-
-
- AdminAdvancedParameters
- Advanced Parameters
- Admin.Navigation.Menu
-
-
-
- AdminInformation
- Information
- Admin.Navigation.Menu
-
-
- AdminPerformance
- Performance
- Admin.Navigation.Menu
-
-
- AdminAdminPreferences
- Administration
- Admin.Navigation.Menu
-
-
- AdminEmails
- E-mail
- Admin.Navigation.Menu
-
-
- AdminImport
- Import
- Admin.Navigation.Menu
-
-
-
- AdminParentEmployees
- Team
- Admin.Navigation.Menu
-
-
-
- AdminEmployees
- Employees
- Admin.Navigation.Menu
-
-
- AdminProfiles
- Roles
- Admin.Navigation.Menu
-
-
- AdminAccess
- Permissions
- Admin.Navigation.Menu
-
-
-
- AdminParentRequestSql
- Database
- Admin.Navigation.Menu
-
-
-
- AdminRequestSql
- SQL Manager
- Admin.Navigation.Menu
-
-
- AdminBackup
- DB Backup
- Admin.Navigation.Menu
-
-
-
- AdminLogs
- Logs
- Admin.Navigation.Menu
-
-
- AdminWebservice
- Webservice
- Admin.Navigation.Menu
-
-
- AdminAuthorizationServer
- Authorization Server
- Admin.Navigation.Menu
-
-
- AdminShopGroup
- Multistore
- Admin.Navigation.Menu
-
-
- AdminShopUrl
- Multistore
- Admin.Navigation.Menu
-
-
- AdminFeatureFlag
- New & Experimental Features
- Admin.Navigation.Menu
-
-
- AdminParentSecurity
-
-
- AdminSecurity
- Security
- Admin.Navigation.Menu
-
-
- AdminSecuritySessionEmployee
-
-
-
- AdminSecuritySessionCustomer
-
+
+
+ ShopParameters
+ Shop Parameters
+ Admin.Navigation.Menu
+
+
+ AdminParentPreferences
+ General
+ Admin.Navigation.Menu
+
+
+ AdminPreferences
+ General
+ Admin.Navigation.Menu
+
+
+ AdminMaintenance
+ Maintenance
+ Admin.Navigation.Menu
+
+
+ AdminParentOrderPreferences
+ Order Settings
+ Admin.Navigation.Menu
+
+
+ AdminOrderPreferences
+ Order Settings
+ Admin.Navigation.Menu
+
+
+ AdminStatuses
+ Statuses
+ Admin.Navigation.Menu
+
+
+ AdminPPreferences
+ Product Settings
+ Admin.Navigation.Menu
+
+
+ AdminParentCustomerPreferences
+ Customer Settings
+ Admin.Navigation.Menu
+
+
+ AdminCustomerPreferences
+ Customer Settings
+ Admin.Navigation.Menu
+
+
+ AdminGroups
+ Groups
+ Admin.Navigation.Menu
+
+
+ AdminGenders
+ Titles
+ Admin.Navigation.Menu
+
+
+ AdminParentStores
+ Contact
+ Admin.Navigation.Menu
+
+
+ AdminContacts
+ Contacts
+ Admin.Navigation.Menu
+
+
+ AdminStores
+ Stores
+ Admin.Navigation.Menu
+
+
+ AdminParentMeta
+ Traffic & SEO
+ Admin.Navigation.Menu
+
+
+ AdminMeta
+ SEO & URLs
+ Admin.Navigation.Menu
+
+
+ AdminSearchEngines
+ Search Engines
+ Admin.Navigation.Menu
+
+
+ AdminParentSearchConf
+ Search
+ Admin.Navigation.Menu
+
+
+ AdminSearchConf
+ Search
+ Admin.Navigation.Menu
+
+
+ AdminTags
+ Tags
+ Admin.Navigation.Menu
+
-
-
- AdminQuickAccesses
- Quick Access
- Admin.Navigation.Menu
-
+
+
+ AdminAdvancedParameters
+ Advanced Parameters
+ Admin.Navigation.Menu
+
+
+ AdminInformation
+ Information
+ Admin.Navigation.Menu
+
+
+ AdminPerformance
+ Performance
+ Admin.Navigation.Menu
+
+
+ AdminAdminPreferences
+ Administration
+ Admin.Navigation.Menu
+
+
+ AdminEmails
+ E-mail
+ Admin.Navigation.Menu
+
+
+ AdminImport
+ Import
+ Admin.Navigation.Menu
+
+
+ AdminParentEmployees
+ Team
+ Admin.Navigation.Menu
+
+
+ AdminEmployees
+ Employees
+ Admin.Navigation.Menu
+
+
+ AdminProfiles
+ Roles
+ Admin.Navigation.Menu
+
+
+ AdminAccess
+ Permissions
+ Admin.Navigation.Menu
+
+
+ AdminParentRequestSql
+ Database
+ Admin.Navigation.Menu
+
+
+ AdminRequestSql
+ SQL Manager
+ Admin.Navigation.Menu
+
+
+ AdminBackup
+ DB Backup
+ Admin.Navigation.Menu
+
+
+ AdminLogs
+ Logs
+ Admin.Navigation.Menu
+
+
+ AdminWebservice
+ Webservice
+ Admin.Navigation.Menu
+
+
+ AdminAuthorizationServer
+ Authorization Server
+ Admin.Navigation.Menu
+
+
+ AdminShopGroup
+ Multistore
+ Admin.Navigation.Menu
+
+
+ AdminShopUrl
+ Multistore
+ Admin.Navigation.Menu
+
+
+ AdminFeatureFlag
+ New & Experimental Features
+ Admin.Navigation.Menu
+
+
+ AdminParentSecurity
+ Security
+ Admin.Navigation.Menu
+
+
+ AdminSecurity
+ Security
+ Admin.Navigation.Menu
+
+
+ AdminSecuritySessionEmployee
+ Employee Sessions
+ Admin.Navigation.Menu
+
+
+ AdminSecuritySessionCustomer
+ Customer Sessions
+ Admin.Navigation.Menu
+
-
-
- DEFAULT
- More
- Admin.Navigation.Menu
-
+
+
+ AdminQuickAccesses
+ Quick Access
+ Admin.Navigation.Menu
+
-
- AdminPatterns
-
+
+
+ DEFAULT
+ More
+ Admin.Navigation.Menu
+
+
+ AdminPatterns
+
diff --git a/install-dev/fixtures/fashion/data/access.xml b/install-dev/fixtures/fashion/data/access.xml
index 21d81641cd322..b3c86d35adb5b 100644
--- a/install-dev/fixtures/fashion/data/access.xml
+++ b/install-dev/fixtures/fashion/data/access.xml
@@ -77,14 +77,6 @@
-
-
+
My Company
16, Main street
2nd floor
Paris
Fashion
767 Fifth Ave.
New York
Fashion
767 Fifth Ave.
New York
My Company
16, Main street
2nd floor
Miami
Accessories and Co
42 Avenue Maréchal Soult
- Hummingbird printed t-shirt - Color : White, Size : S
- Hummingbird printed sweater - Color : White, Size : S
- The adventure begins Framed poster - Size : 80x120cm
- Mug Today is a good day
- Mountain fox notebook Style : Ruled
- Mountain fox notebook Style : Plain
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/install-dev/fixtures/fashion/data/product_attribute.xml b/install-dev/fixtures/fashion/data/product_attribute.xml
index 3a89af4443ac0..f6e33fdd2527f 100644
--- a/install-dev/fixtures/fashion/data/product_attribute.xml
+++ b/install-dev/fixtures/fashion/data/product_attribute.xml
@@ -1,6 +1,6 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/install-dev/fixtures/fashion/data/stock_available.xml b/install-dev/fixtures/fashion/data/stock_available.xml
index 78324562023e7..3c7a40ecd47bc 100644
--- a/install-dev/fixtures/fashion/data/stock_available.xml
+++ b/install-dev/fixtures/fashion/data/stock_available.xml
@@ -6,67 +6,66 @@
-
diff --git a/install-dev/init.php b/install-dev/init.php
index 7322645b5a341..25612a95cf082 100644
--- a/install-dev/init.php
+++ b/install-dev/init.php
@@ -91,10 +91,11 @@
if (file_exists(_PS_CORE_DIR_ . '/app/config/parameters.php')) {
require_once _PS_CORE_DIR_ . '/config/bootstrap.php';
+ require_once _PS_CORE_DIR_ . '/app/AdminKernel.php';
global $kernel;
try {
- $kernel = new AppKernel(_PS_ENV_, _PS_MODE_DEV_);
+ $kernel = new AdminKernel(_PS_ENV_, _PS_MODE_DEV_);
$kernel->boot();
} catch (DBALException $e) {
/*
diff --git a/install-dev/langs/en/data/stock_mvt_reason.xml b/install-dev/langs/en/data/stock_mvt_reason.xml
index 4b26042d70efe..77edb2e4dbd85 100644
--- a/install-dev/langs/en/data/stock_mvt_reason.xml
+++ b/install-dev/langs/en/data/stock_mvt_reason.xml
@@ -1,29 +1,8 @@
-
- Increase
-
-
- Decrease
-
Customer Order
-
- Regulation following an inventory of stock
-
-
- Regulation following an inventory of stock
-
-
- Transfer to another warehouse
-
-
- Transfer from another warehouse
-
-
- Supply Order
-
Customer Order
diff --git a/install-dev/langs/en/data/supplier_order_state.xml b/install-dev/langs/en/data/supplier_order_state.xml
deleted file mode 100644
index dfc4ce42e2583..0000000000000
--- a/install-dev/langs/en/data/supplier_order_state.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/install-dev/langs/en/data/supply_order_state.xml b/install-dev/langs/en/data/supply_order_state.xml
deleted file mode 100644
index 1e8903f0f91d5..0000000000000
--- a/install-dev/langs/en/data/supply_order_state.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- 1 - Creation in progress
-
-
- 2 - Order validated
-
-
- 3 - Pending receipt
-
-
- 4 - Order received in part
-
-
- 5 - Order received completely
-
-
- 6 - Order canceled
-
-
diff --git a/install-dev/langs/en/data/tab.xml b/install-dev/langs/en/data/tab.xml
index f1ab8a4d1fb7f..587f8f2ff17cd 100644
--- a/install-dev/langs/en/data/tab.xml
+++ b/install-dev/langs/en/data/tab.xml
@@ -130,7 +130,6 @@
-
-
diff --git a/admin-dev/themes/new-theme/template/layout.tpl b/admin-dev/themes/new-theme/template/layout.tpl
index 17cd247af5b07..563b1ab02f905 100644
--- a/admin-dev/themes/new-theme/template/layout.tpl
+++ b/admin-dev/themes/new-theme/template/layout.tpl
@@ -1,7 +1,11 @@
- {$header}
+ {render_template
+ smarty_template="header.tpl"
+ twig_template="@PrestaShop/Admin/Layout/head.html.twig"
+ meta_title=$meta_title
+ }
{$ps_version}
{l s='Oh no!'}
-- {l s='The mobile version of this page is not available yet.'} -
-- {l s='Please use a desktop computer to access this page, until is adapted to mobile.'} -
-- {l s='Thank you.'} -
- - arrow_back - {l s='Back' d='Admin.Global'} - -
- {include file="components/layout/quick_access.tpl"}
+ {render_template
+ smarty_template="components/layout/quick_access.tpl"
+ twig_template="@PrestaShop/Admin/Layout/quick_access.html.twig"
+ }
- {include file="components/layout/search_form.tpl"}
+
+ {render_template
+ smarty_template="components/layout/search_form.tpl"
+ twig_template="@PrestaShop/Admin/Layout/search_form.html.twig"
+ }
-
- {include file="components/layout/mobile_quickaccess.tpl"}
+ {render_template
+ smarty_template="components/layout/mobile_quickaccess.tpl"
+ twig_template="@PrestaShop/Admin/Layout/mobile_quick_access.html.twig"
+ }
+
{l s='Your store is in maintenance mode.' d='Admin.Navigation.Notification'}
@@ -90,17 +103,31 @@
{if !isset($hideLegacyStoreContextSelector) || !$hideLegacyStoreContextSelector}
@@ -109,10 +136,25 @@
{/if}
{if $display_header}
- {include file='components/layout/nav_bar.tpl'}
+ {render_template
+ smarty_template="components/layout/nav_bar.tpl"
+ twig_template="@PrestaShop/Admin/Layout/nav_bar.html.twig"
+ }
{/if}
-{if isset($page_header_toolbar)}{$page_header_toolbar}{/if}
+{if isset($page_header_toolbar_template)}
+ {render_template
+ smarty_template=$page_header_toolbar_template
+ twig_template="@PrestaShop/Admin/Layout/toolbar.html.twig"
+ locked_to_all_shop_context=$locked_to_all_shop_context
+ title=$title
+ toolbar_btn=$toolbar_btn
+ table=$table
+ help_link=$help_link
+ enableSidebar=$enableSidebar
+ use_regular_h1_structure=$use_regular_h1_structure
+ }
+{/if}
- {include file="components/layout/shop_list.tpl"}
+ {render_template
+ smarty_template="components/layout/shop_list.tpl"
+ twig_template="@PrestaShop/Admin/Layout/shop_list.html.twig"
+ base_url=$base_url
+ is_multishop= $is_multishop|default:null
+ shop_list= $shop_list|default:null
+ multishop_context= $multishop_context|default:null
+ current_shop_name= $current_shop_name|default:null
+ }
{/if}
{if $show_new_orders || $show_new_customers || $show_new_messages}
- {include file="components/layout/notifications_center.tpl"}
+ {render_template
+ smarty_template="components/layout/notifications_center.tpl"
+ twig_template="@PrestaShop/Admin/Layout/notifications_center.html.twig"
+ }
{/if}
- {include file="components/layout/employee_dropdown.tpl"}
+ {render_template
+ smarty_template="components/layout/employee_dropdown.tpl"
+ twig_template="@PrestaShop/Admin/Layout/employee_dropdown.html.twig"
+ }
{if isset($displayBackOfficeTop)}{$displayBackOfficeTop}{/if}
{if $install_dir_exists}
@@ -141,11 +183,13 @@
{if (!isset($lite_display) || (isset($lite_display) && !$lite_display))}
- {include file='components/layout/non-responsive.tpl'}
{if $display_footer}
- {include file='footer.tpl'}
+ {render_template
+ smarty_template="footer.tpl"
+ twig_template="@PrestaShop/Admin/Layout/footer.html.twig"
+ }
{/if}
{/if}
diff --git a/app/AdminKernel.php b/app/AdminKernel.php
new file mode 100644
index 0000000000000..6373b0df3e1e6
--- /dev/null
+++ b/app/AdminKernel.php
@@ -0,0 +1,29 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+class AdminKernel extends AppKernel
+{
+}
diff --git a/app/AppKernel.php b/app/AppKernel.php
index 041a7148d0239..fe3e14bd89f9f 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -32,7 +32,8 @@
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\Kernel;
-class AppKernel extends Kernel
+
+abstract class AppKernel extends Kernel
{
const VERSION = Version::VERSION;
const MAJOR_VERSION_STRING = Version::MAJOR_VERSION_STRING;
@@ -62,11 +63,12 @@ public function registerBundles()
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
new ApiPlatform\Symfony\Bundle\ApiPlatformBundle(),
// PrestaShop Core bundle
- new PrestaShopBundle\PrestaShopBundle(),
+ new PrestaShopBundle\PrestaShopBundle($this),
// PrestaShop Translation parser
new TranslationToolsBundle(),
- new League\Tactician\Bundle\TacticianBundle(),
new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
+ new Symfony\UX\TwigComponent\TwigComponentBundle(),
+ new Twig\Extra\TwigExtraBundle\TwigExtraBundle(),
);
if (in_array($this->getEnvironment(), array('dev', 'test'), true)) {
@@ -160,19 +162,6 @@ protected function cleanKernelReferences(): void
SymfonyContainer::resetStaticCache();
}
- /**
- * {@inheritdoc}
- */
- protected function getKernelParameters()
- {
- $kernelParameters = parent::getKernelParameters();
-
- return array_merge(
- $kernelParameters,
- array('kernel.active_modules' => $this->getActiveModules())
- );
- }
-
/**
* {@inheritdoc}
*/
@@ -204,24 +193,41 @@ public function getLogDir()
*/
public function registerContainerConfiguration(LoaderInterface $loader)
{
- $loader->load(function (ContainerBuilder $container) {
- $container->setParameter('container.autowiring.strict_mode', true);
- $container->setParameter('container.dumper.inline_class_loader', false);
- $container->addObjectResource($this);
- });
-
+ $installedModules = $this->getActiveModules();
$loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
- // Add translation paths to load into the translator. The paths are loaded by the Symfony's FrameworkExtension
- $loader->load(function (ContainerBuilder $container) {
- /** @var array $moduleTranslationsPaths */
- $moduleTranslationsPaths = $container->getParameter('modules_translation_paths');
- foreach ($this->getActiveModules() as $activeModulePath) {
- $translationsDir = _PS_MODULE_DIR_ . $activeModulePath . '/translations';
- if (is_dir($translationsDir)) {
- $moduleTranslationsPaths[] = $translationsDir;
+ $moduleTranslationsPaths = [];
+ foreach ($installedModules as $activeModulePath)
+ {
+ $modulePath = _PS_MODULE_DIR_ . $activeModulePath;
+ $translationsPath = sprintf('%s/translations', $modulePath);
+
+ $configFiles = [
+ sprintf('%s/config/services.yml', $modulePath),
+ sprintf('%s/config/admin/services.yml', $modulePath),
+ // @todo Uncomment to Load this file once we'll have a unique container
+ // sprintf('%s/config/front/services.yml', $modulePath),
+ ];
+
+ foreach ($configFiles as $file) {
+ if(is_file($file)) {
+ $loader->load($file);
}
}
+
+ if (is_dir($translationsPath)) {
+ $moduleTranslationsPaths[] = $translationsPath;
+ }
+ }
+
+ $loader->load(function (ContainerBuilder $container) use ($moduleTranslationsPaths, $installedModules) {
+ $container->setParameter('container.autowiring.strict_mode', true);
+ $container->setParameter('container.dumper.inline_class_loader', false);
+ $container->setParameter('prestashop.module_dir', _PS_MODULE_DIR_);
+ /** @deprecated kernel.active_modules is deprecated. Use prestashop.installed_modules instead. */
+ $container->setParameter('kernel.active_modules', $installedModules);
+ $container->setParameter('prestashop.installed_modules', $installedModules);
+ $container->addObjectResource($this);
$container->setParameter('modules_translation_paths', $moduleTranslationsPaths);
});
}
@@ -324,4 +330,14 @@ protected function unlockCacheStream($lockStream): void
unlink($clearCacheLockPath);
}
}
+
+ /**
+ * Get App type of current Kernel based on kernel class name. (admin or front)
+ *
+ * @return string
+ */
+ public function getAppType(): string
+ {
+ return $this instanceof \AdminKernel ? 'admin' : 'front';
+ }
}
diff --git a/app/FrontKernel.php b/app/FrontKernel.php
new file mode 100644
index 0000000000000..62463dbe48568
--- /dev/null
+++ b/app/FrontKernel.php
@@ -0,0 +1,29 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+class FrontKernel extends AppKernel
+{
+}
diff --git a/app/config/config.yml b/app/config/config.yml
index 2b1d11b1d8790..e44fe68f2b0c9 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -3,6 +3,7 @@ imports:
- { resource: services.yml }
- { resource: addons/*.yml }
- { resource: doctrine.yml }
+ - { resource: messenger.yml }
# Put parameters here that don't need to change on each machine where the app is deployed
# http://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
@@ -85,6 +86,7 @@ twig:
'%kernel.project_dir%/modules': Modules
'%mail_themes_dir%': MailThemes
'%prestashop_views%': PrestaShopCore
+ '%kernel.project_dir%/admin-dev/themes/new-theme': AdminNewTheme
globals:
webpack_server: false
multistore_field_prefix: !php/const PrestaShopBundle\Service\Form\MultistoreCheckboxEnabler::MULTISTORE_FIELD_PREFIX
@@ -92,11 +94,21 @@ twig:
disabling_switch_prefix: !php/const PrestaShopBundle\Form\Extension\DisablingSwitchExtension::FIELD_PREFIX
api_platform:
- title: PrestaShop API
- version: 1.0.0
+ title: Backoffice API
+ version: 0.1.0
enable_entrypoint: false
+ formats:
+ json:
+ mime_types: [ 'application/json' ]
+ # Allow this format for other API endpoint than native endpoint (by default we will use json)
+ jsonld:
+ mime_types: [ 'application/ld+json' ]
mapping:
paths:
- '%kernel.project_dir%/src/PrestaShopBundle/ApiPlatform/Resources'
-
+ swagger:
+ api_keys:
+ JWT:
+ name: Authorization
+ type: header
metadata_backward_compatibility_layer: false
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 6133b038b2346..5ca052631ee8f 100644
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@ -48,10 +48,3 @@ prestashop:
addons:
api_client:
ttl: 300 # 5min
-
-tactician:
- commandbus:
- default:
- middleware:
- - prestashop.core.command_bus.middleware.command_register_middleware
- - tactician.middleware.command_handler
diff --git a/app/config/messenger.yml b/app/config/messenger.yml
new file mode 100644
index 0000000000000..5babdcf47d374
--- /dev/null
+++ b/app/config/messenger.yml
@@ -0,0 +1,6 @@
+framework:
+ messenger:
+ buses:
+ messenger.bus.default:
+ middleware:
+ - 'PrestaShopBundle\CommandBus\Middleware\CommandRegisterMiddleware'
diff --git a/app/config/security_dev.yml b/app/config/security_dev.yml
index 2ec19650314d2..e8d53f1b1228b 100644
--- a/app/config/security_dev.yml
+++ b/app/config/security_dev.yml
@@ -23,13 +23,18 @@ security:
pattern: ^/(_(profiler|wdt)|css|images|js)/
security: false
+ api_token:
+ pattern: ^/api/oauth2/token
+ security: false
+
api:
- pattern: '^%api_base_path%'
+ pattern: '^(%api_base_path%)(?!/docs)'
stateless: true
provider: 'oauth2'
guard:
authenticator:
- PrestaShop\PrestaShop\Core\Security\TokenAuthenticator
+ request_matcher: PrestaShop\PrestaShop\Core\Security\OAuth2\ApiRequestMatcher
main:
anonymous: ~
diff --git a/app/config/security_test.yml b/app/config/security_test.yml
index d4bb50d87b279..4476a36ed7c0c 100644
--- a/app/config/security_test.yml
+++ b/app/config/security_test.yml
@@ -13,7 +13,7 @@ security:
oauth2:
memory:
users:
- my_client_id: { password: 'prestashop' }
+ my_client_id: { password: 'prestashop', roles: [ 'ROLE_HOOK_READ', 'ROLE_HOOK_WRITE' ] }
encoders:
Symfony\Component\Security\Core\User\User: plaintext
@@ -24,6 +24,10 @@ security:
pattern: ^/(_(profiler|wdt)|css|images|js)/
security: false
+ api_token:
+ pattern: ^/api/oauth2/token
+ security: false
+
api:
pattern: '^%api_base_path%'
stateless: true
@@ -31,6 +35,7 @@ security:
guard:
authenticator:
- PrestaShop\PrestaShop\Core\Security\TokenAuthenticator
+ request_matcher: PrestaShop\PrestaShop\Core\Security\OAuth2\ApiRequestMatcher
main:
anonymous: ~
diff --git a/bin/console b/bin/console
index ef24799ce55e6..fd49818f76998 100755
--- a/bin/console
+++ b/bin/console
@@ -3,6 +3,7 @@
use Symfony\Bundle\FrameworkBundle\Console\Application;
use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Dotenv\Dotenv;
use Symfony\Component\ErrorHandler\Debug;
// if you don't want to setup permissions the proper way, just uncomment the following PHP line
@@ -19,9 +20,19 @@ $env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev
$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(['--no-debug', '']) && $env !== 'prod';
if ($debug) {
- Debug::enable();
+ Debug::enable();
}
-$kernel = new AppKernel($env, $debug);
+require_once __DIR__ . '/../app/AdminKernel.php';
+
+// Loads .env file from the root of project
+$dotEnvFile = dirname(__FILE__, 2) . '/.env';
+ (new Dotenv())
+ // DO NOT use putEnv
+ ->usePutenv(false)
+ ->loadEnv($dotEnvFile)
+;
+
+$kernel = new AdminKernel($env, $debug);
$application = new Application($kernel);
$application->run($input);
diff --git a/classes/Address.php b/classes/Address.php
index 9339ebd0ded0f..b7ab23fa914eb 100644
--- a/classes/Address.php
+++ b/classes/Address.php
@@ -38,12 +38,11 @@ class AddressCore extends ObjectModel
/** @var int Supplier ID which address belongs to */
public $id_supplier = null;
- /**
- * @since 1.5.0
+ /** @var int Id warehouse the address belongs to
*
- * @var int Warehouse ID which address belongs to
+ * @deprecated since 9.0, advanced stock management has been completely removed
*/
- public $id_warehouse = null;
+ public $id_warehouse = 0;
/** @var int Country ID */
public $id_country;
@@ -156,7 +155,6 @@ class AddressCore extends ObjectModel
'id_customer' => ['xlink_resource' => 'customers'],
'id_manufacturer' => ['xlink_resource' => 'manufacturers'],
'id_supplier' => ['xlink_resource' => 'suppliers'],
- 'id_warehouse' => ['xlink_resource' => 'warehouse'],
'id_country' => ['xlink_resource' => 'countries'],
'id_state' => ['xlink_resource' => 'states'],
],
@@ -221,6 +219,7 @@ public function update($null_values = false)
}
// Update the cache
+ // This is probably not correct, because it should be true only if the address is NOT flagged as deleted
static::$addressExists[$this->id] = true;
if (Validate::isUnsignedId($this->id_customer)) {
@@ -244,28 +243,29 @@ public function delete()
Customer::resetAddressCache($this->id_customer, $this->id);
}
- if (!$this->isUsed()) {
- $this->deleteCartAddress();
-
- // Update the cache
- if (isset(static::$addressExists[$this->id])) {
- static::$addressExists[$this->id] = false;
- }
+ // If the address is used in at least one order, we will not delete it, but only mark it and hide it from backoffice
+ // However, even if this address is used, we should probably unlink it from all NON ORDERED carts
+ if ($this->isUsed()) {
+ return $this->softDelete();
+ }
- return parent::delete();
- } else {
- $this->deleted = true;
+ // Remove this address from all carts
+ $this->deleteCartAddress();
- return $this->update();
+ // Update the static cache
+ if (isset(static::$addressExists[$this->id])) {
+ static::$addressExists[$this->id] = false;
}
+
+ return parent::delete();
}
/**
- * removes the address from carts using it, to avoid errors on not existing address
+ * Removes the address from carts using it, to avoid errors on not existing address.
*/
protected function deleteCartAddress()
{
- // keep pending carts, but unlink it from current address
+ // Remove references to this address from all carts
$sql = 'UPDATE ' . _DB_PREFIX_ . 'cart
SET id_address_delivery = 0
WHERE id_address_delivery = ' . $this->id;
@@ -611,7 +611,6 @@ public static function getAddressIdBySupplierId($id_supplier)
$query->where('deleted = 0');
$query->where('id_customer = 0');
$query->where('id_manufacturer = 0');
- $query->where('id_warehouse = 0');
return (int) Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query);
}
diff --git a/classes/Attachment.php b/classes/Attachment.php
index b6874720d5fa1..1f4e73d18dd48 100644
--- a/classes/Attachment.php
+++ b/classes/Attachment.php
@@ -111,7 +111,7 @@ public function update($nullValues = false)
public function delete()
{
if (file_exists(_PS_DOWNLOAD_DIR_ . $this->file)) {
- @unlink(_PS_DOWNLOAD_DIR_ . $this->file);
+ @unlink(_PS_DOWNLOAD_DIR_ . basename($this->file));
}
$sql = new DbQuery();
diff --git a/classes/Carrier.php b/classes/Carrier.php
index 76855434f2789..744eee88fefab 100644
--- a/classes/Carrier.php
+++ b/classes/Carrier.php
@@ -1457,12 +1457,12 @@ public static function getHigherPosition()
}
/**
- * For a given {product, warehouse}, gets the carrier available.
+ * For a given product, gets the carrier available.
*
* @since 1.5.0
*
* @param Product $product The id of the product, or an array with at least the package size and weight
- * @param int|null $id_warehouse Warehouse ID
+ * @param int|null $id_warehouse Warehouse ID - not used anymore
* @param int|null $id_address_delivery Delivery Address ID
* @param int|null$id_shop Shop ID
* @param CartCore|null $cart Cart object
@@ -1472,7 +1472,7 @@ public static function getHigherPosition()
*
* @throws PrestaShopDatabaseException
*/
- public static function getAvailableCarrierList(Product $product, $id_warehouse, $id_address_delivery = null, $id_shop = null, $cart = null, &$error = [])
+ public static function getAvailableCarrierList(Product $product, $id_warehouse = 0, $id_address_delivery = null, $id_shop = null, $cart = null, &$error = [])
{
static $ps_country_default = null;
@@ -1537,13 +1537,6 @@ public static function getAvailableCarrierList(Product $product, $id_warehouse,
}//no linked carrier are available for this zone
}
- // The product is not directly linked with a carrier
- // Get all the carriers linked to a warehouse
- if ($id_warehouse) {
- $warehouse = new Warehouse($id_warehouse);
- $warehouse_carrier_list = $warehouse->getCarriers();
- }
-
$available_carrier_list = [];
$cache_id = 'Carrier::getAvailableCarrierList_getCarriersForOrder_' . (int) $id_zone . '-' . (int) $cart->id;
if (!Cache::isStored($cache_id)) {
@@ -1567,10 +1560,6 @@ public static function getAvailableCarrierList(Product $product, $id_warehouse,
$carrier_list = $available_carrier_list;
}
- if (isset($warehouse_carrier_list)) {
- $carrier_list = array_intersect($carrier_list, $warehouse_carrier_list);
- }
-
$cart_quantity = 0;
$cart_weight = 0;
diff --git a/classes/Cart.php b/classes/Cart.php
index 13d9510172b00..d4f40a5abc600 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -116,6 +116,10 @@ class CartCore extends ObjectModel
protected static $cacheNbPackages = [];
protected static $cachePackageList = [];
protected static $cacheDeliveryOptionList = [];
+
+ /**
+ * @deprecated Since 9.0 and will be removed in 10.0
+ */
protected static $cacheMultiAddressDelivery = [];
/**
@@ -330,18 +334,6 @@ public function updateAddressId($id_address, $id_address_new)
$this->update();
}
- $sql = 'UPDATE `' . _DB_PREFIX_ . 'cart_product`
- SET `id_address_delivery` = ' . (int) $id_address_new . '
- WHERE `id_cart` = ' . (int) $this->id . '
- AND `id_address_delivery` = ' . (int) $id_address;
- Db::getInstance()->execute($sql);
-
- $sql = 'UPDATE `' . _DB_PREFIX_ . 'customization`
- SET `id_address_delivery` = ' . (int) $id_address_new . '
- WHERE `id_cart` = ' . (int) $this->id . '
- AND `id_address_delivery` = ' . (int) $id_address;
- Db::getInstance()->execute($sql);
-
Hook::exec('actionUpdateCartAddress', ['cart' => $this, 'oldAddressId' => (int) $id_address, 'newAddressId' => (int) $id_address_new]);
}
@@ -358,18 +350,6 @@ public function updateDeliveryAddressId(int $currentAddressId, int $newAddressId
$this->update();
}
- $sql = 'UPDATE `' . _DB_PREFIX_ . 'cart_product`
- SET `id_address_delivery` = ' . $newAddressId . '
- WHERE `id_cart` = ' . (int) $this->id . '
- AND `id_address_delivery` = ' . $currentAddressId;
- Db::getInstance()->execute($sql);
-
- $sql = 'UPDATE `' . _DB_PREFIX_ . 'customization`
- SET `id_address_delivery` = ' . $newAddressId . '
- WHERE `id_cart` = ' . (int) $this->id . '
- AND `id_address_delivery` = ' . $currentAddressId;
- Db::getInstance()->execute($sql);
-
Hook::exec('actionUpdateCartAddress', ['cart' => $this, 'oldAddressId' => $currentAddressId, 'newAddressId' => $newAddressId]);
}
@@ -386,6 +366,7 @@ public function delete()
return false;
}
+ // Get all file customization fields from customized_data table and delete the physical file
$uploaded_files = Db::getInstance()->executeS(
'SELECT cd.`value`
FROM `' . _DB_PREFIX_ . 'customized_data` cd
@@ -398,6 +379,7 @@ public function delete()
unlink(_PS_UPLOAD_DIR_ . $must_unlink['value']);
}
+ // Delete all related customized data
Db::getInstance()->execute(
'DELETE FROM `' . _DB_PREFIX_ . 'customized_data`
WHERE `id_customization` IN (
@@ -407,11 +389,13 @@ public function delete()
)'
);
+ // Delete all customization entries (1 customization can have multiple customized_data)
Db::getInstance()->execute(
'DELETE FROM `' . _DB_PREFIX_ . 'customization`
WHERE `id_cart` = ' . (int) $this->id
);
+ // Delete products, delete cart rules
if (!Db::getInstance()->execute('DELETE FROM `' . _DB_PREFIX_ . 'cart_cart_rule` WHERE `id_cart` = ' . (int) $this->id)
|| !Db::getInstance()->execute('DELETE FROM `' . _DB_PREFIX_ . 'cart_product` WHERE `id_cart` = ' . (int) $this->id)) {
return false;
@@ -668,8 +652,8 @@ public function getProducts($refresh = false, $id_product = false, $id_country =
product_shop.`available_for_order`, product_shop.`show_price`, product_shop.`price`, product_shop.`active`, product_shop.`unity`, product_shop.`unit_price`,
stock.`quantity` AS quantity_available, p.`width`, p.`height`, p.`depth`, stock.`out_of_stock`, p.`weight`,
p.`available_date`, p.`date_add`, p.`date_upd`, IFNULL(stock.quantity, 0) as quantity, pl.`link_rewrite`, cl.`link_rewrite` AS category,
- CONCAT(LPAD(cp.`id_product`, 10, 0), LPAD(IFNULL(cp.`id_product_attribute`, 0), 10, 0), IFNULL(cp.`id_address_delivery`, 0), IFNULL(cp.`id_customization`, 0)) AS unique_id, cp.id_address_delivery,
- product_shop.advanced_stock_management, ps.product_supplier_reference supplier_reference');
+ CONCAT(LPAD(cp.`id_product`, 10, 0), LPAD(IFNULL(cp.`id_product_attribute`, 0), 10, 0), IFNULL(cp.`id_customization`, 0)) AS unique_id,
+ ps.product_supplier_reference supplier_reference');
// Build FROM
$sql->from('cart_product', 'cp');
@@ -890,7 +874,7 @@ protected function applyProductCalculations($row, $shopContext, $productQuantity
if (Configuration::get('PS_TAX_ADDRESS_TYPE') == 'id_address_invoice') {
$address_id = (int) $this->id_address_invoice;
} else {
- $address_id = (int) $row['id_address_delivery'];
+ $address_id = (int) $this->id_address_delivery;
}
if (!Address::addressExists($address_id, true)) {
$address_id = null;
@@ -1334,6 +1318,7 @@ public function addCartRule($id_cart_rule, bool $useOrderPrices = false)
Cache::clean('Cart::getOrderedCartRulesIds_' . $this->id . '-' . CartRule::FILTER_ACTION_SHIPPING . '-ids');
Cache::clean('Cart::getOrderedCartRulesIds_' . $this->id . '-' . CartRule::FILTER_ACTION_REDUCTION . '-ids');
Cache::clean('Cart::getOrderedCartRulesIds_' . $this->id . '-' . CartRule::FILTER_ACTION_GIFT . '-ids');
+ Cache::clean('getContextualValue_*');
if ((int) $cartRule->gift_product) {
$this->updateQty(
@@ -1397,10 +1382,6 @@ public function getProductQuantity($idProduct, $idProductAttribute = 0, $idCusto
' . ($idCustomization !== false ? ' AND cp.`id_customization` = ' . (int) $idCustomization : '') . '
AND cp.`id_cart` = ' . (int) $this->id;
- if (Configuration::get('PS_ALLOW_MULTISHIPPING') && $this->isMultiAddressDelivery()) {
- $commonWhere .= ' AND cp.`id_address_delivery` = ' . (int) $idAddressDelivery;
- }
-
if ($idCustomization) {
$commonWhere .= ' AND c.`id_customization` = ' . (int) $idCustomization;
}
@@ -1420,36 +1401,6 @@ public function getProductQuantity($idProduct, $idProductAttribute = 0, $idCusto
return Db::getInstance()->getRow($parentSql);
}
- /**
- * Check if the Cart contains the given Product (Attribute).
- *
- * @deprecated 1.7.3.1
- * @see Cart::getProductQuantity()
- *
- * @param int $id_product Product ID
- * @param int $id_product_attribute ProductAttribute ID
- * @param int $id_customization Customization ID
- * @param int $id_address_delivery Delivery Address ID
- *
- * @return array|bool Whether the Cart contains the Product
- * Result comes directly from the database
- */
- public function containsProduct($id_product, $id_product_attribute = 0, $id_customization = 0, $id_address_delivery = 0)
- {
- $result = $this->getProductQuantity(
- $id_product,
- $id_product_attribute,
- $id_customization,
- $id_address_delivery
- );
-
- if (empty($result['quantity'])) {
- return false;
- }
-
- return ['quantity' => $result['quantity']];
- }
-
/**
* Update Product quantity.
*
@@ -1458,7 +1409,7 @@ public function containsProduct($id_product, $id_product_attribute = 0, $id_cust
* @param int|null $id_product_attribute Attribute ID if needed
* @param int|false $id_customization Customization ID
* @param string $operator Indicate if quantity must be increased or decreased
- * @param int $id_address_delivery Delivery Address ID
+ * @param int $id_address_delivery Delivery Address ID - unused
* @param Shop|null $shop
* @param bool $auto_add_cart_rule
* @param bool $skipAvailabilityCheckOutOfStock
@@ -1484,28 +1435,10 @@ public function updateQty(
$shop = Context::getContext()->shop;
}
- if (Validate::isLoadedObject(Context::getContext()->customer)) {
- if ($id_address_delivery == 0 && (int) $this->id_address_delivery) {
- // The $id_address_delivery is null, use the cart delivery address
- $id_address_delivery = $this->id_address_delivery;
- } elseif ($id_address_delivery == 0) {
- // The $id_address_delivery is null, get the default customer address
- $id_address_delivery = (int) Address::getFirstCustomerAddressId(
- (int) Context::getContext()->customer->id
- );
- } elseif (!Customer::customerHasAddress(Context::getContext()->customer->id, $id_address_delivery)) {
- // The $id_address_delivery must be linked with customer
- $id_address_delivery = 0;
- }
- } else {
- $id_address_delivery = 0;
- }
-
$quantity = (int) $quantity;
$id_product = (int) $id_product;
$id_product_attribute = (int) $id_product_attribute;
$id_customization = (int) $id_customization;
- $id_address_delivery = (int) $id_address_delivery;
$product = new Product($id_product, false, (int) Configuration::get('PS_LANG_DEFAULT'), $shop->id);
if ($id_product_attribute) {
@@ -1541,7 +1474,7 @@ public function updateQty(
'id_customization' => $id_customization,
'quantity' => $quantity,
'operator' => $operator,
- 'id_address_delivery' => $id_address_delivery,
+ 'id_address_delivery' => (int) $this->id_address_delivery,
'shop' => $shop,
'auto_add_cart_rule' => $auto_add_cart_rule,
];
@@ -1549,7 +1482,7 @@ public function updateQty(
Hook::exec('actionCartUpdateQuantityBefore', $data);
if ((int) $quantity <= 0) {
- return $this->deleteProduct($id_product, $id_product_attribute, (int) $id_customization, (int) $id_address_delivery, $preserveGiftRemoval, $useOrderPrices);
+ return $this->deleteProduct($id_product, $id_product_attribute, (int) $id_customization, 0, $preserveGiftRemoval, $useOrderPrices);
}
if (!$product->available_for_order
@@ -1565,8 +1498,7 @@ public function updateQty(
$cartProductQuantity = $this->getProductQuantity(
$id_product,
$id_product_attribute,
- (int) $id_customization,
- (int) $id_address_delivery
+ (int) $id_customization
);
/* Update quantity if product already exist */
@@ -1592,7 +1524,7 @@ public function updateQty(
if ($cartFirstLevelProductQuantity['quantity'] <= 1
|| $cartProductQuantity['quantity'] - $quantity <= 0
) {
- return $this->deleteProduct((int) $id_product, (int) $id_product_attribute, (int) $id_customization, (int) $id_address_delivery, $preserveGiftRemoval, $useOrderPrices);
+ return $this->deleteProduct((int) $id_product, (int) $id_product_attribute, (int) $id_customization, 0, $preserveGiftRemoval, $useOrderPrices);
}
} else {
return false;
@@ -1604,7 +1536,7 @@ public function updateQty(
WHERE `id_product` = ' . (int) $id_product .
' AND `id_customization` = ' . (int) $id_customization .
(!empty($id_product_attribute) ? ' AND `id_product_attribute` = ' . (int) $id_product_attribute : '') . '
- AND `id_cart` = ' . (int) $this->id . (Configuration::get('PS_ALLOW_MULTISHIPPING') && $this->isMultiAddressDelivery() ? ' AND `id_address_delivery` = ' . (int) $id_address_delivery : '') . '
+ AND `id_cart` = ' . (int) $this->id . '
LIMIT 1'
);
} elseif ($operator == 'up') {
@@ -1636,7 +1568,7 @@ public function updateQty(
'id_product' => (int) $id_product,
'id_product_attribute' => (int) $id_product_attribute,
'id_cart' => (int) $this->id,
- 'id_address_delivery' => (int) $id_address_delivery,
+ 'id_address_delivery' => 0,
'id_shop' => $shop->id,
'quantity' => (int) $quantity,
'date_add' => date('Y-m-d H:i:s'),
@@ -1646,7 +1578,7 @@ public function updateQty(
if ((int) $id_customization) {
$result_add &= Db::getInstance()->update('customization', [
'id_product_attribute' => $id_product_attribute,
- 'id_address_delivery' => $id_address_delivery,
+ 'id_address_delivery' => 0,
'in_cart' => 1,
], '`id_customization` = ' . $id_customization);
}
@@ -1672,7 +1604,8 @@ public function updateQty(
}
/**
- * Add customization item to database.
+ * Add customized data to database. If a customization already exists for the given data, it the given field will be
+ * replaced in the customization.
*
* @param int $id_product Product ID
* @param int $id_product_attribute ProductAttribute ID
@@ -1686,6 +1619,7 @@ public function updateQty(
*/
public function _addCustomization($id_product, $id_product_attribute, $index, $type, $value, $quantity, $returnId = false)
{
+ // Check if there already is a customization for this cart, but not added to cart
$exising_customization = Db::getInstance()->executeS(
'SELECT cu.`id_customization`, cd.`index`, cd.`value`, cd.`type` FROM `' . _DB_PREFIX_ . 'customization` cu
LEFT JOIN `' . _DB_PREFIX_ . 'customized_data` cd
@@ -1695,6 +1629,9 @@ public function _addCustomization($id_product, $id_product_attribute, $index, $t
AND in_cart = 0'
);
+ // If we find some, we check if the field we are adding is already in the customizations
+ // If it is, we will remove it
+ // We will also get the customization ID so we can assign it correctly
if ($exising_customization) {
// If the customization field is alreay filled, delete it
foreach ($exising_customization as $customization) {
@@ -1714,6 +1651,7 @@ public function _addCustomization($id_product, $id_product_attribute, $index, $t
}
$id_customization = $exising_customization[0]['id_customization'];
} else {
+ // Otherwise, insert new customization entry
Db::getInstance()->execute(
'INSERT INTO `' . _DB_PREFIX_ . 'customization` (`id_cart`, `id_product`, `id_product_attribute`)
VALUES (' . (int) $this->id . ', ' . (int) $id_product . ', ' . (int) $id_product_attribute . ')'
@@ -1721,6 +1659,7 @@ public function _addCustomization($id_product, $id_product_attribute, $index, $t
$id_customization = Db::getInstance()->Insert_ID();
}
+ // And finally, insert the customized field
$query = 'INSERT INTO `' . _DB_PREFIX_ . 'customized_data` (`id_customization`, `type`, `index`, `value`)
VALUES (' . (int) $id_customization . ', ' . (int) $type . ', ' . (int) $index . ', \'' . pSQL($value) . '\')';
@@ -1728,15 +1667,11 @@ public function _addCustomization($id_product, $id_product_attribute, $index, $t
return false;
}
- if (true === $returnId) {
- return (int) $id_customization;
- }
-
- return true;
+ return $returnId ? (int) $id_customization : true;
}
/**
- * Check if order has already been placed.
+ * Check if order has already been placed for this cart. Usually used to check if we can delete this cart.
*
* @return bool Indicates if the Order exists
*/
@@ -1784,7 +1719,7 @@ public function removeCartRule($id_cart_rule, bool $useOrderPrices = false)
* @param int $id_product Product ID
* @param int|null $id_product_attribute Attribute ID if needed
* @param int $id_customization Customization id
- * @param int $id_address_delivery Delivery Address id
+ * @param int $id_address_delivery Delivery Address id - unused
* @param bool $preserveGiftsRemoval If true gift are not removed so product is still in cart
* @param bool $useOrderPrices If true, will use order prices to re-calculate cartRules after the product is deleted
*
@@ -1807,7 +1742,7 @@ public function deleteProduct(
}
if ((int) $id_customization) {
- if (!$this->_deleteCustomization((int) $id_customization, (int) $id_product, (int) $id_product_attribute, (int) $id_address_delivery)) {
+ if (!$this->_deleteCustomization((int) $id_customization)) {
return false;
}
}
@@ -1846,8 +1781,7 @@ public function deleteProduct(
WHERE `id_product` = ' . (int) $id_product . '
AND `id_customization` = ' . (int) $id_customization .
(null !== $id_product_attribute ? ' AND `id_product_attribute` = ' . (int) $id_product_attribute : '') . '
- AND `id_cart` = ' . (int) $this->id . '
- ' . ((int) $id_address_delivery ? 'AND `id_address_delivery` = ' . (int) $id_address_delivery : ''));
+ AND `id_cart` = ' . (int) $this->id);
if ($result) {
$return = $this->update();
@@ -1893,30 +1827,28 @@ protected function getProductsGifts($id_product, $id_product_attribute)
}
/**
- * Delete a Customization from the Cart. If the Customization is a Picture,
+ * Delete a complete customization from the Cart. If the Customization is a Picture,
* then the Image is also deleted.
*
* @param int $id_customization Customization Id
- * @param int|null $id_product Unused
- * @param int|null $id_product_attribute Unused
- * @param int|null $id_address_delivery Unused
*
* @return bool Indicates if the Customization was successfully deleted
- * @todo: Remove unused parameters
*/
- protected function _deleteCustomization($id_customization, $id_product, $id_product_attribute, $id_address_delivery = 0)
+ protected function _deleteCustomization($id_customization)
{
$result = true;
+ // Try to find the given customization
$customization = Db::getInstance()->getRow('SELECT *
FROM `' . _DB_PREFIX_ . 'customization`
WHERE `id_customization` = ' . (int) $id_customization);
if ($customization) {
+ // If found, let's delete all customized fields for the given customization
$cust_data = Db::getInstance()->getRow('SELECT *
FROM `' . _DB_PREFIX_ . 'customized_data`
WHERE `id_customization` = ' . (int) $id_customization);
- // Delete customization picture if necessary
+ // Delete customization physical file if necessary
if (isset($cust_data['type']) && $cust_data['type'] == Product::CUSTOMIZE_FILE) {
$result &= file_exists(_PS_UPLOAD_DIR_ . $cust_data['value']) ? @unlink(_PS_UPLOAD_DIR_ . $cust_data['value']) : true;
$result &= file_exists(_PS_UPLOAD_DIR_ . $cust_data['value'] . '_small') ? @unlink(_PS_UPLOAD_DIR_ . $cust_data['value'] . '_small') : true;
@@ -1931,6 +1863,7 @@ protected function _deleteCustomization($id_customization, $id_product, $id_prod
return false;
}
+ // And finally delete the customization itself
return Db::getInstance()->execute(
'DELETE FROM `' . _DB_PREFIX_ . 'customization`
WHERE `id_customization` = ' . (int) $id_customization
@@ -2235,13 +2168,13 @@ protected function countProductLines($products)
}
/**
- * @param array $products
+ * @param array $products - not used anymore
*
* @return int
*/
- protected function getDeliveryAddressId($products)
+ protected function getDeliveryAddressId($products = null)
{
- return $products[0]['id_address_delivery'] ?? $this->id_address_delivery;
+ return $this->id_address_delivery;
}
/**
@@ -2286,7 +2219,7 @@ protected function findTaxRulesGroupId($withTaxes, $product, $virtualContext)
if ($withTaxes) {
$taxRulesGroupId = Product::getIdTaxRulesGroupByIdProduct((int) $product['id_product'], $virtualContext);
- $addressId = $this->getProductAddressId($product);
+ $addressId = $this->getProductAddressId();
$address = $this->addressFactory->findOrCreate($addressId, true);
// Refresh cache and execute tax manager factory hook
@@ -2299,17 +2232,17 @@ protected function findTaxRulesGroupId($withTaxes, $product, $virtualContext)
}
/**
- * @param array $product
+ * @param array $product - not used anymore
*
* @return int|null
*/
- public function getProductAddressId($product)
+ public function getProductAddressId($product = null)
{
$taxAddressType = $this->configuration->get('PS_TAX_ADDRESS_TYPE');
if ($taxAddressType == 'id_address_invoice') {
$addressId = (int) $this->id_address_invoice;
} else {
- $addressId = (int) $product['id_address_delivery'];
+ $addressId = (int) $this->id_address_delivery;
}
// Get delivery address of the product from the cart
@@ -2447,7 +2380,6 @@ public function getNbOfPackages()
* 0 => array( // First package
* 'product_list' => array(...),
* 'carrier_list' => array(...),
- * 'id_warehouse' => array(...),
* ),
* ),
* );
@@ -2456,120 +2388,45 @@ public function getNbOfPackages()
*/
public function getPackageList($flush = false)
{
+ // Resolve cache key, we will get the info from cache if present and we are not forcing a refresh
$cache_key = (int) $this->id . '_' . (int) $this->id_address_delivery;
if (isset(static::$cachePackageList[$cache_key]) && static::$cachePackageList[$cache_key] !== false && !$flush) {
return static::$cachePackageList[$cache_key];
}
+ // Load products, hard refresh if needed
$product_list = $this->getProducts($flush);
- // Step 1 : Get product informations (warehouse_list and carrier_list), count warehouse
- // Determine the best warehouse to determine the packages
- // For that we count the number of time we can use a warehouse for a specific delivery address
- $warehouse_count_by_address = [];
-
- $stock_management_active = Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT');
-
- foreach ($product_list as &$product) {
- if ((int) $product['id_address_delivery'] == 0) {
- $product['id_address_delivery'] = (int) $this->id_address_delivery;
- }
-
- if (!isset($warehouse_count_by_address[$product['id_address_delivery']])) {
- $warehouse_count_by_address[$product['id_address_delivery']] = [];
- }
-
- $product['warehouse_list'] = [];
-
- if ($stock_management_active &&
- (int) $product['advanced_stock_management'] == 1) {
- $warehouse_list = Warehouse::getProductWarehouseList($product['id_product'], $product['id_product_attribute'], $this->id_shop);
- if (count($warehouse_list) == 0) {
- $warehouse_list = Warehouse::getProductWarehouseList($product['id_product'], $product['id_product_attribute']);
- }
- // Does the product is in stock ?
- // If yes, get only warehouse where the product is in stock
-
- $warehouse_in_stock = [];
- $manager = StockManagerFactory::getManager();
-
- foreach ($warehouse_list as $key => $warehouse) {
- $product_real_quantities = $manager->getProductRealQuantities(
- $product['id_product'],
- $product['id_product_attribute'],
- [$warehouse['id_warehouse']],
- true
- );
-
- if ($product_real_quantities > 0 || Pack::isPack((int) $product['id_product'])) {
- $warehouse_in_stock[] = $warehouse;
- }
- }
-
- if (!empty($warehouse_in_stock)) {
- $warehouse_list = $warehouse_in_stock;
- $product['in_stock'] = true;
- } else {
- $product['in_stock'] = false;
- }
- } else {
- //simulate default warehouse
- $warehouse_list = [0 => ['id_warehouse' => 0]];
- $product['in_stock'] = StockAvailable::getQuantityAvailableByProduct($product['id_product'], $product['id_product_attribute']) > 0;
- }
-
- foreach ($warehouse_list as $warehouse) {
- $product['warehouse_list'][$warehouse['id_warehouse']] = $warehouse['id_warehouse'];
- if (!isset($warehouse_count_by_address[$product['id_address_delivery']][$warehouse['id_warehouse']])) {
- $warehouse_count_by_address[$product['id_address_delivery']][$warehouse['id_warehouse']] = 0;
- }
-
- ++$warehouse_count_by_address[$product['id_address_delivery']][$warehouse['id_warehouse']];
- }
- }
- unset($product);
-
- arsort($warehouse_count_by_address);
- // Step 2 : Group product by warehouse
- $grouped_by_warehouse = [];
+ // Step 1 - We assign some basic information (load their carriers) to products and separate them by their stock quantities.
+ $grouped_by_stock = [
+ 'in_stock' => [],
+ 'out_of_stock' => [],
+ ];
foreach ($product_list as &$product) {
- if (!isset($grouped_by_warehouse[$product['id_address_delivery']])) {
- $grouped_by_warehouse[$product['id_address_delivery']] = [
- 'in_stock' => [],
- 'out_of_stock' => [],
- ];
- }
+ // Assign delivery address if missing, for compatibility
+ $product['id_address_delivery'] = (int) $this->id_address_delivery;
- $product['carrier_list'] = [];
- $id_warehouse = 0;
- foreach ($warehouse_count_by_address[$product['id_address_delivery']] as $id_war => $val) {
- if (array_key_exists((int) $id_war, $product['warehouse_list'])) {
- $product['carrier_list'] = array_replace(
- $product['carrier_list'],
- Carrier::getAvailableCarrierList(
- new Product($product['id_product']),
- $id_war,
- $product['id_address_delivery'],
- null,
- $this
- )
- );
- if (!$id_warehouse) {
- $id_warehouse = (int) $id_war;
- }
- }
- }
+ // Get product's carriers - the product can have some specific limitations
+ $product['carrier_list'] = Carrier::getAvailableCarrierList(
+ new Product($product['id_product']),
+ 0,
+ (int) $this->id_address_delivery,
+ null,
+ $this
+ );
- if (!isset($grouped_by_warehouse[$product['id_address_delivery']]['in_stock'][$id_warehouse])) {
- $grouped_by_warehouse[$product['id_address_delivery']]['in_stock'][$id_warehouse] = [];
- $grouped_by_warehouse[$product['id_address_delivery']]['out_of_stock'][$id_warehouse] = [];
+ // Apply fallback if no carrier is found
+ if (empty($product['carrier_list'])) {
+ $product['carrier_list'] = [0 => 0];
}
+ // If "send in-stock items first" is enabled and properly implemented sometime in the future, we separate products by stock
if (!$this->allow_seperated_package) {
- $key = 'in_stock';
+ $stockGroupKey = 'in_stock';
} else {
- $key = $product['in_stock'] ? 'in_stock' : 'out_of_stock';
+ $product['in_stock'] = StockAvailable::getQuantityAvailableByProduct($product['id_product'], $product['id_product_attribute']) > 0;
+ $stockGroupKey = $product['in_stock'] ? 'in_stock' : 'out_of_stock';
$product_quantity_in_stock = StockAvailable::getQuantityAvailableByProduct($product['id_product'], $product['id_product_attribute']);
if ($product['in_stock'] && $product['cart_quantity'] > $product_quantity_in_stock) {
$out_stock_part = $product['cart_quantity'] - $product_quantity_in_stock;
@@ -2577,124 +2434,96 @@ public function getPackageList($flush = false)
$product_bis['cart_quantity'] = $out_stock_part;
$product_bis['in_stock'] = 0;
$product['cart_quantity'] -= $out_stock_part;
- $grouped_by_warehouse[$product['id_address_delivery']]['out_of_stock'][$id_warehouse][] = $product_bis;
+ $grouped_by_stock['out_of_stock'][] = $product_bis;
}
}
- if (empty($product['carrier_list'])) {
- $product['carrier_list'] = [0 => 0];
- }
-
- $grouped_by_warehouse[$product['id_address_delivery']][$key][$id_warehouse][] = $product;
+ $grouped_by_stock[$stockGroupKey][] = $product;
}
unset($product);
+ // Now we have them in two groups, those in stock and those not in stock.
- // Step 3 : grouped product from grouped_by_warehouse by available carriers
- $grouped_by_carriers = [];
- foreach ($grouped_by_warehouse as $id_address_delivery => $products_in_stock_list) {
- if (!isset($grouped_by_carriers[$id_address_delivery])) {
- $grouped_by_carriers[$id_address_delivery] = [
- 'in_stock' => [],
- 'out_of_stock' => [],
- ];
- }
- foreach ($products_in_stock_list as $key => $warehouse_list) {
- if (!isset($grouped_by_carriers[$id_address_delivery][$key])) {
- $grouped_by_carriers[$id_address_delivery][$key] = [];
+ // Step 2 - We divide those two groups once more into groups by their carriers.
+ $grouped_by_carriers = [
+ 'in_stock' => [],
+ 'out_of_stock' => [],
+ ];
+ foreach ($grouped_by_stock as $key => $product_list) {
+ foreach ($product_list as $product) {
+ // We construct unique key by combining IDs of their carriers
+ $package_carriers_key = implode(',', $product['carrier_list']);
+
+ // Initialize our array if it's the first product with this combination of these carriers
+ if (!isset($grouped_by_carriers[$key][$package_carriers_key])) {
+ $grouped_by_carriers[$key][$package_carriers_key] = [
+ 'product_list' => [],
+ 'carrier_list' => $product['carrier_list'],
+ ];
}
- foreach ($warehouse_list as $id_warehouse => $product_list) {
- if (!isset($grouped_by_carriers[$id_address_delivery][$key][$id_warehouse])) {
- $grouped_by_carriers[$id_address_delivery][$key][$id_warehouse] = [];
- }
- foreach ($product_list as $product) {
- $package_carriers_key = implode(',', $product['carrier_list']);
- if (!isset($grouped_by_carriers[$id_address_delivery][$key][$id_warehouse][$package_carriers_key])) {
- $grouped_by_carriers[$id_address_delivery][$key][$id_warehouse][$package_carriers_key] = [
- 'product_list' => [],
- 'carrier_list' => $product['carrier_list'],
- 'warehouse_list' => $product['warehouse_list'],
- ];
- }
+ // Add this product to this carrier combination group
+ $grouped_by_carriers[$key][$package_carriers_key]['product_list'][] = $product;
+ }
+ }
+ // Now we have them in two groups, those in stock and those not in stock, then grouped by their common carriers.
+
+ /*
+ * Step 3 - merge product from grouped_by_carriers into $package to minimize the number of package.
+ * Example:
+ * Product A can be sent with carriers A and B
+ * Product B can be sent with carriers A and C
+ * Resulting package will be 1 with carrier A
+ */
+ $package_list = [
+ 'in_stock' => [],
+ 'out_of_stock' => [],
+ ];
- $grouped_by_carriers[$id_address_delivery][$key][$id_warehouse][$package_carriers_key]['product_list'][] = $product;
+ // Count occurance of each carriers to minimize the number of packages
+ $carrier_count = [];
+ foreach ($grouped_by_carriers as $key => $products_grouped_by_carriers) {
+ foreach ($products_grouped_by_carriers as $data) {
+ foreach ($data['carrier_list'] as $id_carrier) {
+ if (!isset($carrier_count[$id_carrier])) {
+ $carrier_count[$id_carrier] = 0;
}
+ ++$carrier_count[$id_carrier];
}
}
}
+ arsort($carrier_count);
- $package_list = [];
- // Step 4 : merge product from grouped_by_carriers into $package to minimize the number of package
- foreach ($grouped_by_carriers as $id_address_delivery => $products_in_stock_list) {
- if (!isset($package_list[$id_address_delivery])) {
- $package_list[$id_address_delivery] = [
- 'in_stock' => [],
- 'out_of_stock' => [],
- ];
- }
-
- foreach ($products_in_stock_list as $key => $warehouse_list) {
- if (!isset($package_list[$id_address_delivery][$key])) {
- $package_list[$id_address_delivery][$key] = [];
- }
- // Count occurance of each carriers to minimize the number of packages
- $carrier_count = [];
- foreach ($warehouse_list as $id_warehouse => $products_grouped_by_carriers) {
- foreach ($products_grouped_by_carriers as $data) {
- foreach ($data['carrier_list'] as $id_carrier) {
- if (!isset($carrier_count[$id_carrier])) {
- $carrier_count[$id_carrier] = 0;
- }
- ++$carrier_count[$id_carrier];
- }
- }
- }
- arsort($carrier_count);
- foreach ($warehouse_list as $id_warehouse => $products_grouped_by_carriers) {
- if (!isset($package_list[$id_address_delivery][$key][$id_warehouse])) {
- $package_list[$id_address_delivery][$key][$id_warehouse] = [];
- }
- foreach ($products_grouped_by_carriers as $data) {
- foreach ($carrier_count as $id_carrier => $rate) {
- if (array_key_exists($id_carrier, $data['carrier_list'])) {
- if (!isset($package_list[$id_address_delivery][$key][$id_warehouse][$id_carrier])) {
- $package_list[$id_address_delivery][$key][$id_warehouse][$id_carrier] = [
- 'carrier_list' => $data['carrier_list'],
- 'warehouse_list' => $data['warehouse_list'],
- 'product_list' => [],
- ];
- }
- $package_list[$id_address_delivery][$key][$id_warehouse][$id_carrier]['carrier_list'] =
- array_intersect($package_list[$id_address_delivery][$key][$id_warehouse][$id_carrier]['carrier_list'], $data['carrier_list']);
- $package_list[$id_address_delivery][$key][$id_warehouse][$id_carrier]['product_list'] =
- array_merge($package_list[$id_address_delivery][$key][$id_warehouse][$id_carrier]['product_list'], $data['product_list']);
-
- break;
- }
+ foreach ($grouped_by_carriers as $key => $products_grouped_by_carriers) {
+ foreach ($products_grouped_by_carriers as $data) {
+ foreach ($carrier_count as $id_carrier => $rate) {
+ if (array_key_exists($id_carrier, $data['carrier_list'])) {
+ if (!isset($package_list[$key][$id_carrier])) {
+ $package_list[$key][$id_carrier] = [
+ 'carrier_list' => $data['carrier_list'],
+ 'product_list' => [],
+ ];
}
+ $package_list[$key][$id_carrier]['carrier_list'] =
+ array_intersect($package_list[$key][$id_carrier]['carrier_list'], $data['carrier_list']);
+ $package_list[$key][$id_carrier]['product_list'] =
+ array_merge($package_list[$key][$id_carrier]['product_list'], $data['product_list']);
+
+ break;
}
}
}
}
- // Step 5 : Reduce depth of $package_list
+ // Step 4 - Reduce depth of $package_list
$final_package_list = [];
- foreach ($package_list as $id_address_delivery => $products_in_stock_list) {
- if (!isset($final_package_list[$id_address_delivery])) {
- $final_package_list[$id_address_delivery] = [];
- }
-
- foreach ($products_in_stock_list as $key => $warehouse_list) {
- foreach ($warehouse_list as $id_warehouse => $products_grouped_by_carriers) {
- foreach ($products_grouped_by_carriers as $data) {
- $final_package_list[$id_address_delivery][] = [
- 'product_list' => $data['product_list'],
- 'carrier_list' => $data['carrier_list'],
- 'warehouse_list' => $data['warehouse_list'],
- 'id_warehouse' => $id_warehouse,
- ];
- }
- }
+ foreach ($package_list as $products_grouped_by_carriers) {
+ foreach ($products_grouped_by_carriers as $data) {
+ $final_package_list[(int) $this->id_address_delivery][] = [
+ 'product_list' => $data['product_list'],
+ 'carrier_list' => $data['carrier_list'],
+ 'warehouse_list' => [0 => 0], // For backward compatibility - not used
+ 'id_warehouse' => 0, // For backward compatibility - not used
+ ];
}
}
@@ -2703,25 +2532,15 @@ public function getPackageList($flush = false)
return $final_package_list;
}
+ /**
+ * @deprecated Since 9.0 and will be removed in 10.0
+ */
public function getPackageIdWarehouse($package, $id_carrier = null)
{
- if ($id_carrier === null) {
- if (isset($package['id_carrier'])) {
- $id_carrier = (int) $package['id_carrier'];
- }
- }
-
- if ($id_carrier == null) {
- return $package['id_warehouse'];
- }
-
- foreach ($package['warehouse_list'] as $id_warehouse) {
- $warehouse = new Warehouse((int) $id_warehouse);
- $available_warehouse_carriers = $warehouse->getCarriers();
- if (in_array($id_carrier, $available_warehouse_carriers)) {
- return (int) $id_warehouse;
- }
- }
+ @trigger_error(sprintf(
+ '%s is deprecated since 9.0 and will be removed in 10.0.',
+ __METHOD__
+ ), E_USER_DEPRECATED);
return 0;
}
@@ -3098,74 +2917,14 @@ public function carrierIsSelected($id_carrier, $id_address)
return true;
}
- /**
- * Get all deliveries options available for the current cart formatted like Carriers::getCarriersForOrder
- * This method was wrote for retrocompatibility with 1.4 theme
- * New theme need to use Cart::getDeliveryOptionList() to generate carriers option in the checkout process.
- *
- * @since 1.5.0
- * @deprecated 1.7.0
- *
- * @param Country $default_country Default Country
- * @param bool $flush Force flushing cache
- *
- * @return array
- */
- public function simulateCarriersOutput(Country $default_country = null, $flush = false)
- {
- $delivery_option_list = $this->getDeliveryOptionList($default_country, $flush);
-
- // This method cannot work if there is multiple address delivery
- if (count($delivery_option_list) > 1 || empty($delivery_option_list)) {
- return [];
- }
-
- $carriers = [];
- foreach (reset($delivery_option_list) as $key => $option) {
- $price = $option['total_price_with_tax'];
- $price_tax_exc = $option['total_price_without_tax'];
- $name = $img = $delay = '';
-
- if ($option['unique_carrier']) {
- $carrier = reset($option['carrier_list']);
- if (isset($carrier['instance'])) {
- $name = $carrier['instance']->name;
- $delay = $carrier['instance']->delay;
- $delay = isset($delay[Context::getContext()->language->id]) ?
- $delay[Context::getContext()->language->id] : $delay[(int) Configuration::get('PS_LANG_DEFAULT')];
- }
- if (isset($carrier['logo'])) {
- $img = $carrier['logo'];
- }
- } else {
- $nameList = [];
- foreach ($option['carrier_list'] as $carrier) {
- $nameList[] = $carrier['instance']->name;
- }
- $name = implode(' -', $nameList);
- $img = ''; // No images if multiple carriers
- $delay = '';
- }
- $carriers[] = [
- 'name' => $name,
- 'img' => $img,
- 'delay' => $delay,
- 'price' => $price,
- 'price_tax_exc' => $price_tax_exc,
- 'id_carrier' => Cart::intifier($key), // Need to translate to an integer for retrocompatibility reason, in 1.4 template we used intval
- 'is_module' => false,
- ];
- }
-
- return $carriers;
- }
-
/**
* Simulate output of selected Carrier.
*
* @param bool $use_cache Use cache
*
* @return int Intified Cart output
+ *
+ * @deprecated Since 9.0 and will be removed in 10.0
*/
public function simulateCarrierSelectedOutput($use_cache = true)
{
@@ -3186,6 +2945,8 @@ public function simulateCarrierSelectedOutput($use_cache = true)
* The size of this sequence is fixed by the first digit of the return
*
* @return string Intified value
+ *
+ * @deprecated Since 9.0 and will be removed in 10.0
*/
public static function intifier($string, $delimiter = ',')
{
@@ -3197,6 +2958,8 @@ public static function intifier($string, $delimiter = ',')
/**
* Translate an int option_delivery identifier (3240002000) in a string ('24,3,').
+ *
+ * @deprecated Since 9.0 and will be removed in 10.0
*/
public static function desintifier($int, $delimiter = ',')
{
@@ -3212,47 +2975,36 @@ public static function desintifier($int, $delimiter = ',')
* Does the Cart use multiple Addresses?
*
* @return bool Indicates if the Cart uses multiple Addresses
+ *
+ * @deprecated Since 9.0 and will be removed in 10.0
*/
public function isMultiAddressDelivery()
{
- if (!isset(static::$cacheMultiAddressDelivery[$this->id])) {
- $sql = new DbQuery();
- $sql->select('count(distinct id_address_delivery)');
- $sql->from('cart_product', 'cp');
- $sql->where('id_cart = ' . (int) $this->id);
- static::$cacheMultiAddressDelivery[$this->id] = Db::getInstance()->getValue($sql) > 1;
- }
+ @trigger_error(sprintf(
+ '%s is deprecated since 9.0 and will be removed in 10.0.',
+ __METHOD__
+ ), E_USER_DEPRECATED);
- return static::$cacheMultiAddressDelivery[$this->id];
+ return false;
}
/**
* Get all delivery Addresses object for the current Cart.
+ *
+ * @deprecated Since 9.0 and will be removed in 10.0
*/
public function getAddressCollection()
{
- $collection = [];
- $cache_id = 'Cart::getAddressCollection' . (int) $this->id;
- if (!Cache::isStored($cache_id)) {
- $result = Db::getInstance()->executeS(
- 'SELECT DISTINCT `id_address_delivery`
- FROM `' . _DB_PREFIX_ . 'cart_product`
- WHERE id_cart = ' . (int) $this->id
- );
- Cache::store($cache_id, $result);
- } else {
- $result = Cache::retrieve($cache_id);
- }
-
- $result[] = ['id_address_delivery' => (int) $this->id_address_delivery];
+ @trigger_error(sprintf(
+ '%s is deprecated since 9.0 and will be removed in 10.0.',
+ __METHOD__
+ ), E_USER_DEPRECATED);
- foreach ($result as $row) {
- if ((int) $row['id_address_delivery'] != 0) {
- $collection[(int) $row['id_address_delivery']] = new Address((int) $row['id_address_delivery']);
- }
+ if ((int) $this->id_address_delivery != 0) {
+ return [(int) $this->id_address_delivery => new Address((int) $this->id_address_delivery)];
}
- return $collection;
+ return [];
}
/**
@@ -3550,11 +3302,8 @@ protected function getPackageShippingCostValue(
if (Configuration::get('PS_TAX_ADDRESS_TYPE') == 'id_address_invoice') {
$address_id = (int) $this->id_address_invoice;
- } elseif (is_array($product_list) && count($product_list)) {
- $prod = current($product_list);
- $address_id = (int) $prod['id_address_delivery'];
} else {
- $address_id = null;
+ $address_id = (int) $this->id_address_delivery;
}
if (!Address::addressExists($address_id, true)) {
$address_id = null;
@@ -3589,8 +3338,7 @@ protected function getPackageShippingCostValue(
if (!isset($id_zone)) {
// Get id zone
- if (!$this->isMultiAddressDelivery()
- && isset($this->id_address_delivery) // Be careful, id_address_delivery is not useful one 1.5
+ if (isset($this->id_address_delivery)
&& $this->id_address_delivery
&& Customer::customerHasAddress($this->id_customer, $this->id_address_delivery)
) {
@@ -3878,12 +3626,15 @@ public function getTotalWeight($products = null)
}
/**
+ * Calculates and caches total weight for all products in cart with given ID.
+ *
* @param int $productId
*/
protected function updateProductWeight($productId)
{
$productId = (int) $productId;
+ // First, products with combinations
if (Combination::isFeatureActive()) {
$weight_product_with_attribute = Db::getInstance()->getValue('
SELECT SUM((p.`weight` + pa.`weight`) * cp.`quantity`) as nb
@@ -3897,6 +3648,7 @@ protected function updateProductWeight($productId)
$weight_product_with_attribute = 0;
}
+ // Then the regular product
$weight_product_without_attribute = Db::getInstance()->getValue('
SELECT SUM(p.`weight` * cp.`quantity`) as nb
FROM `' . _DB_PREFIX_ . 'cart_product` cp
@@ -3904,6 +3656,7 @@ protected function updateProductWeight($productId)
WHERE (cp.`id_product_attribute` IS NULL OR cp.`id_product_attribute` = 0)
AND cp.`id_cart` = ' . $productId);
+ // Finally, we need to add all customizations, because they can also add some weight
$weight_cart_customizations = Db::getInstance()->getValue('
SELECT SUM(cd.`weight` * c.`quantity`) FROM `' . _DB_PREFIX_ . 'customization` c
LEFT JOIN `' . _DB_PREFIX_ . 'customized_data` cd ON (c.`id_customization` = cd.`id_customization`)
@@ -4010,11 +3763,12 @@ public function getRawSummaryDetails(int $id_lang, bool $refresh = false): array
'total_price' => $base_total_tax_inc,
'total_tax' => $total_tax,
'total_price_without_tax' => $base_total_tax_exc,
- 'is_multi_address_delivery' => $this->isMultiAddressDelivery() || ((int) Tools::getValue('multi-shipping') == 1),
- 'free_ship' => !$total_shipping && !count($this->getDeliveryAddressesWithoutCarriers(true, $errors)),
+ 'is_multi_address_delivery' => false,
+ 'free_ship' => !$total_shipping,
'carrier' => new Carrier($this->id_carrier, $id_lang),
];
+ // An array [module_name => module_output] will be returned
$hook = Hook::exec('actionCartSummary', $summary, null, true);
if (is_array($hook)) {
$summary = array_merge($summary, (array) array_shift($hook));
@@ -4039,23 +3793,6 @@ public function checkQuantities($returnProductOnFailure = false)
}
foreach ($this->getProducts() as $product) {
- if (
- !$this->allow_seperated_package
- && !$product['allow_oosp']
- && StockAvailable::dependsOnStock($product['id_product'])
- && $product['advanced_stock_management']
- && (bool) Context::getContext()->customer->isLogged()
- ) {
- $delivery = $this->getDeliveryOption();
- if (!empty($delivery)) {
- $product['stock_quantity'] = StockManager::getStockByCarrier(
- (int) $product['id_product'],
- (int) $product['id_product_attribute'],
- $delivery
- );
- }
- }
-
if (
!$product['active'] ||
!$product['available_for_order'] ||
@@ -4279,7 +4016,7 @@ public function addPictureToProduct($id_product, $index, $type, $file, $returnCu
}
/**
- * Remove a customer's customization.
+ * Deletes a customization field. Only for customizations not added to cart yet.
*
* @param int $id_product Product ID
* @param int $index Customization field identifier as id_customization_field in table customization_field
@@ -4288,6 +4025,7 @@ public function addPictureToProduct($id_product, $index, $type, $file, $returnCu
*/
public function deleteCustomizationToProduct($id_product, $index)
{
+ // Try to find a customization for our cart, the given product, customization field that hasn't been added to cart yet
$cust_data = Db::getInstance()->getRow(
'SELECT cu.`id_customization`, cd.`index`, cd.`value`, cd.`type` FROM `' . _DB_PREFIX_ . 'customization` cu
LEFT JOIN `' . _DB_PREFIX_ . 'customized_data` cd
@@ -4310,17 +4048,20 @@ public function deleteCustomizationToProduct($id_product, $index)
$result = !($result && file_exists(_PS_UPLOAD_DIR_ . $cust_data['value'] . '_small')) || @unlink(_PS_UPLOAD_DIR_ . $cust_data['value'] . '_small');
}
+ // Delete the field that was requested for removal
$result = $result && Db::getInstance()->execute(
'DELETE FROM `' . _DB_PREFIX_ . 'customized_data`
WHERE `id_customization` = ' . (int) $cust_data['id_customization'] . '
AND `index` = ' . (int) $index
);
+ // And check if there are any more remaining fields for that customization
$hasRemainingCustomData = Db::getInstance()->getValue(
'SELECT 1 FROM `' . _DB_PREFIX_ . 'customized_data`
WHERE `id_customization` = ' . (int) $cust_data['id_customization']
);
+ // If not, we will delete the whole customization, it will create a new one when customer customizes the product again
if (!$hasRemainingCustomData) {
$result = $result && Db::getInstance()->execute(
'DELETE FROM `' . _DB_PREFIX_ . 'customization`
@@ -4332,7 +4073,7 @@ public function deleteCustomizationToProduct($id_product, $index)
}
/**
- * Return custom pictures in this cart for a specified product.
+ * Return customizations in this cart for a specified product.
*
* @param int $id_product Product ID
* @param int|null $type Only return customization of this type, can be Product::CUSTOMIZE_FILE or Product::CUSTOMIZE_TEXTFIELD
@@ -4346,7 +4087,8 @@ public function getProductCustomization($id_product, $type = null, $not_in_cart
return [];
}
- // if cart is not set, return nothing to prevent loading of other users data.
+ // If cart is not set, return nothing to prevent loading of other users data.
+ // There should never be a customization with zero id_cart, but just to be sure.
if (0 === (int) $this->id) {
return [];
}
@@ -4384,7 +4126,8 @@ public static function getCustomerCarts($id_customer, $with_order = true)
}
/**
- * Duplicate this Cart in the database.
+ * Duplicate this Cart in the database. This is mainly used by the "reorder" feature. Customer can go to his my account zone
+ * and quickly create a new cart by using his previous order.
*
* @return array|bool Duplicated cart, with success bool
*/
@@ -4399,6 +4142,7 @@ public function duplicate()
$cart->id_shop = $this->id_shop;
$cart->id_shop_group = $this->id_shop_group;
+ // If the original addresses no longer exist or are deleted, we will treat it like a new cart in this regard
if (!Customer::customerHasAddress((int) $cart->id_customer, (int) $cart->id_address_delivery)) {
$cart->id_address_delivery = (int) Address::getFirstCustomerAddressId((int) $cart->id_customer);
}
@@ -4426,8 +4170,6 @@ public function duplicate()
$product_gift = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT cr.`gift_product`, cr.`gift_product_attribute` FROM `' . _DB_PREFIX_ . 'cart_rule` cr LEFT JOIN `' . _DB_PREFIX_ . 'order_cart_rule` ocr ON (ocr.`id_order` = ' . (int) $orderId . ') WHERE ocr.`deleted` = 0 AND ocr.`id_cart_rule` = cr.`id_cart_rule`');
}
- $id_address_delivery = Configuration::get('PS_ALLOW_MULTISHIPPING') ? $cart->id_address_delivery : 0;
-
// Customized products: duplicate customizations before products so that we get new id_customizations
$customs = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(
'SELECT *
@@ -4452,7 +4194,7 @@ public function duplicate()
foreach ($customs_by_id as $customization_id => $val) {
Db::getInstance()->execute(
'INSERT INTO `' . _DB_PREFIX_ . 'customization` (id_cart, id_product_attribute, id_product, `id_address_delivery`, `in_cart`)
- VALUES(' . (int) $cart->id . ', ' . (int) $val['id_product_attribute'] . ', ' . (int) $val['id_product'] . ', ' . (int) $id_address_delivery . ', 1)'
+ VALUES(' . (int) $cart->id . ', ' . (int) $val['id_product_attribute'] . ', ' . (int) $val['id_product'] . ', 0, 1)'
);
$custom_ids[$customization_id] = Db::getInstance(_PS_USE_SQL_SLAVE_)->Insert_ID();
}
@@ -4484,12 +4226,6 @@ public function duplicate()
}
foreach ($products as $product) {
- if ($id_address_delivery) {
- if (Customer::customerHasAddress((int) $cart->id_customer, $product['id_address_delivery'])) {
- $id_address_delivery = $product['id_address_delivery'];
- }
- }
-
foreach ($product_gift as $gift) {
if (isset($gift['gift_product'], $gift['gift_product_attribute']) && (int) $gift['gift_product'] == (int) $product['id_product'] && (int) $gift['gift_product_attribute'] == (int) $product['id_product_attribute']) {
$product['quantity'] = (int) $product['quantity'] - 1;
@@ -4504,7 +4240,7 @@ public function duplicate()
(int) $product['id_product_attribute'],
isset($custom_ids[$id_customization]) ? (int) $custom_ids[$id_customization] : 0,
'up',
- (int) $id_address_delivery,
+ 0,
new Shop((int) $cart->id_shop),
false,
false
@@ -4544,7 +4280,7 @@ public function setWsCartRows($values)
foreach ($values as $value) {
$query .= '(' . (int) $this->id . ', ' . (int) $value['id_product'] . ', ' .
(isset($value['id_product_attribute']) ? (int) $value['id_product_attribute'] : 'NULL') . ', ' .
- (isset($value['id_address_delivery']) ? (int) $value['id_address_delivery'] : 0) . ', ' .
+ '0, ' .
(isset($value['id_customization']) ? (int) $value['id_customization'] : 0) . ', ' .
(int) $value['quantity'] . ', NOW(), ' . (int) Context::getContext()->shop->id . '),';
}
@@ -4564,70 +4300,15 @@ public function setWsCartRows($values)
* @param int $new_id_address_delivery New delivery Address ID
*
* @return bool Whether the delivery Address of the product in the Cart has been successfully updated
+ *
+ * @deprecated Since 9.0 and will be removed in 10.0
*/
public function setProductAddressDelivery($id_product, $id_product_attribute, $old_id_address_delivery, $new_id_address_delivery)
{
- // Check address is linked with the customer
- if (!Customer::customerHasAddress(Context::getContext()->customer->id, $new_id_address_delivery)) {
- return false;
- }
-
- if ($new_id_address_delivery == $old_id_address_delivery) {
- return false;
- }
-
- // Checking if the product with the old address delivery exists
- $sql = new DbQuery();
- $sql->select('count(*)');
- $sql->from('cart_product', 'cp');
- $sql->where('id_product = ' . (int) $id_product);
- $sql->where('id_product_attribute = ' . (int) $id_product_attribute);
- $sql->where('id_address_delivery = ' . (int) $old_id_address_delivery);
- $sql->where('id_cart = ' . (int) $this->id);
- $result = Db::getInstance()->getValue($sql);
-
- if ($result == 0) {
- return false;
- }
-
- // Checking if there is no others similar products with this new address delivery
- $sql = new DbQuery();
- $sql->select('sum(quantity) as qty');
- $sql->from('cart_product', 'cp');
- $sql->where('id_product = ' . (int) $id_product);
- $sql->where('id_product_attribute = ' . (int) $id_product_attribute);
- $sql->where('id_address_delivery = ' . (int) $new_id_address_delivery);
- $sql->where('id_cart = ' . (int) $this->id);
- $result = Db::getInstance()->getValue($sql);
-
- // Removing similar products with this new address delivery
- $sql = 'DELETE FROM ' . _DB_PREFIX_ . 'cart_product
- WHERE id_product = ' . (int) $id_product . '
- AND id_product_attribute = ' . (int) $id_product_attribute . '
- AND id_address_delivery = ' . (int) $new_id_address_delivery . '
- AND id_cart = ' . (int) $this->id . '
- LIMIT 1';
- Db::getInstance()->execute($sql);
-
- // Changing the address
- $sql = 'UPDATE ' . _DB_PREFIX_ . 'cart_product
- SET `id_address_delivery` = ' . (int) $new_id_address_delivery . ',
- `quantity` = `quantity` + ' . (int) $result . '
- WHERE id_product = ' . (int) $id_product . '
- AND id_product_attribute = ' . (int) $id_product_attribute . '
- AND id_address_delivery = ' . (int) $old_id_address_delivery . '
- AND id_cart = ' . (int) $this->id . '
- LIMIT 1';
- Db::getInstance()->execute($sql);
-
- // Changing the address of the customizations
- $sql = 'UPDATE ' . _DB_PREFIX_ . 'customization
- SET `id_address_delivery` = ' . (int) $new_id_address_delivery . '
- WHERE id_product = ' . (int) $id_product . '
- AND id_product_attribute = ' . (int) $id_product_attribute . '
- AND id_address_delivery = ' . (int) $old_id_address_delivery . '
- AND id_cart = ' . (int) $this->id;
- Db::getInstance()->execute($sql);
+ @trigger_error(sprintf(
+ '%s is deprecated since 9.0 and will be removed in 10.0.',
+ __METHOD__
+ ), E_USER_DEPRECATED);
return true;
}
@@ -4657,6 +4338,8 @@ public function setProductCustomizedDatas(&$product, $customized_datas)
* @param bool $keep_quantity Keep the quantity, do not reset if true
*
* @return bool Whether the product has been successfully duplicated
+ *
+ * @deprecated Since 9.0 and will be removed in 10.0, product cannot be in the cart twice.
*/
public function duplicateProduct(
$id_product,
@@ -4666,219 +4349,42 @@ public function duplicateProduct(
$quantity = 1,
$keep_quantity = false
) {
- // Check address is linked with the customer
- if (!Customer::customerHasAddress(Context::getContext()->customer->id, $new_id_address_delivery)) {
- return false;
- }
+ @trigger_error(sprintf(
+ '%s is deprecated since 9.0 and will be removed in 10.0.',
+ __METHOD__
+ ), E_USER_DEPRECATED);
- // Checking the product do not exist with the new address
- $sql = new DbQuery();
- $sql->select('count(*)');
- $sql->from('cart_product', 'c');
- $sql->where('id_product = ' . (int) $id_product);
- $sql->where('id_product_attribute = ' . (int) $id_product_attribute);
- $sql->where('id_address_delivery = ' . (int) $new_id_address_delivery);
- $sql->where('id_cart = ' . (int) $this->id);
- $result = Db::getInstance()->getValue($sql);
-
- if ($result > 0) {
- return false;
- }
-
- // Duplicating cart_product line
- $sql = 'INSERT INTO ' . _DB_PREFIX_ . 'cart_product
- (`id_cart`, `id_product`, `id_shop`, `id_product_attribute`, `quantity`, `date_add`, `id_address_delivery`)
- values(
- ' . (int) $this->id . ',
- ' . (int) $id_product . ',
- ' . (int) $this->id_shop . ',
- ' . (int) $id_product_attribute . ',
- ' . (int) $quantity . ',
- NOW(),
- ' . (int) $new_id_address_delivery . ')';
-
- Db::getInstance()->execute($sql);
-
- if (!$keep_quantity) {
- $sql = new DbQuery();
- $sql->select('quantity');
- $sql->from('cart_product', 'c');
- $sql->where('id_product = ' . (int) $id_product);
- $sql->where('id_product_attribute = ' . (int) $id_product_attribute);
- $sql->where('id_address_delivery = ' . (int) $id_address_delivery);
- $sql->where('id_cart = ' . (int) $this->id);
- $duplicatedQuantity = Db::getInstance()->getValue($sql);
-
- if ($duplicatedQuantity > $quantity) {
- $sql = 'UPDATE ' . _DB_PREFIX_ . 'cart_product
- SET `quantity` = `quantity` - ' . (int) $quantity . '
- WHERE id_cart = ' . (int) $this->id . '
- AND id_product = ' . (int) $id_product . '
- AND id_shop = ' . (int) $this->id_shop . '
- AND id_product_attribute = ' . (int) $id_product_attribute . '
- AND id_address_delivery = ' . (int) $id_address_delivery;
- Db::getInstance()->execute($sql);
- }
- }
-
- // Checking if there is customizations
- $sql = new DbQuery();
- $sql->select('*');
- $sql->from('customization', 'c');
- $sql->where('id_product = ' . (int) $id_product);
- $sql->where('id_product_attribute = ' . (int) $id_product_attribute);
- $sql->where('id_address_delivery = ' . (int) $id_address_delivery);
- $sql->where('id_cart = ' . (int) $this->id);
- $results = Db::getInstance()->executeS($sql);
-
- foreach ($results as $customization) {
- // Duplicate customization
- $sql = 'INSERT INTO ' . _DB_PREFIX_ . 'customization
- (`id_product_attribute`, `id_address_delivery`, `id_cart`, `id_product`, `quantity`, `in_cart`)
- VALUES (
- ' . (int) $customization['id_product_attribute'] . ',
- ' . (int) $new_id_address_delivery . ',
- ' . (int) $customization['id_cart'] . ',
- ' . (int) $customization['id_product'] . ',
- ' . (int) $quantity . ',
- ' . (int) $customization['in_cart'] . ')';
-
- Db::getInstance()->execute($sql);
-
- // Save last insert ID before doing another query
- $last_id = (int) Db::getInstance()->Insert_ID();
-
- // Get data from duplicated customizations
- $sql = new DbQuery();
- $sql->select('`type`, `index`, `value`');
- $sql->from('customized_data');
- $sql->where('id_customization = ' . $customization['id_customization']);
- $last_row = Db::getInstance()->getRow($sql);
-
- // Insert new copied data with new customization ID into customized_data table
- $last_row['id_customization'] = $last_id;
- Db::getInstance()->insert('customized_data', $last_row);
- }
-
- $customization_count = count($results);
- if ($customization_count > 0) {
- $sql = 'UPDATE ' . _DB_PREFIX_ . 'cart_product
- SET `quantity` = `quantity` + ' . (int) $customization_count * $quantity . '
- WHERE id_cart = ' . (int) $this->id . '
- AND id_product = ' . (int) $id_product . '
- AND id_shop = ' . (int) $this->id_shop . '
- AND id_product_attribute = ' . (int) $id_product_attribute . '
- AND id_address_delivery = ' . (int) $new_id_address_delivery;
- Db::getInstance()->execute($sql);
- }
-
- return true;
+ return false;
}
/**
* Update products cart address delivery with the address delivery of the cart.
+ *
+ * @deprecated Since 9.0 and will be removed in 10.0
*/
public function setNoMultishipping()
{
- $emptyCache = false;
- if (Configuration::get('PS_ALLOW_MULTISHIPPING')) {
- // Upgrading quantities
- $sql = 'SELECT sum(`quantity`) as quantity, id_product, id_product_attribute, count(*) as count
- FROM `' . _DB_PREFIX_ . 'cart_product`
- WHERE `id_cart` = ' . (int) $this->id . '
- AND `id_shop` = ' . (int) $this->id_shop . '
- GROUP BY id_product, id_product_attribute
- HAVING count > 1';
-
- foreach (Db::getInstance()->executeS($sql) as $product) {
- $sql = 'UPDATE `' . _DB_PREFIX_ . 'cart_product`
- SET `quantity` = ' . $product['quantity'] . '
- WHERE `id_cart` = ' . (int) $this->id . '
- AND `id_shop` = ' . (int) $this->id_shop . '
- AND id_product = ' . $product['id_product'] . '
- AND id_product_attribute = ' . $product['id_product_attribute'];
- if (Db::getInstance()->execute($sql)) {
- $emptyCache = true;
- }
- }
-
- // Merging multiple lines
- $sql = 'DELETE cp1
- FROM `' . _DB_PREFIX_ . 'cart_product` cp1
- INNER JOIN `' . _DB_PREFIX_ . 'cart_product` cp2
- ON (
- (cp1.id_cart = cp2.id_cart)
- AND (cp1.id_product = cp2.id_product)
- AND (cp1.id_product_attribute = cp2.id_product_attribute)
- AND (cp1.id_address_delivery <> cp2.id_address_delivery)
- AND (cp1.date_add > cp2.date_add)
- )';
- Db::getInstance()->execute($sql);
- }
-
- // Update delivery address for each product line
- $sql = 'UPDATE `' . _DB_PREFIX_ . 'cart_product`
- SET `id_address_delivery` = (
- SELECT `id_address_delivery` FROM `' . _DB_PREFIX_ . 'cart`
- WHERE `id_cart` = ' . (int) $this->id . ' AND `id_shop` = ' . (int) $this->id_shop . '
- )
- WHERE `id_cart` = ' . (int) $this->id . '
- ' . (Configuration::get('PS_ALLOW_MULTISHIPPING') ? ' AND `id_shop` = ' . (int) $this->id_shop : '');
-
- $cache_id = 'Cart::setNoMultishipping' . (int) $this->id . '-' . (int) $this->id_shop . ((isset($this->id_address_delivery) && $this->id_address_delivery) ? '-' . (int) $this->id_address_delivery : '');
- if (!Cache::isStored($cache_id)) {
- if ($result = (bool) Db::getInstance()->execute($sql)) {
- $emptyCache = true;
- }
- Cache::store($cache_id, $result);
- }
-
- if (Customization::isFeatureActive()) {
- Db::getInstance()->execute('
- UPDATE `' . _DB_PREFIX_ . 'customization`
- SET `id_address_delivery` = (
- SELECT `id_address_delivery` FROM `' . _DB_PREFIX_ . 'cart`
- WHERE `id_cart` = ' . (int) $this->id . '
- )
- WHERE `id_cart` = ' . (int) $this->id);
- }
+ @trigger_error(sprintf(
+ '%s is deprecated since 9.0 and will be removed in 10.0.',
+ __METHOD__
+ ), E_USER_DEPRECATED);
- if ($emptyCache) {
- $this->_products = null;
- }
+ return;
}
/**
* Set an address to all products on the cart without address delivery.
+ *
+ * @deprecated Since 9.0 and will be removed in 10.0
*/
public function autosetProductAddress()
{
- $id_address_delivery = 0;
- // Get the main address of the customer
- if ((int) $this->id_address_delivery > 0) {
- $id_address_delivery = (int) $this->id_address_delivery;
- } else {
- $id_address_delivery = (int) Address::getFirstCustomerAddressId(Context::getContext()->customer->id);
- }
-
- if (!$id_address_delivery) {
- return;
- }
-
- // Update
- $sql = 'UPDATE `' . _DB_PREFIX_ . 'cart_product`
- SET `id_address_delivery` = ' . (int) $id_address_delivery . '
- WHERE `id_cart` = ' . (int) $this->id . '
- AND (`id_address_delivery` = 0 OR `id_address_delivery` IS NULL)
- AND `id_shop` = ' . (int) $this->id_shop;
- Db::getInstance()->execute($sql);
+ @trigger_error(sprintf(
+ '%s is deprecated since 9.0 and will be removed in 10.0.',
+ __METHOD__
+ ), E_USER_DEPRECATED);
- $sql = 'UPDATE `' . _DB_PREFIX_ . 'customization`
- SET `id_address_delivery` = ' . (int) $id_address_delivery . '
- WHERE `id_cart` = ' . (int) $this->id . '
- AND (`id_address_delivery` = 0 OR `id_address_delivery` IS NULL)';
-
- Db::getInstance()->execute($sql);
+ return;
}
public function deleteAssociations()
@@ -4954,10 +4460,10 @@ public static function isGuestCartByCartId($id_cart)
}
/**
- * Are all products of the Cart still available in the current state ? They might have been converted to another
- * type of product since then
+ * Checks if all products of the cart are still available in the current state. They might have been converted to another
+ * type of product since then, ordering disabled or deactivated.
*
- * @return bool False if one of the products from the cart has been changed into a new type of product
+ * @return bool false if one of the product not publicly orderable anymore
*/
public function checkAllProductsAreStillAvailableInThisState()
{
@@ -4965,9 +4471,15 @@ public function checkAllProductsAreStillAvailableInThisState()
$currentProduct = new Product();
$currentProduct->hydrate($product);
+ // Check if the product combinations state is still valid
if ($currentProduct->hasAttributes() && $product['id_product_attribute'] === '0') {
return false;
}
+
+ // Check if product is still active and possible to order
+ if (!$product['active'] || !$product['available_for_order']) {
+ return false;
+ }
}
return true;
@@ -5026,35 +4538,6 @@ public function checkAllProductsHaveMinimalQuantities()
return true;
}
- /**
- * Get all the IDs of the delivery Addresses without Carriers.
- *
- * @param bool $return_collection Returns sa collection
- * @param array $error Contains an error message if an error occurs
- *
- * @return array Array of address id or of address object
- */
- public function getDeliveryAddressesWithoutCarriers($return_collection = false, &$error = [])
- {
- $addresses_without_carriers = [];
- foreach ($this->getProducts(false, false, null, false) as $product) {
- if (!in_array($product['id_address_delivery'], $addresses_without_carriers)
- && !count(Carrier::getAvailableCarrierList(new Product($product['id_product']), null, $product['id_address_delivery'], null, null, $error))) {
- $addresses_without_carriers[] = $product['id_address_delivery'];
- }
- }
- if (!$return_collection) {
- return $addresses_without_carriers;
- } else {
- $addresses_instance_without_carriers = [];
- foreach ($addresses_without_carriers as $id_address) {
- $addresses_instance_without_carriers[] = new Address($id_address);
- }
-
- return $addresses_instance_without_carriers;
- }
- }
-
/**
* Set flag to split lines of products given away and also manually added to cart.
*/
diff --git a/classes/CartRule.php b/classes/CartRule.php
index dd7689a8205f0..7d6ad6e718597 100644
--- a/classes/CartRule.php
+++ b/classes/CartRule.php
@@ -613,6 +613,12 @@ public static function cartRuleExists($code)
*/
public static function deleteByIdCustomer($id_customer)
{
+ // Remove cart rules only if we got some sensible ID of a customer.
+ // If we would pass zero further below, it would delete all non-customer-restricted cart rules.
+ if (empty($id_customer)) {
+ return false;
+ }
+
$return = true;
$cart_rules = new PrestaShopCollection('CartRule');
$cart_rules->where('id_customer', '=', $id_customer);
diff --git a/classes/ConfigurationTest.php b/classes/ConfigurationTest.php
index ed1ea39a07616..bfeaf7b0260a7 100644
--- a/classes/ConfigurationTest.php
+++ b/classes/ConfigurationTest.php
@@ -82,6 +82,7 @@ public static function getDefaultTests()
'files' => false,
'mails_dir' => 'mails',
'openssl' => false,
+ 'openssl_key_generation' => false,
'simplexml' => false,
'zip' => false,
'fileinfo' => false,
@@ -398,6 +399,20 @@ public static function test_openssl()
return function_exists('openssl_encrypt');
}
+ public static function test_openssl_key_generation()
+ {
+ $privateKey = openssl_pkey_new([
+ 'private_key_bits' => 2048,
+ 'private_key_type' => OPENSSL_KEYTYPE_RSA,
+ ]);
+
+ if ($privateKey === false) {
+ return false;
+ }
+
+ return true;
+ }
+
public static function test_sessions()
{
return in_array(session_status(), [PHP_SESSION_ACTIVE, PHP_SESSION_NONE], true);
diff --git a/classes/Context.php b/classes/Context.php
index 6fdd51f7fe730..db1eae31aa229 100644
--- a/classes/Context.php
+++ b/classes/Context.php
@@ -366,7 +366,6 @@ public function updateCustomer(Customer $customer)
// If previous logic resolved to some cart to be used, save it and put this information to cookie
if (Validate::isLoadedObject($this->cart)) {
$this->cart->save();
- $this->cart->autosetProductAddress();
$this->cookie->id_cart = (int) $this->cart->id;
}
diff --git a/classes/Currency.php b/classes/Currency.php
index fe4400100ca96..4ae79a6a1bd52 100644
--- a/classes/Currency.php
+++ b/classes/Currency.php
@@ -480,12 +480,10 @@ public function delete()
Configuration::updateValue('PS_CURRENCY_DEFAULT', $result['id_currency']);
}
- $this->deleted = true;
-
// Remove currency restrictions
$res = Db::getInstance()->delete('module_currency', 'id_currency = ' . (int) $this->id);
- return $res && $this->update();
+ return $res && $this->softDelete();
}
/**
diff --git a/classes/CustomerMessage.php b/classes/CustomerMessage.php
index 7099b486dc44f..8a8e39355099f 100644
--- a/classes/CustomerMessage.php
+++ b/classes/CustomerMessage.php
@@ -162,7 +162,7 @@ public static function getTotalCustomerMessages($where = null)
public function delete()
{
if (!empty($this->file_name)) {
- @unlink(_PS_UPLOAD_DIR_ . $this->file_name);
+ @unlink(_PS_UPLOAD_DIR_ . basename($this->file_name));
}
return parent::delete();
diff --git a/classes/Customization.php b/classes/Customization.php
index 52a8913b675b4..da5f626959ca6 100644
--- a/classes/Customization.php
+++ b/classes/Customization.php
@@ -173,6 +173,7 @@ public static function getCustomizationPrice($idCustomization)
return 0;
}
+ // For anyone migrating this - not sure why there is a SUM, when there can be only one line
return (float) Db::getInstance()->getValue(
'
SELECT SUM(`price`) FROM `' . _DB_PREFIX_ . 'customized_data`
@@ -193,6 +194,7 @@ public static function getCustomizationWeight($idCustomization)
return 0;
}
+ // For anyone migrating this - not sure why there is a SUM, when there can be only one line
return (float) Db::getInstance()->getValue(
'
SELECT SUM(`weight`) FROM `' . _DB_PREFIX_ . 'customized_data`
diff --git a/classes/Dispatcher.php b/classes/Dispatcher.php
index 4db294ae89bda..4a4ef19104ae4 100644
--- a/classes/Dispatcher.php
+++ b/classes/Dispatcher.php
@@ -576,13 +576,33 @@ private function buildRequestUri($requestUri, $isMultiLanguageActivated, Shop $s
*/
protected function loadRoutes($id_shop = null)
{
+ // Initialize shop context if not provided
$context = Context::getContext();
-
if (isset($context->shop) && $id_shop === null) {
$id_shop = (int) $context->shop->id;
}
- // Load custom routes from modules
+ // Initialize language list we will be building our routes in
+ $language_ids = Language::getIDs();
+ if (isset($context->language) && !in_array($context->language->id, $language_ids)) {
+ $language_ids[] = (int) $context->language->id;
+ }
+
+ /*
+ * Step 1 - We have some default hardcoded routes initialized in $this->default_routes, these will
+ * be used as a base.
+ */
+
+ /*
+ * Step 2 - Module routes
+ *
+ * Loads custom routes from modules for given shop. Beware that these routes are not multilanguage,
+ * passed routes will be the same for each language of the shop.
+ *
+ * Module routes can overwrite those set in $this->default_routes, if their name matches.
+ * An array [module_name => module_output] will be returned
+ * Hook call is ignoring exceptions set in the backoffice
+ */
$modules_routes = Hook::exec('moduleRoutes', ['id_shop' => $id_shop], null, true, false);
if (is_array($modules_routes) && count($modules_routes)) {
foreach ($modules_routes as $module_route) {
@@ -603,13 +623,13 @@ protected function loadRoutes($id_shop = null)
}
}
- $language_ids = Language::getIDs();
-
- if (isset($context->language) && !in_array($context->language->id, $language_ids)) {
- $language_ids[] = (int) $context->language->id;
- }
-
- // Set default routes
+ /*
+ * Step 3 - Initialize default routes into $this->routes that will get used.
+ *
+ * This takes each default route we have until now and calls computeRoute upon each route.
+ * This enriches the route by a final regex and strips not needed keywords. Then, we add it
+ * to route list of each language.
+ */
foreach ($this->default_routes as $id => $route) {
$route = $this->computeRoute(
$route['rule'],
@@ -618,14 +638,15 @@ protected function loadRoutes($id_shop = null)
isset($route['params']) ? $route['params'] : []
);
foreach ($language_ids as $id_lang) {
- // the default routes are the same, whatever the language
$this->routes[$id_shop][$id_lang][$id] = $route;
}
}
- // Load the custom routes prior the defaults to avoid infinite loops
if ($this->use_routes) {
- // Load routes from meta table
+ /*
+ * Step 4 - Load multilanguage routes from meta table. These are static routes for pages like /bestsellers that configurable
+ * in SEO & URL section in the backoffice and don't use any parameters or keywords.
+ */
$sql = 'SELECT m.page, ml.url_rewrite, ml.id_lang
FROM `' . _DB_PREFIX_ . 'meta` m
LEFT JOIN `' . _DB_PREFIX_ . 'meta_lang` ml ON (m.id_meta = ml.id_meta' . Shop::addSqlRestrictionOnLang('ml', (int) $id_shop) . ')
@@ -646,7 +667,8 @@ protected function loadRoutes($id_shop = null)
}
}
- // Set default empty route if no empty route (that's weird I know)
+ // Set default empty route if no empty route (that's weird I know).
+ // Should probably be set as default value in the constructor in 9.0.0.
if (!$this->empty_route) {
$this->empty_route = [
'routeID' => 'index',
@@ -655,13 +677,16 @@ protected function loadRoutes($id_shop = null)
];
}
- // Load custom routes
+ /*
+ * Step 5 - Custom routes set in ps_configurations. Those are configured product, category,
+ * cms etc. rules that you can configure in SEO & URL section in the backoffice.
+ *
+ * Beware that these routes are not multilanguage, they will be the same for each language of the shop.
+ * It probably would not be difficult to make them multilanguage, if route was stored in configuration
+ * for each language.
+ */
foreach ($this->default_routes as $route_id => $route_data) {
if ($custom_route = Configuration::get('PS_ROUTE_' . $route_id, null, null, $id_shop)) {
- if (isset($context->language) && !in_array($context->language->id, $language_ids)) {
- $language_ids[] = (int) $context->language->id;
- }
-
$route = $this->computeRoute(
$custom_route,
$route_data['controller'],
@@ -669,12 +694,18 @@ protected function loadRoutes($id_shop = null)
isset($route_data['params']) ? $route_data['params'] : []
);
foreach ($language_ids as $id_lang) {
- // those routes are the same, whatever the language
$this->routes[$id_shop][$id_lang][$route_id] = $route;
}
}
}
}
+
+ /*
+ * Step 6 - Allow modules to modify routes in any way or add their own multilanguage routes.
+ *
+ * Use getRoutes, addRoute, removeRoute methods for this purpose.
+ */
+ Hook::exec('actionAfterLoadRoutes', ['dispatcher' => $this]);
}
/**
@@ -747,7 +778,9 @@ public function computeRoute($rule, $controller, array $keywords = [], array $pa
}
/**
- * @param string $route_id Name of the route (need to be uniq,a second route with same name will override the first)
+ * Adds a new route to the list of routes. If it already exists, it will override the existing one.
+ *
+ * @param string $route_id Name of the route
* @param string $rule Url rule
* @param string $controller Controller to call if request uri match the rule
* @param int $id_lang
@@ -786,6 +819,40 @@ public function addRoute(
$this->routes[$id_shop][$id_lang][$route_id] = $route;
}
+ /**
+ * Returns a list of processed routes getting used.
+ *
+ * @return array List of routes
+ */
+ public function getRoutes()
+ {
+ return $this->routes;
+ }
+
+ /**
+ * Removes a route from a list of processed routes.
+ *
+ * @param string $route_id Name of the route
+ * @param int $id_lang
+ * @param int $id_shop
+ */
+ public function removeRoute($route_id, $id_lang = null, $id_shop = null)
+ {
+ $context = Context::getContext();
+
+ if (isset($context->language) && $id_lang === null) {
+ $id_lang = (int) $context->language->id;
+ }
+
+ if (isset($context->shop) && $id_shop === null) {
+ $id_shop = (int) $context->shop->id;
+ }
+
+ if (isset($this->routes[$id_shop][$id_lang][$route_id])) {
+ unset($this->routes[$id_shop][$id_lang][$route_id]);
+ }
+ }
+
/**
* Check if a route exists.
*
@@ -958,14 +1025,22 @@ public function createUrl(
}
}
+ // Add controller to parameters if not present
if (!empty($route['controller'])) {
$query_params['controller'] = $route['controller'];
}
- $query = http_build_query(array_merge($add_params, $query_params), '', '&');
+
+ // Build final parameters, add language if needed
+ $urlParams = array_merge($add_params, $query_params);
+
+ // If multilanguage is activated, we add proper language ID, overwriting
+ // the previous one if it was provided
if ($this->multilang_activated) {
- $query .= (!empty($query) ? '&' : '') . 'id_lang=' . (int) $id_lang;
+ $urlParams['id_lang'] = (int) $id_lang;
}
- $url = 'index.php?' . $query;
+
+ // Build the final URL
+ $url = 'index.php?' . http_build_query($urlParams, '', '&');
}
return $url . $anchor;
diff --git a/classes/Employee.php b/classes/Employee.php
index b1931b78e22f4..6fbb25011135e 100644
--- a/classes/Employee.php
+++ b/classes/Employee.php
@@ -27,12 +27,13 @@
use PrestaShop\PrestaShop\Adapter\ServiceLocator;
use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
use PrestaShop\PrestaShop\Core\Crypto\Hashing;
+use PrestaShop\PrestaShop\Core\Model\EmployeeInterface;
use PrestaShopBundle\Security\Admin\SessionRenewer;
/**
* Class EmployeeCore.
*/
-class EmployeeCore extends ObjectModel
+class EmployeeCore extends ObjectModel implements EmployeeInterface
{
/** @var int|null Employee ID */
public $id;
@@ -332,8 +333,8 @@ public function getByEmail($email, $plaintextPassword = null, $activeOnly = true
return false;
}
- $this->id = $result['id_employee'];
- $this->id_profile = $result['id_profile'];
+ $this->id = (int) $result['id_employee'];
+ $this->id_profile = (int) $result['id_profile'];
foreach ($result as $key => $value) {
if (property_exists($this, $key)) {
$this->{$key} = $value;
@@ -561,7 +562,7 @@ public function hasAuthOnShopGroup($idShopGroup)
*
* @since 1.5.0
*/
- public function getDefaultShopID()
+ public function getDefaultShopID(): int
{
if ($this->isSuperAdmin() || in_array(Configuration::get('PS_SHOP_DEFAULT'), $this->associated_shops)) {
return (int) Configuration::get('PS_SHOP_DEFAULT');
@@ -761,4 +762,71 @@ public function getDefaultTabClassName()
return null;
}
+
+ /*
+ * Interface functions
+ */
+ public function getId(): int
+ {
+ return (int) $this->id;
+ }
+
+ public function getProfileId(): int
+ {
+ return (int) $this->id_profile;
+ }
+
+ public function getLanguageId(): int
+ {
+ return (int) $this->id_lang;
+ }
+
+ public function getFirstName(): string
+ {
+ return $this->firstname;
+ }
+
+ public function getLastName(): string
+ {
+ return $this->lastname;
+ }
+
+ public function getEmail(): string
+ {
+ return $this->email;
+ }
+
+ public function getPassword(): string
+ {
+ return $this->passwd;
+ }
+
+ public function getDefaultTabId(): int
+ {
+ return (int) $this->default_tab;
+ }
+
+ public function getAssociatedShopIds(): array
+ {
+ return $this->associated_shops;
+ }
+
+ public function getAssociatedShopGroupIds(): array
+ {
+ $associatedShopGroupIds = [];
+ foreach ($this->associated_shops as $shopId) {
+ /** @var int $groupFromShop */
+ $groupFromShop = Shop::getGroupFromShop($shopId, true);
+ if (!empty($groupFromShop) && !in_array($groupFromShop, $associatedShopGroupIds)) {
+ $associatedShopGroupIds[] = (int) $groupFromShop;
+ }
+ }
+
+ return $this->associated_shops;
+ }
+
+ public function getImageUrl(): string
+ {
+ return $this->getImage();
+ }
}
diff --git a/classes/FeatureFlag.php b/classes/FeatureFlag.php
index 251c425e21cfc..deae337077841 100644
--- a/classes/FeatureFlag.php
+++ b/classes/FeatureFlag.php
@@ -39,6 +39,11 @@ class FeatureFlagCore extends ObjectModel
*/
public $name;
+ /**
+ * @var string
+ */
+ public $type;
+
/**
* @var string
*/
@@ -77,6 +82,12 @@ class FeatureFlagCore extends ObjectModel
'primary' => 'id_feature_flag',
'fields' => [
'name' => ['type' => self::TYPE_STRING, 'required' => true, 'size' => 191],
+ 'type' => [
+ 'type' => self::TYPE_STRING,
+ 'required' => true,
+ 'size' => 64,
+ 'default' => FeatureFlagSettings::TYPE_DEFAULT,
+ ],
'label_wording' => ['type' => self::TYPE_STRING, 'required' => true, 'size' => 191],
'label_domain' => ['type' => self::TYPE_STRING, 'required' => true, 'size' => 255],
'description_wording' => ['type' => self::TYPE_STRING, 'required' => true, 'size' => 191],
diff --git a/classes/FeatureValue.php b/classes/FeatureValue.php
index 78afeefe6ebbc..85ef0ddb080d4 100644
--- a/classes/FeatureValue.php
+++ b/classes/FeatureValue.php
@@ -24,6 +24,8 @@
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/
+use PrestaShop\PrestaShop\Core\Domain\Feature\FeatureValueSettings;
+
/**
* Class FeatureValueCore.
*/
@@ -50,7 +52,7 @@ class FeatureValueCore extends ObjectModel
'custom' => ['type' => self::TYPE_BOOL, 'validate' => 'isBool'],
/* Lang fields */
- 'value' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 255],
+ 'value' => ['type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => FeatureValueSettings::VALUE_MAX_LENGTH],
],
];
diff --git a/classes/GroupReduction.php b/classes/GroupReduction.php
index f853c4fc41480..86bd5d73c0c2d 100644
--- a/classes/GroupReduction.php
+++ b/classes/GroupReduction.php
@@ -63,10 +63,7 @@ public function delete()
WHERE cp.`id_category` = ' . (int) $this->id_category
);
- $ids = [];
- foreach ($products as $row) {
- $ids[] = $row['id_product'];
- }
+ $ids = array_column($products, 'id_product');
if ($ids) {
Db::getInstance()->delete('product_group_reduction_cache', 'id_product IN (' . implode(', ', $ids) . ')');
@@ -111,14 +108,10 @@ protected function _updateCache()
'
SELECT cp.`id_product`
FROM `' . _DB_PREFIX_ . 'category_product` cp
- WHERE cp.`id_category` = ' . (int) $this->id_category,
- false
+ WHERE cp.`id_category` = ' . (int) $this->id_category
);
- $ids = [];
- foreach ($products as $product) {
- $ids[] = $product['id_product'];
- }
+ $ids = array_column($products, 'id_product');
$result = true;
if ($ids) {
@@ -194,15 +187,14 @@ public static function setProductReduction($id_product, $id_group = null, $id_ca
$categories = Product::getProductCategories((int) $id_product);
- if ($categories) {
- foreach ($categories as $category) {
- $reductions = GroupReduction::getGroupsByCategoryId((int) $category);
- if ($reductions) {
- foreach ($reductions as $reduction) {
- $current_group_reduction = new GroupReduction((int) $reduction['id_group_reduction']);
- $res &= $current_group_reduction->_setCache();
- }
- }
+ foreach ($categories as $category) {
+ $reductions = GroupReduction::getGroupsByCategoryId((int) $category);
+ if (!$reductions) {
+ continue;
+ }
+ foreach ($reductions as $reduction) {
+ $current_group_reduction = new GroupReduction((int) $reduction['id_group_reduction']);
+ $res &= $current_group_reduction->_setCache();
}
}
@@ -212,11 +204,8 @@ public static function setProductReduction($id_product, $id_group = null, $id_ca
public static function deleteProductReduction($id_product)
{
$query = 'DELETE FROM `' . _DB_PREFIX_ . 'product_group_reduction_cache` WHERE `id_product` = ' . (int) $id_product;
- if (Db::getInstance()->execute($query) === false) {
- return false;
- }
- return true;
+ return Db::getInstance()->execute($query);
}
public static function duplicateReduction($id_product_old, $id_product)
@@ -245,11 +234,8 @@ public static function duplicateReduction($id_product_old, $id_product)
public static function deleteCategory($id_category)
{
$query = 'DELETE FROM `' . _DB_PREFIX_ . 'group_reduction` WHERE `id_category` = ' . (int) $id_category;
- if (Db::getInstance()->execute($query) === false) {
- return false;
- }
- return true;
+ return Db::getInstance()->execute($query);
}
/**
diff --git a/classes/Hook.php b/classes/Hook.php
index f4e4d09db2229..02f42362f88b7 100644
--- a/classes/Hook.php
+++ b/classes/Hook.php
@@ -641,21 +641,55 @@ public static function registerHook($module_instance, $hook_name, $shop_list = n
return $return;
}
- public static function unregisterHook($module_instance, $hook_name, $shop_list = null)
+ /**
+ * Unhooks a module from given hook
+ *
+ * @param ModuleCore $module_instance The module to unhook
+ * @param int|string $hook_identifier Hook ID or hook name to unhook the module from
+ * @param int[]|null $shop_list List of shop ids
+ *
+ * @return bool
+ */
+ public static function unregisterHook($module_instance, $hook_identifier, $shop_list = null)
{
- if (is_numeric($hook_name)) {
- // $hook_name passed it the id_hook
- $hook_id = $hook_name;
- $hook_name = Hook::getNameById((int) $hook_id);
+ if (Validate::isUnsignedInt($hook_identifier)) {
+ // If we received hook ID as an integer directly, we try to find it's name
+ $hook_id = $hook_identifier;
+
+ /*
+ * Try to load hook name. The hook could be deleted, but we don't care, we can still do the job.
+ * Try/catch block is here because getNameById throws an exception when the hook is not found.
+ * It would be better if getNameById returned false in future versions.
+ */
+ try {
+ $hook_name = Hook::getNameById((int) $hook_identifier);
+ } catch (PrestaShopObjectNotFoundException $e) {
+ }
+
+ // If getting the name failed or we got some malformed hook name
+ if (empty($hook_name)) {
+ $hook_name = '';
+ }
} else {
- $hook_id = Hook::getIdByName($hook_name, false);
+ // If we received hook name as a string, we try to find it's ID
+ $hook_id = Hook::getIdByName($hook_identifier, false);
+ $hook_name = $hook_identifier;
}
- if (!$hook_id) {
+ // Hook id is critical, we can't unhook anything if we don't know the ID
+ if (empty($hook_id)) {
return false;
}
- Hook::exec('actionModuleUnRegisterHookBefore', ['object' => $module_instance, 'hook_name' => $hook_name]);
+ if (!empty($hook_name)) {
+ Hook::exec(
+ 'actionModuleUnRegisterHookBefore',
+ [
+ 'object' => $module_instance,
+ 'hook_name' => $hook_name,
+ ]
+ );
+ }
// Unregister module on hook by id
$sql = 'DELETE FROM `' . _DB_PREFIX_ . 'hook_module`
@@ -666,13 +700,15 @@ public static function unregisterHook($module_instance, $hook_name, $shop_list =
// Clean modules position
$module_instance->cleanPositions($hook_id, $shop_list);
- Hook::exec(
- 'actionModuleUnRegisterHookAfter',
- [
- 'object' => $module_instance,
- 'hook_name' => $hook_name,
- ]
- );
+ if (!empty($hook_name)) {
+ Hook::exec(
+ 'actionModuleUnRegisterHookAfter',
+ [
+ 'object' => $module_instance,
+ 'hook_name' => $hook_name,
+ ]
+ );
+ }
return $result;
}
@@ -751,11 +787,11 @@ public static function disableHooksForModule(int $moduleId): void
* @param string $hook_name Hook Name
* @param array $hook_args Parameters for the functions
* @param string|int|null $id_module Execute hook for this module only
- * @param bool $array_return If specified, module output will be set by name in an array
- * @param bool $check_exceptions Check permission exceptions
- * @param bool $use_push Force change to be refreshed on Dashboard widgets
+ * @param bool $array_return If specified, the result will be provided in an array [module_name => module_output]
+ * @param bool $check_exceptions Check if this function should respect hook controller exceptions configured in backoffice
+ * @param bool $use_push Force change to be refreshed on Dashboard widgets (unused)
* @param int|null $id_shop If specified, hook will be execute the shop with this ID
- * @param bool $chain If specified, hook will chain the return of hook module
+ * @param bool $chain If specified, each module on this hook will receive the result of the previous one
*
* @throws PrestaShopException
*
@@ -775,10 +811,12 @@ public static function exec(
Tools::displayParameterAsDeprecated('use_push');
}
+ // If we are in the installation phase OR the hook is disabled, it won't be executed
if (defined('PS_INSTALLATION_IN_PROGRESS') || !self::getHookStatusByName($hook_name)) {
return $array_return ? [] : null;
}
+ // Get hook registry to collect debug information
$hookRegistry = self::getHookRegistry();
$isRegistryEnabled = null !== $hookRegistry;
@@ -792,6 +830,7 @@ public static function exec(
$array_return = false;
}
+ // Check if we should execute non native modules
static $disable_non_native_modules = null;
if ($disable_non_native_modules === null) {
$disable_non_native_modules = (bool) Configuration::get('PS_DISABLE_NON_NATIVE_MODULE');
@@ -802,8 +841,8 @@ public static function exec(
throw new PrestaShopException('Invalid id_module or hook_name');
}
- // If no modules associated to hook_name or recompatible hook name, we stop the function
-
+ // We retrieve a list of modules to be executed for the given hook.
+ // If no modules associated to hook_name or recompatible hook name, we stop the function.
if (!$module_list = Hook::getHookModuleExecList($hook_name)) {
if ($isRegistryEnabled) {
$hookRegistry->collect();
@@ -818,12 +857,13 @@ public static function exec(
$hookRegistry->collect();
}
- return ($array_return) ? [] : false;
+ return ($array_return) ? [] : null;
}
// Store list of executed hooks on this page
Hook::$executed_hooks[$id_hook] = $hook_name;
+ // Enrich our arguments with some extra data we send along with it
$context = Context::getContext();
if (!isset($hook_args['cookie']) || !$hook_args['cookie']) {
$hook_args['cookie'] = $context->cookie;
@@ -836,6 +876,8 @@ public static function exec(
$altern = 0;
$output = ($array_return) ? [] : '';
+ // If non native modules are disabled, we must get the list of native ones
+ // that came bundled with the store.
if ($disable_non_native_modules && !isset(Hook::$native_module)) {
Hook::$native_module = Module::getNativeModuleList();
}
@@ -853,22 +895,26 @@ public static function exec(
}
foreach ($module_list as $key => $hookRegistration) {
- // Check errors
+ // If the caller provided a specific module ID for which ONLY this hook
+ // should be executed, we check if it matches.
if ($id_module && $id_module != $hookRegistration['id_module']) {
continue;
}
+ // If non native modules are disabled and this module is not a native one.
if ((bool) $disable_non_native_modules && Hook::$native_module && count(Hook::$native_module) && !in_array($hookRegistration['module'], Hook::$native_module)) {
continue;
}
$registeredHookId = $hookRegistration['id_hook'];
if ($registeredHookId === $id_hook) {
- // the module is registered to the canonical hook name
+ // The module is registered to the canonical (proper) hook name
$registeredHookName = $hook_name;
} else {
- // the module is registered to an alias
+ // The module is registered to an alias
$registeredHookName = static::getNameById($hookRegistration['id_hook']);
+
+ // We throw an error - aliases are deprecated.
trigger_error(
sprintf(
'The hook "%s" is deprecated, please use "%s" instead in module "%s".',
@@ -880,8 +926,10 @@ public static function exec(
);
}
- // Check permissions
+ // Check conditions to execute the module
if ($check_exceptions) {
+ // First, we check controller exceptions configured in backoffice when setting up the hook
+ // The merchant can exclude certain hooks from certain controllers
$exceptions = Module::getExceptionsStatic($hookRegistration['id_module'], $hookRegistration['id_hook']);
$controller_obj = Context::getContext()->controller;
@@ -893,27 +941,32 @@ public static function exec(
: $controller_obj->php_self;
}
- //check if current controller is a module controller
+ // Check if current controller is a module controller and prefix it's name if needed
+ // to standardized format
if (isset($controller_obj->module) && Validate::isLoadedObject($controller_obj->module)) {
$controller = 'module-' . $controller_obj->module->name . '-' . $controller;
}
+ // If our controller is on the list of exceptions, nothing to do here
if (in_array($controller, $exceptions)) {
continue;
}
- //Backward compatibility of controller names
+ // Backward compatibility of controller names
$matching_name = [
'authentication' => 'auth',
];
if (isset($matching_name[$controller]) && in_array($matching_name[$controller], $exceptions)) {
continue;
}
+
+ // If we are in the backoffice, we check if the current employee has view rights for this module
if (Validate::isLoadedObject($context->employee) && !Module::getPermissionStatic($hookRegistration['id_module'], 'view', $context->employee)) {
continue;
}
}
+ // We check if this module is valid
if (!($moduleInstance = Module::getInstanceByName($hookRegistration['module']))) {
continue;
}
@@ -933,13 +986,12 @@ public static function exec(
if ($array_return) {
$output[$moduleInstance->name] = $display;
+ } elseif (true === $chain) {
+ $output = $display;
} else {
- if (true === $chain) {
- $output = $display;
- } else {
- $output .= $display;
- }
+ $output .= $display;
}
+
if ($isRegistryEnabled) {
$hookRegistry->hookedByCallback($moduleInstance, $hook_args);
}
@@ -953,12 +1005,10 @@ public static function exec(
if ($array_return) {
$output[$moduleInstance->name] = $display;
+ } elseif (true === $chain) {
+ $output = $display;
} else {
- if (true === $chain) {
- $output = $display;
- } else {
- $output .= $display;
- }
+ $output .= $display;
}
}
diff --git a/classes/Image.php b/classes/Image.php
index 7680eae3f5b0b..71941e723a8cd 100644
--- a/classes/Image.php
+++ b/classes/Image.php
@@ -27,6 +27,7 @@
use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration;
/**
@@ -637,7 +638,7 @@ public function deleteImage($forceDelete = false)
// Delete auto-generated images
$image_types = ImageType::getImagesTypes();
$sfContainer = SymfonyContainer::getInstance();
- $isMultipleImageFormatFeatureEnabled = $sfContainer->get('prestashop.core.admin.feature_flag.repository')->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT);
+ $isMultipleImageFormatFeatureEnabled = $sfContainer->get(FeatureFlagStateCheckerInterface::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT);
foreach ($image_types as $imageType) {
$filesToDelete = $this->deleteAutoGeneratedImage($imageType, $this->image_format, $filesToDelete);
diff --git a/classes/Language.php b/classes/Language.php
index e8ca51225f69d..25e4a942ecb2d 100644
--- a/classes/Language.php
+++ b/classes/Language.php
@@ -495,7 +495,6 @@ public function loadUpdateSQL()
{
$tables = Db::getInstance()->executeS('SHOW TABLES LIKE \'' . str_replace('_', '\\_', _DB_PREFIX_) . '%\_lang\' ');
$langTables = [];
-
foreach ($tables as $table) {
foreach ($table as $t) {
$langTables[] = $t;
@@ -520,8 +519,8 @@ public function loadUpdateSQL()
}
/**
- * duplicate translated rows from xxx_lang tables
- * from the shop default language.
+ * Creates new entries in _lang tables using the data from default language.
+ * If data already exist in that language, they won't be overwritten.
*
* @param string $tableName
* @param int $shopDefaultLangId
@@ -533,52 +532,66 @@ public function loadUpdateSQL()
*/
private function duplicateRowsFromDefaultShopLang($tableName, $shopDefaultLangId, $shopId)
{
- preg_match('#^' . preg_quote(_DB_PREFIX_) . '(.+)_lang$#i', $tableName, $m);
- $identifier = 'id_' . $m[1];
-
- $fields = [];
- // We will check if the table contains a column "id_shop"
- // If yes, we will add "id_shop" as a WHERE condition in queries copying data from default language
- $shop_field_exists = $primary_key_exists = false;
+ // We load all columns from the table
$columns = Db::getInstance()->executeS('SHOW COLUMNS FROM `' . $tableName . '`');
+
+ // We check if the table contains a column "id_shop".
+ // If yes, we will add "id_shop" as a WHERE condition in queries copying data from default language.
+ $idShopColumnExists = false;
+ $idLangColumnExists = false;
+
+ // We extract the column names from the table
+ $columnNames = [];
foreach ($columns as $column) {
- $fields[] = '`' . $column['Field'] . '`';
+ // Build field to our list
+ $columnNames[] = $column['Field'];
+
+ // Save info that we will need to use id_shop
if ($column['Field'] == 'id_shop') {
- $shop_field_exists = true;
+ $idShopColumnExists = true;
}
- if ($column['Field'] == $identifier) {
- $primary_key_exists = true;
+
+ // Check if the table actually has id_lang column, so we don't crash for some custom tables
+ if ($column['Field'] == 'id_lang') {
+ $idLangColumnExists = true;
}
}
- $fields = implode(',', $fields);
- if (!$primary_key_exists) {
+ // If the table does not contain id_lang, nothing to do here
+ if ($idLangColumnExists === false) {
return true;
}
- $sql = 'INSERT IGNORE INTO `' . $tableName . '` (' . $fields . ') (SELECT ';
+ // Format insert fields, they are just normal column names without any prefix.
+ $insertFields = [];
+ foreach ($columnNames as $columnName) {
+ $insertFields[] = '`' . $columnName . '`';
+ }
- // For each column, copy data from default language
- reset($columns);
- $selectQueries = [];
- foreach ($columns as $column) {
- if ($identifier != $column['Field'] && $column['Field'] != 'id_lang') {
- $selectQueries[] = '(
- SELECT `' . bqSQL($column['Field']) . '`
- FROM `' . bqSQL($tableName) . '` tl
- WHERE tl.`id_lang` = ' . (int) $shopDefaultLangId . '
- ' . ($shop_field_exists ? ' AND tl.`id_shop` = ' . (int) $shopId : '') . '
- AND tl.`' . bqSQL($identifier) . '` = `' . bqSQL(str_replace('_lang', '', $tableName)) . '`.`' . bqSQL($identifier) . '`
- )';
+ /*
+ * Now let's format select fields. We will prefix every column with our table prefix, with one exception.
+ *
+ * For language field, we will use the unique language ID from lang table we cross join. Otherwise we would
+ * be inserting the ID of default language for every row.
+ */
+ $selectFields = [];
+ foreach ($columnNames as $columnName) {
+ if ($columnName == 'id_lang') {
+ $selectFields[] = 'l.`id_lang`';
} else {
- $selectQueries[] = '`' . bqSQL($column['Field']) . '`';
+ $selectFields[] = 'tl.`' . $columnName . '`';
}
}
- $sql .= implode(',', $selectQueries);
- $sql .= ' FROM `' . _DB_PREFIX_ . 'lang` CROSS JOIN `' . bqSQL(str_replace('_lang', '', $tableName)) . '` ';
- // prevent insert with where initial data exists
- $sql .= ' WHERE `' . bqSQL($identifier) . '` IN (SELECT `' . bqSQL($identifier) . '` FROM `' . bqSQL($tableName) . '`) )';
+ // Format the SQL query and run it
+ // Entries which already exist are ignored, only new ones are added.
+ $sql = '
+ INSERT IGNORE INTO `' . $tableName . '` (' . implode(', ', $insertFields) . ')
+ SELECT ' . implode(', ', $selectFields) . '
+ FROM `' . $tableName . '` tl
+ CROSS JOIN `' . _DB_PREFIX_ . 'lang` l
+ WHERE tl.id_lang = ' . (int) $shopDefaultLangId .
+ ($idShopColumnExists ? ' AND tl.`id_shop` = ' . (int) $shopId : '');
return Db::getInstance()->execute($sql);
}
@@ -593,16 +606,34 @@ public function delete()
$this->iso_code = Language::getIsoById($this->id);
}
- // Database translations deletion
+ // Now let's delete all entries in _lang tables for given languages
$result = Db::getInstance()->executeS('SHOW TABLES FROM `' . _DB_NAME_ . '`');
+
+ // A key we will be searching for, database returns it in this weird format
$tableNameKey = 'Tables_in_' . _DB_NAME_;
foreach ($result as $row) {
- if (isset($row[$tableNameKey]) && !empty($row[$tableNameKey]) && preg_match('/_lang$/', $row[$tableNameKey])) {
- if (!Db::getInstance()->execute('DELETE FROM `' . $row[$tableNameKey] . '` WHERE `id_lang` = ' . (int) $this->id)) {
- return false;
+ // If we received empty table name for some reason or the language name does not end with _lang
+ if (empty($row[$tableNameKey]) || !preg_match('/_lang$/', $row[$tableNameKey])) {
+ continue;
+ }
+
+ // We check if this table contains id_lang column
+ $columns = Db::getInstance()->executeS('SHOW COLUMNS FROM `' . $row[$tableNameKey] . '`');
+ $idLangColumnExists = false;
+ foreach ($columns as $column) {
+ if ($column['Field'] == 'id_lang') {
+ $idLangColumnExists = true;
}
}
+
+ // If it doesn't, nothing to delete
+ if ($idLangColumnExists === false) {
+ continue;
+ }
+
+ // Delete all entries for this language ID
+ Db::getInstance()->execute('DELETE FROM `' . $row[$tableNameKey] . '` WHERE `id_lang` = ' . (int) $this->id);
}
// Delete tags
@@ -1247,13 +1278,21 @@ public static function downloadXLFLanguagePack($locale, &$errors = [], $type = s
return false;
}
- $content = Tools::file_get_contents($url, false, null, static::PACK_DOWNLOAD_TIMEOUT);
+ // 3 attempts to download the language pack
+ for ($i = 1; $i <= 3; ++$i) {
+ $content = Tools::file_get_contents($url, false, null, static::PACK_DOWNLOAD_TIMEOUT);
- //Check if response is empty or not a valid zip file
- if (empty($content) || strpos($content, "\x50\x4b\x03\x04") === false) {
- $errors[] = Context::getContext()->getTranslator()->trans('Language pack unavailable.', [], 'Admin.International.Notification') . ' ' . $url;
+ // If we managed to download the pack successfully and it's a valid zip file, we stop
+ if (!empty($content) && strpos($content, "\x50\x4b\x03\x04") !== false) {
+ break;
+ }
- return false;
+ // If not, we will give it another try, unless we are on our last attempt
+ if ($i == 3) {
+ $errors[] = Context::getContext()->getTranslator()->trans('Language pack unavailable.', [], 'Admin.International.Notification') . ' ' . $url;
+
+ return false;
+ }
}
return false !== file_put_contents($file, $content);
diff --git a/classes/Link.php b/classes/Link.php
index 0d2722f21ded2..317b51eb2fd38 100644
--- a/classes/Link.php
+++ b/classes/Link.php
@@ -1187,7 +1187,7 @@ public function getCatImageLink($name, $idCategory, $type = null, string $extens
}
/**
- * Create link after language change, for the change language block.
+ * Retrieves a link for the current page in different language.
*
* @param int $idLang Language ID
* @param Context|null $context the context if needed
@@ -1230,6 +1230,11 @@ public function getLanguageLink($idLang, Context $context = null)
} elseif (isset($params['fc']) && $params['fc'] == 'module') {
$module = Validate::isModuleName(Tools::getValue('module')) ? Tools::getValue('module') : '';
if (!empty($module)) {
+ // Let modules provide correct $params to build the URL if they need to (rewrites in correct language).
+ Hook::exec(
+ 'actionLanguageLinkParameters',
+ ['linkParams' => &$params, 'linkIdLang' => (int) $idLang]
+ );
unset($params['fc'], $params['module']);
return $this->getModuleLink($module, $controller, $params, null, (int) $idLang);
diff --git a/classes/Mail.php b/classes/Mail.php
index 6062e706b419f..864faac43a49e 100644
--- a/classes/Mail.php
+++ b/classes/Mail.php
@@ -160,6 +160,7 @@ public static function send(
$idShop = Context::getContext()->shop->id;
}
+ // An array [module_name => module_output] will be returned
$hookBeforeEmailResult = Hook::exec(
'actionEmailSendBefore',
[
@@ -452,6 +453,8 @@ function ($carry, $item) {
$templateHtml = '';
$templateTxt = '';
+
+ // An array [module_name => module_output] will be returned (no effect)
Hook::exec(
'actionEmailAddBeforeContent',
[
@@ -471,6 +474,8 @@ function ($carry, $item) {
'utf-8'
)
);
+
+ // An array [module_name => module_output] will be returned (no effect)
Hook::exec(
'actionEmailAddAfterContent',
[
@@ -569,6 +574,8 @@ function ($carry, $item) {
$templateVars['{color}'] = Tools::safeOutput(Configuration::get('PS_MAIL_COLOR', null, null, $idShop));
// Get extra template_vars
$extraTemplateVars = [];
+
+ // An array [module_name => module_output] will be returned (no effect)
Hook::exec(
'actionGetExtraMailTemplateVars',
[
diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php
index b805cede1f8c8..5a0d6cf6af73b 100644
--- a/classes/ObjectModel.php
+++ b/classes/ObjectModel.php
@@ -1955,12 +1955,28 @@ public function deleteImage($force_delete = false)
return false;
}
+ /** @var PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration $imageFormatConfiguration */
+ $imageFormatConfiguration = ServiceLocator::get('PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration');
+ $configuredImageFormats = $imageFormatConfiguration->getGenerationFormats();
+
$types = ImageType::getImagesTypes();
foreach ($types as $image_type) {
if (file_exists($this->image_dir . $this->id . '-' . stripslashes($image_type['name']) . '.' . $this->image_format)
&& !unlink($this->image_dir . $this->id . '-' . stripslashes($image_type['name']) . '.' . $this->image_format)) {
return false;
}
+
+ foreach ($configuredImageFormats as $imageFormat) {
+ $file = $this->image_dir . $this->id . '-' . stripslashes($image_type['name']) . '.' . $imageFormat;
+ if (file_exists($file)) {
+ unlink($file);
+ }
+
+ $file = $this->image_dir . $this->id . '-' . stripslashes($image_type['name']) . '2x.' . $imageFormat;
+ if (file_exists($file)) {
+ unlink($file);
+ }
+ }
}
}
diff --git a/classes/Pack.php b/classes/Pack.php
index 67f2549dec1c0..75f5dcb5cd5f4 100644
--- a/classes/Pack.php
+++ b/classes/Pack.php
@@ -531,21 +531,16 @@ public static function isCurrentlyUsed($table = null, $has_active_column = false
* @param int $id_product id_pack
*
* @return bool
+ *
+ * @deprecated Since 9.0 and will be removed in 10.0
*/
public static function usesAdvancedStockManagement($id_product)
{
- if (!Pack::isPack($id_product)) {
- return false;
- }
+ @trigger_error(sprintf(
+ '%s is deprecated since 9.0 and will be removed in 10.0.',
+ __METHOD__
+ ), E_USER_DEPRECATED);
- $products = Pack::getItems($id_product, Configuration::get('PS_LANG_DEFAULT'));
- foreach ($products as $product) {
- // if one product uses the advanced stock management
- if ($product->advanced_stock_management == 1) {
- return true;
- }
- }
- // not used
return false;
}
@@ -555,22 +550,17 @@ public static function usesAdvancedStockManagement($id_product)
* @param int $id_product id_pack
*
* @return bool
+ *
+ * @deprecated Since 9.0 and will be removed in 10.0
*/
public static function allUsesAdvancedStockManagement($id_product)
{
- if (!Pack::isPack($id_product)) {
- return false;
- }
+ @trigger_error(sprintf(
+ '%s is deprecated since 9.0 and will be removed in 10.0.',
+ __METHOD__
+ ), E_USER_DEPRECATED);
- $products = Pack::getItems($id_product, Configuration::get('PS_LANG_DEFAULT'));
- foreach ($products as $product) {
- // if one product uses the advanced stock management
- if ($product->advanced_stock_management == 0) {
- return false;
- }
- }
- // not used
- return true;
+ return false;
}
/**
diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index 24560f01b44ed..4f536ef30e4db 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -297,8 +297,6 @@ public function validateOrder(
foreach ($cart_delivery_option as $id_address => $key_carriers) {
foreach ($delivery_option_list[$id_address][$key_carriers]['carrier_list'] as $id_carrier => $data) {
foreach ($data['package_list'] as $id_package) {
- // Rewrite the id_warehouse
- $package_list[$id_address][$id_package]['id_warehouse'] = (int) $this->context->cart->getPackageIdWarehouse($package_list[$id_address][$id_package], (int) $id_carrier);
$package_list[$id_address][$id_package]['id_carrier'] = $id_carrier;
}
}
@@ -346,7 +344,7 @@ public function validateOrder(
$this->name,
$dont_touch_amount,
$amount_paid,
- $package_list[$id_address][$id_package]['id_warehouse'],
+ 0,
$cart_total_paid,
self::DEBUG_MODE,
$order_status,
@@ -672,10 +670,12 @@ public function validateOrder(
'{discounts}' => $cart_rules_list_html,
'{discounts_txt}' => $cart_rules_list_txt,
'{total_paid}' => Tools::getContextLocale($this->context)->formatPrice($order->total_paid, $this->context->currency->iso_code),
+ '{total_paid_tax_excl}' => Tools::getContextLocale($this->context)->formatPrice($order->total_paid_tax_excl, $this->context->currency->iso_code),
'{total_shipping_tax_excl}' => Tools::getContextLocale($this->context)->formatPrice($order->total_shipping_tax_excl, $this->context->currency->iso_code),
'{total_shipping_tax_incl}' => Tools::getContextLocale($this->context)->formatPrice($order->total_shipping_tax_incl, $this->context->currency->iso_code),
'{total_tax_paid}' => Tools::getContextLocale($this->context)->formatPrice(($order->total_paid_tax_incl - $order->total_paid_tax_excl), $this->context->currency->iso_code),
'{recycled_packaging_label}' => $order->recyclable ? $this->trans('Yes', [], 'Shop.Theme.Global') : $this->trans('No', [], 'Shop.Theme.Global'),
+ '{message}' => $order->getFirstMessage(),
];
if (Product::getTaxCalculationMethod() == PS_TAX_EXC) {
@@ -721,18 +721,6 @@ public function validateOrder(
}
}
- // updates stock in shops
- if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
- $product_list = $order->getProducts();
- foreach ($product_list as $product) {
- // if the available quantities depends on the physical stock
- if (StockAvailable::dependsOnStock($product['product_id'])) {
- // synchronizes
- StockAvailable::synchronize($product['product_id'], $order->id_shop);
- }
- }
- }
-
$order->updateOrderDetailTax();
// sync all stock
@@ -1099,7 +1087,7 @@ protected function createOrderFromCart(
// Insert new Order detail list using cart for the current order
$order_detail = new OrderDetail(null, null, $context);
- $order_detail->createList($order, $cart, $id_order_state, $order->product_list, 0, true, $warehouseId);
+ $order_detail->createList($order, $cart, $id_order_state, $order->product_list, 0, true);
if ($debug) {
PrestaShopLogger::addLog('PaymentModule::validateOrder - OrderCarrier is about to be added', 1, null, 'Cart', (int) $cart->id, true);
diff --git a/classes/Product.php b/classes/Product.php
index 9d1941fae56b4..d6c2cff939d53 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -26,7 +26,6 @@
*/
use PrestaShop\Decimal\DecimalNumber;
-use PrestaShop\PrestaShop\Adapter\ServiceLocator;
use PrestaShop\PrestaShop\Core\Domain\Product\Pack\ValueObject\PackStockType;
use PrestaShop\PrestaShop\Core\Domain\Product\ProductSettings;
use PrestaShop\PrestaShop\Core\Domain\Product\Stock\ValueObject\OutOfStockType;
@@ -78,7 +77,7 @@ class ProductCore extends ObjectModel
public $description_short;
/**
- * @deprecated since 1.7.8
+ * @deprecated since 1.7.8 and will be removed in future version.
* @see StockAvailable::$quantity instead
*
* @var int Quantity available
@@ -274,15 +273,15 @@ class ProductCore extends ObjectModel
public $id_color_default = 0;
/**
- * @deprecated since 1.7.8
- * The advanced stock management feature is not maintained anymore
+ * @deprecated since 1.7.8 and will be removed in future version.
+ * This property was only relevant to advanced stock management and that feature is not maintained anymore.
*
* @var bool Tells if the product uses the advanced stock management
*/
public $advanced_stock_management = false;
/**
- * @deprecated since 1.7.8
+ * @deprecated since 1.7.8 and will be removed in future version.
* @see StockAvailable::$out_of_stock instead
*
* @var int
@@ -293,12 +292,12 @@ class ProductCore extends ObjectModel
public $out_of_stock = OutOfStockType::OUT_OF_STOCK_DEFAULT;
/**
- * @deprecated since 1.7.8
- * This property was only relevant to advanced stock management and that feature is not maintained anymore
+ * @deprecated since 1.7.8 and will be removed in future version.
+ * This property was only relevant to advanced stock management and that feature is not maintained anymore.
*
* @var bool|null
*/
- public $depends_on_stock;
+ public $depends_on_stock = false;
/**
* @var bool
@@ -841,17 +840,6 @@ public function update($null_values = false)
$this->setGroupReduction();
$this->updateUnitRatio();
- // Sync stock Reference, EAN13, MPN and UPC
- if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && StockAvailable::dependsOnStock($this->id, Context::getContext()->shop->id)) {
- Db::getInstance()->update('stock', [
- 'reference' => pSQL($this->reference),
- 'ean13' => pSQL($this->ean13),
- 'isbn' => pSQL($this->isbn),
- 'upc' => pSQL($this->upc),
- 'mpn' => pSQL($this->mpn),
- ], 'id_product = ' . (int) $this->id . ' AND id_product_attribute = 0');
- }
-
Hook::exec('actionProductSave', ['id_product' => (int) $this->id, 'product' => $this]);
Hook::exec('actionProductUpdate', ['id_product' => (int) $this->id, 'product' => $this]);
if ($this->getType() == Product::PTYPE_VIRTUAL && $this->active && !Configuration::get('PS_VIRTUAL_PROD_FEATURE_ACTIVE')) {
@@ -1088,9 +1076,9 @@ public static function cleanPositions($id_category, $position = 0)
/**
* Get the default attribute for a product.
*
- * @param int $id_product Product identifier
- * @param int $minimum_quantity
- * @param bool $reset
+ * @param int $id_product Product ID
+ * @param int $minimum_quantity Minimal quantity there should be in stock of the combination
+ * @param bool $reset Force reload new values and not use cache
*
* @return int Attributes list
*/
@@ -1100,22 +1088,23 @@ public static function getDefaultAttribute($id_product, $minimum_quantity = 0, $
return 0;
}
- if ($reset && isset(static::$_combinations[$id_product])) {
- unset(static::$_combinations[$id_product]);
- }
-
- if (!isset(static::$_combinations[$id_product])) {
+ // If we should start fresh OR we did not want default combination for this product yet, we initialize cache
+ if ($reset || !isset(static::$_combinations[$id_product])) {
static::$_combinations[$id_product] = [];
}
+
+ // If we already have a value for this product and minimal quantity, we retrieve it from cache.
if (isset(static::$_combinations[$id_product][$minimum_quantity])) {
return static::$_combinations[$id_product][$minimum_quantity];
}
+ // First attempt - check if the product even has some attributes
$sql = 'SELECT product_attribute_shop.id_product_attribute
FROM ' . _DB_PREFIX_ . 'product_attribute pa
' . Shop::addSqlAssociation('product_attribute', 'pa') . '
WHERE pa.id_product = ' . (int) $id_product;
+ // If none are found, we exit right away
$result_no_filter = (int) Db::getInstance()->getValue($sql);
if (!$result_no_filter) {
static::$_combinations[$id_product][$minimum_quantity] = 0;
@@ -1123,6 +1112,7 @@ public static function getDefaultAttribute($id_product, $minimum_quantity = 0, $
return 0;
}
+ // Try to check if the default combination matches our minimum_quantity quantity condition, if yes - win
$sql = 'SELECT product_attribute_shop.id_product_attribute
FROM ' . _DB_PREFIX_ . 'product_attribute pa
' . Shop::addSqlAssociation('product_attribute', 'pa') . '
@@ -1132,6 +1122,7 @@ public static function getDefaultAttribute($id_product, $minimum_quantity = 0, $
' AND pa.id_product = ' . (int) $id_product;
$result = (int) Db::getInstance()->getValue($sql);
+ // If not, check if there is ANY combination matching minimum_quantity, if yes - not perfect, but works
if (!$result) {
$sql = 'SELECT product_attribute_shop.id_product_attribute
FROM ' . _DB_PREFIX_ . 'product_attribute pa
@@ -1143,6 +1134,7 @@ public static function getDefaultAttribute($id_product, $minimum_quantity = 0, $
$result = (int) Db::getInstance()->getValue($sql);
}
+ // If still nothing, we will return the default combination
if (!$result) {
$sql = 'SELECT product_attribute_shop.id_product_attribute
FROM ' . _DB_PREFIX_ . 'product_attribute pa
@@ -1153,10 +1145,12 @@ public static function getDefaultAttribute($id_product, $minimum_quantity = 0, $
$result = (int) Db::getInstance()->getValue($sql);
}
+ // If for some reason (database inconsistency) we still did not find any combination, we use the fallback one
if (!$result) {
$result = $result_no_filter;
}
+ // Cache it for next time and return it
static::$_combinations[$id_product][$minimum_quantity] = $result;
return $result;
@@ -1297,33 +1291,6 @@ public function validateField($field, $value, $id_lang = null, $skip = [], $huma
*/
public function delete()
{
- /*
- * @since 1.5.0
- * It is NOT possible to delete a product if there are currently:
- * - physical stock for this product
- * - supply order(s) for this product
- */
- if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $this->advanced_stock_management) {
- $stock_manager = StockManagerFactory::getManager();
- $physical_quantity = $stock_manager->getProductPhysicalQuantities($this->id, 0);
- $real_quantity = $stock_manager->getProductRealQuantities($this->id, 0);
- if ($physical_quantity > 0) {
- return false;
- }
- if ($real_quantity > $physical_quantity) {
- return false;
- }
-
- $warehouse_product_locations = ServiceLocator::get('\\PrestaShop\\PrestaShop\\Core\\Foundation\\Database\\EntityManager')->getRepository('WarehouseProductLocation')->findByIdProduct($this->id);
- foreach ($warehouse_product_locations as $warehouse_product_location) {
- $warehouse_product_location->delete();
- }
-
- $stocks = ServiceLocator::get('\\PrestaShop\\PrestaShop\\Core\\Foundation\\Database\\EntityManager')->getRepository('Stock')->findByIdProduct($this->id);
- foreach ($stocks as $stock) {
- $stock->delete();
- }
- }
$result = parent::delete();
// Removes the product from StockAvailable, for the current shop
@@ -1360,6 +1327,7 @@ public function delete()
!$this->deleteProductSale() ||
!$this->deleteSearchIndexes() ||
!$this->deleteAccessories() ||
+ !$this->deleteCarrierRestrictions() ||
!$this->deleteFromAccessories() ||
!$this->deleteFromSupplier() ||
!$this->deleteDownload() ||
@@ -1803,7 +1771,6 @@ public function productAttributeExists($attributes_list, $current_product_attrib
* The supplier_reference params now set the supplier reference of the default supplier of the product if possible
*
* @deprecated since 1.5.0
- * @see StockManager if you want to manage real stock
* @see StockAvailable if you want to manage available quantities for sale on your shop(s)
* @see ProductSupplier for manage supplier reference(s)
*
@@ -2346,17 +2313,6 @@ public function updateAttribute(
$this->cache_default_attribute = $id_default_attribute;
}
- // Sync stock Reference, EAN13, ISBN, MPN and UPC for this attribute
- if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && StockAvailable::dependsOnStock($this->id, Context::getContext()->shop->id)) {
- Db::getInstance()->update('stock', [
- 'reference' => pSQL($reference),
- 'ean13' => pSQL($ean13),
- 'isbn' => pSQL($isbn),
- 'upc' => pSQL($upc),
- 'mpn' => pSQL($mpn),
- ], 'id_product = ' . $this->id . ' AND id_product_attribute = ' . (int) $id_product_attribute);
- }
-
Hook::exec('actionProductAttributeUpdate', ['id_product_attribute' => (int) $id_product_attribute]);
return true;
@@ -2473,38 +2429,9 @@ public function addAttribute(
$combination->setImages($id_images);
}
- if (Configuration::get('PS_DEFAULT_WAREHOUSE_NEW_PRODUCT') != 0 && Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
- $warehouse_location_entity = new WarehouseProductLocation();
- $warehouse_location_entity->id_product = $this->id;
- $warehouse_location_entity->id_product_attribute = (int) $combination->id;
- $warehouse_location_entity->id_warehouse = (int) Configuration::get('PS_DEFAULT_WAREHOUSE_NEW_PRODUCT');
- $warehouse_location_entity->location = pSQL('');
- $warehouse_location_entity->save();
- }
-
return (int) $combination->id;
}
- /**
- * @deprecated since 1.5.0
- *
- * @return bool
- */
- public function updateQuantityProductWithAttributeQuantity()
- {
- Tools::displayAsDeprecated();
-
- return Db::getInstance()->execute('
- UPDATE `' . _DB_PREFIX_ . 'product`
- SET `quantity` = IFNULL(
- (
- SELECT SUM(`quantity`)
- FROM `' . _DB_PREFIX_ . 'product_attribute`
- WHERE `id_product` = ' . (int) $this->id . '
- ), \'0\')
- WHERE `id_product` = ' . (int) $this->id);
- }
-
/**
* Delete product attributes.
*
@@ -4592,6 +4519,20 @@ public function deleteAccessories()
return Db::getInstance()->delete('accessory', 'id_product_1 = ' . (int) $this->id);
}
+ /**
+ * Delete product carrier restriction.
+ *
+ * @return bool Deletion result
+ */
+ public function deleteCarrierRestrictions()
+ {
+ $all_shops = Context::getContext()->shop->getContext() == Shop::CONTEXT_ALL ? true : false;
+
+ return Db::getInstance()->execute('DELETE FROM `' . _DB_PREFIX_ . 'product_carrier`
+ WHERE `id_product` = ' . (int) $this->id . (!$all_shops ? ' AND `id_shop` = ' . (int) Context::getContext()->shop->id : '')
+ );
+ }
+
/**
* Delete product from other products accessories.
*
@@ -4899,7 +4840,7 @@ public static function searchByName($id_lang, $query, Context $context = null, $
Tools::displayParameterAsDeprecated('context');
}
$sql = new DbQuery();
- $sql->select('p.`id_product`, pl.`name`, p.`ean13`, p.`isbn`, p.`upc`, p.`mpn`, p.`active`, p.`reference`, m.`name` AS manufacturer_name, stock.`quantity`, product_shop.advanced_stock_management, p.`customizable`');
+ $sql->select('p.`id_product`, pl.`name`, p.`ean13`, p.`isbn`, p.`upc`, p.`mpn`, p.`active`, p.`reference`, m.`name` AS manufacturer_name, stock.`quantity`, p.`customizable`');
$sql->from('product', 'p');
$sql->join(Shop::addSqlAssociation('product', 'p'));
$sql->leftJoin(
@@ -5627,11 +5568,11 @@ public static function getProductProperties($id_lang, $row, Context $context = n
$row['category'] = Category::getLinkRewrite((int) $row['id_category_default'], (int) $id_lang);
$row['category_name'] = Db::getInstance()->getValue('SELECT name FROM ' . _DB_PREFIX_ . 'category_lang WHERE id_shop = ' . (int) $context->shop->id . ' AND id_lang = ' . (int) $id_lang . ' AND id_category = ' . (int) $row['id_category_default']);
$row['link'] = $context->link->getProductLink((int) $row['id_product'], $row['link_rewrite'], $row['category'], $row['ean13']);
- $row['manufacturer_name'] = !empty((int) $row['id_manufacturer']) ? Manufacturer::getNameById((int) $row['id_manufacturer']) : null;
- $row['attribute_price'] = 0;
- if ($id_product_attribute) {
- $row['attribute_price'] = (float) Combination::getPrice($id_product_attribute);
+ if (empty($row['manufacturer_name']) && (isset($row['id_manufacturer']) && !empty((int) $row['id_manufacturer']))) {
+ $row['manufacturer_name'] = Manufacturer::getNameById((int) $row['id_manufacturer']);
+ } else {
+ $row['manufacturer_name'] = null;
}
if (isset($row['quantity_wanted'])) {
@@ -5745,6 +5686,11 @@ public static function getProductProperties($id_lang, $row, Context $context = n
$row['specific_prices'] = $specific_prices;
+ /* Get quantity of the base product.
+ * For products without combinations - self explanatory.
+ * For products with combinations - this value is a SUM of quantities of all combinations.
+ * You have 2 black shirts + 2 white shirts = $quantity 4.
+ */
$row['quantity'] = Product::getQuantity(
(int) $row['id_product'],
0,
@@ -5755,6 +5701,7 @@ public static function getProductProperties($id_lang, $row, Context $context = n
$row['quantity_all_versions'] = $row['quantity'];
+ // If we have some combination ID specified, we will return more precise stock and date for this combination
if ($row['id_product_attribute']) {
$row['quantity'] = Product::getQuantity(
(int) $row['id_product'],
@@ -5771,8 +5718,14 @@ public static function getProductProperties($id_lang, $row, Context $context = n
}
$row['id_image'] = Product::defineProductImage($row, $id_lang);
- $row['features'] = Product::getFrontFeaturesStatic((int) $id_lang, $row['id_product']);
+ /*
+ * Loading of files attached to product. This is using cache_has_attachments property which needs to be managed
+ * every time a file is changed. It can sometimes lead to database inconsistency.
+ *
+ * It would be better to lazy load it in ProductLazyArray so we can just always take the live data
+ * if needed and would not need to take care about cache_has_attachments.
+ */
$row['attachments'] = [];
if (!isset($row['cache_has_attachments']) || $row['cache_has_attachments']) {
$row['attachments'] = Product::getAttachmentsStatic((int) $id_lang, $row['id_product']);
@@ -6051,6 +6004,9 @@ public static function getAllCustomizedDatas($id_cart, $id_lang = null, $only_in
return false;
}
+ // Load cart object to get delivery address ID
+ $cart = new Cart((int) $id_cart);
+
if ($id_customization === 0) {
// Backward compatibility: check if there are no products in cart with specific `id_customization` before returning false
$product_customizations = (int) Db::getInstance()->getValue('
@@ -6070,7 +6026,7 @@ public static function getAllCustomizedDatas($id_cart, $id_lang = null, $only_in
}
if (!$result = Db::getInstance()->executeS('
- SELECT cd.`id_customization`, c.`id_address_delivery`, c.`id_product`, cfl.`id_customization_field`, c.`id_product_attribute`,
+ SELECT cd.`id_customization`, c.`id_product`, cfl.`id_customization_field`, c.`id_product_attribute`,
cd.`type`, cd.`index`, cd.`value`, cd.`id_module`, cfl.`name`
FROM `' . _DB_PREFIX_ . 'customized_data` cd
NATURAL JOIN `' . _DB_PREFIX_ . 'customization` c
@@ -6087,15 +6043,15 @@ public static function getAllCustomizedDatas($id_cart, $id_lang = null, $only_in
foreach ($result as $row) {
if ((int) $row['id_module'] && (int) $row['type'] == Product::CUSTOMIZE_TEXTFIELD) {
- // Hook displayCustomization: Call only the module in question
+ // Hook called only for the module concerned
// When a module saves a customization programmatically, it should add its ID in the `id_module` column
$row['value'] = Hook::exec('displayCustomization', ['customization' => $row], (int) $row['id_module']);
}
- $customized_datas[(int) $row['id_product']][(int) $row['id_product_attribute']][(int) $row['id_address_delivery']][(int) $row['id_customization']]['datas'][(int) $row['type']][] = $row;
+ $customized_datas[(int) $row['id_product']][(int) $row['id_product_attribute']][(int) $cart->id_address_delivery][(int) $row['id_customization']]['datas'][(int) $row['type']][] = $row;
}
if (!$result = Db::getInstance()->executeS(
- 'SELECT `id_product`, `id_product_attribute`, `id_customization`, `id_address_delivery`, `quantity`, `quantity_refunded`, `quantity_returned`
+ 'SELECT `id_product`, `id_product_attribute`, `id_customization`, `quantity`, `quantity_refunded`, `quantity_returned`
FROM `' . _DB_PREFIX_ . 'customization`
WHERE `id_cart` = ' . (int) $id_cart .
((int) $id_customization ? ' AND `id_customization` = ' . (int) $id_customization : '') .
@@ -6105,10 +6061,10 @@ public static function getAllCustomizedDatas($id_cart, $id_lang = null, $only_in
}
foreach ($result as $row) {
- $customized_datas[(int) $row['id_product']][(int) $row['id_product_attribute']][(int) $row['id_address_delivery']][(int) $row['id_customization']]['quantity'] = (int) $row['quantity'];
- $customized_datas[(int) $row['id_product']][(int) $row['id_product_attribute']][(int) $row['id_address_delivery']][(int) $row['id_customization']]['quantity_refunded'] = (int) $row['quantity_refunded'];
- $customized_datas[(int) $row['id_product']][(int) $row['id_product_attribute']][(int) $row['id_address_delivery']][(int) $row['id_customization']]['quantity_returned'] = (int) $row['quantity_returned'];
- $customized_datas[(int) $row['id_product']][(int) $row['id_product_attribute']][(int) $row['id_address_delivery']][(int) $row['id_customization']]['id_customization'] = (int) $row['id_customization'];
+ $customized_datas[(int) $row['id_product']][(int) $row['id_product_attribute']][(int) $cart->id_address_delivery][(int) $row['id_customization']]['quantity'] = (int) $row['quantity'];
+ $customized_datas[(int) $row['id_product']][(int) $row['id_product_attribute']][(int) $cart->id_address_delivery][(int) $row['id_customization']]['quantity_refunded'] = (int) $row['quantity_refunded'];
+ $customized_datas[(int) $row['id_product']][(int) $row['id_product_attribute']][(int) $cart->id_address_delivery][(int) $row['id_customization']]['quantity_returned'] = (int) $row['quantity_returned'];
+ $customized_datas[(int) $row['id_product']][(int) $row['id_product_attribute']][(int) $cart->id_address_delivery][(int) $row['id_customization']]['id_customization'] = (int) $row['id_customization'];
}
return $customized_datas;
@@ -6720,81 +6676,6 @@ public static function checkAccessStatic($id_product, $id_customer)
return Cache::retrieve($cache_id);
}
- /**
- * Add a stock movement for current product.
- *
- * Since 1.5, this method only permit to add/remove available quantities of the current product in the current shop
- *
- * @see StockManager if you want to manage real stock
- * @see StockAvailable if you want to manage available quantities for sale on your shop(s)
- * @deprecated since 1.5.0
- *
- * @param int $quantity
- * @param int $id_reason StockMvtReason identifier - useless
- * @param int|null $id_product_attribute Attribute identifier
- * @param int|null $id_order Order identifier - DEPRECATED
- * @param int|null $id_employee Employee identifier - DEPRECATED
- *
- * @return bool
- */
- public function addStockMvt($quantity, $id_reason, $id_product_attribute = null, $id_order = null, $id_employee = null)
- {
- if (!$this->id || !$id_reason) {
- return false;
- }
-
- if ($id_product_attribute == null) {
- $id_product_attribute = 0;
- }
-
- $reason = new StockMvtReason((int) $id_reason);
- if (!Validate::isLoadedObject($reason)) {
- return false;
- }
-
- $quantity = abs((int) $quantity) * $reason->sign;
-
- return StockAvailable::updateQuantity($this->id, $id_product_attribute, $quantity);
- }
-
- /**
- * @deprecated since 1.5.0
- *
- * @param int $id_lang Language identifier
- *
- * @return array
- */
- public function getStockMvts($id_lang)
- {
- Tools::displayAsDeprecated();
-
- return Db::getInstance()->executeS('
- SELECT sm.id_stock_mvt, sm.date_add, sm.quantity, sm.id_order,
- CONCAT(pl.name, \' \', GROUP_CONCAT(IFNULL(al.name, \'\'), \'\')) product_name, CONCAT(e.lastname, \' \', e.firstname) employee, mrl.name reason
- FROM `' . _DB_PREFIX_ . 'stock_mvt` sm
- LEFT JOIN `' . _DB_PREFIX_ . 'product_lang` pl ON (
- sm.id_product = pl.id_product
- AND pl.id_lang = ' . (int) $id_lang . Shop::addSqlRestrictionOnLang('pl') . '
- )
- LEFT JOIN `' . _DB_PREFIX_ . 'stock_mvt_reason_lang` mrl ON (
- sm.id_stock_mvt_reason = mrl.id_stock_mvt_reason
- AND mrl.id_lang = ' . (int) $id_lang . '
- )
- LEFT JOIN `' . _DB_PREFIX_ . 'employee` e ON (
- e.id_employee = sm.id_employee
- )
- LEFT JOIN `' . _DB_PREFIX_ . 'product_attribute_combination` pac ON (
- pac.id_product_attribute = sm.id_product_attribute
- )
- LEFT JOIN `' . _DB_PREFIX_ . 'attribute_lang` al ON (
- al.id_attribute = pac.id_attribute
- AND al.id_lang = ' . (int) $id_lang . '
- )
- WHERE sm.id_product=' . (int) $this->id . '
- GROUP BY sm.id_stock_mvt
- ');
- }
-
/**
* @return int TaxRulesGroup identifier
*/
@@ -7719,28 +7600,21 @@ public function updateWs($null_values = false)
*
* @param int $id_product Product identifier
* @param int $id_product_attribute Attribute identifier
- * @param int $id_warehouse Warehouse identifier
+ * @param int $id_warehouse Warehouse identifier - not used anymore
* @param int|null $id_shop Shop identifier
*
* @return int real_quantity
+ *
+ * @deprecated Since 9.0 and will be removed in 10.0 - use StockAvailable::getQuantityAvailableByProduct directly
*/
public static function getRealQuantity($id_product, $id_product_attribute = 0, $id_warehouse = 0, $id_shop = null)
{
- static $manager = null;
+ @trigger_error(sprintf(
+ '%s is deprecated since 9.0 and will be removed in 10.0.',
+ __METHOD__
+ ), E_USER_DEPRECATED);
- if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && null === $manager) {
- $manager = StockManagerFactory::getManager();
- }
-
- if (
- Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')
- && Product::usesAdvancedStockManagement($id_product)
- && StockAvailable::dependsOnStock($id_product, $id_shop)
- ) {
- return $manager->getProductRealQuantities($id_product, $id_product_attribute, $id_warehouse, true);
- } else {
- return StockAvailable::getQuantityAvailableByProduct($id_product, $id_product_attribute, $id_shop);
- }
+ return StockAvailable::getQuantityAvailableByProduct($id_product, $id_product_attribute, $id_shop);
}
/**
@@ -7751,16 +7625,17 @@ public static function getRealQuantity($id_product, $id_product_attribute = 0, $
* @param int $id_product Product identifier
*
* @return bool
+ *
+ * @deprecated Since 9.0 and will be removed in 10.0
*/
public static function usesAdvancedStockManagement($id_product)
{
- $query = new DbQuery();
- $query->select('product_shop.advanced_stock_management');
- $query->from('product', 'p');
- $query->join(Shop::addSqlAssociation('product', 'p'));
- $query->where('p.id_product = ' . (int) $id_product);
+ @trigger_error(sprintf(
+ '%s is deprecated since 9.0 and will be removed in 10.0.',
+ __METHOD__
+ ), E_USER_DEPRECATED);
- return (bool) Db::getInstance()->getValue($query);
+ return false;
}
/**
@@ -7811,67 +7686,54 @@ public function loadStockData()
// Default product quantity is available quantity to sell in current shop
$this->quantity = StockAvailable::getQuantityAvailableByProduct($this->id, 0);
$this->out_of_stock = StockAvailable::outOfStock($this->id);
- $this->depends_on_stock = StockAvailable::dependsOnStock($this->id);
$this->location = StockAvailable::getLocation($this->id) ?: '';
-
- if (Context::getContext()->shop->getContext() == Shop::CONTEXT_GROUP && Context::getContext()->shop->getContextShopGroup()->share_stock == 1) {
- $this->advanced_stock_management = $this->useAdvancedStockManagement();
- }
}
/**
- * Get Advanced Stock Management status for this product
+ * Get the default category id according to the shop.
*
- * @return bool 0 for disabled, 1 for enabled
+ * @return int
*/
- public function useAdvancedStockManagement()
+ public function getDefaultCategory(): int
{
- return (bool) Db::getInstance()->getValue(
- 'SELECT `advanced_stock_management`
- FROM ' . _DB_PREFIX_ . 'product_shop
- WHERE id_product=' . (int) $this->id . Shop::addSqlRestriction()
+ $defaultCategory = Db::getInstance()->getValue(
+ 'SELECT product_shop.`id_category_default`
+ FROM `' . _DB_PREFIX_ . 'product` p
+ ' . Shop::addSqlAssociation('product', 'p') . '
+ WHERE p.`id_product` = ' . (int) $this->id
);
+
+ return (int) ($defaultCategory ?? Context::getContext()->shop->id_category);
}
/**
- * Set Advanced Stock Management status for this product
+ * Get Advanced Stock Management status for this product
*
- * @param bool $value false for disabled, true for enabled
+ * @return bool 0 for disabled, 1 for enabled
*/
- public function setAdvancedStockManagement($value)
+ public function useAdvancedStockManagement()
{
- $this->advanced_stock_management = (bool) $value;
- if (
- Context::getContext()->shop->getContext() == Shop::CONTEXT_GROUP
- && Context::getContext()->shop->getContextShopGroup()->share_stock == 1
- ) {
- Db::getInstance()->execute(
- '
- UPDATE `' . _DB_PREFIX_ . 'product_shop`
- SET `advanced_stock_management`=' . (int) $value . '
- WHERE id_product=' . (int) $this->id . Shop::addSqlRestriction()
- );
- } else {
- $this->setFieldsToUpdate(['advanced_stock_management' => true]);
- $this->save();
- }
+ @trigger_error(sprintf(
+ '%s is deprecated since 9.0 and will be removed in 10.0.',
+ __METHOD__
+ ), E_USER_DEPRECATED);
+
+ return false;
}
/**
- * Get the default category id according to the shop.
+ * Set Advanced Stock Management status for this product
*
- * @return int
+ * @param bool $value false for disabled, true for enabled
*/
- public function getDefaultCategory(): int
+ public function setAdvancedStockManagement($value)
{
- $defaultCategory = Db::getInstance()->getValue(
- 'SELECT product_shop.`id_category_default`
- FROM `' . _DB_PREFIX_ . 'product` p
- ' . Shop::addSqlAssociation('product', 'p') . '
- WHERE p.`id_product` = ' . (int) $this->id
- );
+ @trigger_error(sprintf(
+ '%s is deprecated since 9.0 and will be removed in 10.0.',
+ __METHOD__
+ ), E_USER_DEPRECATED);
- return (int) ($defaultCategory ?? Context::getContext()->shop->id_category);
+ return;
}
/**
diff --git a/classes/QuickAccess.php b/classes/QuickAccess.php
index 0a13fbaa980aa..a0b0a75f0e168 100644
--- a/classes/QuickAccess.php
+++ b/classes/QuickAccess.php
@@ -26,6 +26,7 @@
use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
/**
* Class QuickAccessCore.
@@ -168,6 +169,6 @@ public function toggleNewWindow()
*/
private static function productPageV2Enabled(): bool
{
- return SymfonyContainer::getInstance()->get('prestashop.core.admin.feature_flag.repository')->isEnabled(FeatureFlagSettings::FEATURE_FLAG_PRODUCT_PAGE_V2);
+ return SymfonyContainer::getInstance()->get(FeatureFlagStateCheckerInterface::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_PRODUCT_PAGE_V2);
}
}
diff --git a/classes/RequestSql.php b/classes/RequestSql.php
index caaa4faaefb05..528c01d92c606 100644
--- a/classes/RequestSql.php
+++ b/classes/RequestSql.php
@@ -65,6 +65,7 @@ class RequestSqlCore extends ObjectModel
'RESET', 'START', 'STOP', 'PURGE', 'EXECUTE', 'PREPARE', 'DEALLOCATE', 'LOCK', 'USING', 'DROP', 'FOR', 'UPDATE', 'BEGIN', 'BY', 'ALL', 'SHARE',
'MODE', 'TO', 'KEY', 'DISTINCTROW', 'DISTINCT', 'HIGH_PRIORITY', 'LOW_PRIORITY', 'DELAYED', 'IGNORE', 'FORCE', 'STRAIGHT_JOIN',
'SQL_SMALL_RESULT', 'SQL_BIG_RESULT', 'QUICK', 'SQL_BUFFER_RESULT', 'SQL_CACHE', 'SQL_NO_CACHE', 'SQL_CALC_FOUND_ROWS', 'WITH',
+ 'OUTFILE', 'DUMPFILE',
],
];
diff --git a/classes/SpecificPrice.php b/classes/SpecificPrice.php
index b3afc6d6d00d1..fe9e4856735b3 100644
--- a/classes/SpecificPrice.php
+++ b/classes/SpecificPrice.php
@@ -23,9 +23,6 @@
* @copyright Since 2007 PrestaShop SA and Contributors
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/
-
-use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater;
-
class SpecificPriceCore extends ObjectModel
{
public const ORDER_DEFAULT_FROM_QUANTITY = 1;
@@ -268,7 +265,7 @@ public static function getPriority($id_product)
}
$priority = 'id_customer;' . $priority;
- return preg_split('/;/', $priority);
+ return explode(';', $priority);
}
/**
@@ -579,37 +576,6 @@ public static function getSpecificPrice(
return self::$_specificPriceCache[$key];
}
- /**
- * @deprecated since 8.0 and will be removed in next major version.
- * @see SpecificPricePriorityUpdater::updateDefaultPriorities()
- *
- * @param array $priorities
- *
- * @return bool
- */
- public static function setPriorities($priorities)
- {
- @trigger_error(
- sprintf(
- '%s is deprecated since version 8.0. Use %s instead.',
- __METHOD__,
- SpecificPricePriorityUpdater::class . '::updateDefaultPriorities()'
- ),
- E_USER_DEPRECATED
- );
-
- $value = '';
- if (is_array($priorities)) {
- foreach ($priorities as $priority) {
- $value .= pSQL($priority) . ';';
- }
- }
-
- SpecificPrice::deletePriorities();
-
- return Configuration::updateValue('PS_SPECIFIC_PRICE_PRIORITIES', rtrim($value, ';'));
- }
-
/**
* Truncate the specific price priorities.
*
diff --git a/classes/Store.php b/classes/Store.php
index bbdfea6b89374..87d1d6cd5824e 100644
--- a/classes/Store.php
+++ b/classes/Store.php
@@ -202,4 +202,14 @@ public static function storeExists($idStore)
return isset($row['id_store']);
}
+
+ /**
+ * This method checks if at least one store is configured
+ *
+ * @return bool
+ */
+ public static function atLeastOneStoreExists()
+ {
+ return (bool) Db::getInstance()->getValue('SELECT `id_store` FROM ' . _DB_PREFIX_ . 'store', false);
+ }
}
diff --git a/classes/Tab.php b/classes/Tab.php
index 3dfa2718d290e..ba536a8c415de 100644
--- a/classes/Tab.php
+++ b/classes/Tab.php
@@ -353,7 +353,7 @@ public static function getTabs($idLang, $idParent = null)
*/
public static function getIdFromClassName($className)
{
- $className = self::getClassName($className);
+ $className = strtolower($className);
if (empty(self::$_getIdFromClassName)) {
self::$_getIdFromClassName = [];
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT id_tab, class_name FROM `' . _DB_PREFIX_ . 'tab`', true, false);
@@ -368,29 +368,6 @@ public static function getIdFromClassName($className)
return isset(self::$_getIdFromClassName[$className]) ? (int) self::$_getIdFromClassName[$className] : false;
}
- /**
- * @deprecated 1.7.0, to be removed in 1.7.1. Upgrade module to 1.7.
- */
- private static function getClassName($className)
- {
- $legacyClassNames = [
- 'AdminTools',
- 'AdminPriceRule',
- 'AdminAdmin',
- 'AdminParentStats',
- 'AdminMarketing',
- 'AdminCarrierWizard',
- 'AdminTabs',
- ];
-
- if (in_array($className, $legacyClassNames)) {
- @trigger_error($className . ' is a deprecated tab since version 1.7.0 and "Default" will be removed in 1.7.1.. Upgrade module using the docs: http://build.prestashop.com/news/how-we-reorganized-main-menu-prestashop-1.7/.', E_USER_DEPRECATED);
- $className = 'DEFAULT';
- }
-
- return strtolower($className);
- }
-
/**
* Get collection from module name.
*
diff --git a/classes/Tools.php b/classes/Tools.php
index 6d3f42db0cedd..68a0ae77188d0 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -30,7 +30,6 @@
use PrestaShop\PrestaShop\Adapter\SymfonyContainer;
use PrestaShop\PrestaShop\Core\Cache\Clearer\CacheClearerInterface;
use PrestaShop\PrestaShop\Core\Foundation\Filesystem\FileSystem as PsFileSystem;
-use PrestaShop\PrestaShop\Core\Localization\Exception\LocalizationException;
use PrestaShop\PrestaShop\Core\Localization\Locale;
use PrestaShop\PrestaShop\Core\Localization\Locale\Repository as LocaleRepository;
use PrestaShop\PrestaShop\Core\Security\Hashing;
@@ -661,46 +660,6 @@ public static function setCurrency($cookie)
return $currency;
}
- /**
- * Return price with currency sign for a given product.
- *
- * @deprecated Since 1.7.6.0. Please use Locale::formatPrice() instead
- * @see PrestaShop\PrestaShop\Core\Localization\Locale
- *
- * @param float $price Product price
- * @param int|Currency|array|null $currency Current currency (object, id_currency, NULL => context currency)
- * @param bool $no_utf8 Not used anymore
- * @param Context|null $context
- *
- * @return string Price correctly formatted (sign, decimal separator...)
- * if you modify this function, don't forget to modify the Javascript function formatCurrency (in tools.js)
- *
- * @throws LocalizationException
- */
- public static function displayPrice($price, $currency = null, $no_utf8 = false, Context $context = null)
- {
- @trigger_error(
- 'Tools::displayPrice() is deprecated since version 1.7.6.0. Use ' . Locale::class . '::formatPrice() instead.',
- E_USER_DEPRECATED
- );
-
- if (!is_numeric($price)) {
- return $price;
- }
-
- $context = $context ?: Context::getContext();
- $currency = $currency ?: $context->currency;
-
- if (is_int($currency)) {
- $currency = Currency::getCurrencyInstance($currency);
- }
-
- $locale = static::getContextLocale($context);
- $currencyCode = is_array($currency) ? $currency['iso_code'] : $currency->iso_code;
-
- return $locale->formatPrice($price, $currencyCode);
- }
-
/**
* Return current locale
*
@@ -732,33 +691,6 @@ public static function getContextLocale(Context $context)
return $locale;
}
- /**
- * Returns a well formatted number.
- *
- * @deprecated Since 1.7.6.0. Please use Locale::formatNumber() instead
- * @see Locale
- *
- * @param int|float|string $number The number to format
- * @param null $currency not used anymore
- *
- * @return string The formatted number
- *
- * @throws Exception
- * @throws LocalizationException
- */
- public static function displayNumber($number, $currency = null)
- {
- @trigger_error(
- 'Tools::displayNumber() is deprecated since version 1.7.5.0. Use ' . Locale::class . ' instead.',
- E_USER_DEPRECATED
- );
-
- $context = Context::getContext();
- $locale = static::getContextLocale($context);
-
- return $locale->formatNumber($number);
- }
-
public static function displayPriceSmarty($params, &$smarty)
{
$context = Context::getContext();
@@ -2336,11 +2268,6 @@ public static function generateHtaccess($path = null, $rewrite_settings = null,
', $errors), - 'css_files' => $this->css_files, ]); - - return $this->smartyOutputContent('controllers/orders/form_customization_feedback.tpl'); - } - } - - public function ajaxProcessUpdateQty() - { - if ($this->access('edit')) { - $errors = []; - if (!$this->context->cart->id) { - return; - } - $qty = Tools::getValue('qty'); - $id_product = (int) Tools::getValue('id_product'); - if ($this->context->cart->OrderExists()) { - $errors[] = $this->trans('An order has already been placed with this cart.', [], 'Admin.Catalog.Notification'); - } elseif (!$id_product || !Validate::isLoadedObject($product = new Product((int) $id_product, true, $this->context->language->id))) { - $errors[] = $this->trans('Invalid product', [], 'Admin.Catalog.Notification'); - } elseif (!$qty || $qty == 0) { - $errors[] = $this->trans('Invalid quantity', [], 'Admin.Catalog.Notification'); - } - - // Don't try to use a product if not instanciated before due to errors - $id_customization = (int) Tools::getValue('id_customization', 0); - $id_product_attribute = Tools::getValue('id_product_attribute'); - if (isset($product) && $product->id) { - if ($id_product_attribute != 0) { - if (!Product::isAvailableWhenOutOfStock($product->out_of_stock) && !ProductAttribute::checkAttributeQty((int) $id_product_attribute, (int) $qty)) { - $errors[] = $this->trans('There are not enough products in stock.', [], 'Admin.Catalog.Notification'); - } - } elseif (!$product->checkQty((int) $qty)) { - $errors[] = $this->trans('There are not enough products in stock.', [], 'Admin.Catalog.Notification'); - } - if (!$id_customization && !$product->hasAllRequiredCustomizableFields()) { - $errors[] = $this->trans('Please fill in all the required fields.', [], 'Admin.Notifications.Error'); - } - $this->context->cart->save(); - } else { - $errors[] = $this->trans('This product cannot be added to the cart.', [], 'Admin.Catalog.Notification'); - } - - if (!count($errors)) { - if ((int) $qty < 0) { - $qty = str_replace('-', '', $qty); - $operator = 'down'; - } else { - $operator = 'up'; - } - - if (!($qty_upd = $this->context->cart->updateQty($qty, $id_product, (int) $id_product_attribute, $id_customization, $operator))) { - $errors[] = $this->trans('You already have the maximum quantity available for this product.', [], 'Admin.Catalog.Notification'); - } elseif ($qty_upd < 0 && isset($product)) { - $minimal_qty = $id_product_attribute ? ProductAttribute::getAttributeMinimalQty((int) $id_product_attribute) : $product->minimal_quantity; - $errors[] = $this->trans('You must add a minimum quantity of %d', [$minimal_qty], 'Admin.Orderscustomers.Notification'); - } - } - - echo json_encode(array_merge($this->ajaxReturnVars(), ['errors' => $errors])); - } - } - - public function ajaxProcessUpdateDeliveryOption() - { - if ($this->access('edit')) { - $delivery_option = Tools::getValue('delivery_option'); - if ($delivery_option !== false) { - $this->context->cart->setDeliveryOption([$this->context->cart->id_address_delivery => $delivery_option]); - } - $recyclable = (int) Tools::getValue('recyclable'); - if (Validate::isBool($recyclable)) { - $this->context->cart->recyclable = $recyclable; - } - $gift = (int) Tools::getValue('gift'); - if (Validate::isBool($gift)) { - $this->context->cart->gift = $gift; - } - if (Validate::isMessage(($gift_message = pSQL(Tools::getValue('gift_message'))))) { - $this->context->cart->gift_message = $gift_message; - } - $this->context->cart->save(); - echo json_encode($this->ajaxReturnVars()); - } - } - - public function ajaxProcessUpdateOrderMessage() - { - if ($this->access('edit')) { - $id_message = false; - if ($old_message = Message::getMessageByCartId((int) $this->context->cart->id)) { - $id_message = $old_message['id_message']; - } - $message = new Message((int) $id_message); - if ($message_content = Tools::getValue('message')) { - if (Validate::isMessage($message_content)) { - $message->message = $message_content; - $message->id_cart = (int) $this->context->cart->id; - $message->id_customer = (int) $this->context->cart->id_customer; - $message->save(); - } - } elseif (Validate::isLoadedObject($message)) { - $message->delete(); - } - echo json_encode($this->ajaxReturnVars()); - } - } - - public function ajaxProcessUpdateCurrency() - { - if ($this->access('edit')) { - $currency = new Currency((int) Tools::getValue('id_currency')); - if (Validate::isLoadedObject($currency) && !$currency->deleted && $currency->active) { - $this->context->cart->id_currency = (int) $currency->id; - $this->context->currency = $currency; - $this->context->cart->save(); - } - echo json_encode($this->ajaxReturnVars()); - } - } - - public function ajaxProcessUpdateLang() - { - if ($this->access('edit')) { - $lang = new Language((int) Tools::getValue('id_lang')); - if (Validate::isLoadedObject($lang) && $lang->active) { - $this->context->cart->id_lang = (int) $lang->id; - $this->context->cart->save(); - } - echo json_encode($this->ajaxReturnVars()); - } - } - - public function ajaxProcessDuplicateOrder() - { - if ($this->access('edit')) { - $errors = []; - if (!$id_order = Tools::getValue('id_order')) { - $errors[] = $this->trans('Invalid order', [], 'Admin.Orderscustomers.Notification'); - } - $cart = Cart::getCartByOrderId($id_order); - $new_cart = $cart->duplicate(); - if (!$new_cart || !Validate::isLoadedObject($new_cart['cart'])) { - $errors[] = $this->trans('The order cannot be renewed.', [], 'Admin.Orderscustomers.Notification'); - } elseif (!$new_cart['success']) { - $errors[] = $this->trans('The order cannot be renewed.', [], 'Admin.Orderscustomers.Notification'); - } else { - $this->context->cart = $new_cart['cart']; - echo json_encode($this->ajaxReturnVars()); - } - } - } - - public function ajaxProcessDeleteVoucher() - { - if ($this->access('edit')) { - if ($this->context->cart->removeCartRule((int) Tools::getValue('id_cart_rule'))) { - echo json_encode($this->ajaxReturnVars()); - } - } - } - - public function ajaxProcessupdateFreeShipping() - { - if ($this->access('edit')) { - if (!$id_cart_rule = CartRule::getIdByCode(CartRule::BO_ORDER_CODE_PREFIX . (int) $this->context->cart->id)) { - $cart_rule = new CartRule(); - $cart_rule->code = CartRule::BO_ORDER_CODE_PREFIX . (int) $this->context->cart->id; - $cart_rule->name = [Configuration::get('PS_LANG_DEFAULT') => $this->trans('Free Shipping', [], 'Admin.Orderscustomers.Feature')]; - $cart_rule->id_customer = (int) $this->context->cart->id_customer; - $cart_rule->free_shipping = true; - $cart_rule->quantity = 1; - $cart_rule->quantity_per_user = 1; - $cart_rule->minimum_amount_currency = (int) $this->context->cart->id_currency; - $cart_rule->reduction_currency = (int) $this->context->cart->id_currency; - $cart_rule->date_from = date('Y-m-d H:i:s', time()); - $cart_rule->date_to = date('Y-m-d H:i:s', time() + 24 * 36000); - $cart_rule->active = true; - $cart_rule->add(); - } else { - $cart_rule = new CartRule((int) $id_cart_rule); - } - - $this->context->cart->removeCartRule((int) $cart_rule->id); - if (Tools::getValue('free_shipping')) { - $this->context->cart->addCartRule((int) $cart_rule->id); - } - - echo json_encode($this->ajaxReturnVars()); - } - } - - public function ajaxProcessAddVoucher() - { - if ($this->access('edit')) { - $errors = []; - $id_cart_rule = Tools::getValue('id_cart_rule'); - if (!$id_cart_rule) { - $errors[] = $this->trans('Invalid voucher.', [], 'Admin.Catalog.Notification'); - } else { - $cart_rule = new CartRule((int) $id_cart_rule); - if (!Validate::isLoadedObject($cart_rule)) { - $errors[] = $this->trans('Invalid voucher.', [], 'Admin.Catalog.Notification'); - } elseif ($err = $cart_rule->checkValidity($this->context)) { - $errors[] = $err; - } - if (!count($errors)) { - if (!$this->context->cart->addCartRule((int) $cart_rule->id)) { - $errors[] = $this->trans('Can\'t add the voucher.', [], 'Admin.Advparameters.Notification'); - } - } - } - echo json_encode(array_merge($this->ajaxReturnVars(), ['errors' => $errors])); - } - } - - public function ajaxProcessUpdateAddress() - { - if ($this->access('edit')) { - echo json_encode(['addresses' => $this->context->customer->getAddresses((int) $this->context->cart->id_lang)]); - } - } - - public function ajaxProcessUpdateAddresses() - { - if ($this->access('edit')) { - if (($id_address_delivery = (int) Tools::getValue('id_address_delivery')) && - Validate::isLoadedObject($address_delivery = new Address((int) $id_address_delivery)) && - $address_delivery->id_customer == $this->context->cart->id_customer) { - $this->context->cart->id_address_delivery = (int) $address_delivery->id; - } - - if (($id_address_invoice = (int) Tools::getValue('id_address_invoice')) && - Validate::isLoadedObject($address_invoice = new Address((int) $id_address_invoice)) && - $address_invoice->id_customer = $this->context->cart->id_customer) { - $this->context->cart->id_address_invoice = (int) $address_invoice->id; - } - $this->context->cart->save(); - - echo json_encode($this->ajaxReturnVars()); - } - } - - protected function getCartSummary() - { - $summary = $this->context->cart->getSummaryDetails(null, true); - $currency = Context::getContext()->currency; - if (count($summary['products'])) { - foreach ($summary['products'] as &$product) { - $product['numeric_price'] = $product['price']; - $product['numeric_total'] = $product['total']; - $product['price'] = str_replace($currency->symbol, '', $this->context->getCurrentLocale()->formatPrice($product['price'], $currency->iso_code)); - $product['total'] = str_replace($currency->symbol, '', $this->context->getCurrentLocale()->formatPrice($product['total'], $currency->iso_code)); - $product['image_link'] = $this->context->link->getImageLink($product['link_rewrite'], $product['id_image'], 'small_default'); - if (!isset($product['attributes_small'])) { - $product['attributes_small'] = ''; - } - $product['customized_datas'] = Product::getAllCustomizedDatas((int) $this->context->cart->id, null, true, null, (int) $product['id_customization']); - } - } - if (count($summary['discounts'])) { - foreach ($summary['discounts'] as &$voucher) { - $voucher['value_real'] = $this->context->getCurrentLocale()->formatPrice($voucher['value_real'], $currency->iso_code); - } - } - - if (isset($summary['gift_products']) && count($summary['gift_products'])) { - foreach ($summary['gift_products'] as &$product) { - $product['image_link'] = $this->context->link->getImageLink($product['link_rewrite'], $product['id_image'], 'small_default'); - if (!isset($product['attributes_small'])) { - $product['attributes_small'] = ''; - } - } - } - - return $summary; - } - - protected function getDeliveryOptionList() - { - $delivery_option_list_formated = []; - $delivery_option_list = $this->context->cart->getDeliveryOptionList(); - - if (!count($delivery_option_list)) { - return []; - } - - $id_default_carrier = (int) Configuration::get('PS_CARRIER_DEFAULT'); - foreach (current($delivery_option_list) as $key => $delivery_option) { - $name = ''; - $first = true; - $id_default_carrier_delivery = false; - foreach ($delivery_option['carrier_list'] as $carrier) { - if (!$first) { - $name .= ', '; - } else { - $first = false; - } - - $name .= $carrier['instance']->name; - - if ($delivery_option['unique_carrier']) { - $name .= ' - ' . $carrier['instance']->delay[$this->context->employee->id_lang]; - } - - if (!$id_default_carrier_delivery) { - $id_default_carrier_delivery = (int) $carrier['instance']->id; - } - if ($carrier['instance']->id == $id_default_carrier) { - $id_default_carrier_delivery = $id_default_carrier; - } - if (!$this->context->cart->id_carrier) { - $this->context->cart->setDeliveryOption([$this->context->cart->id_address_delivery => (int) $carrier['instance']->id . ',']); - $this->context->cart->save(); - } - } - $delivery_option_list_formated[] = ['name' => $name, 'key' => $key]; - } - - return $delivery_option_list_formated; - } - - public function displayAjaxSearchCarts() - { - $id_customer = (int) Tools::getValue('id_customer'); - $carts = Cart::getCustomerCarts((int) $id_customer, false); - $orders = Order::getCustomerOrders((int) $id_customer); - - if (count($carts)) { - foreach ($carts as $key => &$cart) { - $cart_obj = new Cart((int) $cart['id_cart']); - if ($cart['id_cart'] == $this->context->cart->id) { - unset($carts[$key]); - - continue; - } - $currency = new Currency((int) $cart['id_currency']); - $cart['total_price'] = $this->context->getCurrentLocale()->formatPrice($cart_obj->getOrderTotal(), $currency->iso_code); - } - } - if (count($orders)) { - foreach ($orders as &$order) { - $currency = new Currency((int) $order['id_currency']); - $order['total_paid_real'] = $this->context->getCurrentLocale()->formatPrice($order['total_paid_real'], $currency->iso_code); - } - } - if ($orders || $carts) { - $to_return = array_merge( - $this->ajaxReturnVars(), - [ - 'carts' => $carts, - 'orders' => $orders, - 'found' => true, - ] - ); - } else { - $to_return = array_merge($this->ajaxReturnVars(), ['found' => false]); - } - - echo json_encode($to_return); - } - - public function ajaxReturnVars() - { - $id_cart = (int) $this->context->cart->id; - $message_content = ''; - if ($message = Message::getMessageByCartId((int) $this->context->cart->id)) { - $message_content = $message['message']; - } - $cart_rules = $this->context->cart->getCartRules(CartRule::FILTER_ACTION_SHIPPING); - - $free_shipping = false; - if (count($cart_rules)) { - foreach ($cart_rules as $cart_rule) { - if ($cart_rule['id_cart_rule'] == CartRule::getIdByCode(CartRule::BO_ORDER_CODE_PREFIX . (int) $this->context->cart->id)) { - $free_shipping = true; - - break; - } - } - } - - $addresses = $this->context->customer->getAddresses((int) $this->context->cart->id_lang); - - foreach ($addresses as &$data) { - $address = new Address((int) $data['id_address']); - $data['formated_address'] = AddressFormat::generateAddress($address, [], '
'); - } - - return [ - 'summary' => $this->getCartSummary(), - 'delivery_option_list' => $this->getDeliveryOptionList(), - 'cart' => $this->context->cart, - 'currency' => new Currency($this->context->cart->id_currency), - 'addresses' => $addresses, - 'id_cart' => $id_cart, - 'order_message' => $message_content, - 'link_order' => $this->context->link->getPageLink( - 'order', - false, - (int) $this->context->cart->id_lang, - 'step=3&recover_cart=' . $id_cart . '&token_cart=' . md5(_COOKIE_KEY_ . 'recover_cart_' . $id_cart) - ), - 'free_shipping' => (int) $free_shipping, - ]; - } - public function initToolbar() { parent::initToolbar(); unset($this->toolbar_btn['new']); } - /** - * Display an image as a download. - */ - public function displayAjaxCustomizationImage() - { - if (!Tools::isSubmit('img') || !Tools::isSubmit('name')) { - return; - } - - $img = Tools::getValue('img'); - $name = Tools::getValue('name'); - $path = _PS_UPLOAD_DIR_ . $img; - - if (Validate::isMd5($img) && Validate::isGenericName($path)) { - header('Content-type: image/jpeg'); - header('Content-Disposition: attachment; filename="' . $name . '.jpg"'); - readfile($path); - } - } - - public function displayAjaxGetSummary() - { - echo json_encode($this->ajaxReturnVars()); - } - - public function ajaxProcessUpdateProductPrice() - { - if ($this->access('edit')) { - SpecificPrice::deleteByIdCart((int) $this->context->cart->id, (int) Tools::getValue('id_product'), (int) Tools::getValue('id_product_attribute')); - $specific_price = new SpecificPrice(); - $specific_price->id_cart = (int) $this->context->cart->id; - $specific_price->id_shop = 0; - $specific_price->id_shop_group = 0; - $specific_price->id_currency = 0; - $specific_price->id_country = 0; - $specific_price->id_group = 0; - $specific_price->id_customer = (int) $this->context->customer->id; - $specific_price->id_product = (int) Tools::getValue('id_product'); - $specific_price->id_product_attribute = (int) Tools::getValue('id_product_attribute'); - $specific_price->price = (float) Tools::getValue('price'); - $specific_price->from_quantity = 1; - $specific_price->reduction = 0; - $specific_price->reduction_type = 'amount'; - $specific_price->from = '0000-00-00 00:00:00'; - $specific_price->to = '0000-00-00 00:00:00'; - $specific_price->add(); - echo json_encode($this->ajaxReturnVars()); - } - } - public static function getOrderTotalUsingTaxCalculationMethod($id_cart) { $context = Context::getContext(); diff --git a/controllers/admin/AdminCountriesController.php b/controllers/admin/AdminCountriesController.php index d6f8b82c4d43d..9a6ed94762f56 100644 --- a/controllers/admin/AdminCountriesController.php +++ b/controllers/admin/AdminCountriesController.php @@ -493,7 +493,6 @@ protected function displayValidFields() { /* The following translations are needed later - don't remove the comments! $this->trans('Customer', [], 'Admin.Global'); - $this->trans('Warehouse', [], 'Admin.Global'); $this->trans('Country', [], 'Admin.Global'); $this->trans('State', [], 'Admin.Global'); $this->trans('Address', [], 'Admin.Global'); diff --git a/controllers/admin/AdminDashboardController.php b/controllers/admin/AdminDashboardController.php index 5fb0b20d67b55..3a125543c6059 100644 --- a/controllers/admin/AdminDashboardController.php +++ b/controllers/admin/AdminDashboardController.php @@ -405,6 +405,8 @@ public function ajaxProcessRefreshDashboard() 'extra' => (int) Tools::getValue('extra'), ]; + // Hook called only for the module concerned + // An array [module_name => module_output] will be returned die(json_encode(Hook::exec('dashboardData', $params, $id_module, true))); } diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php deleted file mode 100644 index 615a3c5af4d4e..0000000000000 --- a/controllers/admin/AdminFeaturesController.php +++ /dev/null @@ -1,661 +0,0 @@ - - * @copyright Since 2007 PrestaShop SA and Contributors - * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) - */ - -/** - * @property FeatureValue $object - */ -class AdminFeaturesControllerCore extends AdminController -{ - /** @var bool */ - public $bootstrap = true; - /** @var string */ - protected $position_identifier = 'id_feature'; - protected $feature_name; - - public function __construct() - { - $this->table = 'feature'; - $this->className = 'Feature'; - $this->list_id = 'feature'; - $this->identifier = 'id_feature'; - $this->lang = true; - - parent::__construct(); - - $this->fields_list = [ - 'id_feature' => [ - 'title' => $this->trans('ID', [], 'Admin.Global'), - 'align' => 'center', - 'class' => 'fixed-width-xs', - ], - 'name' => [ - 'title' => $this->trans('Name', [], 'Admin.Global'), - 'width' => 'auto', - 'filter_key' => 'b!name', - ], - 'value' => [ - 'title' => $this->trans('Values', [], 'Admin.Global'), - 'orderby' => false, - 'search' => false, - 'align' => 'center', - 'class' => 'fixed-width-xs', - ], - 'position' => [ - 'title' => $this->trans('Position', [], 'Admin.Global'), - 'filter_key' => 'a!position', - 'align' => 'center', - 'class' => 'fixed-width-xs', - 'position' => 'position', - ], - ]; - - $this->bulk_actions = [ - 'delete' => [ - 'text' => $this->trans('Delete selected', [], 'Admin.Actions'), - 'icon' => 'icon-trash', - 'confirm' => $this->trans('Delete selected items?', [], 'Admin.Notifications.Warning'), - ], - ]; - } - - /** - * AdminController::renderList() override. - * - * @see AdminController::renderList() - */ - public function renderList() - { - $this->addRowAction('view'); - $this->addRowAction('edit'); - $this->addRowAction('delete'); - - return parent::renderList(); - } - - /** - * Change object type to feature value (use when processing a feature value). - */ - protected function setTypeValue() - { - $this->table = 'feature_value'; - $this->className = 'FeatureValue'; - $this->identifier = 'id_feature_value'; - } - - /** - * Change object type to feature (use when processing a feature). - */ - protected function setTypeFeature() - { - $this->table = 'feature'; - $this->className = 'Feature'; - $this->identifier = 'id_feature'; - } - - /** - * @return false|string|void - * - * @throws PrestaShopDatabaseException - * @throws PrestaShopException - */ - public function renderView() - { - if ($id = (int) Tools::getValue('id_feature')) { - $this->setTypeValue(); - $this->list_id = 'feature_value'; - $this->lang = true; - - // Action for list - $this->addRowAction('edit'); - $this->addRowAction('delete'); - - if (!Validate::isLoadedObject($obj = new Feature((int) $id))) { - $this->errors[] = $this->trans('An error occurred while updating the status for an object.', [], 'Admin.Notifications.Error') . ' ' . $this->table . ' ' . $this->trans('(cannot load object)', [], 'Admin.Notifications.Error'); - - return; - } - - $this->feature_name = $obj->name; - $this->toolbar_title = $this->feature_name[$this->context->employee->id_lang]; - $this->fields_list = [ - 'id_feature_value' => [ - 'title' => $this->trans('ID', [], 'Admin.Global'), - 'align' => 'center', - 'class' => 'fixed-width-xs', - ], - 'value' => [ - 'title' => $this->trans('Value', [], 'Admin.Global'), - ], - ]; - - $this->_where = sprintf('AND `id_feature` = %d', (int) $id); - self::$currentIndex = self::$currentIndex . '&id_feature=' . (int) $id . '&viewfeature'; - $this->processFilter(); - - return parent::renderList(); - } - } - - /** - * AdminController::renderForm() override. - * - * @see AdminController::renderForm() - */ - public function renderForm() - { - $this->toolbar_title = $this->trans('Add a new feature', [], 'Admin.Catalog.Feature'); - $this->fields_form = [ - 'legend' => [ - 'title' => $this->trans('Feature', [], 'Admin.Catalog.Feature'), - 'icon' => 'icon-info-sign', - ], - 'input' => [ - [ - 'type' => 'text', - 'label' => $this->trans('Name', [], 'Admin.Global'), - 'name' => 'name', - 'lang' => true, - 'size' => 33, - 'hint' => $this->trans('Invalid characters:', [], 'Admin.Notifications.Info') . ' <>;=#{}', - 'required' => true, - ], - ], - ]; - - if (Shop::isFeatureActive()) { - $this->fields_form['input'][] = [ - 'type' => 'shop', - 'label' => $this->trans('Store association', [], 'Admin.Global'), - 'name' => 'checkBoxShopAsso', - ]; - } - - $this->fields_form['submit'] = [ - 'title' => $this->trans('Save', [], 'Admin.Actions'), - ]; - - return parent::renderForm(); - } - - public function initPageHeaderToolbar() - { - if (Feature::isFeatureActive()) { - if (empty($this->display)) { - $this->page_header_toolbar_btn['new_feature'] = [ - 'href' => self::$currentIndex . '&addfeature&token=' . $this->token, - 'desc' => $this->trans('Add new feature', [], 'Admin.Catalog.Feature'), - 'icon' => 'process-icon-new', - ]; - - $this->page_header_toolbar_btn['new_feature_value'] = [ - 'href' => self::$currentIndex . '&addfeature_value&id_feature=' . (int) Tools::getValue('id_feature') . '&token=' . $this->token, - 'desc' => $this->trans('Add new feature value', [], 'Admin.Catalog.Help'), - 'icon' => 'process-icon-new', - ]; - } - } - - if ($this->display == 'view') { - $this->page_header_toolbar_btn['new_feature_value'] = [ - 'href' => self::$currentIndex . '&addfeature_value&id_feature=' . (int) Tools::getValue('id_feature') . '&token=' . $this->token, - 'desc' => $this->trans('Add new feature value', [], 'Admin.Catalog.Help'), - 'icon' => 'process-icon-new', - ]; - } - - parent::initPageHeaderToolbar(); - } - - /** - * AdminController::initToolbar() override. - * - * @see AdminController::initToolbar() - */ - public function initToolbar() - { - switch ($this->display) { - case 'editFeatureValue': - case 'add': - case 'edit': - $this->toolbar_btn['save'] = [ - 'href' => '#', - 'desc' => $this->trans('Save', [], 'Admin.Actions'), - ]; - - if ($this->display == 'editFeatureValue') { - $this->toolbar_btn['save-and-stay'] = [ - 'short' => 'SaveAndStay', - 'href' => '#', - 'desc' => $this->trans('Save and add another value', [], 'Admin.Catalog.Help'), - 'force_desc' => true, - ]; - } - - // Default cancel button - like old back link - $back = Tools::safeOutput(Tools::getValue('back', '')); - if (empty($back)) { - $back = self::$currentIndex . '&token=' . $this->token; - } - - $this->toolbar_btn['back'] = [ - 'href' => $back, - 'desc' => $this->trans('Back to the list', [], 'Admin.Catalog.Help'), - ]; - - break; - case 'view': - $this->toolbar_btn['newAttributes'] = [ - 'href' => self::$currentIndex . '&addfeature_value&id_feature=' . (int) Tools::getValue('id_feature') . '&token=' . $this->token, - 'desc' => $this->trans('Add new feature values', [], 'Admin.Catalog.Help'), - ]; - $this->toolbar_btn['back'] = [ - 'href' => self::$currentIndex . '&token=' . $this->token, - 'desc' => $this->trans('Back to the list', [], 'Admin.Catalog.Help'), - ]; - - break; - default: - parent::initToolbar(); - } - } - - public function initToolbarTitle() - { - $bread_extended = $this->breadcrumbs; - - switch ($this->display) { - case 'edit': - $bread_extended[] = $this->trans('Edit New Feature', [], 'Admin.Catalog.Feature'); - $this->addMetaTitle($bread_extended[count($bread_extended) - 1]); - - break; - - case 'add': - $bread_extended[] = $this->trans('Add New Feature', [], 'Admin.Catalog.Feature'); - $this->addMetaTitle($bread_extended[count($bread_extended) - 1]); - - break; - - case 'view': - $bread_extended[] = $this->feature_name[$this->context->employee->id_lang] ?? null; - $this->addMetaTitle($bread_extended[count($bread_extended) - 1]); - - break; - - case 'editFeatureValue': - if (Tools::getValue('id_feature_value')) { - if (($id = (int) Tools::getValue('id_feature'))) { - if (Validate::isLoadedObject($obj = new Feature((int) $id))) { - $bread_extended[] = '' . $obj->name[$this->context->employee->id_lang] . ''; - } - - if (Validate::isLoadedObject($obj = new FeatureValue((int) Tools::getValue('id_feature_value')))) { - $bread_extended[] = $this->trans('Edit: %value%', ['%value%' => $obj->value[$this->context->employee->id_lang]], 'Admin.Catalog.Feature'); - } - } else { - $bread_extended[] = $this->trans('Edit value', [], 'Admin.Catalog.Feature'); - } - } else { - $bread_extended[] = $this->trans('Add new value', [], 'Admin.Catalog.Feature'); - } - - if (count($bread_extended) > 0) { - $this->addMetaTitle($bread_extended[count($bread_extended) - 1]); - } - - break; - } - - $this->toolbar_title = $bread_extended; - } - - /** - * AdminController::renderForm() override. - * - * @see AdminController::renderForm() - */ - public function initFormFeatureValue() - { - $this->setTypeValue(); - - $this->fields_form[0]['form'] = [ - 'legend' => [ - 'title' => $this->trans('Feature value', [], 'Admin.Catalog.Feature'), - 'icon' => 'icon-info-sign', - ], - 'input' => [ - [ - 'type' => 'select', - 'label' => $this->trans('Feature', [], 'Admin.Catalog.Feature'), - 'name' => 'id_feature', - 'options' => [ - 'query' => Feature::getFeatures($this->context->language->id), - 'id' => 'id_feature', - 'name' => 'name', - ], - 'required' => true, - ], - [ - 'type' => 'text', - 'label' => $this->trans('Value', [], 'Admin.Global'), - 'name' => 'value', - 'lang' => true, - 'size' => 33, - 'hint' => $this->trans('Invalid characters:', [], 'Admin.Notifications.Info') . ' <>;=#{}', - 'required' => true, - ], - ], - 'submit' => [ - 'title' => $this->trans('Save', [], 'Admin.Actions'), - ], - 'buttons' => [ - 'save-and-stay' => [ - 'title' => $this->trans('Save then add another value', [], 'Admin.Catalog.Feature'), - 'name' => 'submitAdd' . $this->table . 'AndStay', - 'type' => 'submit', - 'class' => 'btn btn-default pull-right', - 'icon' => 'process-icon-save', - ], - ], - ]; - - $this->fields_value['id_feature'] = (int) Tools::getValue('id_feature'); - - // Create Object FeatureValue - $feature_value = new FeatureValue(Tools::getValue('id_feature_value')); - - $this->getlanguages(); - $helper = new HelperForm(); - $helper->show_cancel_button = true; - - $back = Tools::safeOutput(Tools::getValue('back', '')); - if (empty($back)) { - $back = self::$currentIndex . '&token=' . $this->token; - } - if (!Validate::isCleanHtml($back)) { - die(Tools::displayError()); - } - - $helper->back_url = $back; - $helper->currentIndex = self::$currentIndex; - $helper->token = $this->token; - $helper->table = $this->table; - $helper->identifier = $this->identifier; - $helper->override_folder = 'feature_value/'; - $helper->id = $feature_value->id; - $helper->toolbar_scroll = false; - $helper->tpl_vars = [ - 'feature_value' => $feature_value, - ]; - $helper->languages = $this->_languages; - $helper->default_form_language = $this->default_form_language; - $helper->allow_employee_form_lang = $this->allow_employee_form_lang; - $helper->fields_value = $this->getFieldsValue($feature_value); - $helper->toolbar_btn = $this->toolbar_btn; - $helper->title = $this->trans('Add a new feature value', [], 'Admin.Catalog.Feature'); - $this->content .= $helper->generateForm($this->fields_form); - } - - /** - * AdminController::initContent() override. - * - * @see AdminController::initContent() - */ - public function initContent() - { - if (Feature::isFeatureActive()) { - if ($this->display == 'edit' || $this->display == 'add') { - if (!$this->loadObject(true)) { - return; - } - $this->content .= $this->renderForm(); - } elseif ($this->display == 'view') { - // Some controllers use the view action without an object - if ($this->className) { - $this->loadObject(true); - } - $this->content .= $this->renderView(); - } elseif ($this->display == 'editFeatureValue') { - $this->object = new FeatureValue((int) Tools::getValue('id_feature_value')); - $this->content .= $this->initFormFeatureValue(); - } elseif ($this->display != 'view' && !$this->ajax) { - // If a feature value was saved, we need to reset the values to display the list - $this->setTypeFeature(); - $this->content .= $this->renderList(); - /* reset all attributes filter */ - if (!Tools::getValue('submitFilterfeature_value', 0) && !Tools::getIsset('id_feature_value')) { - $this->processResetFilters('feature_value'); - } - } - } else { - $adminPerformanceUrl = $this->context->link->getAdminLink('AdminPerformance'); - $url = '' . $this->trans('Performance', [], 'Admin.Global') . ''; - $this->displayWarning($this->trans('This feature has been disabled. You can activate it here: %url%.', ['%url%' => $url], 'Admin.Catalog.Notification')); - } - - $this->context->smarty->assign([ - 'content' => $this->content, - ]); - } - - public function initProcess() - { - // Are we working on feature values? - if ((Tools::getValue('id_feature_value') && !Tools::getValue('id_feature')) - || Tools::isSubmit('deletefeature_value') - || Tools::isSubmit('submitAddfeature_value') - || Tools::isSubmit('addfeature_value') - || Tools::isSubmit('updatefeature_value') - || Tools::isSubmit('submitBulkdeletefeature_value')) { - $this->setTypeValue(); - } - - if (Tools::getIsset('viewfeature')) { - $this->list_id = 'feature_value'; - - if (isset($_POST['submitReset' . $this->list_id])) { - $this->processResetFilters(); - } - } else { - $this->list_id = 'feature'; - $this->_defaultOrderBy = 'position'; - $this->_defaultOrderWay = 'ASC'; - } - - parent::initProcess(); - } - - public function postProcess() - { - if (!Feature::isFeatureActive()) { - return; - } - - /* set location with current index */ - if (Tools::getIsset('id_feature') && Tools::getIsset('viewfeature')) { - self::$currentIndex = self::$currentIndex . '&id_feature=' . Tools::getValue('id_feature', 0) . '&viewfeature'; - } - - if ($this->table == 'feature_value' && ($this->action == 'save' || $this->action == 'delete' || $this->action == 'bulkDelete')) { - Hook::exec( - 'displayFeatureValuePostProcess', - ['errors' => &$this->errors] - ); - } // send errors as reference to allow displayFeatureValuePostProcess to stop saving process - else { - Hook::exec( - 'displayFeaturePostProcess', - ['errors' => &$this->errors] - ); - } // send errors as reference to allow displayFeaturePostProcess to stop saving process - - parent::postProcess(); - - if ($this->table == 'feature_value' && ($this->display == 'edit' || $this->display == 'add')) { - $this->display = 'editFeatureValue'; - } - } - - /** - * Override processAdd to change SaveAndStay button action. - * - * @see classes/AdminControllerCore::processAdd() - */ - public function processAdd() - { - $object = parent::processAdd(); - - if (Tools::isSubmit('submitAdd' . $this->table . 'AndStay') && !count($this->errors)) { - if ($this->table == 'feature_value' && ($this->display == 'edit' || $this->display == 'add')) { - $this->redirect_after = self::$currentIndex . '&addfeature_value&id_feature=' . (int) Tools::getValue('id_feature') . '&conf=3&token=' . $this->token; - } else { - $this->redirect_after = self::$currentIndex . '&' . $this->identifier . '=&conf=3&update' . $this->table . '&token=' . $this->token; - } - } elseif (Tools::isSubmit('submitAdd' . $this->table . 'AndStay') && count($this->errors)) { - $this->display = 'editFeatureValue'; - } - - return $object; - } - - /** - * Override processUpdate to change SaveAndStay button action. - * - * @see classes/AdminControllerCore::processUpdate() - */ - public function processUpdate() - { - $object = parent::processUpdate(); - - if (Tools::isSubmit('submitAdd' . $this->table . 'AndStay') && !count($this->errors)) { - $this->redirect_after = self::$currentIndex . '&' . $this->identifier . '=&conf=3&update' . $this->table . '&token=' . $this->token; - } - - return $object; - } - - /** - * Call the right method for creating or updating object. - * - * @return mixed - */ - public function processSave() - { - if ($this->table == 'feature') { - $id_feature = (int) Tools::getValue('id_feature'); - // Adding last position to the feature if not exist - if ($id_feature <= 0) { - $sql = 'SELECT `position`+1 - FROM `' . _DB_PREFIX_ . 'feature` - ORDER BY position DESC'; - // set the position of the new feature in $_POST for postProcess() method - $_POST['position'] = Db::getInstance()->getValue($sql); - } - // clean \n\r characters - foreach ($_POST as $key => $value) { - if (preg_match('/^name_/Ui', $key)) { - $_POST[$key] = str_replace('\n', '', str_replace('\r', '', $value)); - } - } - } - - return parent::processSave(); - } - - /** - * AdminController::getList() override. - * - * @see AdminController::getList() - * - * @param int $id_lang - * @param string|null $order_by - * @param string|null $order_way - * @param int $start - * @param int|null $limit - * @param int|bool $id_lang_shop - * - * @throws PrestaShopException - */ - public function getList($id_lang, $order_by = null, $order_way = null, $start = 0, $limit = null, $id_lang_shop = false) - { - if ($this->table == 'feature_value') { - $this->_where .= ' AND (a.custom = 0 OR a.custom IS NULL)'; - } - - parent::getList($id_lang, $order_by, $order_way, $start, $limit, $id_lang_shop); - - if ($this->table == 'feature') { - $nb_items = count($this->_list); - for ($i = 0; $i < $nb_items; ++$i) { - $item = &$this->_list[$i]; - - $query = new DbQuery(); - $query->select('COUNT(fv.id_feature_value) as count_values'); - $query->from('feature_value', 'fv'); - $query->where('fv.id_feature =' . (int) $item['id_feature']); - $query->where('(fv.custom=0 OR fv.custom IS NULL)'); - $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query); - $item['value'] = (int) $res; - unset($query); - } - } - } - - public function ajaxProcessUpdatePositions() - { - if ($this->access('edit')) { - $way = (bool) Tools::getValue('way'); - $id_feature = (int) Tools::getValue('id'); - $positions = Tools::getValue('feature'); - - $new_positions = []; - foreach ($positions as $v) { - if (!empty($v)) { - $new_positions[] = $v; - } - } - - foreach ($new_positions as $position => $value) { - $pos = explode('_', $value); - - if (isset($pos[2]) && (int) $pos[2] === $id_feature) { - $feature = new Feature((int) $pos[2]); - if (Validate::isLoadedObject($feature)) { - if ($feature->updatePosition($way, $position, $id_feature)) { - echo 'ok position ' . (int) $position . ' for feature ' . (int) $pos[1] . '\r\n'; - } else { - echo '{"hasError" : true, "errors" : "Can not update feature ' . (int) $id_feature . ' to position ' . (int) $position . ' "}'; - } - } else { - echo '{"hasError" : true, "errors" : "This feature (' . (int) $id_feature . ') can t be loaded"}'; - } - - break; - } - } - } - } -} diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php deleted file mode 100644 index d8709f3544901..0000000000000 --- a/controllers/admin/AdminGendersController.php +++ /dev/null @@ -1,251 +0,0 @@ - - * @copyright Since 2007 PrestaShop SA and Contributors - * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) - */ - -use PrestaShop\PrestaShop\Core\Domain\Title\ValueObject\Gender as ValueObjectGender; - -/** - * @property Gender $object - */ -class AdminGendersControllerCore extends AdminController -{ - /** - * @var int - */ - public $default_image_height; - - /** - * @var int - */ - public $default_image_width; - - public function __construct() - { - $this->bootstrap = true; - $this->table = 'gender'; - $this->className = 'Gender'; - $this->lang = true; - $this->addRowAction('edit'); - $this->addRowAction('delete'); - - parent::__construct(); - - if (!Tools::getValue('realedit')) { - $this->deleted = false; - } - - $this->bulk_actions = [ - 'delete' => [ - 'text' => $this->trans('Delete selected', [], 'Admin.Actions'), - 'confirm' => $this->trans('Delete selected items?', [], 'Admin.Notifications.Warning'), - 'icon' => 'icon-trash', - ], - ]; - - $this->default_image_height = 16; - $this->default_image_width = 16; - - $this->fieldImageSettings = [ - 'name' => 'image', - 'dir' => 'genders', - ]; - - $this->fields_list = [ - 'id_gender' => [ - 'title' => $this->trans('ID', [], 'Admin.Global'), - 'align' => 'center', - 'class' => 'fixed-width-xs', - ], - 'name' => [ - 'title' => $this->trans('Social title', [], 'Admin.Shopparameters.Feature'), - 'filter_key' => 'b!name', - ], - 'type' => [ - 'title' => $this->trans('Gender', [], 'Admin.Global'), - 'orderby' => false, - 'type' => 'select', - 'list' => [ - 0 => $this->trans('Male', [], 'Admin.Shopparameters.Feature'), - 1 => $this->trans('Female', [], 'Admin.Shopparameters.Feature'), - 2 => $this->trans('Neutral', [], 'Admin.Shopparameters.Feature'), - ], - 'filter_key' => 'a!type', - 'callback' => 'displayGenderType', - 'callback_object' => $this, - ], - 'image' => [ - 'title' => $this->trans('Image', [], 'Admin.Global'), - 'align' => 'center', - 'image' => 'genders', - 'orderby' => false, - 'search' => false, - ], - ]; - } - - public function initPageHeaderToolbar() - { - if (empty($this->display)) { - $this->page_header_toolbar_btn['new_gender'] = [ - 'href' => self::$currentIndex . '&addgender&token=' . $this->token, - 'desc' => $this->trans('Add new social title', [], 'Admin.Shopparameters.Feature'), - 'icon' => 'process-icon-new', - ]; - } - - parent::initPageHeaderToolbar(); - } - - /** - * @return string|void - * - * @throws SmartyException - */ - public function renderForm() - { - $this->fields_form = [ - 'legend' => [ - 'title' => $this->trans('Social titles', [], 'Admin.Shopparameters.Feature'), - 'icon' => 'icon-male', - ], - 'input' => [ - [ - 'type' => 'text', - 'label' => $this->trans('Social title', [], 'Admin.Global'), - 'name' => 'name', - 'lang' => true, - 'col' => 4, - 'hint' => $this->trans('Invalid characters:', [], 'Admin.Shopparameters.Help') . ' <>;=#{}', - 'required' => true, - ], - [ - 'type' => 'radio', - 'label' => $this->trans('Gender', [], 'Admin.Global'), - 'name' => 'type', - 'required' => false, - 'class' => 't', - 'values' => [ - [ - 'id' => 'type_male', - 'value' => ValueObjectGender::TYPE_MALE, - 'label' => $this->trans('Male', [], 'Admin.Shopparameters.Feature'), - ], - [ - 'id' => 'type_female', - 'value' => ValueObjectGender::TYPE_FEMALE, - 'label' => $this->trans('Female', [], 'Admin.Shopparameters.Feature'), - ], - [ - 'id' => 'type_neutral', - 'value' => ValueObjectGender::TYPE_OTHER, - 'label' => $this->trans('Neutral', [], 'Admin.Shopparameters.Feature'), - ], - ], - ], - [ - 'type' => 'file', - 'label' => $this->trans('Image', [], 'Admin.Global'), - 'name' => 'image', - 'col' => 6, - 'value' => true, - ], - [ - 'type' => 'text', - 'label' => $this->trans('Image width', [], 'Admin.Shopparameters.Feature'), - 'name' => 'img_width', - 'col' => 2, - 'hint' => $this->trans('Image width in pixels. Enter "0" to use the original size.', [], 'Admin.Shopparameters.Help'), - ], - [ - 'type' => 'text', - 'label' => $this->trans('Image height', [], 'Admin.Shopparameters.Feature'), - 'name' => 'img_height', - 'col' => 2, - 'hint' => $this->trans('Image height in pixels. Enter "0" to use the original size.', [], 'Admin.Shopparameters.Help'), - ], - ], - 'submit' => [ - 'title' => $this->trans('Save', [], 'Admin.Actions'), - ], - ]; - - /** @var Gender|false $obj */ - $obj = $this->loadObject(true); - if (!$obj) { - return; - } - - $this->fields_value = [ - 'img_width' => $this->default_image_width, - 'img_height' => $this->default_image_height, - 'image' => $obj->getImage(), - ]; - - return parent::renderForm(); - } - - public function displayGenderType($value, $tr) - { - return $this->fields_list['type']['list'][$value]; - } - - protected function postImage($id) - { - if (isset($this->fieldImageSettings['name'], $this->fieldImageSettings['dir'])) { - if (!Validate::isInt(Tools::getValue('img_width')) || !Validate::isInt(Tools::getValue('img_height'))) { - $this->errors[] = $this->trans('Width and height must be numeric values.', [], 'Admin.Shopparameters.Notification'); - } else { - if ((int) Tools::getValue('img_width') > 0 && (int) Tools::getValue('img_height') > 0) { - $width = (int) Tools::getValue('img_width'); - $height = (int) Tools::getValue('img_height'); - } else { - $width = null; - $height = null; - } - - return $this->uploadImage($id, $this->fieldImageSettings['name'], $this->fieldImageSettings['dir'] . '/', false, $width, $height); - } - } - - return !count($this->errors); - } - - protected function afterImageUpload() - { - parent::afterImageUpload(); - - if (($id_gender = (int) Tools::getValue('id_gender')) - && count($_FILES) - && file_exists(_PS_GENDERS_DIR_ . $id_gender . '.jpg')) { - $current_file = _PS_TMP_IMG_DIR_ . 'gender_mini_' . $id_gender . '_' . $this->context->shop->id . '.jpg'; - - if (file_exists($current_file)) { - unlink($current_file); - } - } - - return true; - } -} diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php index 533916e6249f1..297e9a31fb210 100644 --- a/controllers/admin/AdminImagesController.php +++ b/controllers/admin/AdminImagesController.php @@ -25,8 +25,8 @@ */ use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings; +use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface; use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration; -use PrestaShopBundle\Entity\Repository\FeatureFlagRepository; /** * @property ImageType $object @@ -83,17 +83,23 @@ public function init() parent::init(); $this->canGenerateAvif = $this->get('PrestaShop\PrestaShop\Core\Image\AvifExtensionChecker')->isAvailable(); - $this->isMultipleImageFormatFeatureEnabled = $this->get(FeatureFlagRepository::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT); + $this->isMultipleImageFormatFeatureEnabled = $this->get(FeatureFlagStateCheckerInterface::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT); $this->imageFormatConfiguration = $this->get('PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration'); $formFields = []; if ($this->isMultipleImageFormatFeatureEnabled) { + /* We will disable few image formats + * Base JPG is mandatory, see https://github.com/PrestaShop/PrestaShop/issues/30944 + * AVIF support depends on platform - PHP version and required libraries available + */ $imageFormatsDisabled = []; - $imageFormatsDisabled['jpg'] = true; // jpg is mandatory, see https://github.com/PrestaShop/PrestaShop/issues/30944 - if (false === $this->canGenerateAvif) { + $imageFormatsDisabled['jpg'] = true; + if (!$this->canGenerateAvif) { $imageFormatsDisabled['avif'] = true; } + + // Load configured formats to see what to check $configuredImageFormats = $this->imageFormatConfiguration->getGenerationFormats(); $fields = [ @@ -441,6 +447,19 @@ public function initModal(): void ]; } + public function beforeUpdateOptions() + { + // Unset AVIF if not supported, add JPG if missing + foreach ($_POST['PS_IMAGE_FORMAT'] as $k => $v) { + if ($v == 'avif' && !$this->canGenerateAvif) { + unset($_POST['PS_IMAGE_FORMAT'][$k]); + } + } + if (!in_array('jpg', $_POST['PS_IMAGE_FORMAT'])) { + $_POST['PS_IMAGE_FORMAT'][] = 'jpg'; + } + } + public function updateOptionPsImageFormat($value): void { if ($this->access('edit') != '1') { diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 5a0c885117bcb..ac2783718d032 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -111,15 +111,6 @@ public function __construct() ]; // @since 1.5.0 - if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) { - $this->entities = array_merge( - $this->entities, - [ - $this->trans('Supply Orders', [], 'Admin.Advparameters.Feature'), - $this->trans('Supply Order Details', [], 'Admin.Advparameters.Feature'), - ] - ); - } $this->entities = array_flip($this->entities); @@ -164,18 +155,6 @@ public function __construct() 'label' => $this->trans('ID / Name of the store', [], 'Admin.Advparameters.Feature'), 'help' => $this->trans('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, the default store will be used.', [], 'Admin.Advparameters.Help'), ], - 'advanced_stock_management' => [ - 'label' => $this->trans('Advanced Stock Management', [], 'Admin.Advparameters.Feature'), - 'help' => $this->trans('Enable advanced stock management on product (0 = No, 1 = Yes)', [], 'Admin.Advparameters.Help'), - ], - 'depends_on_stock' => [ - 'label' => $this->trans('Depends on stock', [], 'Admin.Advparameters.Feature'), - 'help' => $this->trans('0 = Use quantity set in product, 1 = Use quantity from warehouse.', [], 'Admin.Advparameters.Help'), - ], - 'warehouse' => [ - 'label' => $this->trans('Warehouse', [], 'Admin.Advparameters.Feature'), - 'help' => $this->trans('ID of the warehouse to set as storage.', [], 'Admin.Advparameters.Help'), - ], ]; self::$default_values = [ @@ -193,8 +172,6 @@ public function __construct() 'low_stock_alert' => false, 'weight' => 0, 'default_on' => null, - 'advanced_stock_management' => 0, - 'depends_on_stock' => 0, 'available_date' => date('Y-m-d'), ]; @@ -326,18 +303,6 @@ public function __construct() 'label' => $this->trans('ID / Name of the store', [], 'Admin.Advparameters.Feature'), 'help' => $this->trans('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, the default store will be used.', [], 'Admin.Advparameters.Help'), ], - 'advanced_stock_management' => [ - 'label' => $this->trans('Advanced Stock Management', [], 'Admin.Advparameters.Feature'), - 'help' => $this->trans('Enable advanced stock management on product (0 = No, 1 = Yes).', [], 'Admin.Advparameters.Help'), - ], - 'depends_on_stock' => [ - 'label' => $this->trans('Depends on stock', [], 'Admin.Advparameters.Feature'), - 'help' => $this->trans('0 = Use quantity set in product, 1 = Use quantity from warehouse.', [], 'Admin.Advparameters.Help'), - ], - 'warehouse' => [ - 'label' => $this->trans('Warehouse', [], 'Admin.Advparameters.Feature'), - 'help' => $this->trans('ID of the warehouse to set as storage.', [], 'Admin.Advparameters.Help'), - ], 'accessories' => ['label' => $this->trans('Accessories (x,y,z...)', [], 'Admin.Advparameters.Feature')], ]; @@ -368,8 +333,6 @@ public function __construct() 'customizable' => 0, 'uploadable_files' => 0, 'text_fields' => 0, - 'advanced_stock_management' => 0, - 'depends_on_stock' => 0, 'is_virtual' => 0, ]; @@ -550,68 +513,6 @@ public function __construct() break; } - // @since 1.5.0 - if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) { - switch ((int) Tools::getValue('entity')) { - case $this->entities[$this->trans('Supply Orders', [], 'Admin.Advparameters.Feature')]: - // required fields - $this->required_fields = [ - 'id_supplier', - 'id_warehouse', - 'reference', - 'date_delivery_expected', - ]; - // available fields - $this->available_fields = [ - 'no' => ['label' => $this->trans('Ignore this column', [], 'Admin.Advparameters.Feature')], - 'id' => ['label' => $this->trans('ID', [], 'Admin.Global')], - 'id_supplier' => ['label' => $this->trans('Supplier ID *', [], 'Admin.Advparameters.Feature')], - 'id_lang' => ['label' => $this->trans('Lang ID', [], 'Admin.Advparameters.Feature')], - 'id_warehouse' => ['label' => $this->trans('Warehouse ID *', [], 'Admin.Advparameters.Feature')], - 'id_currency' => ['label' => $this->trans('Currency ID *', [], 'Admin.Advparameters.Feature')], - 'reference' => ['label' => $this->trans('Supply Order Reference *', [], 'Admin.Advparameters.Feature')], - 'date_delivery_expected' => ['label' => $this->trans('Delivery Date (Y-M-D)*', [], 'Admin.Advparameters.Feature')], - 'discount_rate' => ['label' => $this->trans('Discount rate', [], 'Admin.Advparameters.Feature')], - 'is_template' => ['label' => $this->trans('Template', [], 'Admin.Advparameters.Feature')], - ]; - // default values - self::$default_values = [ - 'id_lang' => (int) Configuration::get('PS_LANG_DEFAULT'), - 'id_currency' => Currency::getDefaultCurrency()->id, - 'discount_rate' => '0', - 'is_template' => '0', - ]; - - break; - case $this->entities[$this->trans('Supply Order Details', [], 'Admin.Advparameters.Feature')]: - // required fields - $this->required_fields = [ - 'supply_order_reference', - 'id_product', - 'unit_price_te', - 'quantity_expected', - ]; - // available fields - $this->available_fields = [ - 'no' => ['label' => $this->trans('Ignore this column', [], 'Admin.Advparameters.Feature')], - 'supply_order_reference' => ['label' => $this->trans('Supply Order Reference *', [], 'Admin.Advparameters.Feature')], - 'id_product' => ['label' => $this->trans('Product ID *', [], 'Admin.Advparameters.Feature')], - 'id_product_attribute' => ['label' => $this->trans('Product Attribute ID', [], 'Admin.Advparameters.Feature')], - 'unit_price_te' => ['label' => $this->trans('Unit Price (tax excl.)*', [], 'Admin.Advparameters.Feature')], - 'quantity_expected' => ['label' => $this->trans('Quantity Expected *', [], 'Admin.Advparameters.Feature')], - 'discount_rate' => ['label' => $this->trans('Discount Rate', [], 'Admin.Advparameters.Feature')], - 'tax_rate' => ['label' => $this->trans('Tax Rate', [], 'Admin.Advparameters.Feature')], - ]; - // default values - self::$default_values = [ - 'discount_rate' => '0', - 'tax_rate' => '0', - ]; - - break; - } - } - $this->separator = ($separator = Tools::substr((string) (trim(Tools::getValue('separator'))), 0, 1)) ? $separator : ';'; $this->convert = false; $this->multiple_value_separator = ($separator = Tools::substr((string) (trim(Tools::getValue('multiple_value_separator'))), 0, 1)) ? $separator : ','; @@ -774,7 +675,6 @@ public function renderForm() 'id_language' => ($id_lang_selected) ? $id_lang_selected : $this->context->language->id, 'available_fields' => $this->getAvailableFields(), 'truncateAuthorized' => (Shop::isFeatureActive() && $this->context->employee->isSuperAdmin()) || !Shop::isFeatureActive(), - 'PS_ADVANCED_STOCK_MANAGEMENT' => Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'), ]; return parent::renderForm(); @@ -1650,10 +1550,8 @@ protected function productImportOne($info, $default_language_id, $id_lang, $forc return; } - $update_advanced_stock_management_value = false; if (isset($product->id) && $product->id && Product::existsInDatabase((int) $product->id, 'product')) { $product->loadStockData(); - $update_advanced_stock_management_value = true; $category_data = Product::getProductCategories((int) $product->id); if (is_array($category_data)) { @@ -2206,124 +2104,7 @@ protected function productImportOne($info, $default_language_id, $id_lang, $forc // clean feature positions to avoid conflict Feature::cleanPositions(); - // set advanced stock managment if (!$validateOnly) { - /* @phpstan-ignore-next-line Data from the property `advanced_stock_management` come from the database */ - if ($product->advanced_stock_management != 1 && $product->advanced_stock_management != 0) { - $this->warnings[] = $this->trans( - 'Advanced stock management has incorrect value. Not set for product %name%', - [ - '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language_id]), - ], - 'Admin.Advparameters.Notification' - ); - } elseif (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $product->advanced_stock_management == 1) { - $this->warnings[] = $this->trans( - 'Advanced stock management is not enabled, cannot enable on product %name%', - [ - '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language_id]), - ], - 'Admin.Advparameters.Notification' - ); - } elseif ($update_advanced_stock_management_value) { - $product->setAdvancedStockManagement($product->advanced_stock_management); - } - // automaticly disable depends on stock, if a_s_m set to disabled - if (StockAvailable::dependsOnStock($product->id) == 1 && $product->advanced_stock_management == 0) { - StockAvailable::setProductDependsOnStock($product->id, false); - } - } - - // Check if warehouse exists - if (isset($product->warehouse) && $product->warehouse) { - if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) { - $this->warnings[] = $this->trans( - 'Advanced stock management is not enabled, warehouse not set on product %name%', - [ - '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language_id]), - ], - 'Admin.Advparameters.Notification' - ); - } elseif (!$validateOnly) { - if (Warehouse::exists($product->warehouse)) { - // Get already associated warehouses - $associated_warehouses_collection = WarehouseProductLocation::getCollection($product->id); - // Delete any entry in warehouse for this product - foreach ($associated_warehouses_collection as $awc) { - $awc->delete(); - } - $warehouse_location_entity = new WarehouseProductLocation(); - $warehouse_location_entity->id_product = $product->id; - $warehouse_location_entity->id_product_attribute = 0; - $warehouse_location_entity->id_warehouse = $product->warehouse; - if (WarehouseProductLocation::getProductLocation($product->id, 0, $product->warehouse) !== false) { - $warehouse_location_entity->update(); - } else { - $warehouse_location_entity->save(); - } - StockAvailable::synchronize($product->id); - } else { - $this->warnings[] = $this->trans( - 'Warehouse did not exist, cannot set on product %name%.', - [ - '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language_id]), - ], - 'Admin.Advparameters.Notification' - ); - } - } - } - - // stock available - if (isset($product->depends_on_stock)) { - /* @phpstan-ignore-next-line Data from the property `depends_on_stock` come from the database */ - if ($product->depends_on_stock != 0 && $product->depends_on_stock != 1) { - $this->warnings[] = $this->trans( - 'Incorrect value for "Depends on stock" for product %name%', - [ - '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language_id]), - ], - 'Admin.Advparameters.Notification' - ); - /* @phpstan-ignore-next-line Data from properties `advanced_stock_management` & `depends_on_stock` come from the database */ - } elseif ((!$product->advanced_stock_management || $product->advanced_stock_management == 0) && $product->depends_on_stock == 1) { - $this->warnings[] = $this->trans( - 'Advanced stock management is not enabled, cannot set "Depends on stock" for product %name%', - [ - '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language_id]), - ], - 'Admin.Advparameters.Notification' - ); - } elseif (!$validateOnly) { - StockAvailable::setProductDependsOnStock($product->id, $product->depends_on_stock); - } - - // This code allows us to set qty and disable depends on stock - if (!$validateOnly) { - // if depends on stock and quantity, add quantity to stock - if ($product->depends_on_stock == 1) { - $stock_manager = StockManagerFactory::getManager(); - $price = str_replace(',', '.', (string) $product->wholesale_price); - if ($price == '0') { - $price = 0.000001; - } - $price = round((float) $price, 6); - $warehouse = new Warehouse($product->warehouse); - if ($stock_manager->addProduct((int) $product->id, 0, $warehouse, (int) $product->quantity, 1, $price, true)) { - StockAvailable::synchronize((int) $product->id); - } - } else { - if ($shop_is_feature_active) { - foreach ($shops as $shop) { - StockAvailable::setQuantity((int) $product->id, 0, (int) $product->quantity, (int) $shop); - } - } else { - StockAvailable::setQuantity((int) $product->id, 0, (int) $product->quantity, (int) $this->context->shop->id); - } - } - } - } elseif (!$validateOnly) { - // if not depends_on_stock set, use normal qty if ($shop_is_feature_active) { foreach ($shops as $shop) { StockAvailable::setQuantity((int) $product->id, 0, (int) $product->quantity, (int) $shop); @@ -2800,114 +2581,8 @@ protected function attributeImportOne($info, $default_language, &$groups, &$attr } } - // set advanced stock managment - if (isset($info['advanced_stock_management'])) { - if ($info['advanced_stock_management'] != 1 && $info['advanced_stock_management'] != 0) { - $this->warnings[] = $this->trans( - 'Advanced stock management has incorrect value. Not set for product with id %id%.', - [ - '%id%' => Tools::htmlentitiesUTF8($product->id), - ], - 'Admin.Advparameters.Notification' - ); - } elseif (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $info['advanced_stock_management'] == 1) { - $this->warnings[] = $this->trans( - 'Advanced stock management is not enabled, cannot enable on product with id %id%.', - [ - '%id%' => Tools::htmlentitiesUTF8($product->id), - ], - 'Admin.Advparameters.Notification' - ); - } elseif (!$validateOnly) { - $product->setAdvancedStockManagement($info['advanced_stock_management']); - } - // automaticly disable depends on stock, if a_s_m set to disabled - if (!$validateOnly && StockAvailable::dependsOnStock($product->id) == 1 && $info['advanced_stock_management'] == 0) { - StockAvailable::setProductDependsOnStock($product->id, false, null, $id_product_attribute); - } - } - - // Check if warehouse exists - if (isset($info['warehouse']) && $info['warehouse']) { - if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) { - $this->warnings[] = $this->trans( - 'Advanced stock management is not enabled, warehouse is not set on product with id %id%.', - ['%id%' => Tools::htmlentitiesUTF8($product->id)], - 'Admin.Advparameters.Notification' - ); - } else { - if (Warehouse::exists($info['warehouse'])) { - $warehouse_location_entity = new WarehouseProductLocation(); - $warehouse_location_entity->id_product = $product->id; - $warehouse_location_entity->id_product_attribute = $id_product_attribute; - $warehouse_location_entity->id_warehouse = $info['warehouse']; - if (!$validateOnly) { - if (WarehouseProductLocation::getProductLocation($product->id, $id_product_attribute, $info['warehouse']) !== false) { - $warehouse_location_entity->update(); - } else { - $warehouse_location_entity->save(); - } - StockAvailable::synchronize($product->id); - } - } else { - $this->warnings[] = $this->trans( - 'Warehouse did not exist, cannot set on product %name%.', - [ - '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language]), - ], - 'Admin.Advparameters.Notification' - ); - } - } - } - // stock available - if (isset($info['depends_on_stock'])) { - if ($info['depends_on_stock'] != 0 && $info['depends_on_stock'] != 1) { - $this->warnings[] = $this->trans( - 'Incorrect value for "Depends on stock" for product %name%', - [ - '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language]), - ], - 'Admin.Notifications.Error' - ); - } elseif ((!$info['advanced_stock_management'] || $info['advanced_stock_management'] == 0) && $info['depends_on_stock'] == 1) { - $this->warnings[] = $this->trans( - 'Advanced stock management is not enabled, cannot set "Depends on stock" for product %name%', - [ - '%name%' => Tools::htmlentitiesUTF8($product->name[$default_language]), - ], - 'Admin.Advparameters.Notification' - ); - } elseif (!$validateOnly) { - StockAvailable::setProductDependsOnStock($product->id, $info['depends_on_stock'], null, $id_product_attribute); - } - - // This code allows us to set qty and disable depends on stock - if (isset($info['quantity'])) { - // if depends on stock and quantity, add quantity to stock - if ($info['depends_on_stock'] == 1) { - $stock_manager = StockManagerFactory::getManager(); - $price = str_replace(',', '.', $info['wholesale_price']); - if ($price == '0') { - $price = 0.000001; - } - $price = round((float) $price, 6); - $warehouse = new Warehouse($info['warehouse']); - if (!$validateOnly && $stock_manager->addProduct((int) $product->id, $id_product_attribute, $warehouse, (int) $info['quantity'], 1, $price, true)) { - StockAvailable::synchronize((int) $product->id); - } - } elseif (!$validateOnly) { - if ($shop_is_feature_active) { - foreach ($id_shop_list as $shop) { - StockAvailable::setQuantity((int) $product->id, $id_product_attribute, (int) $info['quantity'], (int) $shop); - } - } else { - StockAvailable::setQuantity((int) $product->id, $id_product_attribute, (int) $info['quantity'], $this->context->shop->id); - } - } - } - } elseif (!$validateOnly) { // if not depends_on_stock set, use normal qty + if (!$validateOnly) { if ($shop_is_feature_active) { foreach ($id_shop_list as $shop) { StockAvailable::setQuantity((int) $product->id, $id_product_attribute, (int) $info['quantity'], (int) $shop); @@ -3996,305 +3671,29 @@ public function storeContactImportOne($info, $shop_is_feature_active, $regenerat /** * @since 1.5.0 + * @deprecated Since 9.0 and will be removed in 10.0 */ public function supplyOrdersImport($offset = false, $limit = false, $validateOnly = false) { - // opens CSV & sets locale - $this->receiveTab(); - $handle = $this->openCsvFile($offset); - if (!$handle) { - return false; - } - - AdminImportController::setLocale(); - - $force_ids = Tools::getValue('forceIDs'); - - // main loop, for each supply orders to import - $line_count = 0; - for ($current_line = 0; ($line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator)) && (!$limit || $current_line < $limit); ++$current_line) { - ++$line_count; - if ($this->convert) { - $line = $this->utf8EncodeArray($line); - } - $info = AdminImportController::getMaskedRow($line); - - $this->supplyOrdersImportOne( - $info, - $force_ids, - $current_line, - $validateOnly - ); - } - // closes - $this->closeCsvFile($handle); - - return $line_count; - } - - protected function supplyOrdersImportOne($info, $force_ids, $current_line, $validateOnly = false) - { - // sets default values if needed - AdminImportController::setDefaultValues($info); + @trigger_error(sprintf( + '%s is deprecated since 9.0 and will be removed in 10.0.', + __METHOD__ + ), E_USER_DEPRECATED); - // if an id is set, instanciates a supply order with this id if possible - if (array_key_exists('id', $info) && (int) $info['id'] && SupplyOrder::exists((int) $info['id'])) { - $supply_order = new SupplyOrder((int) $info['id']); - } elseif (array_key_exists('reference', $info) && $info['reference'] && SupplyOrder::exists(pSQL($info['reference']))) { - $supply_order = SupplyOrder::getSupplyOrderByReference(pSQL($info['reference'])); - } else { // new supply order - $supply_order = new SupplyOrder(); - } - - // gets parameters - $id_supplier = (int) $info['id_supplier']; - $id_lang = (int) $info['id_lang']; - $id_warehouse = (int) $info['id_warehouse']; - $id_currency = (int) $info['id_currency']; - $reference = pSQL($info['reference']); - $date_delivery_expected = pSQL($info['date_delivery_expected']); - $discount_rate = (float) $info['discount_rate']; - $is_template = (bool) $info['is_template']; - - $error = ''; - // checks parameters - if (!Supplier::supplierExists($id_supplier)) { - $error = $this->trans('Supplier ID (%id%) is not valid (at line %line%).', ['%id%' => $id_supplier, '%line%' => $current_line + 1], 'Admin.Advparameters.Notification'); - } - if (!Language::getLanguage($id_lang)) { - $error = $this->trans('Lang ID (%id%) is not valid (at line %line%).', ['%id%' => $id_lang, '%line%' => $current_line + 1], 'Admin.Advparameters.Notification'); - } - if (!Warehouse::exists($id_warehouse)) { - $error = $this->trans('Warehouse ID (%id%) is not valid (at line %line%).', ['%id%' => $id_warehouse, '%line%' => $current_line + 1], 'Admin.Advparameters.Notification'); - } - if (!Currency::getCurrency($id_currency)) { - $error = $this->trans('Currency ID (%id%) is not valid (at line %line%).', ['%id%' => $id_currency, '%line%' => $current_line + 1], 'Admin.Advparameters.Notification'); - } - if (empty($supply_order->reference) && SupplyOrder::exists($reference)) { - $error = $this->trans('Reference (%ref%) already exists (at line %line%).', ['%ref%' => $reference, '%line%' => $current_line + 1], 'Admin.Advparameters.Notification'); - } - if (!empty($supply_order->reference) && ($supply_order->reference != $reference && SupplyOrder::exists($reference))) { - $error = $this->trans('Reference (%ref%) already exists (at line %line%).', ['%ref%' => $reference, '%line%' => $current_line + 1], 'Admin.Advparameters.Notification'); - } - if (!Validate::isDateFormat($date_delivery_expected)) { - $error = $this->trans('Date format (%date%) is not valid (at line %line%). It should be: %date_format%.', ['%date%' => $date_delivery_expected, '%line%' => $current_line + 1, '%date_format%' => $this->trans('YYYY-MM-DD', [], 'Admin.Advparameters.Notification')], 'Admin.Advparameters.Notification'); - } elseif (new DateTime($date_delivery_expected) <= new DateTime('yesterday')) { - $error = $this->trans('Date (%date%) cannot be in the past (at line %line%). Format: %date_format%.', ['%date%' => $date_delivery_expected, '%line%' => $current_line + 1, '%date_format%' => $this->trans('YYYY-MM-DD', [], 'Admin.Advparameters.Notification')], 'Admin.Advparameters.Notification'); - } - if ($discount_rate < 0 || $discount_rate > 100) { - $error = $this->trans( - 'Discount rate (%rate%) is not valid (at line %line%). %format%.', - ['%rate%' => $discount_rate, '%line%' => $current_line + 1, '%format%' => $this->trans('Format: Between 0 and 100', [], 'Admin.Advparameters.Notification')], - 'Admin.Advparameters.Notification' - ); - } - if ($supply_order->id > 0 && !$supply_order->isEditable()) { - $error = $this->trans('Supply Order (%id%) is not editable (at line %line%).', ['%id%' => $supply_order->id, '%line%' => $current_line + 1], 'Admin.Advparameters.Notification'); - } - - // if no errors, sets supply order - if (empty($error)) { - // adds parameters - $info['id_ref_currency'] = (int) Currency::getDefaultCurrency()->id; - $info['supplier_name'] = pSQL(Supplier::getNameById($id_supplier)); - if ($supply_order->id > 0) { - $info['id_supply_order_state'] = (int) $supply_order->id_supply_order_state; - $info['id'] = (int) $supply_order->id; - } else { - $info['id_supply_order_state'] = 1; - } - - // sets parameters - AdminImportController::arrayWalk($info, ['AdminImportController', 'fillInfo'], $supply_order); - - /** @var SupplyOrder $supply_order */ - if ((int) $supply_order->id && ($supply_order->exists((int) $supply_order->id) || $supply_order->exists($supply_order->reference))) { - $res = ($validateOnly || $supply_order->update()); - } else { - $supply_order->force_id = (bool) $force_ids; - $res = ($validateOnly || $supply_order->add()); - } - - // errors - if (!$res) { - $this->errors[] = $this->trans('Supply Order could not be saved (at line %line%).', ['%line%' => $current_line + 1], 'Admin.Advparameters.Notification'); - } - } else { - $this->errors[] = $error; - } + return 0; } + /** + * @deprecated Since 9.0 and will be removed in 10.0 + */ public function supplyOrdersDetailsImport($offset = false, $limit = false, &$crossStepsVariables = false, $validateOnly = false) { - // opens CSV & sets locale - $this->receiveTab(); - $handle = $this->openCsvFile($offset); - if (!$handle) { - return false; - } - - AdminImportController::setLocale(); - - $products = []; - $reset = true; - if ($crossStepsVariables !== false && array_key_exists('products', $crossStepsVariables)) { - $products = $crossStepsVariables['products']; - } - if ($crossStepsVariables !== false && array_key_exists('reset', $crossStepsVariables)) { - $reset = $crossStepsVariables['reset']; - } - - $force_ids = Tools::getValue('forceIDs'); - - // main loop, for each supply orders details to import - $line_count = 0; - for ($current_line = 0; ($line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator)) && (!$limit || $current_line < $limit); ++$current_line) { - ++$line_count; - if ($this->convert) { - $line = $this->utf8EncodeArray($line); - } - $info = AdminImportController::getMaskedRow($line); - - $this->supplyOrdersDetailsImportOne( - $info, - $products, // by ref - $reset, // by ref - $force_ids, - $current_line, - $validateOnly - ); - } - // closes - $this->closeCsvFile($handle); - - if ($crossStepsVariables !== false) { - $crossStepsVariables['products'] = $products; - $crossStepsVariables['reset'] = $reset; - } - - return $line_count; - } - - protected function supplyOrdersDetailsImportOne($info, &$products, &$reset, $force_ids, $current_line, $validateOnly = false) - { - // sets default values if needed - AdminImportController::setDefaultValues($info); - - // gets the supply order - if (array_key_exists('supply_order_reference', $info) && pSQL($info['supply_order_reference']) && SupplyOrder::exists(pSQL($info['supply_order_reference']))) { - $supply_order = SupplyOrder::getSupplyOrderByReference(pSQL($info['supply_order_reference'])); - } else { - $this->errors[] = sprintf( - $this->trans('Supply Order (%s) could not be loaded (at line %d).', [], 'Admin.Advparameters.Notification'), - Tools::htmlentitiesUTF8($info['supply_order_reference']), - $current_line + 1 - ); + @trigger_error(sprintf( + '%s is deprecated since 9.0 and will be removed in 10.0.', + __METHOD__ + ), E_USER_DEPRECATED); - return; - } - - // sets parameters - $id_product = (int) $info['id_product']; - if (empty($info['id_product_attribute'])) { - $info['id_product_attribute'] = 0; - } - $id_product_attribute = (int) $info['id_product_attribute']; - $unit_price_te = (float) $info['unit_price_te']; - $quantity_expected = (int) $info['quantity_expected']; - $discount_rate = (float) $info['discount_rate']; - $tax_rate = (float) $info['tax_rate']; - - // checks if one product/attribute is there only once - if (isset($products[$id_product][$id_product_attribute])) { - $this->errors[] = sprintf( - $this->trans('Product/Attribute (%d/%d) cannot be added twice (at line %d).', [], 'Admin.Advparameters.Notification'), - $id_product, - $id_product_attribute, - $current_line + 1 - ); - } else { - $products[$id_product][$id_product_attribute] = $quantity_expected; - } - - // checks parameters - $supplier_reference = ProductSupplier::getProductSupplierReference($id_product, $id_product_attribute, $supply_order->id_supplier); - if (false === $supplier_reference) { - $this->errors[] = sprintf( - $this->trans('Product (%d/%d) is not available for this order (at line %d).', [], 'Admin.Advparameters.Notification'), - $id_product, - $id_product_attribute, - $current_line + 1 - ); - } - if ($unit_price_te < 0) { - $this->errors[] = sprintf($this->trans('Unit Price (tax excl.) (%d) is not valid (at line %d).', [], 'Admin.Advparameters.Notification'), $unit_price_te, $current_line + 1); - } - if ($quantity_expected < 0) { - $this->errors[] = sprintf($this->trans('Quantity Expected (%d) is not valid (at line %d).', [], 'Admin.Advparameters.Notification'), $quantity_expected, $current_line + 1); - } - if ($discount_rate < 0 || $discount_rate > 100) { - $this->errors[] = sprintf( - $this->trans('Discount rate (%d) is not valid (at line %d). %s.', [], 'Admin.Advparameters.Notification'), - $discount_rate, - $current_line + 1, - $this->trans('Format: Between 0 and 100', [], 'Admin.Advparameters.Notification') - ); - } - if ($tax_rate < 0 || $tax_rate > 100) { - $this->errors[] = sprintf( - $this->trans('Quantity Expected (%d) is not valid (at line %d).', [], 'Admin.Advparameters.Notification'), - $tax_rate, - $current_line + 1, - $this->trans('Format: Between 0 and 100', [], 'Admin.Advparameters.Notification') - ); - } - - // if no errors, sets supply order details - if (empty($this->errors)) { - // resets order if needed - if (!$validateOnly && $reset) { - $supply_order->resetProducts(); - $reset = false; - } - - // creates new product - $supply_order_detail = new SupplyOrderDetail(); - AdminImportController::arrayWalk($info, ['AdminImportController', 'fillInfo'], $supply_order_detail); - - /* @var SupplyOrderDetail $supply_order_detail */ - - // sets parameters - $supply_order_detail->id_supply_order = $supply_order->id; - $currency = new Currency($supply_order->id_ref_currency); - $supply_order_detail->id_currency = $currency->id; - $supply_order_detail->exchange_rate = $currency->conversion_rate; - $supply_order_detail->supplier_reference = $supplier_reference; - $supply_order_detail->name = Product::getProductName($id_product, $id_product_attribute, $supply_order->id_lang); - - // gets ean13 / ref / upc - $query = new DbQuery(); - $query->select(' - IFNULL(pa.reference, IFNULL(p.reference, \'\')) as reference, - IFNULL(pa.ean13, IFNULL(p.ean13, \'\')) as ean13, - IFNULL(pa.upc, IFNULL(p.upc, \'\')) as upc - '); - $query->from('product', 'p'); - $query->leftJoin('product_attribute', 'pa', 'pa.id_product = p.id_product AND id_product_attribute = ' . (int) $id_product_attribute); - $query->where('p.id_product = ' . (int) $id_product); - $query->where('p.is_virtual = 0 AND p.cache_is_pack = 0'); - $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); - $product_infos = $res['0']; - - $supply_order_detail->reference = $product_infos['reference']; - $supply_order_detail->ean13 = $product_infos['ean13']; - $supply_order_detail->upc = $product_infos['upc']; - $supply_order_detail->force_id = (bool) $force_ids; - if (!$validateOnly) { - $supply_order_detail->add(); - $supply_order->update(); - } - unset($supply_order_detail); - } + return 0; } public function utf8EncodeArray($array) @@ -4439,13 +3838,11 @@ protected function truncateTables($case) Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'product_group_reduction_cache`'); Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'product_sale`'); Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'product_supplier`'); - Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'warehouse_product_location`'); Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'stock`'); Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'stock_available`'); Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'stock_mvt`'); Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'customization`'); Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'customization_field`'); - Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'supply_order_detail`'); Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'product_attribute`'); Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'product_attribute_shop`'); Db::getInstance()->execute('TRUNCATE TABLE `' . _DB_PREFIX_ . 'product_attribute_combination`'); @@ -4651,18 +4048,6 @@ public function importByGroups($offset = false, $limit = false, &$results = null break; } - // @since 1.5.0 - if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) { - switch ((int) Tools::getValue('entity')) { - case $this->entities[$import_type = $this->trans('Supply Orders', [], 'Admin.Advparameters.Feature')]: - $doneCount += $this->supplyOrdersImport($offset, $limit, $validateOnly); - break; - case $this->entities[$import_type = $this->trans('Supply Order Details', [], 'Admin.Advparameters.Feature')]: - $doneCount += $this->supplyOrdersDetailsImport($offset, $limit, $crossStepsVariables, $validateOnly); - break; - } - } - if ($results !== null) { $results['isFinished'] = ($doneCount < $limit); if ($results['isFinished'] && $clearCache && !$validateOnly) { diff --git a/controllers/admin/AdminLegacyLayoutController.php b/controllers/admin/AdminLegacyLayoutController.php index 487ca1aeee6ac..5bb26062825e2 100644 --- a/controllers/admin/AdminLegacyLayoutController.php +++ b/controllers/admin/AdminLegacyLayoutController.php @@ -1,4 +1,9 @@ $this->useRegularH1Structure, // legacy context selector is hidden on migrated pages when multistore feature is used 'hideLegacyStoreContextSelector' => $this->isMultistoreEnabled(), + 'locked_to_all_shop_context' => $this->lockedToAllShopContext, ]; if ($this->helpLink === false || !empty($this->helpLink)) { @@ -230,5 +236,17 @@ public function display() parent::display(); $this->outPutHtml = ob_get_contents(); ob_end_clean(); + + // We push notifications from the legacy controller but only in migrated page for now (that's why it is done here and ont in AdminController) + // and of course only if the Symfony layout is enabled This will mostly be useful when legacy pages are rendered by Symfony layout + if ($this->get(FeatureFlagStateCheckerInterface::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_SYMFONY_LAYOUT)) { + foreach (['errors', 'warnings', 'informations', 'confirmations'] as $type) { + /** @var AddFlashMessage $addFlashMessage */ + $addFlashMessage = $this->get(AddFlashMessage::class); + foreach ($this->$type as $message) { + $addFlashMessage->addMessage($type, $message); + } + } + } } } diff --git a/controllers/admin/AdminPdfController.php b/controllers/admin/AdminPdfController.php index 79dd8ad9c4b55..23f202290625e 100644 --- a/controllers/admin/AdminPdfController.php +++ b/controllers/admin/AdminPdfController.php @@ -158,20 +158,16 @@ public function processGenerateDeliverySlipsPDF() $this->generatePDF($order_invoice_collection, PDF::TEMPLATE_DELIVERY_SLIP); } + /** + * @deprecated Since 9.0 and will be removed in 10.0 + */ public function processGenerateSupplyOrderFormPDF() { - if (!Tools::isSubmit('id_supply_order')) { - die($this->trans('The supply order ID is missing.', [], 'Admin.Orderscustomers.Notification')); - } - - $id_supply_order = (int) Tools::getValue('id_supply_order'); - $supply_order = new SupplyOrder($id_supply_order); - - if (!Validate::isLoadedObject($supply_order)) { - die($this->trans('The supply order cannot be found within your database.', [], 'Admin.Orderscustomers.Notification')); - } - - $this->generatePDF($supply_order, PDF::TEMPLATE_SUPPLY_ORDER_FORM); + @trigger_error(sprintf( + '%s is deprecated since 9.0 and will be removed in 10.0.', + __METHOD__ + ), E_USER_DEPRECATED); + die; } public function generateDeliverySlipPDFByIdOrderInvoice($id_order_invoice) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 49ec7142fd53d..5a31ad4411eba 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -23,8 +23,12 @@ * @copyright Since 2007 PrestaShop SA and Contributors * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) */ + +use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater; use PrestaShop\PrestaShop\Adapter\SymfonyContainer; +use PrestaShop\PrestaShop\Core\Exception\CoreException; use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings; +use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface; use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration; /** @@ -597,21 +601,6 @@ public function processDelete() if (isset($object->noZeroObject) && count($taxes = call_user_func([$this->className, $object->noZeroObject])) <= 1) { $this->errors[] = $this->trans('You need at least one object.', [], 'Admin.Notifications.Error') . ' ' . $this->table . '
' . $this->trans('You cannot delete all of the items.', [], 'Admin.Notifications.Error'); } else { - /* - * @since 1.5.0 - * It is NOT possible to delete a product if there are currently: - * - physical stock for this product - * - supply order(s) for this product - */ - if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $object->advanced_stock_management) { - $stock_manager = StockManagerFactory::getManager(); - $physical_quantity = $stock_manager->getProductPhysicalQuantities($object->id, 0); - $real_quantity = $stock_manager->getProductRealQuantities($object->id, 0); - if ($physical_quantity > 0 || $real_quantity > $physical_quantity) { - $this->errors[] = $this->trans('You cannot delete this product because there is physical stock left.', [], 'Admin.Catalog.Notification'); - } - } - if (!count($this->errors)) { if ($object->delete()) { $id_category = (int) Tools::getValue('id_category'); @@ -687,25 +676,8 @@ protected function processBulkDelete() ini_set('max_execution_time', (string) round($count * 1.5)); } - if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) { - $stock_manager = StockManagerFactory::getManager(); - } - foreach ($products as $id_product) { $product = new Product((int) $id_product); - /* - * @since 1.5.0 - * It is NOT possible to delete a product if there are currently: - * - physical stock for this product - * - supply order(s) for this product - */ - if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $product->advanced_stock_management && isset($stock_manager)) { // @phpstan-ignore-line - $physical_quantity = $stock_manager->getProductPhysicalQuantities($product->id, 0); - $real_quantity = $stock_manager->getProductRealQuantities($product->id, 0); - if ($physical_quantity > 0 || $real_quantity > $physical_quantity) { - $this->errors[] = $this->trans('You cannot delete the product #%d because there is physical stock left.', [$product->id], 'Admin.Catalog.Notification'); - } - } if (!count($this->errors)) { if ($product->delete()) { PrestaShopLogger::addLog(sprintf('%s deletion', $this->className), 1, null, $this->className, (int) $product->id, true, (int) $this->context->employee->id); @@ -818,7 +790,6 @@ public function processProductAttribute() Tools::getValue('attribute_low_stock_alert'), Tools::getValue('attribute_mpn') ); - StockAvailable::setProductDependsOnStock((int) $product->id, $product->depends_on_stock, null, (int) $id_product_attribute); StockAvailable::setProductOutOfStock((int) $product->id, $product->out_of_stock, null, (int) $id_product_attribute); } } else { @@ -852,7 +823,6 @@ public function processProductAttribute() Tools::getValue('attribute_low_stock_alert'), Tools::getValue('attribute_mpn') ); - StockAvailable::setProductDependsOnStock((int) $product->id, $product->depends_on_stock, null, (int) $id_product_attribute); StockAvailable::setProductOutOfStock((int) $product->id, $product->out_of_stock, null, (int) $id_product_attribute); } } else { @@ -1066,10 +1036,15 @@ public function processSpecificPricePriorities() if (!$priorities = Tools::getValue('specificPricePriority')) { $this->errors[] = $this->trans('Please specify priorities.', [], 'Admin.Catalog.Notification'); } elseif (Tools::isSubmit('specificPricePriorityToAll') && Tools::getValue('specificPricePriorityToAll')) { - if (!SpecificPrice::setPriorities($priorities)) { - $this->errors[] = $this->trans('An error occurred while updating priorities.', [], 'Admin.Catalog.Notification'); - } else { + $sfContainer = SymfonyContainer::getInstance(); + /** @var SpecificPricePriorityUpdater $specificPricePriorityUpdater */ + $specificPricePriorityUpdater = $sfContainer->get(SpecificPricePriorityUpdater::class); + + try { + $specificPricePriorityUpdater->updateDefaultPriorities($priorities); $this->confirmations[] = 'The price rule has successfully updated'; + } catch (CoreException $e) { + $this->errors[] = $this->trans('An error occurred while updating priorities.', [], 'Admin.Catalog.Notification'); } } elseif (!SpecificPrice::setSpecificPriority((int) $obj->id, $priorities)) { $this->errors[] = $this->trans('An error occurred while setting priorities.', [], 'Admin.Catalog.Notification'); @@ -1360,34 +1335,20 @@ public function ajaxProcessDeleteProductAttribute() $id_product_attribute = (int) Tools::getValue('id_product_attribute'); if ($id_product && Validate::isUnsignedId($id_product) && Validate::isLoadedObject($product = new Product($id_product))) { - if (($depends_on_stock = StockAvailable::dependsOnStock($id_product)) && StockAvailable::getQuantityAvailableByProduct($id_product, $id_product_attribute)) { - $json = [ - 'status' => 'error', - 'message' => 'It is not possible to delete a combination while it still has some quantities in the Advanced Stock Management. You must delete its stock first.', - ]; + $product->deleteAttributeCombination((int) $id_product_attribute); + $product->checkDefaultAttributes(); + if (!$product->hasAttributes()) { + $product->cache_default_attribute = 0; + $product->update(); } else { - $product->deleteAttributeCombination((int) $id_product_attribute); - $product->checkDefaultAttributes(); - if (!$product->hasAttributes()) { - $product->cache_default_attribute = 0; - $product->update(); - } else { - Product::updateDefaultAttribute($id_product); - } - - if ($depends_on_stock && !Stock::deleteStockByIds($id_product, $id_product_attribute)) { - $json = [ - 'status' => 'error', - 'message' => 'Error while deleting the stock', - ]; - } else { - $json = [ - 'status' => 'ok', - 'message' => $this->_conf[1], - 'id_product_attribute' => (int) $id_product_attribute, - ]; - } + Product::updateDefaultAttribute($id_product); } + + $json = [ + 'status' => 'ok', + 'message' => $this->_conf[1], + 'id_product_attribute' => (int) $id_product_attribute, + ]; } else { $json = [ 'status' => 'error', @@ -1760,15 +1721,6 @@ public function processAdd() $this->updatePackItems($this->object); $this->updateDownloadProduct($this->object); - if (Configuration::get('PS_FORCE_ASM_NEW_PRODUCT') && Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && $this->object->getType() != Product::PTYPE_VIRTUAL) { - $this->object->advanced_stock_management = 1; - $this->object->save(); - $id_shops = Shop::getContextListShopID(); - foreach ($id_shops as $id_shop) { - StockAvailable::setProductDependsOnStock($this->object->id, true, (int) $id_shop, 0); - } - } - if (empty($this->errors)) { $languages = Language::getLanguages(false); if ($this->isProductFieldUpdated('category_box') && !$this->object->updateCategories(Tools::getValue('categoryBox'))) { @@ -1788,15 +1740,6 @@ public function processAdd() } } - if (Configuration::get('PS_DEFAULT_WAREHOUSE_NEW_PRODUCT') != 0 && Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) { - $warehouse_location_entity = new WarehouseProductLocation(); - $warehouse_location_entity->id_product = $this->object->id; - $warehouse_location_entity->id_product_attribute = 0; - $warehouse_location_entity->id_warehouse = (int) Configuration::get('PS_DEFAULT_WAREHOUSE_NEW_PRODUCT'); - $warehouse_location_entity->location = ''; - $warehouse_location_entity->save(); - } - // Apply groups reductions $this->object->setGroupReduction(); @@ -1899,6 +1842,16 @@ public function processUpdate() if (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_SHOP) { $values = (array) Tools::getValue('multishop_check', []); $values['state'] = Product::STATE_SAVED; + $values['id_manufacturer'] = true; + $values['ean13'] = true; + $values['mpn'] = true; + $values['isbn'] = true; + $values['upc'] = true; + $values['reference'] = true; + $values['weight'] = true; + $values['depth'] = true; + $values['width'] = true; + $values['height'] = true; $object->setFieldsToUpdate($values); } @@ -1928,9 +1881,7 @@ public function processUpdate() // If the product doesn't exist in the current shop but exists in another shop if (Shop::getContext() == Shop::CONTEXT_SHOP && !$existing_product->isAssociatedToShop($this->context->shop->id)) { $out_of_stock = StockAvailable::outOfStock($existing_product->id, $existing_product->id_shop_default); - $depends_on_stock = StockAvailable::dependsOnStock($existing_product->id, $existing_product->id_shop_default); StockAvailable::setProductOutOfStock((int) $this->object->id, $out_of_stock, $this->context->shop->id); - StockAvailable::setProductDependsOnStock((int) $this->object->id, $depends_on_stock, $this->context->shop->id); } PrestaShopLogger::addLog(sprintf('%s modification', $this->className), 1, null, $this->className, (int) $this->object->id, true, (int) $this->context->employee->id); @@ -1965,10 +1916,6 @@ public function processUpdate() } $this->updatePackItems($object); - // Disallow avanced stock management if the product become a pack - if ($product_type_before == Product::PTYPE_SIMPLE && $object->getType() == Product::PTYPE_PACK) { - StockAvailable::setProductDependsOnStock((int) $object->id, false); - } $this->updateDownloadProduct($object, 1); $this->updateTags(Language::getLanguages(false), $object); @@ -1983,9 +1930,6 @@ public function processUpdate() } } - if ($this->isTabSubmitted('Warehouses')) { - $this->processWarehouses(); - } if (empty($this->errors)) { if (in_array($object->visibility, ['both', 'search']) && Configuration::get('PS_SEARCH_INDEXATION')) { Search::indexation(false, $object->id); @@ -2597,79 +2541,6 @@ public function processSuppliers($id_product = null) } } - /** - * Post treatment for warehouses. - */ - public function processWarehouses() - { - if ((int) Tools::getValue('warehouse_loaded') === 1 && Validate::isLoadedObject($product = new Product((int) $id_product = Tools::getValue('id_product')))) { - // Get all id_product_attribute - $attributes = $product->getAttributesResume($this->context->language->id); - if (empty($attributes)) { - $attributes[] = [ - 'id_product_attribute' => 0, - 'attribute_designation' => '', - ]; - } - - // Get all available warehouses - $warehouses = Warehouse::getWarehouses(true); - - // Get already associated warehouses - $associated_warehouses_collection = WarehouseProductLocation::getCollection($product->id); - - $elements_to_manage = []; - - // get form information - foreach ($attributes as $attribute) { - foreach ($warehouses as $warehouse) { - $key = $warehouse['id_warehouse'] . '_' . $product->id . '_' . $attribute['id_product_attribute']; - - // get elements to manage - if (Tools::isSubmit('check_warehouse_' . $key)) { - $location = Tools::getValue('location_warehouse_' . $key, ''); - $elements_to_manage[$key] = $location; - } - } - } - - // Delete entry if necessary - foreach ($associated_warehouses_collection as $awc) { - /** @var WarehouseProductLocation $awc */ - if (!array_key_exists($awc->id_warehouse . '_' . $awc->id_product . '_' . $awc->id_product_attribute, $elements_to_manage)) { - $awc->delete(); - } - } - - // Manage locations - foreach ($elements_to_manage as $key => $location) { - $params = explode('_', $key); - - $wpl_id = (int) WarehouseProductLocation::getIdByProductAndWarehouse((int) $params[1], (int) $params[2], (int) $params[0]); - - if (empty($wpl_id)) { - //create new record - $warehouse_location_entity = new WarehouseProductLocation(); - $warehouse_location_entity->id_product = (int) $params[1]; - $warehouse_location_entity->id_product_attribute = (int) $params[2]; - $warehouse_location_entity->id_warehouse = (int) $params[0]; - $warehouse_location_entity->location = pSQL($location); - $warehouse_location_entity->save(); - } else { - $warehouse_location_entity = new WarehouseProductLocation((int) $wpl_id); - - $location = pSQL($location); - - if ($location != $warehouse_location_entity->location) { - $warehouse_location_entity->location = pSQL($location); - $warehouse_location_entity->update(); - } - } - } - StockAvailable::synchronize((int) $id_product); - } - } - /** * Get an array of pack items for display from the product object if specified, else from POST/GET values. * @@ -2883,7 +2754,7 @@ public function ajaxProcessaddProductImage($idProduct = null, $inputFileName = ' * * In case of .jpg images, the actual format inside is decided by ImageManager. */ - if ($sfContainer->get('prestashop.core.admin.feature_flag.repository')->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) { + if ($sfContainer->get(FeatureFlagStateCheckerInterface::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) { $configuredImageFormats = $sfContainer->get(ImageFormatConfiguration::class)->getGenerationFormats(); } else { $configuredImageFormats = ['jpg']; @@ -2960,41 +2831,6 @@ public function ajaxProcessProductQuantity() $product = new Product((int) Tools::getValue('id_product'), true); switch (Tools::getValue('actionQty')) { - case 'depends_on_stock': - if (Tools::getValue('value') === false) { - die(json_encode(['error' => 'Undefined value'])); - } - if ((int) Tools::getValue('value') != 0 && (int) Tools::getValue('value') != 1) { - die(json_encode(['error' => 'Incorrect value'])); - } - if (!$product->advanced_stock_management && (int) Tools::getValue('value') == 1) { - die(json_encode(['error' => 'Not possible if advanced stock management is disabled.'])); - } - if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') - && (int) Tools::getValue('value') == 1 - && ( - Pack::isPack($product->id) - && !Pack::allUsesAdvancedStockManagement($product->id) - && ( - $product->pack_stock_type == Pack::STOCK_TYPE_PACK_BOTH - || $product->pack_stock_type == Pack::STOCK_TYPE_PRODUCTS_ONLY - || ( - $product->pack_stock_type == Pack::STOCK_TYPE_DEFAULT - && (Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PRODUCTS_ONLY - || Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PACK_BOTH) - ) - ) - ) - ) { - die(json_encode(['error' => 'You cannot use advanced stock management for this pack because' . '
' . - '- advanced stock management is not enabled for these products' . '
' . - '- you have chosen to decrement products quantities.', ])); - } - - StockAvailable::setProductDependsOnStock($product->id, (bool) Tools::getValue('value')); - - break; - case 'pack_stock_type': $value = Tools::getValue('value'); if ($value === false) { @@ -3004,22 +2840,6 @@ public function ajaxProcessProductQuantity() && (int) $value != 2 && (int) $value != 3) { die(json_encode(['error' => 'Incorrect value'])); } - if ($product->depends_on_stock - && !Pack::allUsesAdvancedStockManagement($product->id) - && ( - (int) $value == 1 - || (int) $value == 2 - || ( - (int) $value == 3 - && (Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PRODUCTS_ONLY - || Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PACK_BOTH) - ) - ) - ) { - die(json_encode(['error' => 'You cannot use this stock management option because:' . '
' . - '- advanced stock management is not enabled for these products' . '
' . - '- advanced stock management is enabled for the pack', ])); - } Product::setPackStockType($product->id, $value); @@ -3056,23 +2876,6 @@ public function ajaxProcessProductQuantity() die(json_encode(['error' => $error])); } - break; - case 'advanced_stock_management': - if (Tools::getValue('value') === false) { - die(json_encode(['error' => 'Undefined value'])); - } - if ((int) Tools::getValue('value') != 1 && (int) Tools::getValue('value') != 0) { - die(json_encode(['error' => 'Incorrect value'])); - } - if (!Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT') && (int) Tools::getValue('value') == 1) { - die(json_encode(['error' => 'Not possible if advanced stock management is disabled. '])); - } - - $product->setAdvancedStockManagement((bool) Tools::getValue('value')); - if (StockAvailable::dependsOnStock($product->id) == 1 && (int) Tools::getValue('value') == 0) { - StockAvailable::setProductDependsOnStock($product->id, false); - } - break; } die(json_encode(['error' => false])); diff --git a/controllers/admin/AdminSearchController.php b/controllers/admin/AdminSearchController.php index b7d8d4304d7e7..76fd3b981e45f 100644 --- a/controllers/admin/AdminSearchController.php +++ b/controllers/admin/AdminSearchController.php @@ -306,8 +306,9 @@ public function searchFeatures() } $sfRouteParams = (!empty($row['route_name'])) ? ['route' => $row['route_name']] : []; + $params = ['bo_query' => $this->query]; $this->_list['features'][$row['name']][] = [ - 'link' => Context::getContext()->link->getAdminLink((string) $row['class_name'], true, $sfRouteParams), + 'link' => Context::getContext()->link->getAdminLink((string) $row['class_name'], true, $sfRouteParams, $params), ]; } } @@ -503,6 +504,7 @@ protected function getSearchPanels(string $searchedExpression): void ); // Get additional search panels from hooks + // An array [module_name => module_output] will be returned $alternativeSearchPanelsFromModules = Hook::exec( 'actionGetAlternativeSearchPanels', [ @@ -528,6 +530,7 @@ protected function getSearchPanels(string $searchedExpression): void 'title' => $searchPanel->getTitle(), 'button_label' => $searchPanel->getButtonLabel(), 'link' => $searchPanel->getLink(), + 'is_external_link' => $searchPanel->isExternalLink(), ]; } } diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php index 3adf35b18c710..bed57835c44b9 100644 --- a/controllers/admin/AdminShopController.php +++ b/controllers/admin/AdminShopController.php @@ -585,7 +585,6 @@ public function renderForm() 'product_attribute' => $this->trans('Product combinations', [], 'Admin.Advparameters.Feature'), 'stock_available' => $this->trans('Available quantities for sale', [], 'Admin.Advparameters.Feature'), 'store' => $this->trans('Stores', [], 'Admin.Global'), - 'warehouse' => $this->trans('Warehouses', [], 'Admin.Advparameters.Feature'), 'webservice_account' => $this->trans('Webservice accounts', [], 'Admin.Advparameters.Feature'), 'attribute_group' => $this->trans('Attribute groups', [], 'Admin.Advparameters.Feature'), 'feature' => $this->trans('Features', [], 'Admin.Global'), diff --git a/controllers/admin/AdminShopUrlController.php b/controllers/admin/AdminShopUrlController.php index e81ceccbe7296..596ef84b594cc 100644 --- a/controllers/admin/AdminShopUrlController.php +++ b/controllers/admin/AdminShopUrlController.php @@ -106,7 +106,8 @@ public function viewAccess($disable = false) public function renderList() { - $this->addRowActionSkipList('delete', [1]); + // We will hide "delete" action for all URLs that are set as main ones for the store + $this->addRowActionSkipList('delete', $this->getUnremovableUrls()); $this->addRowAction('edit'); $this->addRowAction('delete'); @@ -122,6 +123,19 @@ public function renderList() return parent::renderList(); } + /** + * Returns a list of URLs that are selected as main ones for some store. + * + * @return array of URLs that are selected as main + */ + protected function getUnremovableUrls() + { + return array_column( + Db::getInstance()->executeS('SELECT id_shop_url FROM ' . _DB_PREFIX_ . 'shop_url WHERE main = 1'), + 'id_shop_url' + ); + } + /** * @return string|void * diff --git a/controllers/admin/AdminStatsTabController.php b/controllers/admin/AdminStatsTabController.php index 2cac7921f5976..ddd057760e14d 100644 --- a/controllers/admin/AdminStatsTabController.php +++ b/controllers/admin/AdminStatsTabController.php @@ -208,6 +208,7 @@ public function displayStats() } if ($module_instance && $module_instance->active) { + // Hook called only for the module concerned $hook = Hook::exec('displayAdminStatsModules', [], $module_instance->id); } } diff --git a/controllers/admin/AdminStatusesController.php b/controllers/admin/AdminStatusesController.php deleted file mode 100644 index 53bdf8d2389a6..0000000000000 --- a/controllers/admin/AdminStatusesController.php +++ /dev/null @@ -1,771 +0,0 @@ - - * @copyright Since 2007 PrestaShop SA and Contributors - * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) - */ - -/** - * @property OrderState $object - */ -class AdminStatusesControllerCore extends AdminController -{ - public function __construct() - { - $this->bootstrap = true; - $this->table = 'order_state'; - $this->className = 'OrderState'; - $this->lang = true; - $this->deleted = true; - $this->colorOnBackground = false; - $this->multishop_context = Shop::CONTEXT_ALL; - $this->imageType = 'gif'; - $this->fieldImageSettings = [ - 'name' => 'icon', - 'dir' => 'os', - ]; - - parent::__construct(); - - $this->bulk_actions = ['delete' => ['text' => $this->trans('Delete selected', [], 'Admin.Actions'), 'confirm' => $this->trans('Delete selected items?', [], 'Admin.Notifications.Warning')]]; - } - - public function init() - { - if (Tools::isSubmit('addorder_return_state')) { - $this->display = 'add'; - } - if (Tools::isSubmit('updateorder_return_state')) { - $this->display = 'edit'; - } - - return parent::init(); - } - - /** - * init all variables to render the order status list. - */ - protected function initOrderStatusList(): void - { - $this->table = 'order_state'; - $this->className = 'OrderState'; - $this->_defaultOrderBy = $this->identifier = 'id_order_state'; - $this->list_id = 'order_state'; - $this->deleted = true; - $this->_orderBy = null; - $this->fields_list = [ - 'id_order_state' => [ - 'title' => $this->trans('ID', [], 'Admin.Global'), - 'align' => 'text-center', - 'class' => 'fixed-width-xs', - ], - 'name' => [ - 'title' => $this->trans('Name', [], 'Admin.Global'), - 'width' => 'auto', - 'color' => 'color', - ], - 'logo' => [ - 'title' => $this->trans('Icon', [], 'Admin.Shopparameters.Feature'), - 'align' => 'text-center', - 'image' => 'os', - 'orderby' => false, - 'search' => false, - 'class' => 'fixed-width-xs', - ], - 'send_email' => [ - 'title' => $this->trans('Send email to customer', [], 'Admin.Shopparameters.Feature'), - 'align' => 'text-center', - 'active' => 'sendEmail', - 'type' => 'bool', - 'ajax' => true, - 'orderby' => false, - 'class' => 'fixed-width-sm', - ], - 'delivery' => [ - 'title' => $this->trans('Delivery', [], 'Admin.Global'), - 'align' => 'text-center', - 'active' => 'delivery', - 'type' => 'bool', - 'ajax' => true, - 'orderby' => false, - 'class' => 'fixed-width-sm', - ], - 'invoice' => [ - 'title' => $this->trans('Invoice', [], 'Admin.Global'), - 'align' => 'text-center', - 'active' => 'invoice', - 'type' => 'bool', - 'ajax' => true, - 'orderby' => false, - 'class' => 'fixed-width-sm', - ], - 'template' => [ - 'title' => $this->trans('Email template', [], 'Admin.Shopparameters.Feature'), - ], - ]; - } - - /** - * Init all variables to render the order status list. - * - * @deprecated Use `initOrderStatusList` - */ - protected function initOrderStatutsList() - { - $this->initOrderStatusList(); - } - - /** - * init all variables to render the order return list. - */ - protected function initOrdersReturnsList() - { - $this->table = 'order_return_state'; - $this->className = 'OrderReturnState'; - $this->_defaultOrderBy = $this->identifier = 'id_order_return_state'; - $this->list_id = 'order_return_state'; - $this->deleted = false; - $this->_orderBy = null; - - $this->fields_list = [ - 'id_order_return_state' => [ - 'title' => $this->trans('ID', [], 'Admin.Global'), - 'align' => 'center', - 'class' => 'fixed-width-xs', - ], - 'name' => [ - 'title' => $this->trans('Name', [], 'Admin.Global'), - 'align' => 'left', - 'width' => 'auto', - 'color' => 'color', - ], - ]; - } - - protected function initOrderReturnsForm() - { - $id_order_return_state = (int) Tools::getValue('id_order_return_state'); - - // Create Object OrderReturnState - $order_return_state = new OrderReturnState($id_order_return_state); - - //init field form variable for order return form - $this->fields_form = []; - - //$this->initToolbar(); - $this->getlanguages(); - $helper = new HelperForm(); - $helper->currentIndex = self::$currentIndex; - $helper->token = $this->token; - $helper->table = 'order_return_state'; - $helper->identifier = 'id_order_return_state'; - $helper->id = $order_return_state->id; - $helper->toolbar_scroll = false; - $helper->languages = $this->_languages; - $helper->default_form_language = $this->default_form_language; - $helper->allow_employee_form_lang = $this->allow_employee_form_lang; - - if ($order_return_state->id) { - $helper->fields_value = [ - 'name' => $this->getFieldValue($order_return_state, 'name'), - 'color' => $this->getFieldValue($order_return_state, 'color'), - ]; - } else { - $helper->fields_value = [ - 'name' => $this->getFieldValue($order_return_state, 'name'), - 'color' => '#ffffff', - ]; - } - - $helper->toolbar_btn = $this->toolbar_btn; - $helper->title = $this->trans('Edit return status', [], 'Admin.Shopparameters.Feature'); - - return $helper; - } - - public function initPageHeaderToolbar() - { - if (empty($this->display)) { - $this->page_header_toolbar_btn['new_order_state'] = [ - 'href' => self::$currentIndex . '&addorder_state&token=' . $this->token, - 'desc' => $this->trans('Add new order status', [], 'Admin.Shopparameters.Feature'), - 'icon' => 'process-icon-new', - ]; - $this->page_header_toolbar_btn['new_order_return_state'] = [ - 'href' => self::$currentIndex . '&addorder_return_state&token=' . $this->token, - 'desc' => $this->trans('Add new order return status', [], 'Admin.Shopparameters.Feature'), - 'icon' => 'process-icon-new', - ]; - } - - parent::initPageHeaderToolbar(); - } - - /** - * Function used to render the list to display for this controller. - */ - public function renderList() - { - //init and render the first list - $this->addRowAction('edit'); - $this->addRowAction('delete'); - $this->addRowActionSkipList('delete', $this->getUnremovableStatuses()); - $this->bulk_actions = [ - 'delete' => [ - 'text' => $this->trans('Delete selected', [], 'Admin.Actions'), - 'confirm' => $this->trans('Delete selected items?', [], 'Admin.Notifications.Warning'), - 'icon' => 'icon-trash', - ], - ]; - $this->initOrderStatusList(); - $lists = parent::renderList(); - - //init and render the second list - $this->list_skip_actions = []; - $this->_filter = false; - $this->addRowActionSkipList('delete', [1, 2, 3, 4, 5]); - $this->initOrdersReturnsList(); - $this->checkFilterForOrdersReturnsList(); - - // call postProcess() to take care of actions and filters - $this->postProcess(); - $this->toolbar_title = $this->trans('Return statuses', [], 'Admin.Shopparameters.Feature'); - - parent::initToolbar(); - $lists .= parent::renderList(); - - return $lists; - } - - protected function getUnremovableStatuses() - { - return array_map(function ($row) { - return (int) $row['id_order_state']; - }, Db::getInstance()->executeS('SELECT id_order_state FROM ' . _DB_PREFIX_ . 'order_state WHERE unremovable = 1')); - } - - protected function checkFilterForOrdersReturnsList() - { - // test if a filter is applied for this list - if (Tools::isSubmit('submitFilter' . $this->table) || $this->context->cookie->{'submitFilter' . $this->table} !== false) { - $this->filter = true; - } - - // test if a filter reset request is required for this list - if (isset($_POST['submitReset' . $this->table])) { - $this->action = 'reset_filters'; - } else { - $this->action = ''; - } - } - - public function renderForm() - { - $this->fields_form = [ - 'tinymce' => true, - 'legend' => [ - 'title' => $this->trans('Order status', [], 'Admin.Shopparameters.Feature'), - 'icon' => 'icon-time', - ], - 'input' => [ - [ - 'type' => 'text', - 'label' => $this->trans('Status name', [], 'Admin.Shopparameters.Feature'), - 'name' => 'name', - 'lang' => true, - 'required' => true, - 'hint' => [ - $this->trans('Order status (e.g. \'Pending\').', [], 'Admin.Shopparameters.Help'), - $this->trans('Invalid characters: numbers and', [], 'Admin.Shopparameters.Help') . ' !<>,;?=+()@#"{}_$%:', - ], - ], - [ - 'type' => 'file', - 'label' => $this->trans('Icon', [], 'Admin.Shopparameters.Feature'), - 'name' => 'icon', - 'hint' => $this->trans('Upload an icon from your computer (File type: .gif, suggested size: 16x16).', [], 'Admin.Shopparameters.Help'), - ], - [ - 'type' => 'color', - 'label' => $this->trans('Color', [], 'Admin.Shopparameters.Feature'), - 'name' => 'color', - 'hint' => $this->trans('Status will be highlighted in this color. HTML colors only.', [], 'Admin.Shopparameters.Help') . ' "lightblue", "#CC6600")', - ], - [ - 'type' => 'checkbox', - 'name' => 'logable', - 'values' => [ - 'query' => [ - ['id' => 'on', 'name' => $this->trans('Consider the associated order as validated.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'], - ], - 'id' => 'id', - 'name' => 'name', - ], - ], - [ - 'type' => 'checkbox', - 'name' => 'invoice', - 'values' => [ - 'query' => [ - ['id' => 'on', 'name' => $this->trans('Allow a customer to download and view PDF versions of their invoices.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'], - ], - 'id' => 'id', - 'name' => 'name', - ], - ], - [ - 'type' => 'checkbox', - 'name' => 'hidden', - 'values' => [ - 'query' => [ - ['id' => 'on', 'name' => $this->trans('Hide this status in all customer orders.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'], - ], - 'id' => 'id', - 'name' => 'name', - ], - ], - [ - 'type' => 'checkbox', - 'name' => 'send_email', - 'values' => [ - 'query' => [ - ['id' => 'on', 'name' => $this->trans('Send an email to the customer when their order status has changed.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'], - ], - 'id' => 'id', - 'name' => 'name', - ], - ], - [ - 'type' => 'checkbox', - 'name' => 'pdf_invoice', - 'values' => [ - 'query' => [ - ['id' => 'on', 'name' => $this->trans('Attach invoice PDF to email.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'], - ], - 'id' => 'id', - 'name' => 'name', - ], - ], - [ - 'type' => 'checkbox', - 'name' => 'pdf_delivery', - 'values' => [ - 'query' => [ - ['id' => 'on', 'name' => $this->trans('Attach delivery slip PDF to email.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'], - ], - 'id' => 'id', - 'name' => 'name', - ], - ], - [ - 'type' => 'checkbox', - 'name' => 'shipped', - 'values' => [ - 'query' => [ - ['id' => 'on', 'name' => $this->trans('Set the order as shipped.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'], - ], - 'id' => 'id', - 'name' => 'name', - ], - ], - [ - 'type' => 'checkbox', - 'name' => 'paid', - 'values' => [ - 'query' => [ - ['id' => 'on', 'name' => $this->trans('Set the order as paid.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'], - ], - 'id' => 'id', - 'name' => 'name', - ], - ], - [ - 'type' => 'checkbox', - 'name' => 'delivery', - 'values' => [ - 'query' => [ - ['id' => 'on', 'name' => $this->trans('Show delivery PDF.', [], 'Admin.Shopparameters.Feature'), 'val' => '1'], - ], - 'id' => 'id', - 'name' => 'name', - ], - ], - [ - 'type' => 'select_template', - 'label' => $this->trans('Template', [], 'Admin.Shopparameters.Feature'), - 'name' => 'template', - 'lang' => true, - 'options' => [ - 'query' => $this->getTemplates(), - 'id' => 'id', - 'name' => 'name', - 'folder' => 'folder', - ], - 'hint' => [ - $this->trans('Only letters, numbers and underscores ("_") are allowed.', [], 'Admin.Shopparameters.Help'), - $this->trans('Email template for both .html and .txt.', [], 'Admin.Shopparameters.Help'), - ], - ], - ], - 'submit' => [ - 'title' => $this->trans('Save', [], 'Admin.Actions'), - ], - ]; - - if (Tools::isSubmit('updateorder_state') || Tools::isSubmit('addorder_state')) { - return $this->renderOrderStatusForm(); - } elseif (Tools::isSubmit('updateorder_return_state') || Tools::isSubmit('addorder_return_state')) { - return $this->renderOrderReturnsForm(); - } else { - return parent::renderForm(); - } - } - - protected function renderOrderStatusForm() - { - if (!($obj = $this->loadObject(true))) { - return; - } - - $this->fields_value = [ - 'logable_on' => $this->getFieldValue($obj, 'logable'), - 'invoice_on' => $this->getFieldValue($obj, 'invoice'), - 'hidden_on' => $this->getFieldValue($obj, 'hidden'), - 'send_email_on' => $this->getFieldValue($obj, 'send_email'), - 'shipped_on' => $this->getFieldValue($obj, 'shipped'), - 'paid_on' => $this->getFieldValue($obj, 'paid'), - 'delivery_on' => $this->getFieldValue($obj, 'delivery'), - 'pdf_delivery_on' => $this->getFieldValue($obj, 'pdf_delivery'), - 'pdf_invoice_on' => $this->getFieldValue($obj, 'pdf_invoice'), - ]; - - if ($this->getFieldValue($obj, 'color') !== false) { - $this->fields_value['color'] = $this->getFieldValue($obj, 'color'); - } else { - $this->fields_value['color'] = '#ffffff'; - } - - return parent::renderForm(); - } - - protected function renderOrderReturnsForm() - { - $helper = $this->initOrderReturnsForm(); - $helper->show_cancel_button = true; - - $back = Tools::safeOutput(Tools::getValue('back', '')); - if (empty($back)) { - $back = self::$currentIndex . '&token=' . $this->token; - } - if (!Validate::isCleanHtml($back)) { - die(Tools::displayError()); - } - - $helper->back_url = $back; - - $this->fields_form[0]['form'] = [ - 'tinymce' => true, - 'legend' => [ - 'title' => $this->trans('Return status', [], 'Admin.Shopparameters.Feature'), - 'icon' => 'icon-time', - ], - 'input' => [ - [ - 'type' => 'text', - 'label' => $this->trans('Status name', [], 'Admin.Shopparameters.Feature'), - 'name' => 'name', - 'lang' => true, - 'required' => true, - 'hint' => [ - $this->trans('Order\'s return status name.', [], 'Admin.Shopparameters.Help'), - $this->trans('Invalid characters: numbers and', [], 'Admin.Shopparameters.Help') . ' !<>,;?=+()@#"�{}_$%:', - ], - ], - [ - 'type' => 'color', - 'label' => $this->trans('Color', [], 'Admin.Shopparameters.Feature'), - 'name' => 'color', - 'hint' => $this->trans('Status will be highlighted in this color. HTML colors only.', [], 'Admin.Shopparameters.Help') . ' "lightblue", "#CC6600")', - ], - ], - 'submit' => [ - 'title' => $this->trans('Save', [], 'Admin.Actions'), - ], - ]; - - return $helper->generateForm($this->fields_form); - } - - protected function getTemplates() - { - $default_path = '../mails/'; - // Mail templates can also be found in the theme folder - $theme_path = '../themes/' . $this->context->shop->theme->getName() . '/mails/'; - - $array = []; - foreach (Language::getLanguages(false) as $language) { - $iso_code = $language['iso_code']; - - // If there is no folder for the given iso_code in /mails or in /themes/[theme_name]/mails, we bypass this language - if (!@filemtime(_PS_ADMIN_DIR_ . '/' . $default_path . $iso_code) && !@filemtime(_PS_ADMIN_DIR_ . '/' . $theme_path . $iso_code)) { - continue; - } - - $theme_templates_dir = _PS_ADMIN_DIR_ . '/' . $theme_path . $iso_code; - $theme_templates = is_dir($theme_templates_dir) ? scandir($theme_templates_dir, SCANDIR_SORT_NONE) : []; - // We merge all available emails in one array - $templates = array_unique(array_merge(scandir(_PS_ADMIN_DIR_ . '/' . $default_path . $iso_code, SCANDIR_SORT_NONE), $theme_templates)); - foreach ($templates as $key => $template) { - if (!strncmp(strrev($template), 'lmth.', 5)) { - $search_result = array_search($template, $theme_templates); - $array[$iso_code][] = [ - 'id' => substr($template, 0, -5), - 'name' => substr($template, 0, -5), - 'folder' => ((!empty($search_result) ? $theme_path : $default_path)), - ]; - } - } - } - - return $array; - } - - public function postProcess() - { - if (Tools::isSubmit($this->table . 'Orderby') || Tools::isSubmit($this->table . 'Orderway')) { - $this->filter = true; - } - - if (Tools::isSubmit('submitAddorder_return_state')) { - if (!$this->access('add')) { - return; - } - - $id_order_return_state = Tools::getValue('id_order_return_state'); - - // Create Object OrderReturnState - $order_return_state = new OrderReturnState((int) $id_order_return_state); - - $order_return_state->color = Tools::getValue('color'); - $order_return_state->name = []; - foreach (Language::getIDs(false) as $id_lang) { - $order_return_state->name[$id_lang] = Tools::getValue('name_' . $id_lang); - } - - // Update object - if (!$order_return_state->save()) { - $this->errors[] = $this->trans('An error has occurred: Can\'t save the current order\'s return status.', [], 'Admin.Orderscustomers.Notification'); - } else { - Tools::redirectAdmin(self::$currentIndex . '&conf=4&token=' . $this->token); - } - } - - if (Tools::isSubmit('submitBulkdeleteorder_return_state')) { - if (!$this->access('delete')) { - return; - } - - $this->className = 'OrderReturnState'; - $this->table = 'order_return_state'; - $this->boxes = Tools::getValue('order_return_stateBox'); - $this->deleted = false; - parent::processBulkDelete(); - } - - if (Tools::isSubmit('deleteorder_return_state')) { - if (!$this->access('delete')) { - return; - } - - $id_order_return_state = Tools::getValue('id_order_return_state'); - - // Create Object OrderReturnState - $order_return_state = new OrderReturnState((int) $id_order_return_state); - - if (!$order_return_state->delete()) { - $this->errors[] = $this->trans('An error has occurred: Can\'t delete the current order\'s return status.', [], 'Admin.Orderscustomers.Notification'); - } else { - Tools::redirectAdmin(self::$currentIndex . '&conf=1&token=' . $this->token); - } - } - - if (Tools::isSubmit('submitAdd' . $this->table)) { - if (!$this->access('add')) { - return; - } - - $langIds = Language::getIDs(false); - $langDefault = (int) Configuration::get('PS_LANG_DEFAULT'); - foreach ($langIds as $id_lang) { - $name = (string) Tools::getValue('name_' . $id_lang); - if (empty($name)) { - $name = (string) Tools::getValue('name_' . $langDefault); - } - - $exists = OrderState::existsLocalizedNameInDatabase( - $name, - (int) $id_lang, - Tools::getIsset('id_order_state') ? (int) Tools::getValue('id_order_state') : null - ); - if ($exists) { - $this->errors[] = $this->trans('This name already exists.', [], 'Admin.Design.Notification'); - break; - } - } - - $this->deleted = false; // Disabling saving historisation - $_POST['invoice'] = (int) Tools::getValue('invoice_on'); - $_POST['logable'] = (int) Tools::getValue('logable_on'); - $_POST['send_email'] = (int) Tools::getValue('send_email_on'); - $_POST['hidden'] = (int) Tools::getValue('hidden_on'); - $_POST['shipped'] = (int) Tools::getValue('shipped_on'); - $_POST['paid'] = (int) Tools::getValue('paid_on'); - $_POST['delivery'] = (int) Tools::getValue('delivery_on'); - $_POST['pdf_delivery'] = (int) Tools::getValue('pdf_delivery_on'); - $_POST['pdf_invoice'] = (int) Tools::getValue('pdf_invoice_on'); - if (!$_POST['send_email']) { - foreach ($langIds as $id_lang) { - $_POST['template_' . $id_lang] = ''; - } - } - - return parent::postProcess(); - } elseif (Tools::isSubmit('delete' . $this->table)) { - if (!$this->access('delete')) { - return; - } - - $order_state = new OrderState(Tools::getValue('id_order_state'), $this->context->language->id); - if (!$order_state->isRemovable()) { - $this->errors[] = $this->trans('For security reasons, you cannot delete default order statuses.', [], 'Admin.Shopparameters.Notification'); - } else { - return parent::postProcess(); - } - } elseif (Tools::isSubmit('submitBulkdelete' . $this->table)) { - if (!$this->access('delete')) { - return; - } - - foreach (Tools::getValue($this->table . 'Box', []) as $selection) { - $order_state = new OrderState((int) $selection, $this->context->language->id); - if (!$order_state->isRemovable()) { - $this->errors[] = $this->trans('For security reasons, you cannot delete default order statuses.', [], 'Admin.Shopparameters.Notification'); - - break; - } - } - - if (!count($this->errors)) { - return parent::postProcess(); - } - } else { - return parent::postProcess(); - } - } - - protected function filterToField($key, $filter) - { - if ($this->table == 'order_state') { - $this->initOrderStatusList(); - } elseif ($this->table == 'order_return_state') { - $this->initOrdersReturnsList(); - } - - return parent::filterToField($key, $filter); - } - - protected function afterImageUpload() - { - parent::afterImageUpload(); - - if (($id_order_state = (int) Tools::getValue('id_order_state')) - && count($_FILES) - && file_exists(_PS_ORDER_STATE_IMG_DIR_ . $id_order_state . '.gif')) { - $current_file = _PS_TMP_IMG_DIR_ . 'order_state_mini_' . $id_order_state . '_' . $this->context->shop->id . '.gif'; - - if (file_exists($current_file)) { - unlink($current_file); - } - } - - return true; - } - - public function ajaxProcessSendEmailOrderState() - { - if ($this->access('edit') != '1') { - echo json_encode(['success' => 0, 'text' => $this->trans('You do not have permission to edit this.', [], 'Admin.Notifications.Error')]); - - return; - } - - $id_order_state = (int) Tools::getValue('id_order_state'); - - $sql = 'UPDATE ' . _DB_PREFIX_ . 'order_state SET `send_email`= NOT `send_email` WHERE id_order_state=' . $id_order_state; - $result = Db::getInstance()->execute($sql); - - if ($result) { - echo json_encode(['success' => 1, 'text' => $this->trans('The status has been updated successfully.', [], 'Admin.Notifications.Success')]); - } else { - echo json_encode(['success' => 0, 'text' => $this->trans('An error occurred while updating the status.', [], 'Admin.Notifications.Error')]); - } - } - - public function ajaxProcessDeliveryOrderState() - { - if ($this->access('edit') != '1') { - echo json_encode(['success' => 0, 'text' => $this->trans('You do not have permission to edit this.', [], 'Admin.Notifications.Error')]); - - return; - } - - $id_order_state = (int) Tools::getValue('id_order_state'); - - $sql = 'UPDATE ' . _DB_PREFIX_ . 'order_state SET `delivery`= NOT `delivery` WHERE id_order_state=' . $id_order_state; - $result = Db::getInstance()->execute($sql); - - if ($result) { - echo json_encode(['success' => 1, 'text' => $this->trans('The status has been updated successfully.', [], 'Admin.Notifications.Success')]); - } else { - echo json_encode(['success' => 0, 'text' => $this->trans('An error occurred while updating the status.', [], 'Admin.Notifications.Error')]); - } - } - - public function ajaxProcessInvoiceOrderState() - { - if ($this->access('edit') != '1') { - echo json_encode(['success' => 0, 'text' => $this->trans('You do not have permission to edit this.', [], 'Admin.Notifications.Error')]); - - return; - } - $id_order_state = (int) Tools::getValue('id_order_state'); - - $sql = 'UPDATE ' . _DB_PREFIX_ . 'order_state SET `invoice`= NOT `invoice` WHERE id_order_state=' . $id_order_state; - $result = Db::getInstance()->execute($sql); - - if ($result) { - echo json_encode(['success' => 1, 'text' => $this->trans('The status has been updated successfully.', [], 'Admin.Notifications.Success')]); - } else { - echo json_encode(['success' => 0, 'text' => $this->trans('An error occurred while updating the status.', [], 'Admin.Notifications.Error')]); - } - } -} diff --git a/controllers/admin/AdminStoresController.php b/controllers/admin/AdminStoresController.php index dbf7007240aef..99dadf130f287 100644 --- a/controllers/admin/AdminStoresController.php +++ b/controllers/admin/AdminStoresController.php @@ -24,6 +24,11 @@ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) */ +use PrestaShop\PrestaShop\Adapter\SymfonyContainer; +use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings; +use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface; +use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration; + /** * @property Store $object */ @@ -414,15 +419,35 @@ protected function postImage($id) { $ret = parent::postImage($id); + /* + * Let's resolve which formats we will use for image generation. + * In new image system, it's multiple formats. In case of legacy, it's only .jpg. + * + * In case of .jpg images, the actual format inside is decided by ImageManager. + */ + $sfContainer = SymfonyContainer::getInstance(); + if ($sfContainer->get(FeatureFlagStateCheckerInterface::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) { + $configuredImageFormats = $sfContainer->get(ImageFormatConfiguration::class)->getGenerationFormats(); + } else { + $configuredImageFormats = ['jpg']; + } + if (($id_store = (int) Tools::getValue('id_store')) && count($_FILES) && file_exists(_PS_STORE_IMG_DIR_ . $id_store . '.jpg')) { $images_types = ImageType::getImagesTypes('stores'); foreach ($images_types as $image_type) { - ImageManager::resize( - _PS_STORE_IMG_DIR_ . $id_store . '.jpg', - _PS_STORE_IMG_DIR_ . $id_store . '-' . stripslashes($image_type['name']) . '.jpg', - (int) $image_type['width'], - (int) $image_type['height'] - ); + foreach ($configuredImageFormats as $imageFormat) { + // For JPG images, we let Imagemanager decide what to do and choose between JPG/PNG. + // For webp and avif extensions, we want it to follow our command and ignore the original format. + $forceFormat = ($imageFormat !== 'jpg'); + ImageManager::resize( + _PS_STORE_IMG_DIR_ . $id_store . '.jpg', + _PS_STORE_IMG_DIR_ . $id_store . '-' . stripslashes($image_type['name']) . '.' . $imageFormat, + (int) $image_type['width'], + (int) $image_type['height'], + $imageFormat, + $forceFormat + ); + } } } diff --git a/controllers/admin/AdminSuppliersController.php b/controllers/admin/AdminSuppliersController.php index 8c03736ccd74c..3ddf04b211dd2 100644 --- a/controllers/admin/AdminSuppliersController.php +++ b/controllers/admin/AdminSuppliersController.php @@ -98,7 +98,6 @@ public function initPageHeaderToolbar() */ public function renderForm() { - // loads current warehouse if (!($obj = $this->loadObject(true))) { return; } @@ -531,8 +530,6 @@ public function postProcess() } elseif (Tools::isSubmit('delete' . $this->table)) { if (!($obj = $this->loadObject(true))) { return; - } elseif (SupplyOrder::supplierHasPendingOrders($obj->id)) { - $this->errors[] = $this->trans('It is not possible to delete a supplier if there are pending supplier orders.', [], 'Admin.Catalog.Notification'); } else { //delete all product_supplier linked to this supplier Db::getInstance()->execute('DELETE FROM `' . _DB_PREFIX_ . 'product_supplier` WHERE `id_supplier`=' . (int) $obj->id); diff --git a/controllers/admin/AdminTaxRulesGroupController.php b/controllers/admin/AdminTaxRulesGroupController.php index e1feb1487c4d1..5d43a6d22c2b5 100644 --- a/controllers/admin/AdminTaxRulesGroupController.php +++ b/controllers/admin/AdminTaxRulesGroupController.php @@ -153,7 +153,7 @@ public function initRulesList($id_group) LEFT JOIN `' . _DB_PREFIX_ . 'state` s ON (a.`id_state` = s.`id_state`) LEFT JOIN `' . _DB_PREFIX_ . 'tax` t - ON (a.`id_tax` = t.`id_tax`)'; + ON (a.`id_tax` = t.`id_tax` AND t.active = 1)'; $this->_where = 'AND `id_tax_rules_group` = ' . (int) $id_group; $this->_use_found_rows = false; diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index 830f8d2062104..7130ff1cd8f81 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -806,6 +806,9 @@ protected function findAndWriteTranslationsIntoFile($file_name, $files, $theme_n $array_check_duplicate = []; } + $module_name_lowercase = strtolower($module_name); + $theme_name_lowercase = strtolower((string) $theme_name); + foreach ($files as $file) { if (preg_match('/^(.*)\.(tpl|php)$/', $file) && Tools::file_exists_cache($dir . $file) && !in_array($file, self::$ignore_folder)) { // Get content for this file @@ -817,16 +820,19 @@ protected function findAndWriteTranslationsIntoFile($file_name, $files, $theme_n // Parse this content $matches = $this->userParseFile($content, $this->type_selected, $type_file, $module_name); + unset($content); + // Write each translation on its module file - $template_name = substr(basename($file), 0, -4); + $template_name = strtolower(substr(basename($file), 0, -4)); foreach ($matches as $key) { + $key_md5 = md5($key); if ($theme_name) { - $post_key = md5(strtolower($module_name) . '_' . strtolower($theme_name) . '_' . strtolower($template_name) . '_' . md5($key)); - $pattern = '\'<{' . strtolower($module_name) . '}' . strtolower($theme_name) . '>' . strtolower($template_name) . '_' . md5($key) . '\''; + $post_key = md5($module_name_lowercase . '_' . $theme_name_lowercase . '_' . $template_name . '_' . $key_md5); + $pattern = '\'<{' . $module_name_lowercase . '}' . $theme_name_lowercase . '>' . $template_name . '_' . $key_md5 . '\''; } else { - $post_key = md5(strtolower($module_name) . '_' . strtolower($template_name) . '_' . md5($key)); - $pattern = '\'<{' . strtolower($module_name) . '}prestashop>' . strtolower($template_name) . '_' . md5($key) . '\''; + $post_key = md5($module_name_lowercase . '_' . $template_name . '_' . $key_md5); + $pattern = '\'<{' . $module_name_lowercase . '}prestashop>' . $template_name . '_' . $key_md5 . '\''; } if (array_key_exists($post_key, $_POST) && !in_array($pattern, $array_check_duplicate)) { @@ -913,12 +919,14 @@ protected function findAndFillTranslations($files, $theme_name, $module_name, $d // Parse this content $matches = $this->userParseFile($content, $this->type_selected, $type_file, $module_name); + unset($content); + // Write each translation on its module file $template_name = substr(basename($file), 0, -4); foreach ($matches as $key) { $md5_key = md5($key); - $module_key = '<{' . Tools::strtolower($module_name) . '}' . strtolower($theme_name) . '>' . Tools::strtolower($template_name) . '_' . $md5_key; + $module_key = '<{' . Tools::strtolower($module_name) . '}' . strtolower((string) $theme_name) . '>' . Tools::strtolower($template_name) . '_' . $md5_key; $default_key = '<{' . Tools::strtolower($module_name) . '}prestashop>' . Tools::strtolower($template_name) . '_' . $md5_key; // to avoid duplicate entry if (!in_array($module_key, $array_check_duplicate)) { @@ -3113,7 +3121,7 @@ public static function getEmailHTML($email) $email_file = _PS_ROOT_DIR_ . $email; } - if (file_exists($email_file)) { + if (strpos(realpath($email_file), _PS_ROOT_DIR_) === 0 && file_exists($email_file)) { $email_html = file_get_contents($email_file); } else { $email_html = ''; diff --git a/controllers/admin/DummyAdminController.php b/controllers/admin/DummyAdminController.php index 9b841a857001f..6ea1b1a2a7d28 100644 --- a/controllers/admin/DummyAdminController.php +++ b/controllers/admin/DummyAdminController.php @@ -92,10 +92,7 @@ protected function redirect() return ''; } - /** - * @return ContainerInterface|null - */ - protected function buildContainer() + protected function buildContainer(): ContainerInterface { return SymfonyContainer::getInstance(); } diff --git a/controllers/front/AttachmentController.php b/controllers/front/AttachmentController.php index c13d177381391..92d810bb918e5 100644 --- a/controllers/front/AttachmentController.php +++ b/controllers/front/AttachmentController.php @@ -50,7 +50,7 @@ public function postProcess() /** * @see http://ca2.php.net/manual/en/function.readfile.php#54295 */ - public function readfileChunked($filename, $retbytes = true) + public function readfileChunked(string $filename, bool $retbytes = true) { // how many bytes per chunk $chunksize = 1 * (1024 * 1024); diff --git a/controllers/front/CartController.php b/controllers/front/CartController.php index 7d3820356907a..980df8983934b 100644 --- a/controllers/front/CartController.php +++ b/controllers/front/CartController.php @@ -56,7 +56,7 @@ class CartControllerCore extends FrontController * * @param string $canonicalURL */ - public function canonicalRedirection($canonicalURL = '') + public function canonicalRedirection(string $canonicalURL = '') { } @@ -334,13 +334,13 @@ protected function processDeleteProductInCart() 'id_address_delivery' => (int) $this->id_address_delivery, ]; + // An array [module_name => module_output] will be returned (no effect) Hook::exec('actionObjectProductInCartDeleteBefore', $data, null, true); if ($this->context->cart->deleteProduct( $this->id_product, $this->id_product_attribute, - $this->customization_id, - $this->id_address_delivery + $this->customization_id )) { Hook::exec('actionObjectProductInCartDeleteAfter', $data); @@ -495,7 +495,7 @@ protected function processChangeProductInCart() $this->id_product_attribute, $this->customization_id, Tools::getValue('op', 'up'), - $this->id_address_delivery, + 0, null, true, true @@ -538,7 +538,7 @@ protected function processChangeProductInCart() * * @return bool */ - public function productInCartMatchesCriteria($productInCart) + public function productInCartMatchesCriteria(array $productInCart) { return ( !isset($this->id_product_attribute) || @@ -582,7 +582,7 @@ public function getTemplateVarPage() * * @return bool */ - protected function shouldAvailabilityErrorBeRaised($product, $qtyToCheck) + protected function shouldAvailabilityErrorBeRaised(Product $product, int $qtyToCheck) { if (($this->id_product_attribute)) { return !Product::isAvailableWhenOutOfStock($product->out_of_stock) diff --git a/controllers/front/CmsController.php b/controllers/front/CmsController.php index 774eeae6d7745..3b2d18d2d6e85 100644 --- a/controllers/front/CmsController.php +++ b/controllers/front/CmsController.php @@ -45,7 +45,7 @@ class CmsControllerCore extends FrontController /** @var bool */ public $ssl = false; - public function canonicalRedirection($canonicalURL = '') + public function canonicalRedirection(string $canonicalURL = '') { if (Validate::isLoadedObject($this->cms) && ($canonicalURL = $this->context->link->getCMSLink($this->cms, $this->cms->link_rewrite, $this->ssl))) { parent::canonicalRedirection($canonicalURL); @@ -102,15 +102,16 @@ public function initContent() if ($this->assignCase == self::CMS_CASE_PAGE) { $cmsVar = $this->objectPresenter->present($this->cms); + // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter $filteredCmsContent = Hook::exec( 'filterCmsContent', ['object' => $cmsVar], - $id_module = null, - $array_return = false, - $check_exceptions = true, - $use_push = false, - $id_shop = null, - $chain = true + null, + false, + true, + false, + null, + true ); if (!empty($filteredCmsContent['object'])) { $cmsVar = $filteredCmsContent['object']; @@ -131,15 +132,16 @@ public function initContent() } elseif ($this->assignCase == self::CMS_CASE_CATEGORY) { $cmsCategoryVar = $this->getTemplateVarCategoryCms(); + // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter $filteredCmsCategoryContent = Hook::exec( 'filterCmsCategoryContent', ['object' => $cmsCategoryVar], - $id_module = null, - $array_return = false, - $check_exceptions = true, - $use_push = false, - $id_shop = null, - $chain = true + null, + false, + true, + false, + null, + true ); if (!empty($filteredCmsCategoryContent['object'])) { $cmsCategoryVar = $filteredCmsCategoryContent['object']; diff --git a/controllers/front/DiscountController.php b/controllers/front/DiscountController.php index 82c6c0633fd18..bf982fea7d8a8 100644 --- a/controllers/front/DiscountController.php +++ b/controllers/front/DiscountController.php @@ -104,7 +104,7 @@ public function getBreadcrumbLinks() * * @return mixed */ - protected function getCombinableVoucherTranslation($voucher) + protected function getCombinableVoucherTranslation(array $voucher) { if ($voucher['cart_rule_restriction']) { $combinableVoucherTranslation = $this->trans('No', [], 'Shop.Theme.Global'); @@ -116,13 +116,15 @@ protected function getCombinableVoucherTranslation($voucher) } /** + * Formats a value of a voucher with fixed reduction + * * @param bool $hasTaxIncluded * @param float $amount * @param int $currencyId * * @return string */ - protected function formatReductionAmount($hasTaxIncluded, $amount, $currencyId) + protected function formatReductionAmount(bool $hasTaxIncluded, float $amount, int $currencyId) { if ($hasTaxIncluded) { $taxTranslation = $this->trans('Tax included', [], 'Shop.Theme.Checkout'); @@ -137,32 +139,36 @@ protected function formatReductionAmount($hasTaxIncluded, $amount, $currencyId) } /** + * Formats a value of a voucher with percentage reduction + * * @param float $percentage * * @return string */ - protected function formatReductionInPercentage($percentage) + protected function formatReductionInPercentage(float $percentage) { - return sprintf('%s%%', $percentage); + return sprintf('%s%%', $this->context->getCurrentLocale()->formatNumber($percentage)); } /** + * Formats all reductions and benefits of a voucher. (One voucher can provide a discount and gift at the same time.) + * * @param array $voucher * * @return array */ - protected function accumulateCartRuleValue($voucher) + protected function accumulateCartRuleValue(array $voucher) { $cartRuleValue = []; if ($voucher['reduction_percent'] > 0) { - $cartRuleValue[] = $this->formatReductionInPercentage($voucher['reduction_percent']); + $cartRuleValue[] = $this->formatReductionInPercentage((float) $voucher['reduction_percent']); } if ($voucher['reduction_amount'] > 0) { $cartRuleValue[] = $this->formatReductionAmount( - $voucher['reduction_tax'], - $voucher['reduction_amount'], + (bool) $voucher['reduction_tax'], + (float) $voucher['reduction_amount'], $voucher['reduction_currency'] ); } @@ -182,6 +188,8 @@ protected function accumulateCartRuleValue($voucher) } /** + * Prepares a single row of voucher table to show it to customer. + * * @param array $voucher * * @return array @@ -201,8 +209,11 @@ protected function buildCartRuleFromVoucher(array $voucher): array $voucher['voucher_cumulable'] = $this->getCombinableVoucherTranslation($voucher); + // Get all benefits of this voucher into array (discount, gift, free shipping etc.) $cartRuleValues = $this->accumulateCartRuleValue($voucher); + // And combine them into a string + // If for some magical reason the voucher has no benefit (should not be achievable in BO), we display a dash if (0 === count($cartRuleValues)) { $voucher['value'] = '-'; } else { diff --git a/controllers/front/GetFileController.php b/controllers/front/GetFileController.php index c0588e3cd9b1a..7fcc88e147b82 100644 --- a/controllers/front/GetFileController.php +++ b/controllers/front/GetFileController.php @@ -336,7 +336,7 @@ private function getMimeType(string $file, string $filename): string * * @param string $msg */ - protected function displayCustomError($msg) + protected function displayCustomError(string $msg) { $translations = [ 'Invalid key.' => $this->trans('Invalid key.', [], 'Shop.Notifications.Error'), diff --git a/controllers/front/HistoryController.php b/controllers/front/HistoryController.php index 427fa1aa4a44c..b1d8c4801a29e 100644 --- a/controllers/front/HistoryController.php +++ b/controllers/front/HistoryController.php @@ -85,7 +85,7 @@ public function getTemplateVarOrders() * * @return string */ - public static function getUrlToInvoice($order, $context) + public static function getUrlToInvoice(Order $order, Context $context) { $url_to_invoice = ''; @@ -109,7 +109,7 @@ public static function getUrlToInvoice($order, $context) * * @return string */ - public static function getUrlToReorder($id_order, $context) + public static function getUrlToReorder(int $id_order, Context $context) { $url_to_reorder = ''; if (!(bool) Configuration::get('PS_DISALLOW_HISTORY_REORDERING')) { diff --git a/controllers/front/OrderConfirmationController.php b/controllers/front/OrderConfirmationController.php index 8953b8ab0e791..59abfae0b8606 100644 --- a/controllers/front/OrderConfirmationController.php +++ b/controllers/front/OrderConfirmationController.php @@ -232,19 +232,20 @@ public function initContent() /** * Execute the hook displayPaymentReturn. */ - public function displayPaymentReturn($order) + public function displayPaymentReturn(Order $order) { if (!Validate::isUnsignedId($this->id_module)) { return false; } + // Hook called only for the module concerned return Hook::exec('displayPaymentReturn', ['order' => $order], $this->id_module); } /** * Execute the hook displayOrderConfirmation. */ - public function displayOrderConfirmation($order) + public function displayOrderConfirmation(Order $order) { return Hook::exec('displayOrderConfirmation', ['order' => $order]); } diff --git a/controllers/front/OrderReturnController.php b/controllers/front/OrderReturnController.php index 3c266e1aaaf8b..125c842ff6966 100644 --- a/controllers/front/OrderReturnController.php +++ b/controllers/front/OrderReturnController.php @@ -92,7 +92,7 @@ public function initContent() $this->setTemplate('customer/order-return'); } - public function getTemplateVarOrderReturn($orderReturn) + public function getTemplateVarOrderReturn(OrderReturn $orderReturn) { $orderReturns = OrderReturn::getOrdersReturn($orderReturn->id_customer, $orderReturn->id_order, false, null, $orderReturn->id); @@ -108,7 +108,7 @@ public function getTemplateVarOrderReturn($orderReturn) return $orderReturnPresenter->present(array_shift($orderReturns)); } - public function getTemplateVarProducts($order_return_id, $order) + public function getTemplateVarProducts(int $order_return_id, Order $order) { $products = []; $return_products = OrderReturn::getOrdersReturnProducts((int) $order_return_id, $order); diff --git a/controllers/front/PageNotFoundController.php b/controllers/front/PageNotFoundController.php index 4f9b81f6a87a9..e3b2390870c13 100644 --- a/controllers/front/PageNotFoundController.php +++ b/controllers/front/PageNotFoundController.php @@ -46,7 +46,7 @@ public function initContent() $this->setTemplate('errors/404'); } - protected function canonicalRedirection($canonical_url = '') + protected function canonicalRedirection(string $canonical_url = '') { // 404 - no need to redirect to the canonical url } diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index 198a8bf98a8d7..43bcecc515383 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -74,7 +74,7 @@ class ProductControllerCore extends ProductPresentingFrontControllerCore */ protected $isPreview = false; - public function canonicalRedirection($canonical_url = '') + public function canonicalRedirection(string $canonical_url = '') { // This is there to prevent error, because this function is also called // in parent front controller before we have even loaded our data. @@ -423,6 +423,7 @@ public function initContent() $product_for_template = $this->getTemplateVarProduct(); + // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter $filteredProduct = Hook::exec( 'filterProductContent', ['object' => $product_for_template], @@ -437,11 +438,22 @@ public function initContent() $product_for_template = $filteredProduct['object']; } - $manufacturerPresenter = new ManufacturerPresenter($this->context->link); - $productManufacturer = $manufacturerPresenter->present( - new Manufacturer((int) $this->product->id_manufacturer, $this->context->language->id), - $this->context->language - ); + // Prepare information about product manufacturer + $productManufacturer = null; + $manufacturerImageUrl = null; + $productBrandUrl = null; + + if (!empty($this->product->id_manufacturer)) { + $manufacturerPresenter = new ManufacturerPresenter($this->context->link); + $productManufacturer = $manufacturerPresenter->present( + new Manufacturer((int) $this->product->id_manufacturer, $this->context->language->id), + $this->context->language + ); + + // These two variables are deprecated are kept just for backward compatibility and will be removed in v10 + $manufacturerImageUrl = $productManufacturer['image']['small']['url']; + $productBrandUrl = $productManufacturer['url']; + } $this->context->smarty->assign([ 'priceDisplay' => $priceDisplay, @@ -452,8 +464,8 @@ public function initContent() 'product' => $product_for_template, 'displayUnitPrice' => !empty($this->product->unity) && $this->product->unit_price > 0.000000, 'product_manufacturer' => $productManufacturer, - 'manufacturer_image_url' => $productManufacturer['image']['small']['url'], - 'product_brand_url' => $productManufacturer['url'], + 'manufacturer_image_url' => $manufacturerImageUrl, + 'product_brand_url' => $productBrandUrl, ]); // Assign attribute groups to the template @@ -601,7 +613,7 @@ protected function assignPriceAndTax() /** * Assign template vars related to attribute groups and colors. */ - protected function assignAttributesGroups($product_for_template = null) + protected function assignAttributesGroups(ProductLazyArray|null $product_for_template = null) { $colors = []; $groups = []; @@ -876,7 +888,7 @@ protected function assignCategory() } } - protected function transformDescriptionWithImg($desc) + protected function transformDescriptionWithImg(string $desc) { $reg = '/\[img\-([0-9]+)\-(left|right)\-([a-zA-Z0-9-_]+)\]/'; while (preg_match($reg, $desc, $matches)) { @@ -966,7 +978,7 @@ protected function textRecord() * * @return array */ - protected function formatQuantityDiscounts($specific_prices, $price, $tax_rate, $ecotax_amount) + protected function formatQuantityDiscounts(array $specific_prices, float $price, float $tax_rate, float $ecotax_amount) { $priceCalculationMethod = Group::getPriceDisplayMethod(Group::getCurrent()->id); $isTaxIncluded = false; @@ -1058,7 +1070,7 @@ private function getIdProductAttributeByGroupOrRequestOrDefault() * * @return int */ - protected function tryToGetAvailableIdProductAttribute($checkedIdProductAttribute) + protected function tryToGetAvailableIdProductAttribute(int $checkedIdProductAttribute) { if (!Configuration::get('PS_DISP_UNAVAILABLE_ATTR')) { $productCombinations = $this->product->getAttributeCombinations(); @@ -1220,7 +1232,7 @@ public function getTemplateVarProduct() * * @return int */ - protected function getProductMinimalQuantity($product) + protected function getProductMinimalQuantity(ProductLazyArray|array $product) { $minimal_quantity = 1; @@ -1272,7 +1284,7 @@ protected function getProductEcotax(array $product): float * * @return ProductController|null */ - public function findProductCombinationById($combinationId) + public function findProductCombinationById(int $combinationId) { $combinations = $this->product->getAttributesGroups($this->context->language->id, $combinationId); @@ -1288,7 +1300,7 @@ public function findProductCombinationById($combinationId) * * @return int */ - protected function getRequiredQuantity($product) + protected function getRequiredQuantity(array $product) { $requiredQuantity = (int) Tools::getValue('quantity_wanted', $this->getProductMinimalQuantity($product)); if ($requiredQuantity < $product['minimal_quantity']) { @@ -1499,7 +1511,7 @@ private function getProductPageTitle(array $meta = null) * * @return bool */ - protected function isValidCombination($productAttributeId, $productId) + protected function isValidCombination(int $productAttributeId, int $productId) { if ($productAttributeId > 0 && $productId > 0) { $combination = new Combination($productAttributeId); diff --git a/controllers/front/SitemapController.php b/controllers/front/SitemapController.php index 93c6d2596cf34..7c87282d5c9f9 100644 --- a/controllers/front/SitemapController.php +++ b/controllers/front/SitemapController.php @@ -60,13 +60,7 @@ public function initContent() */ Hook::exec( 'actionModifyFrontendSitemap', - ['urls' => &$sitemapUrls], - null, - false, - true, - false, - null, - true + ['urls' => &$sitemapUrls] ); /* @@ -107,11 +101,14 @@ protected function getPagesLinks() $cms = CMSCategory::getRecurseCategory($this->context->language->id, 1, 1, 1); $links = $this->getCmsTree($cms); - $links[] = [ - 'id' => 'stores-page', - 'label' => $this->trans('Our stores', [], 'Shop.Theme.Global'), - 'url' => $this->context->link->getPageLink('stores'), - ]; + // We hide stores page, if there is no page configured + if (Store::atLeastOneStoreExists()) { + $links[] = [ + 'id' => 'stores-page', + 'label' => $this->trans('Our stores', [], 'Shop.Theme.Global'), + 'url' => $this->context->link->getPageLink('stores'), + ]; + } $links[] = [ 'id' => 'contact-page', diff --git a/controllers/front/StoresController.php b/controllers/front/StoresController.php index 1ac0d1817b9ee..7e79823adc800 100644 --- a/controllers/front/StoresController.php +++ b/controllers/front/StoresController.php @@ -33,117 +33,6 @@ class StoresControllerCore extends FrontController /** @var StorePresenter */ protected $storePresenter; - /** - * Get formatted string address. - * - * @param array $store - * - * @return string - */ - protected function processStoreAddress($store) - { - $ignore_field = [ - 'firstname', - 'lastname', - ]; - - $out_datas = []; - - $address_datas = AddressFormat::getOrderedAddressFields($store['id_country'], false, true); - $state = (isset($store['id_state'])) ? new State($store['id_state']) : null; - - foreach ($address_datas as $data_line) { - $data_fields = explode(' ', $data_line); - $addr_out = []; - - $data_fields_mod = false; - foreach ($data_fields as $field_item) { - $field_item = trim($field_item); - if (!in_array($field_item, $ignore_field) && !empty($store[$field_item])) { - $addr_out[] = ($field_item == 'city' && $state && !empty($state->iso_code)) ? - $store[$field_item] . ', ' . $state->iso_code : $store[$field_item]; - $data_fields_mod = true; - } - } - if ($data_fields_mod) { - $out_datas[] = implode(' ', $addr_out); - } - } - - $out = implode('
', $out_datas); - - return $out; - } - - public function getStoresForXml() - { - $distance_unit = Configuration::get('PS_DISTANCE_UNIT'); - if (!in_array($distance_unit, ['km', 'mi'])) { - $distance_unit = 'km'; - } - - $distance = (int) Tools::getValue('radius', 100); - $multiplicator = ($distance_unit == 'km' ? 6371 : 3959); - - $langId = (int) Tools::getValue('lang', Configuration::get('PS_LANG_DEFAULT')); - - $stores = Db::getInstance()->executeS(' - SELECT s.*, sl.*, cl.name country, st.iso_code state, - (' . (int) $multiplicator . ' - * acos( - cos(radians(' . (float) Tools::getValue('latitude') . ')) - * cos(radians(latitude)) - * cos(radians(longitude) - radians(' . (float) Tools::getValue('longitude') . ')) - + sin(radians(' . (float) Tools::getValue('latitude') . ')) - * sin(radians(latitude)) - ) - ) distance, - cl.id_country id_country - FROM ' . _DB_PREFIX_ . 'store s - LEFT JOIN ' . _DB_PREFIX_ . 'country_lang cl ON (cl.id_country = s.id_country AND cl.id_lang = ' . (int) $langId . ') - LEFT JOIN ' . _DB_PREFIX_ . 'store_lang sl ON (sl.id_store = s.id_store AND sl.id_lang = ' . (int) $langId . ') - LEFT JOIN ' . _DB_PREFIX_ . 'state st ON (st.id_state = s.id_state) - WHERE s.active = 1 - HAVING distance < ' . (int) $distance . ' - ORDER BY distance ASC - LIMIT 0,20'); - - return $stores; - } - - /** - * Display the Xml for showing the nodes in the google map. - */ - protected function displayAjax() - { - $stores = $this->getStoresForXml(); - $parnode = new SimpleXMLElement('
', ' ', $address))); - $newnode->addAttribute('address', $address); - $newnode->addAttribute('hours', trim($store['hours'])); - $newnode->addAttribute('phone', $store['phone']); - $newnode->addAttribute('fax', $store['fax']); - $newnode->addAttribute('note', $store['note']); - $newnode->addAttribute('id_store', (string) (int) $store['id_store']); - $newnode->addAttribute('has_store_picture', (string) file_exists(_PS_STORE_IMG_DIR_ . (int) $store['id_store'] . '.jpg')); - $newnode->addAttribute('lat', (string) (float) $store['latitude']); - $newnode->addAttribute('lng', (string) (float) $store['longitude']); - if (isset($store['distance'])) { - $newnode->addAttribute('distance', (string) (int) $store['distance']); - } - } - - header('Content-type: text/xml'); - - $this->ajaxRender($parnode->asXML()); - } - /** * Initialize stores controller. * @@ -172,15 +61,23 @@ public function initContent() $distance_unit = 'km'; } - $this->context->smarty->assign([ - 'mediumSize' => Image::getSize(ImageType::getFormattedName('medium')), - 'searchUrl' => $this->context->link->getPageLink('stores'), - 'distance_unit' => $distance_unit, - 'stores' => $this->getTemplateVarStores(), - ]); - - parent::initContent(); - $this->setTemplate('cms/stores'); + // Load stores and present them + $stores = $this->getTemplateVarStores(); + + // If no stores are configured, we hide this page + if (!empty($stores)) { + $this->context->smarty->assign([ + 'mediumSize' => Image::getSize(ImageType::getFormattedName('medium')), + 'searchUrl' => $this->context->link->getPageLink('stores'), + 'distance_unit' => $distance_unit, + 'stores' => $stores, + ]); + parent::initContent(); + $this->setTemplate('cms/stores'); + } else { + $this->redirect_after = '404'; + $this->redirect(); + } } public function getTemplateVarStores() diff --git a/controllers/front/listing/CategoryController.php b/controllers/front/listing/CategoryController.php index 7915a9568192b..be9834d89204d 100644 --- a/controllers/front/listing/CategoryController.php +++ b/controllers/front/listing/CategoryController.php @@ -25,6 +25,7 @@ */ use PrestaShop\PrestaShop\Adapter\Category\CategoryProductSearchProvider; use PrestaShop\PrestaShop\Adapter\Image\ImageRetriever; +use PrestaShop\PrestaShop\Adapter\Presenter\Category\CategoryPresenter; use PrestaShop\PrestaShop\Core\Product\Search\ProductSearchQuery; use PrestaShop\PrestaShop\Core\Product\Search\SortOrder; @@ -44,7 +45,10 @@ class CategoryControllerCore extends ProductListingFrontController */ protected $category; - public function canonicalRedirection($canonicalURL = '') + /** @var CategoryPresenter */ + protected $categoryPresenter; + + public function canonicalRedirection(string $canonicalURL = '') { if (Validate::isLoadedObject($this->category)) { parent::canonicalRedirection($this->context->link->getCategoryLink($this->category)); @@ -98,24 +102,11 @@ public function init() return; } - $categoryVar = $this->getTemplateVarCategory(); - - $filteredCategory = Hook::exec( - 'filterCategoryContent', - ['object' => $categoryVar], - $id_module = null, - $array_return = false, - $check_exceptions = true, - $use_push = false, - $id_shop = null, - $chain = true - ); - if (!empty($filteredCategory['object'])) { - $categoryVar = $filteredCategory['object']; - } + // Initialize presenter, we will use it for all cases + $this->categoryPresenter = new CategoryPresenter($this->context->link); $this->context->smarty->assign([ - 'category' => $categoryVar, + 'category' => $this->getTemplateVarCategory(), 'subcategories' => $this->getTemplateVarSubCategories(), ]); } @@ -201,38 +192,46 @@ protected function getDefaultProductSearchProvider() protected function getTemplateVarCategory() { - $category = $this->objectPresenter->present($this->category); - $category['image'] = $this->getImage( + $categoryVar = $this->categoryPresenter->present( $this->category, - $this->category->id_image + $this->context->language + ); + + $filteredCategory = Hook::exec( + 'filterCategoryContent', + ['object' => $categoryVar], + $id_module = null, + $array_return = false, + $check_exceptions = true, + $use_push = false, + $id_shop = null, + $chain = true ); + if (!empty($filteredCategory['object'])) { + $categoryVar = $filteredCategory['object']; + } - return $category; + return $categoryVar; } protected function getTemplateVarSubCategories() { - return array_map(function (array $category) { - $object = new Category( - $category['id_category'], - $this->context->language->id - ); + $subcategories = $this->category->getSubCategories($this->context->language->id); - $category['image'] = $this->getImage( - $object, - $object->id_image - ); - - $category['url'] = $this->context->link->getCategoryLink( - $category['id_category'], - $category['link_rewrite'] + foreach ($subcategories as &$subcategory) { + $subcategory = $this->categoryPresenter->present( + $subcategory, + $this->context->language ); + } - return $category; - }, $this->category->getSubCategories($this->context->language->id)); + return $subcategories; } - protected function getImage($object, $id_image) + /** + * @deprecated since 9.0.0 and will be removed in 10.0.0 + */ + protected function getImage(Category $object, int $id_image) { $retriever = new ImageRetriever( $this->context->link diff --git a/controllers/front/listing/ManufacturerController.php b/controllers/front/listing/ManufacturerController.php index b64708c381448..d23188dae0e15 100644 --- a/controllers/front/listing/ManufacturerController.php +++ b/controllers/front/listing/ManufacturerController.php @@ -40,7 +40,7 @@ class ManufacturerControllerCore extends ProductListingFrontController /** @var ManufacturerPresenter */ protected $manufacturerPresenter; - public function canonicalRedirection($canonicalURL = '') + public function canonicalRedirection(string $canonicalURL = '') { if (Validate::isLoadedObject($this->manufacturer)) { parent::canonicalRedirection($this->context->link->getManufacturerLink($this->manufacturer)); @@ -167,6 +167,7 @@ protected function assignManufacturer() $this->context->language ); + // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter $filteredManufacturer = Hook::exec( 'filterManufacturerContent', ['object' => $manufacturerVar], @@ -195,6 +196,7 @@ protected function assignAll() if (!empty($manufacturersVar)) { foreach ($manufacturersVar as $k => $manufacturer) { + // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter $filteredManufacturer = Hook::exec( 'filterManufacturerContent', ['object' => $manufacturer], diff --git a/controllers/front/listing/SupplierController.php b/controllers/front/listing/SupplierController.php index 61fe5e75f3403..d25e2f22b3408 100644 --- a/controllers/front/listing/SupplierController.php +++ b/controllers/front/listing/SupplierController.php @@ -23,22 +23,24 @@ * @copyright Since 2007 PrestaShop SA and Contributors * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) */ +use PrestaShop\PrestaShop\Adapter\Presenter\Supplier\SupplierPresenter; use PrestaShop\PrestaShop\Adapter\Supplier\SupplierProductSearchProvider; use PrestaShop\PrestaShop\Core\Product\Search\ProductSearchQuery; use PrestaShop\PrestaShop\Core\Product\Search\SortOrder; class SupplierControllerCore extends ProductListingFrontController { - /** - * @var string - */ + /** @var string */ public $php_self = 'supplier'; /** @var Supplier|null */ protected $supplier; protected $label; - public function canonicalRedirection($canonicalURL = '') + /** @var SupplierPresenter */ + protected $supplierPresenter; + + public function canonicalRedirection(string $canonicalURL = '') { if (Validate::isLoadedObject($this->supplier)) { parent::canonicalRedirection($this->context->link->getSupplierLink($this->supplier)); @@ -79,6 +81,9 @@ public function init() } } + // Initialize presenter, we will use it for all cases + $this->supplierPresenter = new SupplierPresenter($this->context->link); + parent::init(); } @@ -155,17 +160,21 @@ protected function getDefaultProductSearchProvider() */ protected function assignSupplier() { - $supplierVar = $this->objectPresenter->present($this->supplier); + $supplierVar = $this->supplierPresenter->present( + $this->supplier, + $this->context->language + ); + // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter $filteredSupplier = Hook::exec( 'filterSupplierContent', ['object' => $supplierVar], - $id_module = null, - $array_return = false, - $check_exceptions = true, - $use_push = false, - $id_shop = null, - $chain = true + null, + false, + true, + false, + null, + true ); if (!empty($filteredSupplier['object'])) { $supplierVar = $filteredSupplier['object']; @@ -185,15 +194,16 @@ protected function assignAll() if (!empty($suppliersVar)) { foreach ($suppliersVar as $k => $supplier) { + // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter $filteredSupplier = Hook::exec( 'filterSupplierContent', ['object' => $supplier], - $id_module = null, - $array_return = false, - $check_exceptions = true, - $use_push = false, - $id_shop = null, - $chain = true + null, + false, + true, + false, + null, + true ); if (!empty($filteredSupplier['object'])) { $suppliersVar[$k] = $filteredSupplier['object']; @@ -202,26 +212,22 @@ protected function assignAll() } $this->context->smarty->assign([ - 'brands' => $suppliersVar, + 'suppliers' => $suppliersVar, ]); } public function getTemplateVarSuppliers() { $suppliers = Supplier::getSuppliers(true, $this->context->language->id, true); - $suppliers_for_display = []; - - foreach ($suppliers as $supplier) { - $suppliers_for_display[$supplier['id_supplier']] = $supplier; - $suppliers_for_display[$supplier['id_supplier']]['text'] = $supplier['description']; - $suppliers_for_display[$supplier['id_supplier']]['image'] = $this->context->link->getSupplierImageLink($supplier['id_supplier'], 'small_default'); - $suppliers_for_display[$supplier['id_supplier']]['url'] = $this->context->link->getSupplierLink($supplier['id_supplier']); - $suppliers_for_display[$supplier['id_supplier']]['nb_products'] = $supplier['nb_products'] > 1 - ? $this->trans('%number% products', ['%number%' => $supplier['nb_products']], 'Shop.Theme.Catalog') - : $this->trans('%number% product', ['%number%' => $supplier['nb_products']], 'Shop.Theme.Catalog'); + + foreach ($suppliers as &$supplier) { + $supplier = $this->supplierPresenter->present( + $supplier, + $this->context->language + ); } - return $suppliers_for_display; + return $suppliers; } public function getListingLabel() @@ -232,9 +238,8 @@ public function getListingLabel() public function getBreadcrumbLinks() { $breadcrumb = parent::getBreadcrumbLinks(); - $breadcrumb['links'][] = [ - 'title' => $this->trans('All suppliers', [], 'Shop.Theme.Catalog'), + 'title' => $this->trans('Suppliers', [], 'Shop.Theme.Catalog'), 'url' => $this->context->link->getPageLink('supplier', true), ]; diff --git a/docker-compose.yml b/docker-compose.yml index d0ef4bd97ac28..7aec666dc9354 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,6 +39,7 @@ services: - VERSION=${VERSION:-8.1-apache} - USER_ID=${USER_ID:-1000} - GROUP_ID=${GROUP_ID:-1000} + - NODE_VERSION=${NODE_VERSION:-16.20.1} environment: DISABLE_MAKE: ${DISABLE_MAKE:-0} PS_INSTALL_AUTO: ${PS_INSTALL_AUTO:-1} diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index d4875dc692807..12cec23a5c9c7 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -23,6 +23,101 @@ needs please refer to https://devdocs.prestashop.com/ for more information. Changelog for PrestaShop 8 +#################################### +# v8.1.1 - (2023-07-20) +#################################### + +- Back Office: + - Improvement: + - #33278: Update dependencies (by @mflasquin) + - #32894: Admin search - Transmit the search query param (by @sowbiba) + - #32789: Warning on Modules List page when Distribution API cannot be contacted (by @0x346e3730) + - GHSA-gf46-prm4-56pc Protect from writing files on server through SQL form (by @Matthieu Rolland) + - GHSA-m9r4-3fg7-pqm2 Protect file name from path traversal attack (by @Matthieu Rolland) + - GHSA-75p5-jwx4-qw9h Escape variable to prevent sql injection (by @Matthieu Rolland) + - GHSA-hpf4-v7v2-95p2 Protect translation file reading form path traversal attack (by @Matthieu Rolland) + - GHSA-2rf5-3fw8-qm47 Keep file name from containing path traversal (by @Matthieu Rolland) + - GHSA-v4gr-v679-42p7 Keep file name from containing path traversal (by @Matthieu Rolland) + - Bug fix: + - #32493: Fix: When updating object images, old thumbnails are not deleted and updated (by @Codencode) + - #33255: Prevent deleting main URL of a store (by @Hlavtox) + - #33008: Fix 'New' Translation domain (by @mflasquin) + - #33124: Fix issue when disable tax, do not delete tax rules (by @mflasquin) + - #33236: Module manager - Empty category - Add raw filter to display html content (by @sowbiba) + - #33164: Fix authorized application column length (by @mflasquin) + - #33151: Fix for product editor is not storing some fields in multi shop context conservative fix for 8.1.x (by @cruftex) + - #33120: Fix bad display alert when changing product combination quantity (by @fatm-dev) + - #33107: Fix new file button target in product attachment form; (by @fatm-dev) + - #33048: Add string casting for boolean fields (by @nicosomb) + - #32662: Remove module list item when force deletion (by @M0rgan01) + - #32906: Fix clear filter options on missing category (by @FabienPapet) + - #32615: Update ImageGenerator resize destination path (by @M0rgan01) + - #31379: Fix disabling a module for a specific shop applied to all shops (by @matthieu-rolland) + - #32790: Fix PDF translations in backoffice (by @mflasquin) + - #32715: Fix: [BO] : Error notification displayed in Multistore page (by @Codencode) + - #32656: Fix: Warning on the Cart Rules creation/editing page (by @Codencode) +- Front Office: + - Bug fix: + - #32597: Update checkOrGenerateImageType $sourceFilePath (by @M0rgan01) + - #33156: Check if product is active and orderable during checkout (by @Hlavtox) + - #33043: Fix wrong discount amount displayed (by @boherm) + - #32596: Fix availability display logic (by @mflasquin) +- Core: + - Bug fix: + - #33136: Register commonly used deprecated modifiers to Smarty config (by @kpodemski) + - #33148: Update autoload library to v1.0.1 (by @jolelievre) + - #33133: Fix for child themes/multishop themes translations (by @kpodemski) + - Improvement: + - GHSA-xw2r-f8xv-c8xp Add missing html attributes (by @Matthieu Rolland) +- Installer: + - Improvement: + - #32752: Update default catalog 8.1.x (by @ps-jarvis) +- Web Services: + - Bug fix: + - #32842: Changed error code when access token is invalid (by @nicosomb) +- Tests: + - Improvement: + - #33312: Nightly : 8.1.x - Multistore (Removed Delete shop url) (by @Progi1984) + - #31275: Functional Tests : Added deprecated as errors (by @Progi1984) + - #32769: Functional Tests : API : External Auth Server - Resource Endpoint (by @Progi1984) + - #32756: Functional Tests : Faceted search module - Uninstall and delete module (by @Progi1984) + - #32666: Functional Tests : BO - Design - Image Settings - Check base image format (by @Progi1984) + - #32668: Functional Tests : Cash on delivery (COD) module - Reset module (by @Progi1984) + - #32674: Functional Tests : Hummingbird : FO - Login : Login in FO (by @Progi1984) + - Bug fix: + - #33279: Nightly : 8.0.x : Unskip test for the issue 32914 (by @Progi1984) + - #33281: Nightly : 8.1.x : Unskip test for the issue 32914 (by @Progi1984) + - #33130: Nightly : 8.1.x : Fixed error in filterTaxes (by @Progi1984) + - #33131: Nightly : 8.0.x : Fixed error in filterTaxes (by @Progi1984) + - #33033: Nightly : Fixed install Node 14 (by @Progi1984) + - #33023: Nightly : Fixed install Node 14 (by @Progi1984) + - #33011: Nightly : Fixed mocha loader (8.1.x) (by @Progi1984) + - #33012: Nightly : Fixed mocha loader (8.0.x) (by @Progi1984) + - #32849: Nightly : Fixed functional/BO/04*/01*/08* (by @Progi1984) + - #32835: Nightly : 8.1.x : Fixed error in package.json (by @Progi1984) + - #32834: Nightly : 8.0.x : Fixed error in package.json (by @Progi1984) + - #32829: Nightly : Fixed functional/BO/02*/01*/viewAndEditOrder/11* (by @Progi1984) + - #32706: Nightly : Fixed check of shipping price (by @Progi1984) + - Refactoring: + - #33228: Nightly : 8.1.x - Skip test for the issue 32914 (by @Progi1984) + - #33230: Nightly : 8.0.x - Skip test for the issue 32914 (by @Progi1984) + - #33174: Sanity Tests - Fix bug in product V2 tests (by @nesrineabdmouleh) + - #33146: Product V2 tests - Fix bug in product V2 tests (Sanity & Functional campaigns) (by @nesrineabdmouleh) + - #32859: Refacto WS tests countries (by @boubkerbribri) + - #32792: Functional tests - Add new test 'Design > Position > Filter module' (by @nesrineabdmouleh) + - #32782: Functional tests - Add new tests 'Stock > Sort and pagination movements table' (by @nesrineabdmouleh) + - #32718: Functional tests - Add some tests in 'FO > Carts' page (by @nesrineabdmouleh) + - #32598: Functional tests - Add some tests in "Module manager > Alerts tab" (by @nesrineabdmouleh) + - #32640: Fix nightly 18-05 - Add reset filter step to products table (by @nesrineabdmouleh) + +#################################### +# v8.1.0 - (2023-06-20) +#################################### + +- Back Office: + - Bug fix: + - #31379: Fix disabling a module for a specific shop applied to all shops (by @matthieu-rolland and @FabienPapet) + #################################### # v8.1-rc.1 - (2023-05-22) #################################### @@ -239,6 +334,41 @@ Changelog for PrestaShop 8 - #31389: Functional tests - Add scripts to run each test less than 30 minutes (by @nesrineabdmouleh) - #31357: Functional tests - Add new test 'FO > checkout page > Select carrier' (by @nesrineabdmouleh) +#################################### +# v8.0.5 - (2023-07-19) +#################################### + +- Core: + - Improvement: + - GHSA-xw2r-f8xv-c8xp add missing html attributes (by @matthieu-rolland) +- Back Office: + - Improvement: + - #33276: Add file headers and bump some dependencies (by @mflasquin) + - GHSA-gf46-prm4-56pc protect from writing files on server through SQL form (by @matthieu-rolland) + - Bug fix: + - #33234: Update module's information cache and add clear cache for doctrine (by @M0rgan01) + - #33008: Fix 'New' Translation domain (by @mflasquin) + - #33124: Fix issue when disable tax, do not delete tax rules (by @mflasquin) + - #33048: Add string casting for boolean fields (by @nicosomb) + - #31379: Fix disabling a module for a specific shop applied to all shops (by @matthieu-rolland) + - #32790: Fix PDF translations in backoffice (by @mflasquin) + - #32715: Fix: [BO] : Error notification displayed in Multistore page (by @Codencode) +- Front Office: + - Bug fix: + - #32596: Fix availability display logic (by @mflasquin) + - #32345: Hide vouchers with no available quantities (by @tleon) +- Tests: + - Bug fix: + - #33279: Nightly : 8.0.x : Unskip test for the issue 32914 (by @Progi1984) + - #33131: Nightly : 8.0.x : Fixed error in filterTaxes (by @Progi1984) + - #33033: Nightly : Fixed install Node 14 (by @Progi1984) + - #33012: Nightly : Fixed mocha loader (8.0.x) (by @Progi1984) + - #32834: Nightly : 8.0.x : Fixed error in package.json (by @Progi1984) + - #32829: Nightly : Fixed functional/BO/02*/01*/viewAndEditOrder/11* (by @Progi1984) + - Refactoring: + - #33230: Nightly : 8.0.x - Skip test for the issue 32914 (by @Progi1984) + - #33174: Sanity Tests - Fix bug in product V2 tests (by @nesrineabdmouleh) + #################################### # v8.0.4 - (2023-04-13) #################################### diff --git a/index.php b/index.php index b08bc1ba7d79e..48c25857d02e4 100644 --- a/index.php +++ b/index.php @@ -24,5 +24,49 @@ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) */ -require dirname(__FILE__).'/config/config.inc.php'; +use Symfony\Component\Dotenv\Dotenv; +use Symfony\Component\ErrorHandler\Debug; +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; +use Symfony\Component\HttpKernel\HttpKernelInterface; + +// Set front dir constant to use after +if (!defined('_PS_FRONT_DIR_')) { + define('_PS_FRONT_DIR_', dirname(__FILE__)); +} + +// Include some configurations & composer autoload +require_once _PS_FRONT_DIR_ . '/config/config.inc.php'; +require_once _PS_FRONT_DIR_ . '/vendor/autoload.php'; + +// Load .env file from the root of project if present +(new Dotenv(false))->loadEnv(_PS_FRONT_DIR_ . '/.env'); + +// If we want to use new container access in front (Warning: Experimental feature from now!) +if (isset($_ENV['PS_FF_FRONT_CONTAINER_V2']) && filter_var($_ENV['PS_FF_FRONT_CONTAINER_V2'], \FILTER_VALIDATE_BOOL)) { + // Activate Symfony's debug if we need it + if (_PS_MODE_DEV_) { + Debug::enable(); + } + + // Starting Kernel + $kernel = new FrontKernel(_PS_ENV_, _PS_MODE_DEV_); + $request = Request::createFromGlobals(); + + // Try to handle request + try { + $response = $kernel->handle($request, HttpKernelInterface::MASTER_REQUEST, false); + $response->send(); + define('FRONT_LEGACY_CONTEXT', false); + $kernel->terminate($request, $response); + } catch (NotFoundHttpException|Exception $exception) { + // correct Apache charset (except if it's too late) + if (!headers_sent()) { + header('Content-Type: text/html; charset=utf-8'); + } + } +} + +// Prepare and trigger LEGACY front dispatcher +define('FRONT_LEGACY_CONTEXT', true); Dispatcher::getInstance()->dispatch(); diff --git a/install-dev/classes/datas.php b/install-dev/classes/datas.php index 350dc7caf4548..d3c0bfff2c34d 100644 --- a/install-dev/classes/datas.php +++ b/install-dev/classes/datas.php @@ -40,7 +40,6 @@ * @property string $database_prefix * @property string $database_engine * @property string $shop_name - * @property int $shop_activity * @property string $shop_country * @property string $admin_firstname * @property string $admin_lastname @@ -140,11 +139,6 @@ class Datas 'validate' => 'isGenericName', 'default' => 'PrestaShop', ], - 'shop_activity' => [ - 'name' => 'activity', - 'default' => 0, - 'validate' => 'isInt', - ], 'shop_country' => [ 'name' => 'country', 'validate' => 'isLanguageIsoCode', diff --git a/install-dev/classes/session.php b/install-dev/classes/session.php index 8bb39cd4e50d3..4b607c429460d 100644 --- a/install-dev/classes/session.php +++ b/install-dev/classes/session.php @@ -41,7 +41,6 @@ * @property string $database_engine * @property string $shop_name * @property array $xml_loader_ids - * @property int $shop_activity * @property string $shop_country * @property string $admin_firstname * @property string $admin_lastname diff --git a/install-dev/controllers/console/process.php b/install-dev/controllers/console/process.php index 260ac7940dc67..df9116a37949e 100644 --- a/install-dev/controllers/console/process.php +++ b/install-dev/controllers/console/process.php @@ -262,7 +262,6 @@ public function processConfigureShop() return $this->model_install->configureShop([ 'shop_name' => $this->datas->shop_name, - 'shop_activity' => $this->datas->shop_activity, 'shop_country' => $this->datas->shop_country, 'shop_timezone' => $this->datas->timezone, 'use_smtp' => false, @@ -305,7 +304,7 @@ public function processInstallFixtures() } $this->model_install->xml_loader_ids = $this->datas->xml_loader_ids; - $result = $this->model_install->installFixtures(null, ['shop_activity' => $this->datas->shop_activity, 'shop_country' => $this->datas->shop_country]); + $result = $this->model_install->installFixtures(null, ['shop_country' => $this->datas->shop_country]); $this->datas->xml_loader_ids = $this->model_install->xml_loader_ids; return $result; @@ -364,7 +363,7 @@ private function initKernel() require_once _PS_CORE_DIR_ . '/config/bootstrap.php'; global $kernel; - $kernel = new AppKernel(_PS_ENV_, _PS_MODE_DEV_); + $kernel = new AdminKernel(_PS_ENV_, _PS_MODE_DEV_); $kernel->boot(); } diff --git a/install-dev/controllers/http/configure.php b/install-dev/controllers/http/configure.php index 0dadd4eaed43a..0fe8417d1ffa8 100644 --- a/install-dev/controllers/http/configure.php +++ b/install-dev/controllers/http/configure.php @@ -29,10 +29,6 @@ */ class InstallControllerHttpConfigure extends InstallControllerHttp implements HttpConfigureInterface { - /** - * @var array - */ - public $list_activities = []; /** * @var array */ @@ -54,7 +50,6 @@ public function processNextStep(): void if (Tools::isSubmit('shop_name')) { // Save shop configuration $this->session->shop_name = trim(Tools::getValue('shop_name')); - $this->session->shop_activity = Tools::getValue('shop_activity'); $this->session->enable_ssl = (bool) Tools::getValue('enable_ssl'); $this->session->shop_country = Tools::getValue('shop_country'); $this->session->shop_timezone = Tools::getValue('shop_timezone'); @@ -197,33 +192,6 @@ public function getTimezoneByIso($iso): string */ public function display(): void { - // List of activities - $list_activities = [ - 1 => $this->translator->trans('Lingerie and Adult', [], 'Install'), - 2 => $this->translator->trans('Animals and Pets', [], 'Install'), - 3 => $this->translator->trans('Art and Culture', [], 'Install'), - 4 => $this->translator->trans('Babies', [], 'Install'), - 5 => $this->translator->trans('Beauty and Personal Care', [], 'Install'), - 6 => $this->translator->trans('Cars', [], 'Install'), - 7 => $this->translator->trans('Computer Hardware and Software', [], 'Install'), - 8 => $this->translator->trans('Download', [], 'Install'), - 9 => $this->translator->trans('Fashion and Accessories', [], 'Install'), - 10 => $this->translator->trans('Flowers, Gifts and Crafts', [], 'Install'), - 11 => $this->translator->trans('Food and beverage', [], 'Install'), - 12 => $this->translator->trans('HiFi, Photo and Video', [], 'Install'), - 13 => $this->translator->trans('Home and Garden', [], 'Install'), - 14 => $this->translator->trans('Home Appliances', [], 'Install'), - 15 => $this->translator->trans('Jewelry', [], 'Install'), - 16 => $this->translator->trans('Mobile and Telecom', [], 'Install'), - 17 => $this->translator->trans('Services', [], 'Install'), - 18 => $this->translator->trans('Shoes and accessories', [], 'Install'), - 19 => $this->translator->trans('Sports and Entertainment', [], 'Install'), - 20 => $this->translator->trans('Travel', [], 'Install'), - ]; - - asort($list_activities); - $this->list_activities = $list_activities; - // Countries list $this->list_countries = []; $countries = $this->language->getCountries(); diff --git a/install-dev/controllers/http/process.php b/install-dev/controllers/http/process.php index 10b43ae0ea8f7..996b9d88bfd1c 100644 --- a/install-dev/controllers/http/process.php +++ b/install-dev/controllers/http/process.php @@ -212,7 +212,6 @@ public function processConfigureShop() $success = $this->model_install->configureShop([ 'shop_name' => $this->session->shop_name, - 'shop_activity' => $this->session->shop_activity, 'shop_country' => $this->session->shop_country, 'shop_timezone' => $this->session->shop_timezone, 'admin_firstname' => $this->session->admin_firstname, @@ -274,7 +273,7 @@ public function processInstallFixtures() $this->initializeContext(); $this->model_install->xml_loader_ids = $this->session->xml_loader_ids; - if (!$this->model_install->installFixtures(Tools::getValue('entity', null), ['shop_activity' => $this->session->shop_activity, 'shop_country' => $this->session->shop_country]) || $this->model_install->getErrors()) { + if (!$this->model_install->installFixtures(Tools::getValue('entity', null), ['shop_country' => $this->session->shop_country]) || $this->model_install->getErrors()) { $this->ajaxJsonAnswer(false, $this->model_install->getErrors()); } $this->session->xml_loader_ids = $this->model_install->xml_loader_ids; diff --git a/install-dev/controllers/http/system.php b/install-dev/controllers/http/system.php index f428cf9428e92..7cfad76148b30 100644 --- a/install-dev/controllers/http/system.php +++ b/install-dev/controllers/http/system.php @@ -95,6 +95,7 @@ public function display(): void 'gd' => $this->translator->trans('GD library is not installed', [], 'Install'), 'json' => $this->translator->trans('JSON extension is not loaded', [], 'Install'), 'openssl' => $this->translator->trans('PHP OpenSSL extension is not loaded', [], 'Install'), + 'openssl_key_generation' => $this->translator->trans('Unable to generate private keys using openssl_pkey_new. Check your OpenSSL configuration, especially the path to openssl.cafile.', [], 'Install'), 'pdo_mysql' => $this->translator->trans('PDO MySQL extension is not loaded', [], 'Install'), 'simplexml' => $this->translator->trans('SimpleXML extension is not loaded', [], 'Install'), 'zip' => $this->translator->trans('ZIP extension is not enabled', [], 'Install'), diff --git a/install-dev/data/xml/access.xml b/install-dev/data/xml/access.xml index f82b8f8fb591f..7e77d51ed9e55 100644 --- a/install-dev/data/xml/access.xml +++ b/install-dev/data/xml/access.xml @@ -249,10 +249,6 @@
-
-
-
-
-
- translator->trans('Help us learn more about your store so we can offer you optimal guidance and the best features for your business!', [], 'Install'); ?>
-
diff --git a/js/admin.js b/js/admin.js
index 99720d1639786..1854cf69c6e58 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -413,7 +413,6 @@ function stockManagementActivationAuthorization()
getE('PS_ORDER_OUT_OF_STOCK_on').checked = true;
getE('PS_ORDER_OUT_OF_STOCK_on').disabled = 'disabled';
getE('PS_ORDER_OUT_OF_STOCK_off').disabled = 'disabled';
- getE('PS_DEFAULT_WAREHOUSE_NEW_PRODUCT').disabled = 'disabled';
}
}
diff --git a/js/admin/products.js b/js/admin/products.js
index 19151dba23786..9467155573d5f 100644
--- a/js/admin/products.js
+++ b/js/admin/products.js
@@ -1451,16 +1451,8 @@ product_tabs['Quantities'] = new function(){
this.refreshQtyAvailabilityForm = function()
{
- if ($('#depends_on_stock_0').prop('checked'))
- {
- $('.available_quantity').find('input').show();
- $('.available_quantity').find('span').hide();
- }
- else
- {
- $('.available_quantity').find('input').hide();
- $('.available_quantity').find('span').show();
- }
+ $('.available_quantity').find('input').show();
+ $('.available_quantity').find('span').hide();
};
this.onReady = function(){
@@ -1470,37 +1462,6 @@ product_tabs['Quantities'] = new function(){
dateFormat: 'yy-mm-dd'
});
- $('.depends_on_stock').on('click', function(e)
- {
- self.refreshQtyAvailabilityForm();
- self.ajaxCall( { actionQty: 'depends_on_stock', value: $(this).val() } );
- if($(this).val() == 0)
- $('.available_quantity input').trigger('change');
- });
-
- $('.advanced_stock_management').on('click', function(e)
- {
- var val = 0;
- if ($(this).prop('checked'))
- val = 1;
-
- self.ajaxCall({actionQty: 'advanced_stock_management', value: val});
- if (val == 1)
- {
- $(this).val(1);
- $('#depends_on_stock_1').attr('disabled', false);
- }
- else
- {
- $(this).val(0);
- $('#depends_on_stock_1').attr('disabled', true);
- $('#depends_on_stock_0').attr('checked', true);
- self.ajaxCall({actionQty: 'depends_on_stock', value: 0});
- self.refreshQtyAvailabilityForm();
- }
- self.refreshQtyAvailabilityForm();
- });
-
$('.available_quantity').find('input').on('change', function(e, init_val)
{
self.ajaxCall({actionQty: 'set_qty', id_product_attribute: $(this).parent().attr('id').split('_')[1], value: $(this).val()});
@@ -1641,36 +1602,6 @@ product_tabs['VirtualProduct'] = new function(){
}
}
-product_tabs['Warehouses'] = new function(){
- this.onReady = function(){
- $('.check_all_warehouse').on('click', function() {
- //get all checkboxes of current warehouse
- var checkboxes = $('input[name*="'+$(this).val()+'"]');
- var checked = false;
-
- for (var i=0; iget() on the FrameworkBundleAdminController, or better, use dependency injection instead."
+ disallowIn:
+ - src/PrestaShopBundle/Controller/*
+ allowIn:
+ - src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php
+ - src/PrestaShopBundle/Controller/Admin/PrestaShopAdminController.php
disallowedConstants:
-
constant:
@@ -386,6 +385,7 @@ parameters:
allowIn:
- src/Adapter/*
- src/PrestaShopBundle/Install/*
+ - src/Core/Grid/Factory/FeatureValueGridFactory
-
class: PrestaShopBundle\Security\Voter\PageVoter
constant: ['CREATE', 'READ', 'UPDATE', 'DELETE', 'LEVEL_DELETE', 'LEVEL_CREATE', 'LEVEL_READ', 'LEVEL_UPDATE']
diff --git a/phpstan-tmp-legacy-layout-baseline.neon b/phpstan-tmp-legacy-layout-baseline.neon
new file mode 100644
index 0000000000000..92e568f5da443
--- /dev/null
+++ b/phpstan-tmp-legacy-layout-baseline.neon
@@ -0,0 +1,116 @@
+parameters:
+ ignoreErrors:
+ -
+ message: "#^Class Employee is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 1
+ path: src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
+
+ -
+ message: "#^Namespace Context is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 2
+ path: src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
+
+ -
+ message: "#^Namespace Employee is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 1
+ path: src/PrestaShopBundle/Twig/Component/EmployeeDropdown.php
+
+ -
+ message: "#^Namespace Media is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 2
+ path: src/PrestaShopBundle/Twig/Component/Head.php
+
+ -
+ message: "#^Namespace Tools is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 3
+ path: src/PrestaShopBundle/Twig/Component/Head.php
+
+ -
+ message: "#^Namespace Shop is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 3
+ path: src/PrestaShopBundle/Twig/Component/Head.php
+
+ -
+ message: "#^Class Shop is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 2
+ path: src/PrestaShopBundle/Twig/Component/Head.php
+
+ -
+ message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 1
+ path: src/PrestaShopBundle/Twig/Component/MobileQuickAccess.php
+
+ -
+ message: "#^Namespace Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 1
+ path: src/PrestaShopBundle/Twig/Component/MobileQuickAccess.php
+
+ -
+ message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 2
+ path: src/PrestaShopBundle/Twig/Component/MultistoreHeader.php
+
+ -
+ message: "#^Namespace Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 1
+ path: src/PrestaShopBundle/Twig/Component/MultistoreHeader.php
+
+ -
+ message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 1
+ path: src/PrestaShopBundle/Twig/Component/NotificationsCenter.php
+
+ -
+ message: "#^Namespace Configuration is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 4
+ path: src/PrestaShopBundle/Twig/Component/NotificationsCenter.php
+
+ -
+ message: "#^Namespace Context is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 2
+ path: src/PrestaShopBundle/Twig/Component/NotificationsCenter.php
+
+ -
+ message: "#^Namespace Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 1
+ path: src/PrestaShopBundle/Twig/Component/NotificationsCenter.php
+
+ -
+ message: "#^Namespace Profile is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 2
+ path: src/PrestaShopBundle/Twig/Component/NotificationsCenter.php
+
+ -
+ message: "#^Namespace Tools is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 1
+ path: src/PrestaShopBundle/Twig/Component/QuickAccess.php
+
+ -
+ message: "#^Class Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 1
+ path: src/PrestaShopBundle/Twig/Component/SearchForm.php
+
+ -
+ message: "#^Namespace Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 1
+ path: src/PrestaShopBundle/Twig/Component/SearchForm.php
+
+ -
+ message: "#^Namespace Configuration is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 2
+ path: src/PrestaShopBundle/Twig/Component/NavBar.php
+
+ -
+ message: "#^Namespace Dispatcher is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 2
+ path: src/PrestaShopBundle/Twig/Component/NavBar.php
+
+ -
+ message: "#^Namespace Link is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 1
+ path: src/PrestaShopBundle/Twig/Component/NavBar.php
+
+ -
+ message: "#^Namespace Tab is forbidden, No legacy calls inside the prestashop bundle\\. Please create an interface and an adapter if you need to\\.$#"
+ count: 5
+ path: src/PrestaShopBundle/Twig/Component/NavBar.php
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index ecd8f106d7091..d790c4c5b6d8f 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -1,6 +1,7 @@
includes:
- phpstan-baseline.neon
- phpstan-disallowed-calls.neon
+ - phpstan-tmp-legacy-layout-baseline.neon
parameters:
phpVersion: 80100
level: 5
diff --git a/rector.php b/rector.php
new file mode 100644
index 0000000000000..c7605655a15a0
--- /dev/null
+++ b/rector.php
@@ -0,0 +1,98 @@
+paths([
+ __DIR__ . '/src/',
+ ]);
+
+ $rectorConfig->sets(
+ [LevelSetList::UP_TO_PHP_81]
+ );
+
+ /**
+ * Ignored rules for now as grouping them would create a huge PR impossible to review,
+ * so I documented them here, I we can process them one by one.
+ */
+ $rectorConfig->skip([
+ ReadOnlyPropertyRector::class => '*',
+ ClosureToArrowFunctionRector::class => '*',
+ InlineConstructorDefaultToPropertyRector::class => '*',
+ ClassPropertyAssignToConstructorPromotionRector::class => '*',
+ UnionTypesRector::class => '*',
+ MixedTypeRector::class => '*',
+ TypedPropertyFromAssignsRector::class => '*',
+ FinalizePublicClassConstantRector::class => '*',
+ CountOnNullRector::class => '*',
+ AddDefaultValueForUndefinedVariableRector::class => '*',
+ NullToStrictStringFuncCallArgRector::class => '*',
+ JsonThrowOnErrorRector::class => '*',
+ IntersectionTypesRector::class => '*',
+ ReturnNeverTypeRector::class => '*',
+ ChangeSwitchToMatchRector::class => '*',
+ TernaryToNullCoalescingRector::class => '*',
+ RemoveUnusedVariableInCatchRector::class => '*',
+ StringableForToStringRector::class => '*',
+ StringClassNameToClassConstantRector::class => '*',
+ IfToSpaceshipRector::class => '*',
+ FirstClassCallableRector::class => '*',
+ ExceptionHandlerTypehintRector::class => '*',
+ ThisCallOnStaticMethodToStaticCallRector::class => '*',
+ MultiExceptionCatchRector::class => '*',
+ TernaryToElvisRector::class => '*',
+ NullCoalescingOperatorRector::class => '*',
+ ArraySpreadInsteadOfArrayMergeRector::class => '*',
+ AddLiteralSeparatorToNumberRector::class => '*',
+ ParenthesizeNestedTernaryRector::class => '*',
+ GetDebugTypeRector::class => '*',
+ PowToExpRector::class => '*',
+ GetClassOnNullRector::class => '*',
+ ClassConstantToSelfClassRector::class => '*',
+ OptionalParametersAfterRequiredRector::class => '*',
+ ]);
+
+ $rectorConfig->ruleWithConfiguration(AnnotationToAttributeRector::class, [
+ new AnnotationToAttribute(DemoRestricted::class), ]
+ );
+};
diff --git a/src/Adapter/AbstractObjectModelValidator.php b/src/Adapter/AbstractObjectModelValidator.php
index 4292b2190ef01..3ab932428601b 100644
--- a/src/Adapter/AbstractObjectModelValidator.php
+++ b/src/Adapter/AbstractObjectModelValidator.php
@@ -52,7 +52,7 @@ protected function validateObjectModelProperty(ObjectModel $objectModel, string
throw new $exceptionClass(
sprintf(
'Invalid %s %s. Got "%s"',
- get_class($objectModel),
+ $objectModel::class,
$propertyName,
$objectModel->{$propertyName}
),
@@ -61,7 +61,7 @@ protected function validateObjectModelProperty(ObjectModel $objectModel, string
}
} catch (PrestaShopException $e) {
throw new CoreException(
- sprintf('Error occurred when validating %s property "%s"', get_class($objectModel), $propertyName),
+ sprintf('Error occurred when validating %s property "%s"', $objectModel::class, $propertyName),
0,
$e
);
@@ -86,7 +86,7 @@ protected function validateObjectModelLocalizedProperty(ObjectModel $objectModel
throw new $exceptionClass(
sprintf(
'Invalid %s localized property "%s" for language with id "%d"',
- get_class($objectModel),
+ $objectModel::class,
$propertyName,
$langId
),
@@ -96,7 +96,7 @@ protected function validateObjectModelLocalizedProperty(ObjectModel $objectModel
}
} catch (PrestaShopException $e) {
throw new CoreException(
- sprintf('Error occurred when trying to validate %s localized property "%s"', get_class($objectModel), $propertyName),
+ sprintf('Error occurred when trying to validate %s localized property "%s"', $objectModel::class, $propertyName),
0,
$e
);
diff --git a/src/Adapter/Address/CommandHandler/AddCustomerAddressHandler.php b/src/Adapter/Address/CommandHandler/AddCustomerAddressHandler.php
index 348caafe9fb52..d26239a59a3a5 100644
--- a/src/Adapter/Address/CommandHandler/AddCustomerAddressHandler.php
+++ b/src/Adapter/Address/CommandHandler/AddCustomerAddressHandler.php
@@ -28,6 +28,7 @@
use Address;
use PrestaShop\PrestaShop\Adapter\Address\AbstractAddressHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Address\Command\AddCustomerAddressCommand;
use PrestaShop\PrestaShop\Core\Domain\Address\CommandHandler\AddCustomerAddressHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Address\Exception\AddressConstraintException;
@@ -36,6 +37,7 @@
use PrestaShop\PrestaShop\Core\Domain\Address\ValueObject\AddressId;
use PrestaShopException;
+#[AsCommandHandler]
final class AddCustomerAddressHandler extends AbstractAddressHandler implements AddCustomerAddressHandlerInterface
{
/**
diff --git a/src/Adapter/Address/CommandHandler/AddManufacturerAddressHandler.php b/src/Adapter/Address/CommandHandler/AddManufacturerAddressHandler.php
index 3c5337c5c5740..463b47e23ce67 100644
--- a/src/Adapter/Address/CommandHandler/AddManufacturerAddressHandler.php
+++ b/src/Adapter/Address/CommandHandler/AddManufacturerAddressHandler.php
@@ -28,6 +28,7 @@
use Address;
use PrestaShop\PrestaShop\Adapter\Address\AbstractAddressHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Address\Command\AddManufacturerAddressCommand;
use PrestaShop\PrestaShop\Core\Domain\Address\CommandHandler\AddManufacturerAddressHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Address\Exception\AddressException;
@@ -37,6 +38,7 @@
/**
* Adds manufacturer address using legacy object model
*/
+#[AsCommandHandler]
final class AddManufacturerAddressHandler extends AbstractAddressHandler implements AddManufacturerAddressHandlerInterface
{
/**
diff --git a/src/Adapter/Address/CommandHandler/BulkDeleteAddressHandler.php b/src/Adapter/Address/CommandHandler/BulkDeleteAddressHandler.php
index d8025f883dc56..6639d75c5decd 100644
--- a/src/Adapter/Address/CommandHandler/BulkDeleteAddressHandler.php
+++ b/src/Adapter/Address/CommandHandler/BulkDeleteAddressHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Address\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Address\AbstractAddressHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Address\Command\BulkDeleteAddressCommand;
use PrestaShop\PrestaShop\Core\Domain\Address\CommandHandler\BulkDeleteAddressHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Address\Exception\AddressException;
@@ -35,6 +36,7 @@
/**
* Handles command which deletes addresses in bulk action
*/
+#[AsCommandHandler]
final class BulkDeleteAddressHandler extends AbstractAddressHandler implements BulkDeleteAddressHandlerInterface
{
/**
diff --git a/src/Adapter/Address/CommandHandler/DeleteAddressHandler.php b/src/Adapter/Address/CommandHandler/DeleteAddressHandler.php
index 5c1f443253857..92d08fce6e58e 100644
--- a/src/Adapter/Address/CommandHandler/DeleteAddressHandler.php
+++ b/src/Adapter/Address/CommandHandler/DeleteAddressHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Address\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Address\AbstractAddressHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Address\Command\DeleteAddressCommand;
use PrestaShop\PrestaShop\Core\Domain\Address\CommandHandler\DeleteAddressHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Address\Exception\DeleteAddressException;
@@ -34,6 +35,7 @@
/**
* Handles command which deletes address
*/
+#[AsCommandHandler]
final class DeleteAddressHandler extends AbstractAddressHandler implements DeleteAddressHandlerInterface
{
/**
diff --git a/src/Adapter/Address/CommandHandler/EditCartAddressHandler.php b/src/Adapter/Address/CommandHandler/EditCartAddressHandler.php
index 657952c3e1576..3ce0438e37625 100644
--- a/src/Adapter/Address/CommandHandler/EditCartAddressHandler.php
+++ b/src/Adapter/Address/CommandHandler/EditCartAddressHandler.php
@@ -29,6 +29,7 @@
use Cart;
use PrestaShop\PrestaShop\Adapter\Validate;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCartAddressCommand;
use PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCustomerAddressCommand;
use PrestaShop\PrestaShop\Core\Domain\Address\CommandHandler\EditCartAddressHandlerInterface;
@@ -46,6 +47,7 @@
* EditCartAddressHandler manages an address update, it then updates cart
* relation to the newly created address.
*/
+#[AsCommandHandler]
class EditCartAddressHandler implements EditCartAddressHandlerInterface
{
/**
diff --git a/src/Adapter/Address/CommandHandler/EditCustomerAddressHandler.php b/src/Adapter/Address/CommandHandler/EditCustomerAddressHandler.php
index da1a12b895ee0..277a9723b6f61 100644
--- a/src/Adapter/Address/CommandHandler/EditCustomerAddressHandler.php
+++ b/src/Adapter/Address/CommandHandler/EditCustomerAddressHandler.php
@@ -29,6 +29,7 @@
use Address;
use Country;
use PrestaShop\PrestaShop\Adapter\Address\AbstractAddressHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCustomerAddressCommand;
use PrestaShop\PrestaShop\Core\Domain\Address\CommandHandler\EditCustomerAddressHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Address\Exception\AddressConstraintException;
@@ -43,6 +44,7 @@
/**
* Handles update of customer address
*/
+#[AsCommandHandler]
final class EditCustomerAddressHandler extends AbstractAddressHandler implements EditCustomerAddressHandlerInterface
{
/**
diff --git a/src/Adapter/Address/CommandHandler/EditManufacturerAddressHandler.php b/src/Adapter/Address/CommandHandler/EditManufacturerAddressHandler.php
index bf55bd40b0e28..1907b9072a18c 100644
--- a/src/Adapter/Address/CommandHandler/EditManufacturerAddressHandler.php
+++ b/src/Adapter/Address/CommandHandler/EditManufacturerAddressHandler.php
@@ -29,6 +29,7 @@
use Address;
use Country;
use PrestaShop\PrestaShop\Adapter\Address\AbstractAddressHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Address\Command\EditManufacturerAddressCommand;
use PrestaShop\PrestaShop\Core\Domain\Address\CommandHandler\EditManufacturerAddressHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Address\Exception\AddressException;
@@ -37,6 +38,7 @@
/**
* Handles command which edits manufacturer address
*/
+#[AsCommandHandler]
final class EditManufacturerAddressHandler extends AbstractAddressHandler implements EditManufacturerAddressHandlerInterface
{
/**
diff --git a/src/Adapter/Address/CommandHandler/EditOrderAddressHandler.php b/src/Adapter/Address/CommandHandler/EditOrderAddressHandler.php
index ad5e52480182a..ad8f605a58723 100644
--- a/src/Adapter/Address/CommandHandler/EditOrderAddressHandler.php
+++ b/src/Adapter/Address/CommandHandler/EditOrderAddressHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\Address\CommandHandler;
use Order;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCustomerAddressCommand;
use PrestaShop\PrestaShop\Core\Domain\Address\Command\EditOrderAddressCommand;
use PrestaShop\PrestaShop\Core\Domain\Address\CommandHandler\EditCustomerAddressHandlerInterface;
@@ -48,6 +49,7 @@
* EditOrderAddressCommandHandler manages an address update, it then updates order and cart
* relation to the newly created address.
*/
+#[AsCommandHandler]
class EditOrderAddressHandler implements EditOrderAddressHandlerInterface
{
/**
diff --git a/src/Adapter/Address/CommandHandler/SetRequiredFieldsForAddressHandler.php b/src/Adapter/Address/CommandHandler/SetRequiredFieldsForAddressHandler.php
index 5de8e36889746..41b653e61ad36 100644
--- a/src/Adapter/Address/CommandHandler/SetRequiredFieldsForAddressHandler.php
+++ b/src/Adapter/Address/CommandHandler/SetRequiredFieldsForAddressHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Address\CommandHandler;
use CustomerAddress;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Address\Command\SetRequiredFieldsForAddressCommand;
use PrestaShop\PrestaShop\Core\Domain\Address\CommandHandler\SetRequiredFieldsForAddressHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Address\Exception\CannotSetRequiredFieldsForAddressException;
@@ -37,6 +38,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class SetRequiredFieldsForAddressHandler implements SetRequiredFieldsForAddressHandlerInterface
{
/**
diff --git a/src/Adapter/Address/QueryHandler/GetCustomerAddressForEditingHandler.php b/src/Adapter/Address/QueryHandler/GetCustomerAddressForEditingHandler.php
index 9b07745ef0e86..12a7d0375c6a7 100644
--- a/src/Adapter/Address/QueryHandler/GetCustomerAddressForEditingHandler.php
+++ b/src/Adapter/Address/QueryHandler/GetCustomerAddressForEditingHandler.php
@@ -28,6 +28,7 @@
use Customer;
use PrestaShop\PrestaShop\Adapter\Address\AbstractCustomerAddressHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Address\Exception\AddressException;
use PrestaShop\PrestaShop\Core\Domain\Address\Exception\AddressNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Address\Query\GetCustomerAddressForEditing;
@@ -46,6 +47,7 @@
/**
* Handles query which gets customer address for editing
*/
+#[AsQueryHandler]
final class GetCustomerAddressForEditingHandler extends AbstractCustomerAddressHandler implements GetCustomerAddressForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Address/QueryHandler/GetManufacturerAddressForEditingHandler.php b/src/Adapter/Address/QueryHandler/GetManufacturerAddressForEditingHandler.php
index c0747f8e3013d..d57a45ce04c26 100644
--- a/src/Adapter/Address/QueryHandler/GetManufacturerAddressForEditingHandler.php
+++ b/src/Adapter/Address/QueryHandler/GetManufacturerAddressForEditingHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Address\QueryHandler;
use PrestaShop\PrestaShop\Adapter\Address\AbstractAddressHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Address\Query\GetManufacturerAddressForEditing;
use PrestaShop\PrestaShop\Core\Domain\Address\QueryHandler\GetManufacturerAddressForEditingHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Address\QueryResult\EditableManufacturerAddress;
@@ -34,6 +35,7 @@
/**
* Handles query which gets manufacturer address for editing
*/
+#[AsQueryHandler]
final class GetManufacturerAddressForEditingHandler extends AbstractAddressHandler implements GetManufacturerAddressForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Address/QueryHandler/GetRequiredFieldsForAddressHandler.php b/src/Adapter/Address/QueryHandler/GetRequiredFieldsForAddressHandler.php
index 4cdb508363d12..b6cf153df14ed 100644
--- a/src/Adapter/Address/QueryHandler/GetRequiredFieldsForAddressHandler.php
+++ b/src/Adapter/Address/QueryHandler/GetRequiredFieldsForAddressHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Address\QueryHandler;
use PrestaShop\PrestaShop\Adapter\Address\AbstractCustomerAddressHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Address\Exception\AddressException;
use PrestaShop\PrestaShop\Core\Domain\Address\Query\GetRequiredFieldsForAddress;
use PrestaShop\PrestaShop\Core\Domain\Address\QueryHandler\GetRequiredFieldsForAddressHandlerInterface;
@@ -36,6 +37,7 @@
*
* @internal
*/
+#[AsQueryHandler]
final class GetRequiredFieldsForAddressHandler extends AbstractCustomerAddressHandler implements GetRequiredFieldsForAddressHandlerInterface
{
/**
diff --git a/src/Adapter/Admin/PagePreference.php b/src/Adapter/Admin/PagePreference.php
index 7610b8008db61..16c770058b243 100644
--- a/src/Adapter/Admin/PagePreference.php
+++ b/src/Adapter/Admin/PagePreference.php
@@ -59,7 +59,7 @@ public function __construct(SessionInterface $session, bool $isDebug = _PS_MODE_
if ($session->isStarted()) {
$this->session = $session;
} else {
- $sessionClass = get_class($session);
+ $sessionClass = $session::class;
$this->session = new $sessionClass(new PhpBridgeSessionStorage());
}
$this->isDebug = $isDebug;
diff --git a/src/Adapter/Admin/UrlGenerator.php b/src/Adapter/Admin/UrlGenerator.php
index f7d52eac44188..5cffe80e17fc9 100644
--- a/src/Adapter/Admin/UrlGenerator.php
+++ b/src/Adapter/Admin/UrlGenerator.php
@@ -80,7 +80,7 @@ public function generate($name, $parameters = [], $referenceType = self::ABSOLUT
$legacyParameters = $parameters;
// resolve route & legacy mapping
- list($legacyController, $legacyParameters) = $this->getLegacyOptions($name, $parameters);
+ [$legacyController, $legacyParameters] = $this->getLegacyOptions($name, $parameters);
return $this->legacyContext->getAdminLink($legacyController, true, $legacyParameters);
}
diff --git a/src/Adapter/Alias/CommandHandler/AddAliasHandler.php b/src/Adapter/Alias/CommandHandler/AddAliasHandler.php
index a3240766465b6..7d6a5383ca102 100644
--- a/src/Adapter/Alias/CommandHandler/AddAliasHandler.php
+++ b/src/Adapter/Alias/CommandHandler/AddAliasHandler.php
@@ -29,9 +29,11 @@
namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Alias\Command\AddAliasCommand;
use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\AddAliasHandlerInterface;
+#[AsCommandHandler]
class AddAliasHandler implements AddAliasHandlerInterface
{
/**
diff --git a/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php b/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
new file mode 100644
index 0000000000000..a87d9397a3e31
--- /dev/null
+++ b/src/Adapter/Alias/CommandHandler/BulkDeleteAliasHandler.php
@@ -0,0 +1,88 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
+
+use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
+use PrestaShop\PrestaShop\Core\Domain\AbstractBulkCommandHandler;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkDeleteAliasCommand;
+use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\BulkDeleteAliasHandlerInterface;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasException;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\BulkAliasException;
+use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
+use PrestaShop\PrestaShop\Core\Domain\Exception\BulkCommandExceptionInterface;
+
+/**
+ * Handles command which deletes aliases in bulk action
+ */
+#[AsCommandHandler]
+class BulkDeleteAliasHandler extends AbstractBulkCommandHandler implements BulkDeleteAliasHandlerInterface
+{
+ public function __construct(protected AliasRepository $aliasRepository)
+ {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function handle(BulkDeleteAliasCommand $command): void
+ {
+ $this->handleBulkAction($command->getAliasIds(), AliasException::class);
+ }
+
+ /**
+ * @param AliasId $id
+ * @param mixed $command
+ *
+ * @return void
+ */
+ protected function handleSingleAction(mixed $id, mixed $command): void
+ {
+ $this->aliasRepository->delete($id);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected function buildBulkException(array $caughtExceptions): BulkCommandExceptionInterface
+ {
+ return new BulkAliasException(
+ $caughtExceptions,
+ 'Errors occurred during Alias bulk delete action',
+ );
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected function supports(mixed $id): bool
+ {
+ return $id instanceof AliasId;
+ }
+}
diff --git a/src/Adapter/Alias/CommandHandler/BulkUpdateAliasStatusHandler.php b/src/Adapter/Alias/CommandHandler/BulkUpdateAliasStatusHandler.php
index a136d0c30a1cf..cb2f15b56157b 100644
--- a/src/Adapter/Alias/CommandHandler/BulkUpdateAliasStatusHandler.php
+++ b/src/Adapter/Alias/CommandHandler/BulkUpdateAliasStatusHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\AbstractBulkCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkUpdateAliasStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\BulkUpdateAliasStatusHandlerInterface;
@@ -39,6 +40,7 @@
use PrestaShop\PrestaShop\Core\Domain\Exception\BulkCommandExceptionInterface;
use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\BulkFeatureException;
+#[AsCommandHandler]
class BulkUpdateAliasStatusHandler extends AbstractBulkCommandHandler implements BulkUpdateAliasStatusHandlerInterface
{
/**
diff --git a/src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php b/src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php
new file mode 100644
index 0000000000000..820f198d945cb
--- /dev/null
+++ b/src/Adapter/Alias/CommandHandler/DeleteAliasHandler.php
@@ -0,0 +1,50 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
+
+use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\DeleteAliasCommand;
+use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\DeleteAliasHandlerInterface;
+
+#[AsCommandHandler]
+class DeleteAliasHandler implements DeleteAliasHandlerInterface
+{
+ public function __construct(private readonly AliasRepository $aliasRepository)
+ {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function handle(DeleteAliasCommand $command): void
+ {
+ $this->aliasRepository->delete($command->getAliasId());
+ }
+}
diff --git a/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
new file mode 100644
index 0000000000000..2a4314eb34310
--- /dev/null
+++ b/src/Adapter/Alias/CommandHandler/UpdateAliasHandler.php
@@ -0,0 +1,55 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
+
+use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand;
+use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\UpdateAliasHandlerInterface;
+
+#[AsCommandHandler]
+class UpdateAliasHandler implements UpdateAliasHandlerInterface
+{
+ public function __construct(
+ protected AliasRepository $aliasRepository
+ ) {
+ }
+
+ /**
+ * @param UpdateAliasCommand $command
+ */
+ public function handle(UpdateAliasCommand $command): void
+ {
+ $existingAlias = $this->aliasRepository->get($command->getAliasId());
+
+ // We need to delete existing aliases to add new alias entries
+ $this->aliasRepository->deleteAliasesBySearchTerm($existingAlias->search);
+ $this->aliasRepository->create($command->getSearchTerm(), $command->getAliases());
+ }
+}
diff --git a/src/Adapter/Alias/CommandHandler/UpdateAliasStatusHandler.php b/src/Adapter/Alias/CommandHandler/UpdateAliasStatusHandler.php
index 4bfc9d33bff98..90b061003d2c0 100644
--- a/src/Adapter/Alias/CommandHandler/UpdateAliasStatusHandler.php
+++ b/src/Adapter/Alias/CommandHandler/UpdateAliasStatusHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Alias\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler\UpdateAliasStatusHandlerInterfaces;
use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\CannotUpdateAliasException;
@@ -36,6 +37,7 @@
/**
* Toggles alias status
*/
+#[AsCommandHandler]
class UpdateAliasStatusHandler implements UpdateAliasStatusHandlerInterfaces
{
/**
@@ -53,8 +55,8 @@ public function __construct(
*/
public function handle(UpdateAliasStatusCommand $command): void
{
- $alias = $this->aliasRepository->get($command->aliasId);
- $alias->active = $command->enabled;
+ $alias = $this->aliasRepository->get($command->getAliasId());
+ $alias->active = $command->isEnabled();
$this->aliasRepository->partialUpdate($alias, ['active'], CannotUpdateAliasException::class);
}
}
diff --git a/src/Adapter/Alias/QueryHandler/GetAliasForEditingHandler.php b/src/Adapter/Alias/QueryHandler/GetAliasForEditingHandler.php
index 07ccdcde53ada..ab189e08cceca 100644
--- a/src/Adapter/Alias/QueryHandler/GetAliasForEditingHandler.php
+++ b/src/Adapter/Alias/QueryHandler/GetAliasForEditingHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Alias\QueryHandler;
use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Alias\Query\GetAliasForEditing;
use PrestaShop\PrestaShop\Core\Domain\Alias\QueryHandler\GetAliasForEditingHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Alias\QueryResult\AliasForEditing;
@@ -36,6 +37,7 @@
/**
* Handles the query @see GetAliasForEditing using legacy ObjectModel
*/
+#[AsQueryHandler]
class GetAliasForEditingHandler implements GetAliasForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php b/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
new file mode 100644
index 0000000000000..1531c44d1c172
--- /dev/null
+++ b/src/Adapter/Alias/QueryHandler/SearchForSearchTermHandler.php
@@ -0,0 +1,55 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Alias\QueryHandler;
+
+use PrestaShop\PrestaShop\Adapter\Alias\Repository\AliasRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchForSearchTerm;
+use PrestaShop\PrestaShop\Core\Domain\Alias\QueryHandler\SearchForSearchTermHandlerInterface;
+
+#[AsQueryHandler]
+class SearchForSearchTermHandler implements SearchForSearchTermHandlerInterface
+{
+ public function __construct(protected readonly AliasRepository $aliasRepository)
+ {
+ }
+
+ /**
+ * @param SearchForSearchTerm $query
+ *
+ * @return string[]
+ */
+ public function handle(SearchForSearchTerm $query): array
+ {
+ return array_column(
+ $this->aliasRepository->searchSearchTerms($query->getSearchTerm(), $query->getLimit()),
+ 'search'
+ );
+ }
+}
diff --git a/src/Adapter/Alias/Repository/AliasRepository.php b/src/Adapter/Alias/Repository/AliasRepository.php
index 3f345e7494b0b..3d728c5bfbcb4 100644
--- a/src/Adapter/Alias/Repository/AliasRepository.php
+++ b/src/Adapter/Alias/Repository/AliasRepository.php
@@ -32,36 +32,26 @@
use Doctrine\DBAL\Connection;
use PrestaShop\PrestaShop\Adapter\Alias\Validate\AliasValidator;
use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\BulkAliasException;
use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\CannotAddAliasException;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\CannotDeleteAliasException;
use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\BulkFeatureException;
use PrestaShop\PrestaShop\Core\Exception\CoreException;
use PrestaShop\PrestaShop\Core\Repository\AbstractObjectModelRepository;
class AliasRepository extends AbstractObjectModelRepository
{
/**
- * @var Connection
+ * @param Connection $connection
+ * @param string $dbPrefix
+ * @param AliasValidator $aliasValidator
*/
- private $connection;
-
- /**
- * @var string
- */
- private $dbPrefix;
-
- /**
- * @var AliasValidator
- */
- private $aliasValidator;
-
public function __construct(
- Connection $connection,
- string $dbPrefix,
- AliasValidator $aliasValidator
+ protected Connection $connection,
+ protected string $dbPrefix,
+ protected AliasValidator $aliasValidator
) {
- $this->aliasValidator = $aliasValidator;
- $this->connection = $connection;
- $this->dbPrefix = $dbPrefix;
}
/**
@@ -69,12 +59,13 @@ public function __construct(
*
* @param string $searchTerm
* @param string[] $aliases
+ * @param bool $active
*
* @return AliasId[]
*
* @throws CoreException
*/
- public function create(string $searchTerm, array $aliases): array
+ public function create(string $searchTerm, array $aliases, bool $active = true): array
{
$aliasIds = [];
@@ -87,7 +78,7 @@ public function create(string $searchTerm, array $aliases): array
$alias = new Alias();
$alias->search = $searchTerm;
$alias->alias = $searchAlias;
- $alias->active = true;
+ $alias->active = $active;
$this->aliasValidator->validate($alias);
$this->addObjectModel($alias, CannotAddAliasException::class);
@@ -152,6 +143,11 @@ public function getAliasesBySearchTerm(string $searchTerm): array
return $qb->execute()->fetchFirstColumn();
}
+ public function delete(AliasId $aliasId): void
+ {
+ $this->deleteObjectModel($this->get($aliasId), CannotDeleteAliasException::class);
+ }
+
/**
* @param Alias $alias
* @param string[] $propertiesToUpdate
@@ -164,4 +160,63 @@ public function partialUpdate(Alias $alias, array $propertiesToUpdate, string $e
$this->aliasValidator->validate($alias);
$this->partiallyUpdateObjectModel($alias, $propertiesToUpdate, $exceptionClass);
}
+
+ /**
+ * Deletes all related aliases
+ *
+ * @param string $searchTerm
+ */
+ public function deleteAliasesBySearchTerm(string $searchTerm): void
+ {
+ $exceptions = [];
+
+ $aliasIds = $this->connection->createQueryBuilder()
+ ->addSelect('a.id_alias')
+ ->from($this->dbPrefix . 'alias', 'a')
+ ->where('a.search = :searchTerm')
+ ->setParameter('searchTerm', $searchTerm)
+ ->execute()
+ ->fetchFirstColumn()
+ ;
+
+ if (empty($aliasIds)) {
+ return;
+ }
+
+ foreach ($aliasIds as $currentAliasId) {
+ try {
+ $this->deleteObjectModel($this->get(new AliasId((int) $currentAliasId)), CannotDeleteAliasException::class);
+ } catch (CannotDeleteAliasException $e) {
+ $exceptions[] = $e;
+ }
+ }
+
+ if (!empty($exceptions)) {
+ throw new BulkAliasException(
+ $exceptions,
+ 'Errors occurred during Alias bulk delete action',
+ BulkFeatureException::FAILED_BULK_DELETE
+ );
+ }
+ }
+
+ /**
+ * @param string $searchPhrase
+ * @param int|null $limit
+ *
+ * @return array>
+ */
+ public function searchSearchTerms(string $searchPhrase, ?int $limit = null): array
+ {
+ return $this->connection->createQueryBuilder()
+ ->addSelect('a.search')
+ ->from($this->dbPrefix . 'alias', 'a')
+ ->addOrderBy('a.search', 'ASC')
+ ->addGroupBy('a.search')
+ ->setMaxResults($limit)
+ ->where('a.search LIKE :searchPhrase')
+ ->setParameter('searchPhrase', '%' . $searchPhrase . '%')
+ ->execute()
+ ->fetchAllAssociative();
+ }
}
diff --git a/src/Adapter/Attachment/CommandHandler/AddAttachmentHandler.php b/src/Adapter/Attachment/CommandHandler/AddAttachmentHandler.php
index e1bf26ac15053..340c5c69f52da 100644
--- a/src/Adapter/Attachment/CommandHandler/AddAttachmentHandler.php
+++ b/src/Adapter/Attachment/CommandHandler/AddAttachmentHandler.php
@@ -28,6 +28,7 @@
use Attachment;
use PrestaShop\PrestaShop\Adapter\Attachment\AbstractAttachmentHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Attachment\AttachmentFileUploaderInterface;
use PrestaShop\PrestaShop\Core\Domain\Attachment\Command\AddAttachmentCommand;
use PrestaShop\PrestaShop\Core\Domain\Attachment\CommandHandler\AddAttachmentHandlerInterface;
@@ -43,6 +44,7 @@
/**
* Handles attachment creation and file uploading procedures
*/
+#[AsCommandHandler]
final class AddAttachmentHandler extends AbstractAttachmentHandler implements AddAttachmentHandlerInterface
{
/**
diff --git a/src/Adapter/Attachment/CommandHandler/BulkDeleteAttachmentsHandler.php b/src/Adapter/Attachment/CommandHandler/BulkDeleteAttachmentsHandler.php
index e638805047234..810ee787ae975 100644
--- a/src/Adapter/Attachment/CommandHandler/BulkDeleteAttachmentsHandler.php
+++ b/src/Adapter/Attachment/CommandHandler/BulkDeleteAttachmentsHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Attachment\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Attachment\AbstractAttachmentHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Attachment\Command\BulkDeleteAttachmentsCommand;
use PrestaShop\PrestaShop\Core\Domain\Attachment\CommandHandler\BulkDeleteAttachmentsHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Attachment\Exception\AttachmentException;
@@ -35,6 +36,7 @@
/**
* Bulk delete attachments handler
*/
+#[AsCommandHandler]
final class BulkDeleteAttachmentsHandler extends AbstractAttachmentHandler implements BulkDeleteAttachmentsHandlerInterface
{
/**
diff --git a/src/Adapter/Attachment/CommandHandler/DeleteAttachmentHandler.php b/src/Adapter/Attachment/CommandHandler/DeleteAttachmentHandler.php
index 09730822eab62..55a170b56710f 100644
--- a/src/Adapter/Attachment/CommandHandler/DeleteAttachmentHandler.php
+++ b/src/Adapter/Attachment/CommandHandler/DeleteAttachmentHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Attachment\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Attachment\AbstractAttachmentHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Attachment\Command\DeleteAttachmentCommand;
use PrestaShop\PrestaShop\Core\Domain\Attachment\CommandHandler\DeleteAttachmentHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Attachment\Exception\AttachmentNotFoundException;
@@ -35,6 +36,7 @@
/**
* Delete attachment handler
*/
+#[AsCommandHandler]
final class DeleteAttachmentHandler extends AbstractAttachmentHandler implements DeleteAttachmentHandlerInterface
{
/**
diff --git a/src/Adapter/Attachment/CommandHandler/EditAttachmentHandler.php b/src/Adapter/Attachment/CommandHandler/EditAttachmentHandler.php
index f62ef727f5dd7..bf06fe0b47d72 100644
--- a/src/Adapter/Attachment/CommandHandler/EditAttachmentHandler.php
+++ b/src/Adapter/Attachment/CommandHandler/EditAttachmentHandler.php
@@ -28,6 +28,7 @@
use Attachment;
use PrestaShop\PrestaShop\Adapter\Attachment\AbstractAttachmentHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Attachment\AttachmentFileUploaderInterface;
use PrestaShop\PrestaShop\Core\Domain\Attachment\Command\EditAttachmentCommand;
use PrestaShop\PrestaShop\Core\Domain\Attachment\CommandHandler\EditAttachmentHandlerInterface;
@@ -41,6 +42,7 @@
/**
* Handles editing of attachment and file uploading procedures
*/
+#[AsCommandHandler]
final class EditAttachmentHandler extends AbstractAttachmentHandler implements EditAttachmentHandlerInterface
{
/**
diff --git a/src/Adapter/Attachment/QueryHandler/GetAttachmentForEditingHandler.php b/src/Adapter/Attachment/QueryHandler/GetAttachmentForEditingHandler.php
index 00fc65b0a33d8..a5710e7c7ef72 100644
--- a/src/Adapter/Attachment/QueryHandler/GetAttachmentForEditingHandler.php
+++ b/src/Adapter/Attachment/QueryHandler/GetAttachmentForEditingHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler;
use Attachment;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Attachment\Exception\AttachmentNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachmentForEditing;
use PrestaShop\PrestaShop\Core\Domain\Attachment\QueryHandler\GetAttachmentForEditingHandlerInterface;
@@ -39,6 +40,7 @@
*
* @internal
*/
+#[AsQueryHandler]
final class GetAttachmentForEditingHandler implements GetAttachmentForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Attachment/QueryHandler/GetAttachmentHandler.php b/src/Adapter/Attachment/QueryHandler/GetAttachmentHandler.php
index 316fb8e2454a6..70ff1badad28d 100644
--- a/src/Adapter/Attachment/QueryHandler/GetAttachmentHandler.php
+++ b/src/Adapter/Attachment/QueryHandler/GetAttachmentHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler;
use PrestaShop\PrestaShop\Adapter\Attachment\AbstractAttachmentHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Attachment\Exception\AttachmentNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachment;
use PrestaShop\PrestaShop\Core\Domain\Attachment\QueryHandler\GetAttachmentHandlerInterface;
@@ -35,6 +36,7 @@
/**
* Provides path and original file name of attachment
*/
+#[AsQueryHandler]
final class GetAttachmentHandler extends AbstractAttachmentHandler implements GetAttachmentHandlerInterface
{
/**
diff --git a/src/Adapter/Attachment/QueryHandler/GetAttachmentInformationHandler.php b/src/Adapter/Attachment/QueryHandler/GetAttachmentInformationHandler.php
index efaa3e136e5b7..d0cf58d823dca 100644
--- a/src/Adapter/Attachment/QueryHandler/GetAttachmentInformationHandler.php
+++ b/src/Adapter/Attachment/QueryHandler/GetAttachmentInformationHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler;
use PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachmentInformation;
use PrestaShop\PrestaShop\Core\Domain\Attachment\QueryHandler\GetAttachmentInformationHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Attachment\QueryResult\AttachmentInformation;
@@ -35,6 +36,7 @@
/**
* Handles @see GetAttachmentInformation query using legacy object model
*/
+#[AsQueryHandler]
class GetAttachmentInformationHandler implements GetAttachmentInformationHandlerInterface
{
/**
diff --git a/src/Adapter/Attachment/QueryHandler/SearchAttachmentHandler.php b/src/Adapter/Attachment/QueryHandler/SearchAttachmentHandler.php
index e6817b1ad7f06..a7c3fafbb61d0 100644
--- a/src/Adapter/Attachment/QueryHandler/SearchAttachmentHandler.php
+++ b/src/Adapter/Attachment/QueryHandler/SearchAttachmentHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler;
use PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Attachment\Exception\EmptySearchException;
use PrestaShop\PrestaShop\Core\Domain\Attachment\Query\SearchAttachment;
use PrestaShop\PrestaShop\Core\Domain\Attachment\QueryHandler\SearchAttachmentHandlerInterface;
@@ -37,6 +38,7 @@
/**
* Handles @see SearchAttachment query using legacy object model
*/
+#[AsQueryHandler]
class SearchAttachmentHandler implements SearchAttachmentHandlerInterface
{
/**
diff --git a/src/Adapter/Attribute/AdminAttributeGeneratorControllerWrapper.php b/src/Adapter/Attribute/AdminAttributeGeneratorControllerWrapper.php
index 833a398cefd29..04954a8574e3f 100644
--- a/src/Adapter/Attribute/AdminAttributeGeneratorControllerWrapper.php
+++ b/src/Adapter/Attribute/AdminAttributeGeneratorControllerWrapper.php
@@ -31,8 +31,6 @@
use PrestaShopBundle\Translation\TranslatorComponent;
use Product;
use SpecificPriceRule;
-use Stock;
-use StockAvailable;
use Validate;
/**
@@ -112,33 +110,19 @@ public function ajaxProcessDeleteProductAttribute($idAttribute, $idProduct)
}
if ($idProduct && Validate::isUnsignedId($idProduct) && Validate::isLoadedObject($product = new Product($idProduct))) {
- if (($depends_on_stock = StockAvailable::dependsOnStock($idProduct)) && StockAvailable::getQuantityAvailableByProduct($idProduct, $idAttribute)) {
- return [
- 'status' => 'error',
- 'message' => $this->translator->trans('It is not possible to delete a combination while it still has some quantities in the Advanced Stock Management. You must delete its stock first.', [], 'Admin.Catalog.Notification'),
- ];
+ $product->deleteAttributeCombination((int) $idAttribute);
+ $product->checkDefaultAttributes();
+ if (!$product->hasAttributes()) {
+ $product->cache_default_attribute = 0;
+ $product->update();
} else {
- $product->deleteAttributeCombination((int) $idAttribute);
- $product->checkDefaultAttributes();
- if (!$product->hasAttributes()) {
- $product->cache_default_attribute = 0;
- $product->update();
- } else {
- Product::updateDefaultAttribute($idProduct);
- }
-
- if ($depends_on_stock && !Stock::deleteStockByIds($idProduct, $idAttribute)) {
- return [
- 'status' => 'error',
- 'message' => $this->translator->trans('Error while deleting the stock', [], 'Admin.Catalog.Notification'),
- ];
- } else {
- return [
- 'status' => 'ok',
- 'message' => $this->translator->trans('Successful deletion', [], 'Admin.Catalog.Notification'),
- ];
- }
+ Product::updateDefaultAttribute($idProduct);
}
+
+ return [
+ 'status' => 'ok',
+ 'message' => $this->translator->trans('Successful deletion', [], 'Admin.Catalog.Notification'),
+ ];
} else {
return [
'status' => 'error',
diff --git a/src/Adapter/Attribute/CommandHandler/BulkDeleteAttributeHandler.php b/src/Adapter/Attribute/CommandHandler/BulkDeleteAttributeHandler.php
index f281e9bc8f450..94c570eff6553 100644
--- a/src/Adapter/Attribute/CommandHandler/BulkDeleteAttributeHandler.php
+++ b/src/Adapter/Attribute/CommandHandler/BulkDeleteAttributeHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Attribute\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Attribute\AbstractAttributeHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\BulkDeleteAttributeCommand;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\CommandHandler\BulkDeleteAttributeHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Exception\AttributeException;
@@ -35,6 +36,7 @@
/**
* Handles command which deletes attributes in bulk action using legacy object model
*/
+#[AsCommandHandler]
final class BulkDeleteAttributeHandler extends AbstractAttributeHandler implements BulkDeleteAttributeHandlerInterface
{
/**
diff --git a/src/Adapter/Attribute/CommandHandler/DeleteAttributeHandler.php b/src/Adapter/Attribute/CommandHandler/DeleteAttributeHandler.php
index cae898336f537..c31de23ba1721 100644
--- a/src/Adapter/Attribute/CommandHandler/DeleteAttributeHandler.php
+++ b/src/Adapter/Attribute/CommandHandler/DeleteAttributeHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Attribute\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Attribute\AbstractAttributeHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\DeleteAttributeCommand;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\CommandHandler\DeleteAttributeHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Exception\AttributeException;
@@ -35,6 +36,7 @@
/**
* Handles command which deletes the Attribute using legacy object model
*/
+#[AsCommandHandler]
final class DeleteAttributeHandler extends AbstractAttributeHandler implements DeleteAttributeHandlerInterface
{
/**
diff --git a/src/Adapter/Attribute/Repository/AttributeRepository.php b/src/Adapter/Attribute/Repository/AttributeRepository.php
index d863ca4e8dab7..1931f35d8ae56 100644
--- a/src/Adapter/Attribute/Repository/AttributeRepository.php
+++ b/src/Adapter/Attribute/Repository/AttributeRepository.php
@@ -121,6 +121,7 @@ public function getGroupedAttributes(ShopConstraint $shopConstraint, array $attr
)
->andWhere($qb->expr()->in('a.id_attribute_group', ':attributeGroupIds'))
->setParameter('attributeGroupIds', $attributeGroupIdValues, Connection::PARAM_INT_ARRAY)
+ ->addOrderBy('a.position', 'ASC')
;
if (!empty($attributeIds)) {
diff --git a/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php b/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php
new file mode 100644
index 0000000000000..d6145a9eb4e44
--- /dev/null
+++ b/src/Adapter/AttributeGroup/CommandHandler/AddAttributeGroupHandler.php
@@ -0,0 +1,72 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler;
+
+use AttributeGroup;
+use PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository;
+use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\AddAttributeGroupCommand;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\CommandHandler\AddAttributeGroupHandlerInterface;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
+
+/**
+ * Handles adding of attribute groups using legacy logic.
+ */
+#[AsCommandHandler]
+final class AddAttributeGroupHandler extends AbstractObjectModelHandler implements AddAttributeGroupHandlerInterface
+{
+ /**
+ * @var AttributeGroupRepository
+ */
+ private $attributeGroupRepository;
+
+ public function __construct(AttributeGroupRepository $attributeGroupRepository)
+ {
+ $this->attributeGroupRepository = $attributeGroupRepository;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function handle(AddAttributeGroupCommand $command): AttributeGroupId
+ {
+ $attributeGroup = new AttributeGroup();
+
+ $attributeGroup->name = $command->getLocalizedNames();
+ $attributeGroup->public_name = $command->getLocalizedPublicNames();
+ $attributeGroup->group_type = $command->getType()->getValue();
+
+ $id = $this->attributeGroupRepository->add($attributeGroup);
+
+ $this->associateWithShops($attributeGroup, $command->getShopAssociation());
+
+ return $id;
+ }
+}
diff --git a/src/Adapter/AttributeGroup/CommandHandler/BulkDeleteAttributeGroupHandler.php b/src/Adapter/AttributeGroup/CommandHandler/BulkDeleteAttributeGroupHandler.php
index 1d2c7832855fc..e4322f0106051 100644
--- a/src/Adapter/AttributeGroup/CommandHandler/BulkDeleteAttributeGroupHandler.php
+++ b/src/Adapter/AttributeGroup/CommandHandler/BulkDeleteAttributeGroupHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler;
use PrestaShop\PrestaShop\Adapter\AttributeGroup\AbstractAttributeGroupHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\BulkDeleteAttributeGroupCommand;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\CommandHandler\BulkDeleteAttributeGroupHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\DeleteAttributeGroupException;
@@ -35,6 +36,7 @@
/**
* Handles command which deletes multiple attribute groups using legacy object model
*/
+#[AsCommandHandler]
final class BulkDeleteAttributeGroupHandler extends AbstractAttributeGroupHandler implements BulkDeleteAttributeGroupHandlerInterface
{
/**
diff --git a/src/Adapter/AttributeGroup/CommandHandler/DeleteAttributeGroupHandler.php b/src/Adapter/AttributeGroup/CommandHandler/DeleteAttributeGroupHandler.php
index 55970b2912c8f..f5dfc4d6ee3ef 100644
--- a/src/Adapter/AttributeGroup/CommandHandler/DeleteAttributeGroupHandler.php
+++ b/src/Adapter/AttributeGroup/CommandHandler/DeleteAttributeGroupHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler;
use PrestaShop\PrestaShop\Adapter\AttributeGroup\AbstractAttributeGroupHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\DeleteAttributeGroupCommand;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\CommandHandler\DeleteAttributeGroupHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupException;
@@ -36,6 +37,7 @@
/**
* Handles command which deletes attribute group using legacy object model
*/
+#[AsCommandHandler]
final class DeleteAttributeGroupHandler extends AbstractAttributeGroupHandler implements DeleteAttributeGroupHandlerInterface
{
/**
diff --git a/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php b/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php
new file mode 100644
index 0000000000000..459d21909fa7b
--- /dev/null
+++ b/src/Adapter/AttributeGroup/CommandHandler/EditAttributeGroupHandler.php
@@ -0,0 +1,68 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler;
+
+use PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository;
+use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\EditAttributeGroupCommand;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\CommandHandler\EditAttributeGroupHandlerInterface;
+
+/**
+ * Handles editing of attribute groups using legacy logic.
+ */
+#[AsCommandHandler]
+final class EditAttributeGroupHandler extends AbstractObjectModelHandler implements EditAttributeGroupHandlerInterface
+{
+ /**
+ * @var AttributeGroupRepository
+ */
+ private $attributeGroupRepository;
+
+ public function __construct(AttributeGroupRepository $attributeGroupRepository)
+ {
+ $this->attributeGroupRepository = $attributeGroupRepository;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function handle(EditAttributeGroupCommand $command): void
+ {
+ $attributeGroup = $this->attributeGroupRepository->get($command->getAttributeGroupId());
+
+ $attributeGroup->name = $command->getLocalizedNames();
+ $attributeGroup->public_name = $command->getLocalizedPublicNames();
+ $attributeGroup->group_type = $command->getType()->getValue();
+
+ $this->attributeGroupRepository->update($attributeGroup);
+
+ $this->associateWithShops($attributeGroup, $command->getShopAssociation());
+ }
+}
diff --git a/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php b/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php
new file mode 100644
index 0000000000000..92567f8104a0f
--- /dev/null
+++ b/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandler.php
@@ -0,0 +1,68 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\AttributeGroup\QueryHandler;
+
+use PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryHandler\GetAttributeGroupForEditingHandlerInterface;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\EditableAttributeGroup;
+
+/**
+ * Handles query which gets attribute group for editing
+ */
+#[AsQueryHandler]
+final class GetAttributeGroupForEditingHandler implements GetAttributeGroupForEditingHandlerInterface
+{
+ /**
+ * @var AttributeGroupRepository
+ */
+ private $attributeGroupRepository;
+
+ public function __construct(AttributeGroupRepository $attributeGroupRepository)
+ {
+ $this->attributeGroupRepository = $attributeGroupRepository;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function handle(GetAttributeGroupForEditing $query): EditableAttributeGroup
+ {
+ $attributeGroup = $this->attributeGroupRepository->get($query->getAttributeGroupId());
+
+ return new EditableAttributeGroup(
+ $query->getAttributeGroupId()->getValue(),
+ $attributeGroup->name,
+ $attributeGroup->public_name,
+ $attributeGroup->group_type,
+ $attributeGroup->getAssociatedShops()
+ );
+ }
+}
diff --git a/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupListHandler.php b/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupListHandler.php
index dd517d108e4ba..b94c6beb7cdd7 100644
--- a/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupListHandler.php
+++ b/src/Adapter/AttributeGroup/QueryHandler/GetAttributeGroupListHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\AttributeGroup\QueryHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupList;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryHandler\GetAttributeGroupListHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
@@ -35,6 +36,7 @@
/**
* Handles the query GetAttributeGroupList using Doctrine repository
*/
+#[AsQueryHandler]
class GetAttributeGroupListHandler extends AbstractAttributeGroupQueryHandler implements GetAttributeGroupListHandlerInterface
{
/**
diff --git a/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php b/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php
index 51290c8a0f8f2..9edef6bf003ea 100644
--- a/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php
+++ b/src/Adapter/AttributeGroup/Repository/AttributeGroupRepository.php
@@ -29,11 +29,15 @@
use AttributeGroup;
use Doctrine\DBAL\Connection;
+use PrestaShop\PrestaShop\Adapter\AttributeGroup\Validate\AttributeGroupValidator;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\CannotAddAttributeGroupException;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
use PrestaShop\PrestaShop\Core\Domain\Shop\Exception\InvalidShopConstraintException;
use PrestaShop\PrestaShop\Core\Domain\Shop\Exception\ShopAssociationNotFound;
use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopId;
+use PrestaShop\PrestaShop\Core\Exception\CoreException;
use PrestaShop\PrestaShop\Core\Repository\AbstractMultiShopObjectModelRepository;
class AttributeGroupRepository extends AbstractMultiShopObjectModelRepository
@@ -48,12 +52,68 @@ class AttributeGroupRepository extends AbstractMultiShopObjectModelRepository
*/
private $dbPrefix;
+ /**
+ * @var AttributeGroupValidator
+ */
+ private $validator;
+
public function __construct(
Connection $connection,
- string $dbPrefix
+ string $dbPrefix,
+ AttributeGroupValidator $validator
) {
$this->connection = $connection;
$this->dbPrefix = $dbPrefix;
+ $this->validator = $validator;
+ }
+
+ /**
+ * @param AttributeGroupId $attributeGroupId
+ *
+ * @return AttributeGroup
+ *
+ * @throws AttributeGroupNotFoundException
+ * @throws CoreException
+ */
+ public function get(AttributeGroupId $attributeGroupId): AttributeGroup
+ {
+ /** @var AttributeGroup $attributeGroup */
+ $attributeGroup = $this->getObjectModel(
+ $attributeGroupId->getValue(),
+ AttributeGroup::class,
+ AttributeGroupNotFoundException::class
+ );
+
+ return $attributeGroup;
+ }
+
+ /**
+ * @param AttributeGroup $attributeGroup
+ *
+ * @return AttributeGroupId
+ *
+ * @throws CoreException
+ */
+ public function add(AttributeGroup $attributeGroup): AttributeGroupId
+ {
+ $this->validator->validate($attributeGroup);
+ $id = $this->addObjectModel($attributeGroup, CannotAddAttributeGroupException::class);
+
+ return new AttributeGroupId($id);
+ }
+
+ /**
+ * @param AttributeGroup $attributeGroup
+ * @param int $errorCode
+ *
+ * @return void
+ *
+ * @throws CoreException
+ */
+ public function update(AttributeGroup $attributeGroup, int $errorCode = 0): void
+ {
+ $this->validator->validate($attributeGroup);
+ $this->updateObjectModel($attributeGroup, CannotAddAttributeGroupException::class, $errorCode);
}
/**
diff --git a/src/Adapter/AttributeGroup/Validate/AttributeGroupValidator.php b/src/Adapter/AttributeGroup/Validate/AttributeGroupValidator.php
new file mode 100644
index 0000000000000..5e0fdea7fdf89
--- /dev/null
+++ b/src/Adapter/AttributeGroup/Validate/AttributeGroupValidator.php
@@ -0,0 +1,51 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\AttributeGroup\Validate;
+
+use AttributeGroup;
+use PrestaShop\PrestaShop\Adapter\AbstractObjectModelValidator;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
+use PrestaShop\PrestaShop\Core\Exception\CoreException;
+
+/**
+ * Validates Attribute Group properties using legacy object model
+ */
+class AttributeGroupValidator extends AbstractObjectModelValidator
+{
+ /**
+ * @param AttributeGroup $attributeGroup
+ *
+ * @throws CoreException
+ */
+ public function validate(AttributeGroup $attributeGroup): void
+ {
+ $this->validateObjectModelLocalizedProperty($attributeGroup, 'name', AttributeGroupConstraintException::class, AttributeGroupConstraintException::INVALID_NAME);
+ $this->validateObjectModelLocalizedProperty($attributeGroup, 'public_name', AttributeGroupConstraintException::class, AttributeGroupConstraintException::INVALID_NAME);
+ }
+}
diff --git a/src/Adapter/Backup/Backup.php b/src/Adapter/Backup/Backup.php
index bb6604c5860ba..2c504ec221b05 100644
--- a/src/Adapter/Backup/Backup.php
+++ b/src/Adapter/Backup/Backup.php
@@ -101,7 +101,7 @@ public function getAge()
*/
public function getDate()
{
- list($timestamp) = explode('-', $this->fileName);
+ [$timestamp] = explode('-', $this->fileName);
return new DateTimeImmutable('@' . $timestamp);
}
diff --git a/src/Adapter/CMS/Page/CommandHandler/AddCmsPageHandler.php b/src/Adapter/CMS/Page/CommandHandler/AddCmsPageHandler.php
index de47853c8195d..cc72585db09a8 100644
--- a/src/Adapter/CMS/Page/CommandHandler/AddCmsPageHandler.php
+++ b/src/Adapter/CMS/Page/CommandHandler/AddCmsPageHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler;
use CMS;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\AddCmsPageCommand;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\CommandHandler\AddCmsPageHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\Exception\CannotAddCmsPageException;
@@ -37,6 +38,7 @@
/**
* Handles AddCmsPageCommand using legacy object model
*/
+#[AsCommandHandler]
final class AddCmsPageHandler extends AbstractCmsPageHandler implements AddCmsPageHandlerInterface
{
/**
diff --git a/src/Adapter/CMS/Page/CommandHandler/BulkDeleteCmsPageHandler.php b/src/Adapter/CMS/Page/CommandHandler/BulkDeleteCmsPageHandler.php
index 40fa53a69e394..e1a96f39a07ef 100644
--- a/src/Adapter/CMS/Page/CommandHandler/BulkDeleteCmsPageHandler.php
+++ b/src/Adapter/CMS/Page/CommandHandler/BulkDeleteCmsPageHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkDeleteCmsPageCommand;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\CommandHandler\BulkDeleteCmsPageHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\Exception\CannotDeleteCmsPageException;
@@ -35,6 +36,7 @@
/**
* Deletes multiple cms pages
*/
+#[AsCommandHandler]
final class BulkDeleteCmsPageHandler extends AbstractCmsPageHandler implements BulkDeleteCmsPageHandlerInterface
{
/**
diff --git a/src/Adapter/CMS/Page/CommandHandler/BulkDisableCmsPageHandler.php b/src/Adapter/CMS/Page/CommandHandler/BulkDisableCmsPageHandler.php
index c28b9f2e20068..918f2e3fe3cfa 100644
--- a/src/Adapter/CMS/Page/CommandHandler/BulkDisableCmsPageHandler.php
+++ b/src/Adapter/CMS/Page/CommandHandler/BulkDisableCmsPageHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkDisableCmsPageCommand;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\CommandHandler\BulkDisableCmsPageHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\Exception\CannotDisableCmsPageException;
@@ -36,6 +37,7 @@
/**
* Disables multiple cms pages.
*/
+#[AsCommandHandler]
final class BulkDisableCmsPageHandler extends AbstractCmsPageHandler implements BulkDisableCmsPageHandlerInterface
{
/**
diff --git a/src/Adapter/CMS/Page/CommandHandler/BulkEnableCmsPageHandler.php b/src/Adapter/CMS/Page/CommandHandler/BulkEnableCmsPageHandler.php
index 6f2ce07ca12e9..27ecae4854024 100644
--- a/src/Adapter/CMS/Page/CommandHandler/BulkEnableCmsPageHandler.php
+++ b/src/Adapter/CMS/Page/CommandHandler/BulkEnableCmsPageHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkEnableCmsPageCommand;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\CommandHandler\BulkEnableCmsPageHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\Exception\CannotEnableCmsPageException;
@@ -36,6 +37,7 @@
/**
* Enables multiple cms pages.
*/
+#[AsCommandHandler]
final class BulkEnableCmsPageHandler extends AbstractCmsPageHandler implements BulkEnableCmsPageHandlerInterface
{
/**
diff --git a/src/Adapter/CMS/Page/CommandHandler/DeleteCmsPageHandler.php b/src/Adapter/CMS/Page/CommandHandler/DeleteCmsPageHandler.php
index 739575d3352f4..c59548b58ea6b 100644
--- a/src/Adapter/CMS/Page/CommandHandler/DeleteCmsPageHandler.php
+++ b/src/Adapter/CMS/Page/CommandHandler/DeleteCmsPageHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\DeleteCmsPageCommand;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\CommandHandler\DeleteCmsPageHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\Exception\CannotDeleteCmsPageException;
@@ -35,6 +36,7 @@
/**
* Deletes given cms page.
*/
+#[AsCommandHandler]
final class DeleteCmsPageHandler extends AbstractCmsPageHandler implements DeleteCmsPageHandlerInterface
{
/**
diff --git a/src/Adapter/CMS/Page/CommandHandler/EditCmsPageHandler.php b/src/Adapter/CMS/Page/CommandHandler/EditCmsPageHandler.php
index 3c6e4a5843b1d..720ab56f21c1f 100644
--- a/src/Adapter/CMS/Page/CommandHandler/EditCmsPageHandler.php
+++ b/src/Adapter/CMS/Page/CommandHandler/EditCmsPageHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler;
use CMS;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\EditCmsPageCommand;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\CommandHandler\EditCmsPageHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\Exception\CannotEditCmsPageException;
@@ -38,6 +39,7 @@
/**
* Edits cms page
*/
+#[AsCommandHandler]
final class EditCmsPageHandler extends AbstractCmsPageHandler implements EditCmsPageHandlerInterface
{
/**
diff --git a/src/Adapter/CMS/Page/CommandHandler/ToggleCmsPageStatusHandler.php b/src/Adapter/CMS/Page/CommandHandler/ToggleCmsPageStatusHandler.php
index b592cacada8f4..dabe7356d56a1 100644
--- a/src/Adapter/CMS/Page/CommandHandler/ToggleCmsPageStatusHandler.php
+++ b/src/Adapter/CMS/Page/CommandHandler/ToggleCmsPageStatusHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\ToggleCmsPageStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\CommandHandler\ToggleCmsPageStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\Exception\CannotToggleCmsPageException;
@@ -35,6 +36,7 @@
/**
* Changes the status of cms page.
*/
+#[AsCommandHandler]
final class ToggleCmsPageStatusHandler extends AbstractCmsPageHandler implements ToggleCmsPageStatusHandlerInterface
{
/**
diff --git a/src/Adapter/CMS/Page/QueryHandler/GetCmsCategoryIdForRedirectionHandler.php b/src/Adapter/CMS/Page/QueryHandler/GetCmsCategoryIdForRedirectionHandler.php
index 491920daeacad..95bd8f7d61e89 100644
--- a/src/Adapter/CMS/Page/QueryHandler/GetCmsCategoryIdForRedirectionHandler.php
+++ b/src/Adapter/CMS/Page/QueryHandler/GetCmsCategoryIdForRedirectionHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\CMS\Page\QueryHandler;
use PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\AbstractCmsPageHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\Exception\CmsPageException;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\Query\GetCmsCategoryIdForRedirection;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\QueryHandler\GetCmsCategoryIdHandlerForRedirectionInterface;
@@ -36,6 +37,7 @@
* This class is used for getting the id which is used later on to redirect to the right page after certain controller
* actions.
*/
+#[AsQueryHandler]
final class GetCmsCategoryIdForRedirectionHandler extends AbstractCmsPageHandler implements GetCmsCategoryIdHandlerForRedirectionInterface
{
/**
diff --git a/src/Adapter/CMS/Page/QueryHandler/GetCmsPageForEditingHandler.php b/src/Adapter/CMS/Page/QueryHandler/GetCmsPageForEditingHandler.php
index 83c887962d88b..5bb322fd1a314 100644
--- a/src/Adapter/CMS/Page/QueryHandler/GetCmsPageForEditingHandler.php
+++ b/src/Adapter/CMS/Page/QueryHandler/GetCmsPageForEditingHandler.php
@@ -28,6 +28,7 @@
use Link;
use PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\AbstractCmsPageHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\Exception\CmsPageException;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\Exception\CmsPageNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\CmsPage\Query\GetCmsPageForEditing;
@@ -39,6 +40,7 @@
/**
* Gets cms page for editing
*/
+#[AsQueryHandler]
final class GetCmsPageForEditingHandler extends AbstractCmsPageHandler implements GetCmsPageForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/CMS/PageCategory/CommandHandler/AddCmsPageCategoryHandler.php b/src/Adapter/CMS/PageCategory/CommandHandler/AddCmsPageCategoryHandler.php
index ea67b22cb0642..a597486455d19 100644
--- a/src/Adapter/CMS/PageCategory/CommandHandler/AddCmsPageCategoryHandler.php
+++ b/src/Adapter/CMS/PageCategory/CommandHandler/AddCmsPageCategoryHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler;
use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\AddCmsPageCategoryCommand;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\CommandHandler\AddCmsPageCategoryHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CannotAddCmsPageCategoryException;
@@ -38,6 +39,7 @@
/**
* Adds cms page category
*/
+#[AsCommandHandler]
final class AddCmsPageCategoryHandler extends AbstractCmsPageCategoryHandler implements AddCmsPageCategoryHandlerInterface
{
/**
diff --git a/src/Adapter/CMS/PageCategory/CommandHandler/BulkDeleteCmsPageCategoryHandler.php b/src/Adapter/CMS/PageCategory/CommandHandler/BulkDeleteCmsPageCategoryHandler.php
index f9a9c6ae43388..7a22aa4126150 100644
--- a/src/Adapter/CMS/PageCategory/CommandHandler/BulkDeleteCmsPageCategoryHandler.php
+++ b/src/Adapter/CMS/PageCategory/CommandHandler/BulkDeleteCmsPageCategoryHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler;
use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkDeleteCmsPageCategoryCommand;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\CommandHandler\BulkDeleteCmsPageCategoryHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CannotDeleteCmsPageCategoryException;
@@ -37,6 +38,7 @@
/**
* Class BulkDeleteCmsPageCategoryHandler is responsible for deleting multiple cms page categories.
*/
+#[AsCommandHandler]
final class BulkDeleteCmsPageCategoryHandler implements BulkDeleteCmsPageCategoryHandlerInterface
{
/**
diff --git a/src/Adapter/CMS/PageCategory/CommandHandler/BulkDisableCmsPageCategoryHandler.php b/src/Adapter/CMS/PageCategory/CommandHandler/BulkDisableCmsPageCategoryHandler.php
index d05ef260b9818..94d2a3ca56a19 100644
--- a/src/Adapter/CMS/PageCategory/CommandHandler/BulkDisableCmsPageCategoryHandler.php
+++ b/src/Adapter/CMS/PageCategory/CommandHandler/BulkDisableCmsPageCategoryHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler;
use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkDisableCmsPageCategoryCommand;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\CommandHandler\BulkDisableCmsPageCategoryHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CannotDisableCmsPageCategoryException;
@@ -37,6 +38,7 @@
/**
* Class BulkDisableCmsPageCategoryHandler is responsible for deleting multiple cms page categories.
*/
+#[AsCommandHandler]
final class BulkDisableCmsPageCategoryHandler implements BulkDisableCmsPageCategoryHandlerInterface
{
/**
diff --git a/src/Adapter/CMS/PageCategory/CommandHandler/BulkEnableCmsPageCategoryHandler.php b/src/Adapter/CMS/PageCategory/CommandHandler/BulkEnableCmsPageCategoryHandler.php
index 009dfb7a1525f..c609c4a28f2d8 100644
--- a/src/Adapter/CMS/PageCategory/CommandHandler/BulkEnableCmsPageCategoryHandler.php
+++ b/src/Adapter/CMS/PageCategory/CommandHandler/BulkEnableCmsPageCategoryHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler;
use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkEnableCmsPageCategoryCommand;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\CommandHandler\BulkEnableCmsPageCategoryHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CannotEnableCmsPageCategoryException;
@@ -37,6 +38,7 @@
/**
* Class BulkEnableCmsPageCategoryCommand is responsible for enabling cms category pages.
*/
+#[AsCommandHandler]
final class BulkEnableCmsPageCategoryHandler implements BulkEnableCmsPageCategoryHandlerInterface
{
/**
diff --git a/src/Adapter/CMS/PageCategory/CommandHandler/DeleteCmsPageCategoryHandler.php b/src/Adapter/CMS/PageCategory/CommandHandler/DeleteCmsPageCategoryHandler.php
index 76ae18407c717..1c2a17efc4e6b 100644
--- a/src/Adapter/CMS/PageCategory/CommandHandler/DeleteCmsPageCategoryHandler.php
+++ b/src/Adapter/CMS/PageCategory/CommandHandler/DeleteCmsPageCategoryHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler;
use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\DeleteCmsPageCategoryCommand;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\CommandHandler\DeleteCmsPageCategoryHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CannotDeleteCmsPageCategoryException;
@@ -37,6 +38,7 @@
/**
* Class DeleteCmsPageCategoryHandler is responsible for deleting cms page category.
*/
+#[AsCommandHandler]
final class DeleteCmsPageCategoryHandler implements DeleteCmsPageCategoryHandlerInterface
{
/**
diff --git a/src/Adapter/CMS/PageCategory/CommandHandler/EditCmsPageCategoryHandler.php b/src/Adapter/CMS/PageCategory/CommandHandler/EditCmsPageCategoryHandler.php
index e954064edf909..1aa723507ca8f 100644
--- a/src/Adapter/CMS/PageCategory/CommandHandler/EditCmsPageCategoryHandler.php
+++ b/src/Adapter/CMS/PageCategory/CommandHandler/EditCmsPageCategoryHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler;
use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\EditCmsPageCategoryCommand;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\CommandHandler\EditCmsPageCategoryHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CannotUpdateCmsPageCategoryException;
@@ -38,6 +39,7 @@
/**
* Edits cms page category.
*/
+#[AsCommandHandler]
final class EditCmsPageCategoryHandler extends AbstractCmsPageCategoryHandler implements EditCmsPageCategoryHandlerInterface
{
/**
diff --git a/src/Adapter/CMS/PageCategory/CommandHandler/ToggleCmsPageCategoryStatusHandler.php b/src/Adapter/CMS/PageCategory/CommandHandler/ToggleCmsPageCategoryStatusHandler.php
index f48a04cefb12c..d03d125c58ad7 100644
--- a/src/Adapter/CMS/PageCategory/CommandHandler/ToggleCmsPageCategoryStatusHandler.php
+++ b/src/Adapter/CMS/PageCategory/CommandHandler/ToggleCmsPageCategoryStatusHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler;
use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\ToggleCmsPageCategoryStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\CommandHandler\ToggleCmsPageCategoryStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CannotToggleCmsPageCategoryStatusException;
@@ -37,6 +38,7 @@
/**
* Class ToggleCmsPageCategoryStatusHandler is responsible for turning on and off cms page category status.
*/
+#[AsCommandHandler]
final class ToggleCmsPageCategoryStatusHandler implements ToggleCmsPageCategoryStatusHandlerInterface
{
/**
diff --git a/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoriesForBreadcrumbHandler.php b/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoriesForBreadcrumbHandler.php
index f28a8db7c963e..66143bfb6fc85 100644
--- a/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoriesForBreadcrumbHandler.php
+++ b/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoriesForBreadcrumbHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler;
use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CmsPageCategoryException;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CmsPageCategoryNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoriesForBreadcrumb;
@@ -40,6 +41,7 @@
* Class GetCmsPageCategoriesForBreadcrumbHandler is responsible for providing required data for displaying cms page category
* breadcrumbs.
*/
+#[AsQueryHandler]
final class GetCmsPageCategoriesForBreadcrumbHandler implements GetCmsPageCategoriesForBreadcrumbHandlerInterface
{
/**
diff --git a/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoryForEditingHandler.php b/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoryForEditingHandler.php
index 2df16abfc6c4c..0621ab11e28ca 100644
--- a/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoryForEditingHandler.php
+++ b/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoryForEditingHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler;
use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CmsPageCategoryException;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CmsPageCategoryNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoryForEditing;
@@ -39,6 +40,7 @@
*
* @internal
*/
+#[AsQueryHandler]
final class GetCmsPageCategoryForEditingHandler implements GetCmsPageCategoryForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoryNameForListingHandler.php b/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoryNameForListingHandler.php
index d19cd31a5c7de..bd181fd65ec01 100644
--- a/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoryNameForListingHandler.php
+++ b/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageCategoryNameForListingHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler;
use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoryNameForListing;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\QueryHandler\GetCmsPageCategoryNameForListingHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\ValueObject\CmsPageCategoryId;
@@ -35,6 +36,7 @@
/**
* Gets name by cms category which are used for display in cms listing.
*/
+#[AsQueryHandler]
final class GetCmsPageCategoryNameForListingHandler implements GetCmsPageCategoryNameForListingHandlerInterface
{
/**
diff --git a/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageParentCategoryIdForRedirectionHandler.php b/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageParentCategoryIdForRedirectionHandler.php
index 3221262a84b85..91ec56107c794 100644
--- a/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageParentCategoryIdForRedirectionHandler.php
+++ b/src/Adapter/CMS/PageCategory/QueryHandler/GetCmsPageParentCategoryIdForRedirectionHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler;
use CMSCategory;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Exception\CmsPageCategoryException;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageParentCategoryIdForRedirection;
use PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\QueryHandler\GetCmsPageParentCategoryIdForRedirectionHandlerInterface;
@@ -37,6 +38,7 @@
* Class GetCmsPageParentCategoryIdForRedirectionHandler is responsible for providing cms page categories parent id
* for redirecting to the right controller after create, edit, delete, toggle actions.
*/
+#[AsQueryHandler]
final class GetCmsPageParentCategoryIdForRedirectionHandler implements GetCmsPageParentCategoryIdForRedirectionHandlerInterface
{
/**
diff --git a/src/Core/CommandBus/TacticianCommandBusAdapter.php b/src/Adapter/Cache/Clearer/DoctrineCacheClearer.php
similarity index 68%
rename from src/Core/CommandBus/TacticianCommandBusAdapter.php
rename to src/Adapter/Cache/Clearer/DoctrineCacheClearer.php
index 275b0cfa0c557..130f48d939ea5 100644
--- a/src/Core/CommandBus/TacticianCommandBusAdapter.php
+++ b/src/Adapter/Cache/Clearer/DoctrineCacheClearer.php
@@ -24,33 +24,27 @@
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/
-namespace PrestaShop\PrestaShop\Core\CommandBus;
+namespace PrestaShop\PrestaShop\Adapter\Cache\Clearer;
-use League\Tactician\CommandBus;
+use PrestaShop\PrestaShop\Core\Cache\Clearer\CacheClearerInterface;
+use Symfony\Component\Cache\DoctrineProvider;
-/**
- * Class TacticianCommandBusAdapter is Tactician's CommandsBus implementation for PrestaShop's contract.
- */
-final class TacticianCommandBusAdapter implements CommandBusInterface
+final class DoctrineCacheClearer implements CacheClearerInterface
{
- /**
- * @var CommandBus
- */
- private $bus;
+ /** @var DoctrineProvider */
+ private $doctrineProvider;
- /**
- * @param CommandBus $bus
- */
- public function __construct(CommandBus $bus)
- {
- $this->bus = $bus;
+ public function __construct(
+ DoctrineProvider $doctrineProvider
+ ) {
+ $this->doctrineProvider = $doctrineProvider;
}
/**
* {@inheritdoc}
*/
- public function handle($command)
+ public function clear()
{
- return $this->bus->handle($command);
+ $this->doctrineProvider->deleteAll();
}
}
diff --git a/src/Adapter/Carrier/CommandHandler/BulkDeleteCarrierHandler.php b/src/Adapter/Carrier/CommandHandler/BulkDeleteCarrierHandler.php
index e83a310325a13..7c7c05c345463 100644
--- a/src/Adapter/Carrier/CommandHandler/BulkDeleteCarrierHandler.php
+++ b/src/Adapter/Carrier/CommandHandler/BulkDeleteCarrierHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Carrier\AbstractCarrierHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Carrier\Command\BulkDeleteCarrierCommand;
use PrestaShop\PrestaShop\Core\Domain\Carrier\CommandHandler\BulkDeleteCarrierHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Carrier\Exception\CannotDeleteCarrierException;
@@ -38,6 +39,7 @@
/**
* Bulk deletes carriers
*/
+#[AsCommandHandler]
class BulkDeleteCarrierHandler extends AbstractCarrierHandler implements BulkDeleteCarrierHandlerInterface
{
/**
diff --git a/src/Adapter/Carrier/CommandHandler/BulkToggleCarrierStatusHandler.php b/src/Adapter/Carrier/CommandHandler/BulkToggleCarrierStatusHandler.php
index 12f4ae78706b2..e23c53c165da6 100644
--- a/src/Adapter/Carrier/CommandHandler/BulkToggleCarrierStatusHandler.php
+++ b/src/Adapter/Carrier/CommandHandler/BulkToggleCarrierStatusHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Carrier\AbstractCarrierHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Carrier\Command\BulkToggleCarrierStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Carrier\CommandHandler\BulkToggleCarrierStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Carrier\Exception\CannotToggleCarrierStatusException;
@@ -38,6 +39,7 @@
/**
* Bulk toggles carriers status
*/
+#[AsCommandHandler]
class BulkToggleCarrierStatusHandler extends AbstractCarrierHandler implements BulkToggleCarrierStatusHandlerInterface
{
/**
diff --git a/src/Adapter/Carrier/CommandHandler/DeleteCarrierHandler.php b/src/Adapter/Carrier/CommandHandler/DeleteCarrierHandler.php
index 58a7861066402..f468398d39e45 100644
--- a/src/Adapter/Carrier/CommandHandler/DeleteCarrierHandler.php
+++ b/src/Adapter/Carrier/CommandHandler/DeleteCarrierHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Carrier\AbstractCarrierHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Carrier\Command\DeleteCarrierCommand;
use PrestaShop\PrestaShop\Core\Domain\Carrier\CommandHandler\DeleteCarrierHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Carrier\Exception\CannotDeleteCarrierException;
@@ -38,6 +39,7 @@
/**
* Handles command that deletes carrier
*/
+#[AsCommandHandler]
class DeleteCarrierHandler extends AbstractCarrierHandler implements DeleteCarrierHandlerInterface
{
/**
diff --git a/src/Adapter/Carrier/CommandHandler/ToggleCarrierIsFreeHandler.php b/src/Adapter/Carrier/CommandHandler/ToggleCarrierIsFreeHandler.php
index a58f1745a4cfa..451fa15af78a6 100644
--- a/src/Adapter/Carrier/CommandHandler/ToggleCarrierIsFreeHandler.php
+++ b/src/Adapter/Carrier/CommandHandler/ToggleCarrierIsFreeHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Carrier\AbstractCarrierHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Carrier\Command\ToggleCarrierIsFreeCommand;
use PrestaShop\PrestaShop\Core\Domain\Carrier\CommandHandler\ToggleCarrierIsFreeHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Carrier\Exception\CannotToggleCarrierIsFreeStatusException;
use PrestaShop\PrestaShop\Core\Domain\Carrier\Exception\CarrierException;
use PrestaShopException;
+#[AsCommandHandler]
class ToggleCarrierIsFreeHandler extends AbstractCarrierHandler implements ToggleCarrierIsFreeHandlerInterface
{
/**
diff --git a/src/Adapter/Carrier/CommandHandler/ToggleCarrierStatusHandler.php b/src/Adapter/Carrier/CommandHandler/ToggleCarrierStatusHandler.php
index f7fee0bd7cc55..25bc6486cc67a 100644
--- a/src/Adapter/Carrier/CommandHandler/ToggleCarrierStatusHandler.php
+++ b/src/Adapter/Carrier/CommandHandler/ToggleCarrierStatusHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Carrier\AbstractCarrierHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Carrier\Command\ToggleCarrierStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Carrier\CommandHandler\ToggleCarrierStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Carrier\Exception\CannotToggleCarrierStatusException;
@@ -38,6 +39,7 @@
/**
* Handles command that toggle carrier status
*/
+#[AsCommandHandler]
class ToggleCarrierStatusHandler extends AbstractCarrierHandler implements ToggleCarrierStatusHandlerInterface
{
/**
diff --git a/src/Adapter/Cart/CommandHandler/AddCartRuleToCartHandler.php b/src/Adapter/Cart/CommandHandler/AddCartRuleToCartHandler.php
index 73506b64f6519..5f3386422046c 100644
--- a/src/Adapter/Cart/CommandHandler/AddCartRuleToCartHandler.php
+++ b/src/Adapter/Cart/CommandHandler/AddCartRuleToCartHandler.php
@@ -34,6 +34,7 @@
use Customer;
use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
use PrestaShop\PrestaShop\Adapter\ContextStateManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddCartRuleToCartCommand;
use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\AddCartRuleToCartHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartException;
@@ -43,6 +44,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class AddCartRuleToCartHandler extends AbstractCartHandler implements AddCartRuleToCartHandlerInterface
{
/**
diff --git a/src/Adapter/Cart/CommandHandler/AddCustomizationHandler.php b/src/Adapter/Cart/CommandHandler/AddCustomizationHandler.php
index 58d5836c496a5..e865f79182add 100644
--- a/src/Adapter/Cart/CommandHandler/AddCustomizationHandler.php
+++ b/src/Adapter/Cart/CommandHandler/AddCustomizationHandler.php
@@ -30,6 +30,7 @@
use CustomizationField;
use ImageManager;
use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddCustomizationCommand;
use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\AddCustomizationHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartNotFoundException;
@@ -46,6 +47,7 @@
/**
* Handles @var AddCustomizationCommand using legacy object model.
*/
+#[AsCommandHandler]
final class AddCustomizationHandler extends AbstractCartHandler implements AddCustomizationHandlerInterface
{
/**
diff --git a/src/Adapter/Cart/CommandHandler/AddProductToCartHandler.php b/src/Adapter/Cart/CommandHandler/AddProductToCartHandler.php
index 8a3861731efd2..4d17af6b918ad 100644
--- a/src/Adapter/Cart/CommandHandler/AddProductToCartHandler.php
+++ b/src/Adapter/Cart/CommandHandler/AddProductToCartHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Cart\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddCustomizationCommand;
use PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddProductToCartCommand;
use PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateProductQuantityInCartCommand;
@@ -38,6 +39,7 @@
/**
* Handles add product to cart command
*/
+#[AsCommandHandler]
final class AddProductToCartHandler extends AbstractCartHandler implements AddProductToCartHandlerInterface
{
/**
diff --git a/src/Adapter/Cart/CommandHandler/CreateEmptyCustomerCartHandler.php b/src/Adapter/Cart/CommandHandler/CreateEmptyCustomerCartHandler.php
index 0478f23a2fcb2..f92a9e9cf5236 100644
--- a/src/Adapter/Cart/CommandHandler/CreateEmptyCustomerCartHandler.php
+++ b/src/Adapter/Cart/CommandHandler/CreateEmptyCustomerCartHandler.php
@@ -30,6 +30,7 @@
use Configuration;
use Currency;
use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Cart\Command\CreateEmptyCustomerCartCommand;
use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\CreateEmptyCustomerCartHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Cart\ValueObject\CartId;
@@ -38,6 +39,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class CreateEmptyCustomerCartHandler implements CreateEmptyCustomerCartHandlerInterface
{
/**
@@ -83,7 +85,6 @@ private function createEmptyCustomerCart(Customer $customer): Cart
$cart->id_address_delivery = $addressId;
$cart->id_address_invoice = $addressId;
- $cart->setNoMultishipping();
$cart->save();
return $cart;
diff --git a/src/Adapter/Cart/CommandHandler/RemoveCartRuleFromCartHandler.php b/src/Adapter/Cart/CommandHandler/RemoveCartRuleFromCartHandler.php
index 03fe93a280782..d3bbfe90afff3 100644
--- a/src/Adapter/Cart/CommandHandler/RemoveCartRuleFromCartHandler.php
+++ b/src/Adapter/Cart/CommandHandler/RemoveCartRuleFromCartHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Cart\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Cart\Command\RemoveCartRuleFromCartCommand;
use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\RemoveCartRuleFromCartHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartException;
@@ -34,6 +35,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class RemoveCartRuleFromCartHandler extends AbstractCartHandler implements RemoveCartRuleFromCartHandlerInterface
{
/**
diff --git a/src/Adapter/Cart/CommandHandler/RemoveProductFromCartHandler.php b/src/Adapter/Cart/CommandHandler/RemoveProductFromCartHandler.php
index b62bb960d90c9..adf5c08f2a0b3 100644
--- a/src/Adapter/Cart/CommandHandler/RemoveProductFromCartHandler.php
+++ b/src/Adapter/Cart/CommandHandler/RemoveProductFromCartHandler.php
@@ -30,6 +30,7 @@
use Customer;
use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
use PrestaShop\PrestaShop\Adapter\ContextStateManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Cart\Command\RemoveProductFromCartCommand;
use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\RemoveProductFromCartHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartException;
@@ -40,6 +41,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class RemoveProductFromCartHandler extends AbstractCartHandler implements RemoveProductFromCartHandlerInterface
{
/**
diff --git a/src/Adapter/Cart/CommandHandler/SendCartToCustomerHandler.php b/src/Adapter/Cart/CommandHandler/SendCartToCustomerHandler.php
index 5e693c300d486..23a98c3afcbcb 100644
--- a/src/Adapter/Cart/CommandHandler/SendCartToCustomerHandler.php
+++ b/src/Adapter/Cart/CommandHandler/SendCartToCustomerHandler.php
@@ -30,6 +30,7 @@
use Context;
use Customer;
use Mail;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Cart\Command\SendCartToCustomerCommand;
use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\SendCartToCustomerHanlderInterface;
use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartException;
@@ -39,7 +40,10 @@
/**
* @internal
+ *
+ * @deprecated Since 9.0 and will be removed in the next major.
*/
+#[AsCommandHandler]
final class SendCartToCustomerHandler implements SendCartToCustomerHanlderInterface
{
/**
diff --git a/src/Adapter/Cart/CommandHandler/UpdateCartAddressesHandler.php b/src/Adapter/Cart/CommandHandler/UpdateCartAddressesHandler.php
index c497e9f7ca339..713c78b6d1814 100644
--- a/src/Adapter/Cart/CommandHandler/UpdateCartAddressesHandler.php
+++ b/src/Adapter/Cart/CommandHandler/UpdateCartAddressesHandler.php
@@ -28,6 +28,7 @@
use Cart;
use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartAddressesCommand;
use PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartCarrierCommand;
use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\UpdateCartAddressesHandlerInterface;
@@ -37,6 +38,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class UpdateCartAddressesHandler extends AbstractCartHandler implements UpdateCartAddressesHandlerInterface
{
/**
diff --git a/src/Adapter/Cart/CommandHandler/UpdateCartCarrierHandler.php b/src/Adapter/Cart/CommandHandler/UpdateCartCarrierHandler.php
index 38ad820c4992e..8c88434ed4970 100644
--- a/src/Adapter/Cart/CommandHandler/UpdateCartCarrierHandler.php
+++ b/src/Adapter/Cart/CommandHandler/UpdateCartCarrierHandler.php
@@ -29,6 +29,7 @@
use Carrier;
use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
use PrestaShop\PrestaShop\Adapter\ContextStateManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartCarrierCommand;
use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\UpdateCartCarrierHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartConstraintException;
@@ -37,6 +38,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class UpdateCartCarrierHandler extends AbstractCartHandler implements UpdateCartCarrierHandlerInterface
{
/**
diff --git a/src/Adapter/Cart/CommandHandler/UpdateCartCurrencyHandler.php b/src/Adapter/Cart/CommandHandler/UpdateCartCurrencyHandler.php
index 114d4f886b618..aafbc2b8f8b68 100644
--- a/src/Adapter/Cart/CommandHandler/UpdateCartCurrencyHandler.php
+++ b/src/Adapter/Cart/CommandHandler/UpdateCartCurrencyHandler.php
@@ -28,6 +28,7 @@
use Currency;
use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartCurrencyCommand;
use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\UpdateCartCurrencyHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartException;
@@ -39,6 +40,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class UpdateCartCurrencyHandler extends AbstractCartHandler implements UpdateCartCurrencyHandlerInterface
{
/**
diff --git a/src/Adapter/Cart/CommandHandler/UpdateCartDeliverySettingsHandler.php b/src/Adapter/Cart/CommandHandler/UpdateCartDeliverySettingsHandler.php
index 1bffb3f8cebf3..02463269b0fe2 100644
--- a/src/Adapter/Cart/CommandHandler/UpdateCartDeliverySettingsHandler.php
+++ b/src/Adapter/Cart/CommandHandler/UpdateCartDeliverySettingsHandler.php
@@ -29,6 +29,7 @@
use Cart;
use CartRule;
use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\ConfigurationInterface;
use PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartDeliverySettingsCommand;
use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\UpdateCartDeliverySettingsHandlerInterface;
@@ -43,6 +44,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class UpdateCartDeliverySettingsHandler extends AbstractCartHandler implements UpdateCartDeliverySettingsHandlerInterface
{
/**
diff --git a/src/Adapter/Cart/CommandHandler/UpdateCartLanguageHandler.php b/src/Adapter/Cart/CommandHandler/UpdateCartLanguageHandler.php
index cd6279c6816e9..dd874ea05e348 100644
--- a/src/Adapter/Cart/CommandHandler/UpdateCartLanguageHandler.php
+++ b/src/Adapter/Cart/CommandHandler/UpdateCartLanguageHandler.php
@@ -28,6 +28,7 @@
use Language;
use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartLanguageCommand;
use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\UpdateCartLanguageHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartException;
@@ -39,6 +40,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class UpdateCartLanguageHandler extends AbstractCartHandler implements UpdateCartLanguageHandlerInterface
{
/**
diff --git a/src/Adapter/Cart/CommandHandler/UpdateProductPriceInCartHandler.php b/src/Adapter/Cart/CommandHandler/UpdateProductPriceInCartHandler.php
index 29debc44705f4..10d7def6c4e95 100644
--- a/src/Adapter/Cart/CommandHandler/UpdateProductPriceInCartHandler.php
+++ b/src/Adapter/Cart/CommandHandler/UpdateProductPriceInCartHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Cart\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateProductPriceInCartCommand;
use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\UpdateProductPriceInCartHandlerInterface;
use SpecificPrice;
@@ -36,6 +37,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class UpdateProductPriceInCartHandler extends AbstractCartHandler implements UpdateProductPriceInCartHandlerInterface
{
/**
diff --git a/src/Adapter/Cart/CommandHandler/UpdateProductQuantityInCartHandler.php b/src/Adapter/Cart/CommandHandler/UpdateProductQuantityInCartHandler.php
index 35ca87f8ed2b6..c50d178ed2e39 100644
--- a/src/Adapter/Cart/CommandHandler/UpdateProductQuantityInCartHandler.php
+++ b/src/Adapter/Cart/CommandHandler/UpdateProductQuantityInCartHandler.php
@@ -32,6 +32,7 @@
use Pack;
use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
use PrestaShop\PrestaShop\Adapter\ContextStateManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateProductQuantityInCartCommand;
use PrestaShop\PrestaShop\Core\Domain\Cart\CommandHandler\UpdateProductQuantityInCartHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartConstraintException;
@@ -50,6 +51,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class UpdateProductQuantityInCartHandler extends AbstractCartHandler implements UpdateProductQuantityInCartHandlerInterface
{
/**
diff --git a/src/Adapter/Cart/QueryHandler/GetCartForOrderCreationHandler.php b/src/Adapter/Cart/QueryHandler/GetCartForOrderCreationHandler.php
index 42ee9f4edc54d..1e199d0c2d9ba 100644
--- a/src/Adapter/Cart/QueryHandler/GetCartForOrderCreationHandler.php
+++ b/src/Adapter/Cart/QueryHandler/GetCartForOrderCreationHandler.php
@@ -38,6 +38,7 @@
use PrestaShop\Decimal\DecimalNumber;
use PrestaShop\PrestaShop\Adapter\Cart\AbstractCartHandler;
use PrestaShop\PrestaShop\Adapter\ContextStateManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetCartForOrderCreation;
use PrestaShop\PrestaShop\Core\Domain\Cart\QueryHandler\GetCartForOrderCreationHandlerInterface;
@@ -59,6 +60,7 @@
/**
* Handles GetCartForOrderCreation query using legacy object models
*/
+#[AsQueryHandler]
final class GetCartForOrderCreationHandler extends AbstractCartHandler implements GetCartForOrderCreationHandlerInterface
{
/**
@@ -359,7 +361,7 @@ private function extractShippingFromLegacySummary(Cart $cart, array $legacySumma
$deliveryAddress = (int) $cart->id_address_delivery;
//Check if there is any delivery options available for cart delivery address
- if (!array_key_exists($deliveryAddress, $deliveryOptionsByAddress)) {
+ if (!array_key_exists($deliveryAddress, $deliveryOptionsByAddress) && !$cart->isVirtualCart()) {
return null;
}
@@ -374,7 +376,8 @@ private function extractShippingFromLegacySummary(Cart $cart, array $legacySumma
(int) $carrier->id ?: $this->defaultCarrierId ?: null,
(bool) $cart->gift,
(bool) $cart->recyclable,
- $cart->gift_message
+ $cart->gift_message,
+ $cart->isVirtualCart()
);
}
@@ -389,6 +392,9 @@ private function extractShippingFromLegacySummary(Cart $cart, array $legacySumma
private function fetchCartDeliveryOptions(array $deliveryOptionsByAddress, int $deliveryAddressId)
{
$deliveryOptions = [];
+ if (empty($deliveryOptionsByAddress)) {
+ return $deliveryOptions;
+ }
// legacy multishipping feature allowed to split cart shipping to multiple addresses.
// now when the multishipping feature is removed
// the list of carriers should be shared across whole cart for single delivery address
diff --git a/src/Adapter/Cart/QueryHandler/GetCartForViewingHandler.php b/src/Adapter/Cart/QueryHandler/GetCartForViewingHandler.php
index 846d2715d6dc1..bd4b9049c2ced 100644
--- a/src/Adapter/Cart/QueryHandler/GetCartForViewingHandler.php
+++ b/src/Adapter/Cart/QueryHandler/GetCartForViewingHandler.php
@@ -35,6 +35,7 @@
use Group;
use Order;
use PrestaShop\PrestaShop\Adapter\ImageManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetCartForViewing;
use PrestaShop\PrestaShop\Core\Domain\Cart\QueryHandler\GetCartForViewingHandlerInterface;
@@ -48,6 +49,7 @@
/**
* @internal
*/
+#[AsQueryHandler]
final class GetCartForViewingHandler implements GetCartForViewingHandlerInterface
{
/**
diff --git a/src/Adapter/Cart/QueryHandler/GetLastEmptyCustomerCartHandler.php b/src/Adapter/Cart/QueryHandler/GetLastEmptyCustomerCartHandler.php
index b97f5a2bfebc6..51d2ff5bcc5e2 100644
--- a/src/Adapter/Cart/QueryHandler/GetLastEmptyCustomerCartHandler.php
+++ b/src/Adapter/Cart/QueryHandler/GetLastEmptyCustomerCartHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Cart\QueryHandler;
use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartConstraintException;
use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartException;
use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartNotFoundException;
@@ -39,6 +40,7 @@
/**
* Gets last empty cart for customer using legacy object model
*/
+#[AsQueryHandler]
final class GetLastEmptyCustomerCartHandler implements GetLastEmptyCustomerCartHandlerInterface
{
/**
diff --git a/src/Adapter/CartRule/CartRuleActionFiller.php b/src/Adapter/CartRule/CartRuleActionFiller.php
index 656e62b0da86e..7651a0ed9a77f 100644
--- a/src/Adapter/CartRule/CartRuleActionFiller.php
+++ b/src/Adapter/CartRule/CartRuleActionFiller.php
@@ -102,8 +102,7 @@ private function fillDiscount(CartRule $cartRule, ?Discount $discount): void
if ($amountDiscount) {
$this->fillAmountDiscount($cartRule, $amountDiscount);
- }
- if ($percentageDiscount) {
+ } else {
$this->fillPercentageDiscount($cartRule, $percentageDiscount);
}
diff --git a/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php b/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php
index 1d5752b329972..e6cc7e608131a 100644
--- a/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/AddCartRuleHandler.php
@@ -27,16 +27,20 @@
namespace PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler;
use CartRule;
+use DateTimeImmutable;
use PrestaShop\PrestaShop\Adapter\CartRule\CartRuleActionFiller;
use PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\AddCartRuleCommand;
use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\AddCartRuleHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
+use PrestaShop\PrestaShop\Core\Util\DateTime\DateTime as DateTimeUtil;
use PrestaShopException;
/**
* Handles adding new cart rule using legacy logic.
*/
+#[AsCommandHandler]
class AddCartRuleHandler implements AddCartRuleHandlerInterface
{
/**
@@ -66,7 +70,6 @@ public function __construct(
*/
public function handle(AddCartRuleCommand $command): CartRuleId
{
- //@todo: restrictions are missing. We should consider dedicated command for restrictions
$cartRule = $this->cartRuleRepository->add($this->buildCartRuleFromCommandData($command));
return new CartRuleId((int) $cartRule->id);
@@ -87,7 +90,7 @@ private function buildCartRuleFromCommandData(AddCartRuleCommand $command): Cart
$cartRule->description = $command->getDescription();
$cartRule->code = $command->getCode();
$cartRule->highlight = $command->isHighlightInCart();
- $cartRule->partial_use = $command->isAllowPartialUse();
+ $cartRule->partial_use = $command->allowPartialUse();
$cartRule->priority = $command->getPriority();
$cartRule->active = $command->isActive();
@@ -107,8 +110,15 @@ private function fillCartRuleConditionsFromCommandData(CartRule $cartRule, AddCa
{
$cartRule->id_customer = null !== $command->getCustomerId() ? $command->getCustomerId()->getValue() : null;
- $cartRule->date_from = $command->getValidFrom()->format('Y-m-d H:i:s');
- $cartRule->date_to = $command->getValidTo()->format('Y-m-d H:i:s');
+ if (null === $command->getValidFrom() || null === $command->getValidTo()) {
+ $now = new DateTimeImmutable();
+
+ $cartRule->date_from = $now->format(DateTimeUtil::DEFAULT_DATETIME_FORMAT);
+ $cartRule->date_to = $now->modify('+1 month')->format(DateTimeUtil::DEFAULT_DATETIME_FORMAT);
+ } else {
+ $cartRule->date_from = $command->getValidFrom()->format(DateTimeUtil::DEFAULT_DATETIME_FORMAT);
+ $cartRule->date_to = $command->getValidTo()->format(DateTimeUtil::DEFAULT_DATETIME_FORMAT);
+ }
$minimumAmount = $command->getMinimumAmount();
if ($minimumAmount) {
diff --git a/src/Adapter/CartRule/CommandHandler/BulkDeleteCartRuleHandler.php b/src/Adapter/CartRule/CommandHandler/BulkDeleteCartRuleHandler.php
index d1b75079539b7..450ed752ea4e6 100644
--- a/src/Adapter/CartRule/CommandHandler/BulkDeleteCartRuleHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/BulkDeleteCartRuleHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler;
use PrestaShop\PrestaShop\Adapter\CartRule\AbstractCartRuleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkDeleteCartRuleCommand;
use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\BulkDeleteCartRuleHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\BulkDeleteCartRuleException;
@@ -37,6 +38,7 @@
/**
* Deletes cart rules in bulk action using legacy object model
*/
+#[AsCommandHandler]
final class BulkDeleteCartRuleHandler extends AbstractCartRuleHandler implements BulkDeleteCartRuleHandlerInterface
{
/**
diff --git a/src/Adapter/CartRule/CommandHandler/BulkToggleCartRuleStatusHandler.php b/src/Adapter/CartRule/CommandHandler/BulkToggleCartRuleStatusHandler.php
index d0161e57a4a86..82746001936d1 100644
--- a/src/Adapter/CartRule/CommandHandler/BulkToggleCartRuleStatusHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/BulkToggleCartRuleStatusHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler;
use PrestaShop\PrestaShop\Adapter\CartRule\AbstractCartRuleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkToggleCartRuleStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\BulkToggleCartRuleStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\BulkToggleCartRuleException;
@@ -37,6 +38,7 @@
/**
* Handles command which toggles cart rule status in bulk action
*/
+#[AsCommandHandler]
final class BulkToggleCartRuleStatusHandler extends AbstractCartRuleHandler implements BulkToggleCartRuleStatusHandlerInterface
{
/**
diff --git a/src/Adapter/CartRule/CommandHandler/DeleteCartRuleHandler.php b/src/Adapter/CartRule/CommandHandler/DeleteCartRuleHandler.php
index 4206a005d4ca7..fd722bd087095 100644
--- a/src/Adapter/CartRule/CommandHandler/DeleteCartRuleHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/DeleteCartRuleHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler;
use PrestaShop\PrestaShop\Adapter\CartRule\AbstractCartRuleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\DeleteCartRuleCommand;
use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\DeleteCartRuleHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CannotDeleteCartRuleException;
@@ -36,6 +37,7 @@
/**
* Handles deletion of cart rule using legacy object model
*/
+#[AsCommandHandler]
final class DeleteCartRuleHandler extends AbstractCartRuleHandler implements DeleteCartRuleHandlerInterface
{
/**
diff --git a/src/Adapter/CartRule/CommandHandler/EditCartRuleHandler.php b/src/Adapter/CartRule/CommandHandler/EditCartRuleHandler.php
index 19f98dcb4b3c0..bb448e08359d8 100644
--- a/src/Adapter/CartRule/CommandHandler/EditCartRuleHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/EditCartRuleHandler.php
@@ -30,10 +30,12 @@
use CartRule;
use PrestaShop\PrestaShop\Adapter\CartRule\CartRuleActionFiller;
use PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\EditCartRuleCommand;
use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\EditCartRuleHandlerInterface;
use PrestaShop\PrestaShop\Core\Util\DateTime\DateTime as DateTimeUtil;
+#[AsCommandHandler]
class EditCartRuleHandler implements EditCartRuleHandlerInterface
{
/**
@@ -134,8 +136,9 @@ private function fillConditions(CartRule $cartRule, EditCartRuleCommand $command
$cartRule->date_to = $command->getValidTo()->format(DateTimeUtil::DEFAULT_DATETIME_FORMAT);
$updatableProperties[] = 'date_to';
}
- if (null !== $command->getMinimumAmount()) {
- $minimumAmount = $command->getMinimumAmount();
+
+ $minimumAmount = $command->getMinimumAmount();
+ if (null !== $minimumAmount) {
$cartRule->minimum_amount = (float) (string) $minimumAmount->getAmount();
$cartRule->minimum_amount_currency = $minimumAmount->getCurrencyId()->getValue();
$cartRule->minimum_amount_tax = $minimumAmount->isTaxIncluded();
diff --git a/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
new file mode 100644
index 0000000000000..4c364d20b7531
--- /dev/null
+++ b/src/Adapter/CartRule/CommandHandler/SetCartRuleRestrictionsHandler.php
@@ -0,0 +1,153 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler;
+
+use CartRule;
+use PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
+use PrestaShop\PrestaShop\Core\Domain\Carrier\ValueObject\CarrierId;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleRestrictionsCommand;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\SetCartRuleRestrictionsHandlerInterface;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
+use PrestaShop\PrestaShop\Core\Domain\Country\ValueObject\CountryId;
+use PrestaShop\PrestaShop\Core\Domain\Customer\Group\ValueObject\GroupId;
+
+#[AsCommandHandler]
+class SetCartRuleRestrictionsHandler implements SetCartRuleRestrictionsHandlerInterface
+{
+ public function __construct(
+ protected readonly CartRuleRepository $cartRuleRepository
+ ) {
+ }
+
+ public function handle(SetCartRuleRestrictionsCommand $command): void
+ {
+ if (null === $command->getRestrictedCartRuleIds()
+ && null === $command->getProductRestrictionRuleGroups()
+ && null === $command->getRestrictedCarrierIds()
+ && null === $command->getRestrictedCountryIds()
+ && null === $command->getRestrictedGroupIds()
+ ) {
+ // no restrictions were modified
+ return;
+ }
+
+ $cartRule = $this->cartRuleRepository->get($command->getCartRuleId());
+
+ $restrictedCartRuleIds = $command->getRestrictedCartRuleIds();
+ if (null !== $restrictedCartRuleIds) {
+ $this->setCartRuleRestrictions($cartRule, $restrictedCartRuleIds);
+ }
+ $productRestrictionGroups = $command->getProductRestrictionRuleGroups();
+ if (null !== $productRestrictionGroups) {
+ $this->setProductRestrictions($cartRule, $productRestrictionGroups);
+ }
+ $restrictedCarrierIds = $command->getRestrictedCarrierIds();
+ if (null !== $restrictedCarrierIds) {
+ $this->setCarrierRestrictions($cartRule, $restrictedCarrierIds);
+ }
+ $restrictedCountryIds = $command->getRestrictedCountryIds();
+ if (null !== $restrictedCountryIds) {
+ $this->setCountryRestrictions($cartRule, $restrictedCountryIds);
+ }
+ $restrictedGroupIds = $command->getRestrictedGroupIds();
+ if (null !== $restrictedGroupIds) {
+ $this->setGroupRestrictions($cartRule, $restrictedGroupIds);
+ }
+ // it would be more performant updating all restriction props at the end with one update call,
+ // but that way we might introduce cart rule state failure in case one of steps fails somewhere in the middle
+ }
+
+ private function setCartRuleRestrictions(CartRule $cartRule, array $restrictedCartRuleIds): void
+ {
+ $cartRuleId = new CartRuleId((int) $cartRule->id);
+ $this->cartRuleRepository->assertAllCartRulesExists($restrictedCartRuleIds);
+ $this->cartRuleRepository->restrictCartRules($cartRuleId, $restrictedCartRuleIds);
+ $hasRestrictions = !empty($restrictedCartRuleIds);
+
+ $cartRule->cart_rule_restriction = $hasRestrictions;
+ $this->cartRuleRepository->partialUpdate($cartRule, ['cart_rule_restriction']);
+
+ // update cart_rule_restriction property for all the cart rules that have been affected
+ foreach ($this->cartRuleRepository->getRestrictedCartRuleIds($cartRuleId) as $restrictedCartRuleId) {
+ $affectedCartRule = $this->cartRuleRepository->get(new CartRuleId($restrictedCartRuleId));
+ $affectedCartRule->cart_rule_restriction = $hasRestrictions;
+ $this->cartRuleRepository->partialUpdate($affectedCartRule, ['cart_rule_restriction']);
+ }
+ }
+
+ private function setProductRestrictions(CartRule $cartRule, array $restrictionRuleGroups): void
+ {
+ $this->cartRuleRepository->setProductRestrictions(new CartRuleId((int) $cartRule->id), $restrictionRuleGroups);
+
+ $cartRule->product_restriction = !empty($restrictionRuleGroups);
+ $this->cartRuleRepository->partialUpdate($cartRule, ['product_restriction']);
+ }
+
+ /**
+ * @param CartRule $cartRule
+ * @param CarrierId[] $restrictedCarrierIds
+ *
+ * @return void
+ */
+ private function setCarrierRestrictions(CartRule $cartRule, array $restrictedCarrierIds): void
+ {
+ $this->cartRuleRepository->setCarrierRestrictions(new CartRuleId((int) $cartRule->id), $restrictedCarrierIds);
+
+ $cartRule->carrier_restriction = !empty($restrictedCarrierIds);
+ $this->cartRuleRepository->partialUpdate($cartRule, ['carrier_restriction']);
+ }
+
+ /**
+ * @param CartRule $cartRule
+ * @param CountryId[] $restrictedCountryIds
+ *
+ * @return void
+ */
+ private function setCountryRestrictions(CartRule $cartRule, array $restrictedCountryIds): void
+ {
+ $this->cartRuleRepository->setCountryRestrictions(new CartRuleId((int) $cartRule->id), $restrictedCountryIds);
+
+ $cartRule->country_restriction = !empty($restrictedCountryIds);
+ $this->cartRuleRepository->partialUpdate($cartRule, ['country_restriction']);
+ }
+
+ /**
+ * @param GroupId[] $restrictedGroupIds
+ *
+ * @return void
+ */
+ private function setGroupRestrictions(CartRule $cartRule, array $restrictedGroupIds): void
+ {
+ $this->cartRuleRepository->setGroupRestrictions(new CartRuleId((int) $cartRule->id), $restrictedGroupIds);
+
+ $cartRule->group_restriction = !empty($restrictedGroupIds);
+ $this->cartRuleRepository->partialUpdate($cartRule, ['group_restriction']);
+ }
+}
diff --git a/src/Adapter/CartRule/CommandHandler/ToggleCartRuleStatusHandler.php b/src/Adapter/CartRule/CommandHandler/ToggleCartRuleStatusHandler.php
index 54304736e864e..19468d6be4a38 100644
--- a/src/Adapter/CartRule/CommandHandler/ToggleCartRuleStatusHandler.php
+++ b/src/Adapter/CartRule/CommandHandler/ToggleCartRuleStatusHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler;
use PrestaShop\PrestaShop\Adapter\CartRule\AbstractCartRuleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\ToggleCartRuleStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler\ToggleCartRuleStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\UpdateCartRuleException;
@@ -36,6 +37,7 @@
/**
* Handles command which toggles cart rule status
*/
+#[AsCommandHandler]
final class ToggleCartRuleStatusHandler extends AbstractCartRuleHandler implements ToggleCartRuleStatusHandlerInterface
{
/**
diff --git a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
index 581af44fb3406..541d8f9f0a4c6 100644
--- a/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
+++ b/src/Adapter/CartRule/QueryHandler/GetCartRuleForEditingHandler.php
@@ -31,10 +31,9 @@
use CartRule;
use DateTime;
use PrestaShop\Decimal\DecimalNumber;
-use PrestaShop\PrestaShop\Adapter\CartRule\AbstractCartRuleHandler;
use PrestaShop\PrestaShop\Adapter\CartRule\LegacyDiscountApplicationType;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleException;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleNotFoundException;
+use PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\CartRule\Query\GetCartRuleForEditing;
use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryHandler\GetCartRuleForEditingHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult\CartRuleActionForEditing;
@@ -44,28 +43,33 @@
use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult\CartRuleMinimumForEditing;
use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult\CartRuleReductionForEditing;
use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult\CartRuleRestrictionsForEditing;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\DiscountApplicationType;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
use PrestaShop\PrestaShop\Core\Domain\Customer\ValueObject\CustomerId;
use PrestaShop\PrestaShop\Core\Domain\Customer\ValueObject\NoCustomerId;
use PrestaShop\PrestaShop\Core\Util\DateTime\DateTime as DateTimeUtils;
/**
- * Handles command which gets catalog price rule for editing using legacy object model
+ * Handles command which gets cart rule for editing using legacy object model
*/
-final class GetCartRuleForEditingHandler extends AbstractCartRuleHandler implements GetCartRuleForEditingHandlerInterface
+#[AsQueryHandler]
+class GetCartRuleForEditingHandler implements GetCartRuleForEditingHandlerInterface
{
+ public function __construct(
+ protected readonly CartRuleRepository $cartRuleRepository
+ ) {
+ }
+
/**
* @param GetCartRuleForEditing $query
*
* @return CartRuleForEditing
- *
- * @throws CartRuleException
- * @throws CartRuleNotFoundException
*/
public function handle(GetCartRuleForEditing $query): CartRuleForEditing
{
- $cartRuleId = $query->getCartRuleId();
- $cartRule = $this->getCartRule($cartRuleId);
+ $cartRuleId = $query->cartRuleId;
+ $cartRule = $this->cartRuleRepository->get($cartRuleId);
$cartRuleInformation = $this->getCartRuleInformation($cartRule);
$cartRuleConditions = $this->getCartRuleConditions($cartRule);
@@ -115,13 +119,32 @@ private function getCartRuleConditions(CartRule $cartRule): CartRuleConditionsFo
}
}
+ $cartRuleId = new CartRuleId((int) $cartRule->id);
+
+ $restrictedCartRules = [];
+ if ($cartRule->cart_rule_restriction) {
+ $restrictedCartRules = $this->cartRuleRepository->getRestrictedCartRuleIds($cartRuleId);
+ }
+
+ $restrictedCarrierIds = [];
+ if ($cartRule->carrier_restriction) {
+ $restrictedCarrierIds = $this->cartRuleRepository->getRestrictedCarrierIds($cartRuleId);
+ }
+ $restrictedCountryIds = [];
+ if ($cartRule->country_restriction) {
+ $restrictedCountryIds = $this->cartRuleRepository->getRestrictedCountryIds($cartRuleId);
+ }
+ $restrictedGroupIds = [];
+ if ($cartRule->group_restriction) {
+ $restrictedGroupIds = $this->cartRuleRepository->getRestrictedGroupIds($cartRuleId);
+ }
+
$cartRuleRestrictions = new CartRuleRestrictionsForEditing(
- (bool) $cartRule->country_restriction,
- (bool) $cartRule->carrier_restriction,
- (bool) $cartRule->group_restriction,
- (bool) $cartRule->cart_rule_restriction,
- (bool) $cartRule->product_restriction,
- (bool) $cartRule->shop_restriction
+ $restrictedCartRules,
+ $this->getRestrictionRuleGroups($cartRule),
+ $restrictedCarrierIds,
+ $restrictedCountryIds,
+ $restrictedGroupIds
);
return new CartRuleConditionsForEditing(
@@ -135,6 +158,20 @@ private function getCartRuleConditions(CartRule $cartRule): CartRuleConditionsFo
);
}
+ /**
+ * @param CartRule $cartRule
+ *
+ * @return RestrictionRuleGroup[]
+ */
+ private function getRestrictionRuleGroups(CartRule $cartRule): array
+ {
+ if (!$cartRule->product_restriction) {
+ return [];
+ }
+
+ return $this->cartRuleRepository->getProductRestrictions(new CartRuleId((int) $cartRule->id));
+ }
+
private function getCartRuleActions(CartRule $cartRule): CartRuleActionForEditing
{
$discountApplicationType = $this->getDiscountApplicationType($cartRule);
diff --git a/src/Adapter/CartRule/QueryHandler/SearchCartRulesHandler.php b/src/Adapter/CartRule/QueryHandler/SearchCartRulesHandler.php
index ce05ddcf032e6..c4b96fce5e60a 100644
--- a/src/Adapter/CartRule/QueryHandler/SearchCartRulesHandler.php
+++ b/src/Adapter/CartRule/QueryHandler/SearchCartRulesHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\CartRule\QueryHandler;
use CartRule;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\CartRule\Query\SearchCartRules;
use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryHandler\SearchCartRulesHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult\FoundCartRule;
@@ -34,6 +35,7 @@
/**
* Searches for cart rules by search phrase using legacy object model
*/
+#[AsQueryHandler]
final class SearchCartRulesHandler implements SearchCartRulesHandlerInterface
{
/**
diff --git a/src/Adapter/CartRule/Repository/CartRuleRepository.php b/src/Adapter/CartRule/Repository/CartRuleRepository.php
index ebf55adc99a8e..968e4e61fc843 100644
--- a/src/Adapter/CartRule/Repository/CartRuleRepository.php
+++ b/src/Adapter/CartRule/Repository/CartRuleRepository.php
@@ -28,24 +28,28 @@
namespace PrestaShop\PrestaShop\Adapter\CartRule\Repository;
use CartRule;
+use Doctrine\DBAL\Connection;
use PrestaShop\PrestaShop\Adapter\CartRule\Validate\CartRuleValidator;
+use PrestaShop\PrestaShop\Core\Domain\Carrier\ValueObject\CarrierId;
use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CannotAddCartRuleException;
use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CannotEditCartRuleException;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleException;
use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRule;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
+use PrestaShop\PrestaShop\Core\Domain\Country\ValueObject\CountryId;
+use PrestaShop\PrestaShop\Core\Domain\Customer\Group\ValueObject\GroupId;
+use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
use PrestaShop\PrestaShop\Core\Repository\AbstractObjectModelRepository;
class CartRuleRepository extends AbstractObjectModelRepository
{
- /**
- * @var CartRuleValidator
- */
- private $cartRuleValidator;
-
public function __construct(
- CartRuleValidator $cartRuleValidator
+ protected readonly CartRuleValidator $cartRuleValidator,
+ protected readonly Connection $connection,
+ protected readonly string $dbPrefix
) {
- $this->cartRuleValidator = $cartRuleValidator;
}
public function add(CartRule $cartRule): CartRule
@@ -56,6 +60,28 @@ public function add(CartRule $cartRule): CartRule
return $cartRule;
}
+ public function assertAllCartRulesExists(array $cartRuleIds): void
+ {
+ $cartRuleIds = array_map(static function (CartRuleId $cartRuleId): int {
+ return $cartRuleId->getValue();
+ }, $cartRuleIds);
+
+ $qb = $this->connection->createQueryBuilder();
+
+ $result = $qb
+ ->select('COUNT(id_cart_rule) AS cart_rules_count')
+ ->from($this->dbPrefix . 'cart_rule')
+ ->where($qb->expr()->in('id_cart_rule', ':cartRuleIds'))
+ ->setParameter('cartRuleIds', $cartRuleIds, Connection::PARAM_INT_ARRAY)
+ ->execute()
+ ->fetchAssociative()
+ ;
+
+ if (!isset($result['cart_rules_count']) || count($cartRuleIds) !== (int) $result['cart_rules_count']) {
+ throw new CartRuleNotFoundException('Failed to assert that all provided cart rules exists');
+ }
+ }
+
public function get(CartRuleId $cartRuleId): CartRule
{
/** @var CartRule $cartRule */
@@ -68,6 +94,162 @@ public function get(CartRuleId $cartRuleId): CartRule
return $cartRule;
}
+ /**
+ * @param CartRuleId $cartRuleId
+ * @param RestrictionRuleGroup[] $restrictionRuleGroups
+ *
+ * @return void
+ */
+ public function setProductRestrictions(CartRuleId $cartRuleId, array $restrictionRuleGroups): void
+ {
+ // first remove all product restrictions concerning provided cart rule
+ $this->removeProductRestrictions($cartRuleId);
+
+ foreach ($restrictionRuleGroups as $restrictionRuleGroup) {
+ $this->connection->createQueryBuilder()
+ ->insert($this->dbPrefix . 'cart_rule_product_rule_group')
+ ->values([
+ 'id_cart_rule' => $cartRuleId->getValue(),
+ 'quantity' => $restrictionRuleGroup->getRequiredQuantityInCart(),
+ ])
+ ->execute()
+ ;
+
+ $productRuleGroupId = $this->connection->lastInsertId();
+
+ foreach ($restrictionRuleGroup->getRestrictionRules() as $restrictionRule) {
+ $this->connection->createQueryBuilder()
+ ->insert($this->dbPrefix . 'cart_rule_product_rule')
+ ->values([
+ 'id_product_rule_group' => ':productRuleGroupId',
+ 'type' => ':type',
+ ])
+ ->setParameter('productRuleGroupId', $productRuleGroupId)
+ ->setParameter('type', $restrictionRule->getType())
+ ->execute()
+ ;
+
+ $productRuleId = $this->connection->lastInsertId();
+ $productRuleValues = [];
+ $checkedIds = [];
+ foreach ($restrictionRule->getEntityIds() as $id) {
+ if (in_array($id, $checkedIds, true)) {
+ // skip in case there are duplicates
+ continue;
+ }
+ $productRuleValues[] = sprintf('(%d, %d)', $productRuleId, $id);
+ $checkedIds[] = $id;
+ }
+
+ $this->connection->prepare('
+ INSERT INTO ' . $this->dbPrefix . 'cart_rule_product_rule_value (id_product_rule, id_item)
+ VALUES ' . implode(',', $productRuleValues)
+ )->executeStatement();
+ }
+ }
+ }
+
+ /**
+ * @param CartRuleId $cartRuleId
+ *
+ * @return RestrictionRuleGroup[]
+ */
+ public function getProductRestrictions(CartRuleId $cartRuleId): array
+ {
+ // retrieve all item ids based on cart rule
+ $ruleValues = $this->connection->createQueryBuilder()
+ ->select('crprv.id_product_rule, crprv.id_item')
+ ->from($this->dbPrefix . 'cart_rule_product_rule_value', 'crprv')
+ ->innerJoin(
+ 'crprv',
+ $this->dbPrefix . 'cart_rule_product_rule',
+ 'crpr',
+ 'crprv.id_product_rule = crpr.id_product_rule'
+ )
+ ->innerJoin(
+ 'crpr',
+ $this->dbPrefix . 'cart_rule_product_rule_group',
+ 'crprg',
+ 'crpr.id_product_rule_group = crprg.id_product_rule_group'
+ )
+ ->where('crprg.id_cart_rule = :cartRuleId')
+ ->setParameter('cartRuleId', $cartRuleId->getValue())
+ ->execute()
+ ->fetchAllAssociative()
+ ;
+
+ // retrieve all rules based on cart rule
+ $rules = $this->connection->createQueryBuilder()
+ ->select('crpr.id_product_rule, crpr.id_product_rule_group, crpr.type')
+ ->from($this->dbPrefix . 'cart_rule_product_rule', 'crpr')
+ ->innerJoin(
+ 'crpr',
+ $this->dbPrefix . 'cart_rule_product_rule_group',
+ 'crprg',
+ 'crpr.id_product_rule_group = crprg.id_product_rule_group'
+ )
+ ->where('crprg.id_cart_rule = :cartRuleId')
+ ->setParameter('cartRuleId', $cartRuleId->getValue())
+ ->execute()
+ ->fetchAllAssociative()
+ ;
+
+ // retrieve all rule groups based on cart rule
+ $groups = $this->connection->createQueryBuilder()
+ ->select('id_product_rule_group, id_cart_rule, quantity')
+ ->from($this->dbPrefix . 'cart_rule_product_rule_group')
+ ->where('id_cart_rule = :cartRuleId')
+ ->setParameter('cartRuleId', $cartRuleId->getValue())
+ ->execute()
+ ->fetchAllAssociative()
+ ;
+
+ // put quantities under related group
+ $quantityForGroups = [];
+ foreach ($groups as $group) {
+ $productRuleGroupId = (int) $group['id_product_rule_group'];
+ $quantityForGroups[$productRuleGroupId] = (int) $group['quantity'];
+ }
+
+ // put types under related group and product rules
+ $typesForRules = [];
+ foreach ($rules as $rule) {
+ $productRuleId = (int) $rule['id_product_rule'];
+ $typesForRules[$rule['id_product_rule_group']][$productRuleId] = $rule['type'];
+ }
+
+ // put ids under related product rules
+ $ruleItemIdsForRules = [];
+ foreach ($ruleValues as $ruleValue) {
+ $productRuleId = (int) $ruleValue['id_product_rule'];
+ $ruleItemIdsForRules[$productRuleId][] = (int) $ruleValue['id_item'];
+ }
+
+ // finally build the complex restriction rule groups by retrieving related values by array keys structured above
+ $restrictionRuleGroups = [];
+ foreach ($quantityForGroups as $groupId => $quantity) {
+ if (!isset($typesForRules[$groupId])) {
+ throw new CartRuleException(
+ sprintf('Unexpected state of cart rule product restrictions. Failed to retrieve types for rules of group %d', $groupId)
+ );
+ }
+
+ $restrictionRules = [];
+ foreach ($typesForRules[$groupId] as $productRuleId => $type) {
+ if (!isset($ruleItemIdsForRules[$productRuleId])) {
+ throw new CartRuleException(
+ sprintf('Unexpected state of cart rule product restrictions. Failed to retrieve item ids for rule %d', $productRuleId)
+ );
+ }
+ $restrictionRules[] = new RestrictionRule($type, $ruleItemIdsForRules[$productRuleId]);
+ }
+
+ $restrictionRuleGroups[] = new RestrictionRuleGroup($quantity, $restrictionRules);
+ }
+
+ return $restrictionRuleGroups;
+ }
+
/**
* @param CartRule $cartRule
* @param array $propertiesToUpdate
@@ -83,4 +265,261 @@ public function partialUpdate(CartRule $cartRule, array $propertiesToUpdate, int
$errorCode
);
}
+
+ /**
+ * @param CartRuleId $cartRuleId
+ *
+ * @return int[]
+ */
+ public function getRestrictedCartRuleIds(CartRuleId $cartRuleId): array
+ {
+ $cartRuleIdValue = $cartRuleId->getValue();
+ $results = $this->connection->createQueryBuilder()
+ ->select('crc.id_cart_rule_1, crc.id_cart_rule_2')
+ ->from($this->dbPrefix . 'cart_rule_combination', 'crc')
+ ->where('crc.id_cart_rule_1 = :cartRuleId OR crc.id_cart_rule_2 = :cartRuleId')
+ ->setParameter('cartRuleId', $cartRuleIdValue)
+ ->execute()
+ ->fetchAllAssociative()
+ ;
+
+ if (empty($results)) {
+ return [];
+ }
+
+ $cartRuleIds = [];
+ foreach ($results as $result) {
+ $cartRule1 = (int) $result['id_cart_rule_1'];
+ $cartRule2 = (int) $result['id_cart_rule_2'];
+ // if one column is the id of current cart rule then we append the other column value to array
+ $cartRuleIds[] = $cartRule1 === $cartRuleIdValue ? $cartRule2 : $cartRule1;
+ }
+
+ return $cartRuleIds;
+ }
+
+ /**
+ * @param CartRuleId $cartRuleId
+ * @param CartRuleId[] $restrictedCartRuleIds
+ *
+ * @return void
+ */
+ public function restrictCartRules(CartRuleId $cartRuleId, array $restrictedCartRuleIds): void
+ {
+ $this->removeRestrictedCartRules($cartRuleId);
+
+ if (empty($restrictedCartRuleIds)) {
+ return;
+ }
+
+ $checkedIds = [];
+ $insertValues = [];
+ foreach ($restrictedCartRuleIds as $restrictedCartRuleId) {
+ // skip duplicate ids if for some reason they exist
+ if (in_array($restrictedCartRuleId, $checkedIds, true)) {
+ continue;
+ }
+ $insertValues[] = sprintf('(%d,%d)', $cartRuleId->getValue(), $restrictedCartRuleId->getValue());
+ $checkedIds[] = $restrictedCartRuleId;
+ }
+
+ $this->connection->executeStatement(
+ sprintf(
+ 'INSERT INTO %s (`id_cart_rule_1`, `id_cart_rule_2`) VALUES %s',
+ $this->dbPrefix . 'cart_rule_combination',
+ implode(',', $insertValues)
+ )
+ );
+ }
+
+ /**
+ * @param CartRuleId $cartRuleId
+ * @param CarrierId[] $restrictedCarrierIds
+ *
+ * @return void
+ */
+ public function setCarrierRestrictions(CartRuleId $cartRuleId, array $restrictedCarrierIds): void
+ {
+ $this->setRestrictionsByName($cartRuleId, $restrictedCarrierIds, 'carrier');
+ }
+
+ /**
+ * @param GroupId[] $restrictedGroupIds
+ *
+ * @return void
+ */
+ public function setGroupRestrictions(CartRuleId $cartRuleId, array $restrictedGroupIds): void
+ {
+ $this->setRestrictionsByName($cartRuleId, $restrictedGroupIds, 'group');
+ }
+
+ /**
+ * @param CartRuleId $cartRuleId
+ * @param CountryId[] $restrictedCountryIds
+ *
+ * @return void
+ */
+ public function setCountryRestrictions(CartRuleId $cartRuleId, array $restrictedCountryIds): void
+ {
+ $this->setRestrictionsByName($cartRuleId, $restrictedCountryIds, 'country');
+ }
+
+ /**
+ * @param CartRuleId $cartRuleId
+ *
+ * @return int[]
+ */
+ public function getRestrictedCarrierIds(CartRuleId $cartRuleId): array
+ {
+ $cartRuleIdValue = $cartRuleId->getValue();
+ $results = $this->connection->createQueryBuilder()
+ ->select('crc.id_carrier')
+ ->from($this->dbPrefix . 'cart_rule_carrier', 'crc')
+ ->where('crc.id_cart_rule = :cartRuleId')
+ ->setParameter('cartRuleId', $cartRuleIdValue)
+ ->execute()
+ ->fetchAllAssociative();
+
+ if (empty($results)) {
+ return [];
+ }
+
+ return array_map(static fn (array $result): int => (int) $result['id_carrier'], $results);
+ }
+
+ public function getRestrictedGroupIds(CartRuleId $cartRuleId): array
+ {
+ $cartRuleIdValue = $cartRuleId->getValue();
+ $results = $this->connection->createQueryBuilder()
+ ->select('crc.id_group')
+ ->from($this->dbPrefix . 'cart_rule_group', 'crc')
+ ->where('crc.id_cart_rule = :cartRuleId')
+ ->setParameter('cartRuleId', $cartRuleIdValue)
+ ->execute()
+ ->fetchAllAssociative()
+ ;
+
+ if (empty($results)) {
+ return [];
+ }
+
+ return array_map(static fn (array $result): int => (int) $result['id_group'], $results);
+ }
+
+ /**
+ * @param CartRuleId $cartRuleId
+ *
+ * @return int[]
+ */
+ public function getRestrictedCountryIds(CartRuleId $cartRuleId): array
+ {
+ $cartRuleIdValue = $cartRuleId->getValue();
+ $results = $this->connection->createQueryBuilder()
+ ->select('crc.id_country')
+ ->from($this->dbPrefix . 'cart_rule_country', 'crc')
+ ->where('crc.id_cart_rule = :cartRuleId')
+ ->setParameter('cartRuleId', $cartRuleIdValue)
+ ->execute()
+ ->fetchAllAssociative()
+ ;
+
+ if (empty($results)) {
+ return [];
+ }
+
+ return array_map(static fn (array $result): int => (int) $result['id_country'], $results);
+ }
+
+ private function removeRestrictedCartRules(CartRuleId $cartRuleId): void
+ {
+ $this->connection->createQueryBuilder()
+ ->delete($this->dbPrefix . 'cart_rule_combination', 'crc')
+ ->where('crc.id_cart_rule_1 = :cartRuleId OR crc.id_cart_rule_2 = :cartRuleId')
+ ->setParameter('cartRuleId', $cartRuleId->getValue())
+ ->execute()
+ ;
+ }
+
+ private function removeProductRestrictions(CartRuleId $cartRuleId): void
+ {
+ //delete records from cart_rule_product_rule_value for this cart rule
+ $this->connection->prepare('
+ DELETE crprv
+ FROM ' . $this->dbPrefix . 'cart_rule_product_rule_value AS crprv
+ INNER JOIN ' . $this->dbPrefix . 'cart_rule_product_rule AS crpr ON crprv.id_product_rule = crpr.id_product_rule
+ INNER JOIN ' . $this->dbPrefix . 'cart_rule_product_rule_group AS crprg ON crpr.id_product_rule_group = crprg.id_product_rule_group
+ WHERE crprg.id_cart_rule = :cartRuleId
+ ')->executeStatement([
+ ':cartRuleId' => $cartRuleId->getValue(),
+ ]);
+
+ // delete records from cart_rule_product_rule for this cart rule
+ $this->connection->prepare('
+ DELETE crpr
+ FROM ' . $this->dbPrefix . 'cart_rule_product_rule AS crpr
+ INNER JOIN ' . $this->dbPrefix . 'cart_rule_product_rule_group AS crprg ON crpr.id_product_rule_group = crprg.id_product_rule_group
+ WHERE crprg.id_cart_rule = :cartRuleId
+ ')->executeStatement([
+ ':cartRuleId' => $cartRuleId->getValue(),
+ ]);
+
+ // and finally delete records from cart_rule_product_rule_group for this cart rule
+ $this->connection->createQueryBuilder()
+ ->delete($this->dbPrefix . 'cart_rule_product_rule_group')
+ ->where('id_cart_rule = :cartRuleId')
+ ->setParameter('cartRuleId', $cartRuleId->getValue())
+ ->execute()
+ ;
+ }
+
+ /**
+ * @param CartRuleId $cartRuleId
+ * @param CarrierId[]|CountryId[]|GroupId[] $entityIds
+ * @param string $entityName
+ *
+ * @return void
+ */
+ private function setRestrictionsByName(CartRuleId $cartRuleId, array $entityIds, string $entityName): void
+ {
+ $availableEntityNames = ['carrier', 'country', 'group'];
+ if (!in_array($entityName, $availableEntityNames, true)) {
+ throw new InvalidArgumentException('Invalid $entityName provided');
+ }
+
+ $this->removeRestrictionsByName($cartRuleId, $entityName);
+
+ if (empty($entityIds)) {
+ return;
+ }
+
+ $checkedIds = [];
+ $insertValues = [];
+ foreach ($entityIds as $entityId) {
+ $entityIdValue = $entityId->getValue();
+ // skip duplicate ids if for some reason they exist
+ if (in_array($entityIdValue, $checkedIds, true)) {
+ continue;
+ }
+ $insertValues[] = sprintf('(%d,%d)', $cartRuleId->getValue(), $entityIdValue);
+ $checkedIds[] = $entityIdValue;
+ }
+
+ $this->connection->executeStatement(
+ sprintf(
+ 'INSERT INTO %s (`id_cart_rule`, `id_' . $entityName . '`) VALUES %s',
+ $this->dbPrefix . 'cart_rule_' . $entityName,
+ implode(',', $insertValues)
+ )
+ );
+ }
+
+ private function removeRestrictionsByName(CartRuleId $cartRuleId, string $entityName)
+ {
+ $this->connection->createQueryBuilder()
+ ->delete($this->dbPrefix . 'cart_rule_' . $entityName, 'crc')
+ ->where('crc.id_cart_rule = :cartRuleId')
+ ->setParameter('cartRuleId', $cartRuleId->getValue())
+ ->execute()
+ ;
+ }
}
diff --git a/src/Adapter/CatalogPriceRule/CommandHandler/AddCatalogPriceRuleHandler.php b/src/Adapter/CatalogPriceRule/CommandHandler/AddCatalogPriceRuleHandler.php
index b2ae3f4d9eaf4..4792fe925d005 100644
--- a/src/Adapter/CatalogPriceRule/CommandHandler/AddCatalogPriceRuleHandler.php
+++ b/src/Adapter/CatalogPriceRule/CommandHandler/AddCatalogPriceRuleHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler;
use PrestaShop\PrestaShop\Adapter\CatalogPriceRule\AbstractCatalogPriceRuleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\AddCatalogPriceRuleCommand;
use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\CommandHandler\AddCatalogPriceRuleHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Exception\CatalogPriceRuleException;
@@ -37,6 +38,7 @@
/**
* Handles adding new catalog price rule using legacy object model
*/
+#[AsCommandHandler]
final class AddCatalogPriceRuleHandler extends AbstractCatalogPriceRuleHandler implements AddCatalogPriceRuleHandlerInterface
{
/**
diff --git a/src/Adapter/CatalogPriceRule/CommandHandler/BulkDeleteCatalogPriceRuleHandler.php b/src/Adapter/CatalogPriceRule/CommandHandler/BulkDeleteCatalogPriceRuleHandler.php
index 48bd217504fc7..7d975f4e930e3 100644
--- a/src/Adapter/CatalogPriceRule/CommandHandler/BulkDeleteCatalogPriceRuleHandler.php
+++ b/src/Adapter/CatalogPriceRule/CommandHandler/BulkDeleteCatalogPriceRuleHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler;
use PrestaShop\PrestaShop\Adapter\CatalogPriceRule\AbstractCatalogPriceRuleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\BulkDeleteCatalogPriceRuleCommand;
use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\CommandHandler\BulkDeleteCatalogPriceRuleHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Exception\CannotDeleteCatalogPriceRuleException;
@@ -34,6 +35,7 @@
/**
* Deletes catalog prices rules in bulk action using legacy object model
*/
+#[AsCommandHandler]
final class BulkDeleteCatalogPriceRuleHandler extends AbstractCatalogPriceRuleHandler implements BulkDeleteCatalogPriceRuleHandlerInterface
{
/**
diff --git a/src/Adapter/CatalogPriceRule/CommandHandler/DeleteCatalogPriceRuleHandler.php b/src/Adapter/CatalogPriceRule/CommandHandler/DeleteCatalogPriceRuleHandler.php
index 842db7cfc9101..5a40683134693 100644
--- a/src/Adapter/CatalogPriceRule/CommandHandler/DeleteCatalogPriceRuleHandler.php
+++ b/src/Adapter/CatalogPriceRule/CommandHandler/DeleteCatalogPriceRuleHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler;
use PrestaShop\PrestaShop\Adapter\CatalogPriceRule\AbstractCatalogPriceRuleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\DeleteCatalogPriceRuleCommand;
use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\CommandHandler\DeleteCatalogPriceRuleHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Exception\CannotDeleteCatalogPriceRuleException;
@@ -34,6 +35,7 @@
/**
* Handles deletion of catalog price rule using legacy object model
*/
+#[AsCommandHandler]
final class DeleteCatalogPriceRuleHandler extends AbstractCatalogPriceRuleHandler implements DeleteCatalogPriceRuleHandlerInterface
{
/**
diff --git a/src/Adapter/CatalogPriceRule/CommandHandler/EditCatalogPriceRuleHandler.php b/src/Adapter/CatalogPriceRule/CommandHandler/EditCatalogPriceRuleHandler.php
index ea38ef707a329..fadad953e9497 100644
--- a/src/Adapter/CatalogPriceRule/CommandHandler/EditCatalogPriceRuleHandler.php
+++ b/src/Adapter/CatalogPriceRule/CommandHandler/EditCatalogPriceRuleHandler.php
@@ -28,6 +28,7 @@
use DateTime;
use PrestaShop\PrestaShop\Adapter\CatalogPriceRule\AbstractCatalogPriceRuleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\EditCatalogPriceRuleCommand;
use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\CommandHandler\EditCatalogPriceRuleHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Exception\CannotUpdateCatalogPriceRuleException;
@@ -40,6 +41,7 @@
/**
* Handles command which edits catalog price rule handler using legacy object model
*/
+#[AsCommandHandler]
final class EditCatalogPriceRuleHandler extends AbstractCatalogPriceRuleHandler implements EditCatalogPriceRuleHandlerInterface
{
/**
diff --git a/src/Adapter/CatalogPriceRule/QueryHandler/GetCatalogPriceRuleForEditingHandler.php b/src/Adapter/CatalogPriceRule/QueryHandler/GetCatalogPriceRuleForEditingHandler.php
index 5b708eb775672..523b5321e52a8 100644
--- a/src/Adapter/CatalogPriceRule/QueryHandler/GetCatalogPriceRuleForEditingHandler.php
+++ b/src/Adapter/CatalogPriceRule/QueryHandler/GetCatalogPriceRuleForEditingHandler.php
@@ -29,6 +29,7 @@
use DateTime;
use PrestaShop\Decimal\DecimalNumber;
use PrestaShop\PrestaShop\Adapter\CatalogPriceRule\AbstractCatalogPriceRuleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Query\GetCatalogPriceRuleForEditing;
use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\QueryHandler\GetCatalogPriceRuleForEditingHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\QueryResult\EditableCatalogPriceRule;
@@ -39,6 +40,7 @@
/**
* Handles command which gets catalog price rule for editing using legacy object model
*/
+#[AsQueryHandler]
final class GetCatalogPriceRuleForEditingHandler extends AbstractCatalogPriceRuleHandler implements GetCatalogPriceRuleForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/CatalogPriceRule/QueryHandler/GetCatalogPriceRuleListForProductHandler.php b/src/Adapter/CatalogPriceRule/QueryHandler/GetCatalogPriceRuleListForProductHandler.php
index 710bcd3b0a4a7..7db668a53b8e8 100644
--- a/src/Adapter/CatalogPriceRule/QueryHandler/GetCatalogPriceRuleListForProductHandler.php
+++ b/src/Adapter/CatalogPriceRule/QueryHandler/GetCatalogPriceRuleListForProductHandler.php
@@ -30,6 +30,7 @@
use PrestaShop\Decimal\DecimalNumber;
use PrestaShop\PrestaShop\Adapter\CatalogPriceRule\Repository\CatalogPriceRuleRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Query\GetCatalogPriceRuleListForProduct;
use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\QueryHandler\GetCatalogPriceRuleListForProductHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\QueryResult\CatalogPriceRuleForListing;
@@ -39,6 +40,7 @@
/**
* Handles @see GetCatalogPriceRuleListForProduct
*/
+#[AsQueryHandler]
class GetCatalogPriceRuleListForProductHandler implements GetCatalogPriceRuleListForProductHandlerInterface
{
/**
diff --git a/src/Adapter/Category/CategoriesProviderBuilder.php b/src/Adapter/Category/CategoriesProviderBuilder.php
new file mode 100644
index 0000000000000..35116cabd764a
--- /dev/null
+++ b/src/Adapter/Category/CategoriesProviderBuilder.php
@@ -0,0 +1,56 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Category;
+
+use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use PrestaShop\PrestaShop\Core\Addon\Theme\ThemeRepository;
+use PrestaShop\PrestaShop\Core\Util\File\YamlParser;
+use PrestaShopBundle\Service\DataProvider\Admin\CategoriesProvider;
+
+class CategoriesProviderBuilder
+{
+ public function __construct(
+ private readonly LegacyContext $context,
+ private readonly ThemeRepository $themeRepository,
+ private readonly string $cacheDir,
+ private readonly string $rootDir,
+ private readonly string $categoriesConfigPath,
+ ) {
+ }
+
+ public function build(): CategoriesProvider
+ {
+ $yamlParser = new YamlParser($this->cacheDir);
+ $addonsCategories = $yamlParser->parse($this->rootDir . $this->categoriesConfigPath);
+ $themeName = $this->context->getContext()->shop->theme_name;
+ $modulesTheme = $themeName ? $this->themeRepository->getInstanceByName($themeName)->getModulesToEnable() : [];
+
+ return new CategoriesProvider($addonsCategories['prestashop']['addons']['categories'], $modulesTheme);
+ }
+}
diff --git a/src/Adapter/Category/CommandHandler/AddCategoryHandler.php b/src/Adapter/Category/CommandHandler/AddCategoryHandler.php
index 572fd78f09d68..d1968d0911f38 100644
--- a/src/Adapter/Category/CommandHandler/AddCategoryHandler.php
+++ b/src/Adapter/Category/CommandHandler/AddCategoryHandler.php
@@ -29,18 +29,18 @@
use Category;
use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
use PrestaShop\PrestaShop\Adapter\Image\Uploader\CategoryImageUploader;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Category\Command\AddCategoryCommand;
use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\AddCategoryHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotAddCategoryException;
-use PrestaShop\PrestaShop\Core\Domain\Category\Exception\MenuThumbnailsLimitException;
use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\CategoryId;
-use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\MenuThumbnailId;
/**
* Adds new category using legacy object model.
*
* @internal
*/
+#[AsCommandHandler]
final class AddCategoryHandler extends AbstractObjectModelHandler implements AddCategoryHandlerInterface
{
/**
@@ -62,9 +62,6 @@ public function __construct(CategoryImageUploader $categoryImageUploader)
*/
public function handle(AddCategoryCommand $command)
{
- if (count($command->getMenuThumbnailImages()) > count(MenuThumbnailId::ALLOWED_ID_VALUES)) {
- throw new MenuThumbnailsLimitException('Maximum number of menu thumbnails exceeded for new category');
- }
$category = $this->createCategoryFromCommand($command);
$categoryId = new CategoryId((int) $category->id);
@@ -72,8 +69,7 @@ public function handle(AddCategoryCommand $command)
$this->categoryImageUploader->uploadImages(
$categoryId,
$command->getCoverImage(),
- $command->getThumbnailImage(),
- $command->getMenuThumbnailImages()
+ $command->getThumbnailImage()
);
return $categoryId;
@@ -85,7 +81,6 @@ public function handle(AddCategoryCommand $command)
* @return Category
*
* @throws CannotAddCategoryException
- * @throws MenuThumbnailsLimitException
* @throws \PrestaShopDatabaseException
* @throws \PrestaShopException
*/
diff --git a/src/Adapter/Category/CommandHandler/AddRootCategoryHandler.php b/src/Adapter/Category/CommandHandler/AddRootCategoryHandler.php
index 4ca835b9826a2..25ea62dab58ea 100644
--- a/src/Adapter/Category/CommandHandler/AddRootCategoryHandler.php
+++ b/src/Adapter/Category/CommandHandler/AddRootCategoryHandler.php
@@ -29,18 +29,18 @@
use Category;
use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
use PrestaShop\PrestaShop\Adapter\Image\Uploader\CategoryImageUploader;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\ConfigurationInterface;
use PrestaShop\PrestaShop\Core\Domain\Category\Command\AddRootCategoryCommand;
use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\AddRootCategoryHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotAddCategoryException;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryException;
-use PrestaShop\PrestaShop\Core\Domain\Category\Exception\MenuThumbnailsLimitException;
use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\CategoryId;
-use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\MenuThumbnailId;
/**
* Class AddRootCategoryHandler.
*/
+#[AsCommandHandler]
final class AddRootCategoryHandler extends AbstractObjectModelHandler implements AddRootCategoryHandlerInterface
{
/**
@@ -77,8 +77,7 @@ public function handle(AddRootCategoryCommand $command)
$this->categoryImageUploader->uploadImages(
$categoryId,
$command->getCoverImage(),
- $command->getThumbnailImage(),
- $command->getMenuThumbnailImages()
+ $command->getThumbnailImage()
);
return $categoryId;
@@ -96,9 +95,6 @@ public function handle(AddRootCategoryCommand $command)
*/
private function createRootCategoryFromCommand(AddRootCategoryCommand $command)
{
- if (count($command->getMenuThumbnailImages()) > count(MenuThumbnailId::ALLOWED_ID_VALUES)) {
- throw new MenuThumbnailsLimitException('Maximum number of menu thumbnails exceeded for new category');
- }
$category = new Category();
$category->is_root_category = true;
$category->level_depth = 1;
diff --git a/src/Adapter/Category/CommandHandler/BulkDeleteCategoriesHandler.php b/src/Adapter/Category/CommandHandler/BulkDeleteCategoriesHandler.php
index c431d526c2048..fa97171a4edf2 100644
--- a/src/Adapter/Category/CommandHandler/BulkDeleteCategoriesHandler.php
+++ b/src/Adapter/Category/CommandHandler/BulkDeleteCategoriesHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Category\CommandHandler;
use Category;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkDeleteCategoriesCommand;
use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\BulkDeleteCategoriesHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotDeleteRootCategoryForShopException;
@@ -36,6 +37,7 @@
/**
* Class BulkDeleteCategoriesHandler.
*/
+#[AsCommandHandler]
final class BulkDeleteCategoriesHandler extends AbstractDeleteCategoryHandler implements BulkDeleteCategoriesHandlerInterface
{
/**
diff --git a/src/Adapter/Category/CommandHandler/BulkUpdateCategoriesStatusHandler.php b/src/Adapter/Category/CommandHandler/BulkUpdateCategoriesStatusHandler.php
index cf6cf198944c4..f8c41b35c153d 100644
--- a/src/Adapter/Category/CommandHandler/BulkUpdateCategoriesStatusHandler.php
+++ b/src/Adapter/Category/CommandHandler/BulkUpdateCategoriesStatusHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Category\CommandHandler;
use Category;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkUpdateCategoriesStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\BulkUpdateCategoriesStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotUpdateCategoryStatusException;
@@ -37,6 +38,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class BulkUpdateCategoriesStatusHandler implements BulkUpdateCategoriesStatusHandlerInterface
{
/**
diff --git a/src/Adapter/Category/CommandHandler/DeleteCategoryCoverImageHandler.php b/src/Adapter/Category/CommandHandler/DeleteCategoryCoverImageHandler.php
index c2bb49e4279ae..be66382156d8b 100644
--- a/src/Adapter/Category/CommandHandler/DeleteCategoryCoverImageHandler.php
+++ b/src/Adapter/Category/CommandHandler/DeleteCategoryCoverImageHandler.php
@@ -28,6 +28,7 @@
use Category;
use ImageType;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\ConfigurationInterface;
use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCoverImageCommand;
use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\DeleteCategoryCoverImageHandlerInterface;
@@ -42,6 +43,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class DeleteCategoryCoverImageHandler implements DeleteCategoryCoverImageHandlerInterface
{
/**
diff --git a/src/Adapter/Category/CommandHandler/DeleteCategoryHandler.php b/src/Adapter/Category/CommandHandler/DeleteCategoryHandler.php
index d1d1f4f3822f7..5d99af4daaf61 100644
--- a/src/Adapter/Category/CommandHandler/DeleteCategoryHandler.php
+++ b/src/Adapter/Category/CommandHandler/DeleteCategoryHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Category\CommandHandler;
use Category;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCommand;
use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\DeleteCategoryHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotDeleteRootCategoryForShopException;
@@ -36,6 +37,7 @@
/**
* Class DeleteCategoryHandler.
*/
+#[AsCommandHandler]
final class DeleteCategoryHandler extends AbstractDeleteCategoryHandler implements DeleteCategoryHandlerInterface
{
/**
diff --git a/src/Adapter/Category/CommandHandler/DeleteCategoryMenuThumbnailImageHandler.php b/src/Adapter/Category/CommandHandler/DeleteCategoryMenuThumbnailImageHandler.php
deleted file mode 100644
index d094afb01929b..0000000000000
--- a/src/Adapter/Category/CommandHandler/DeleteCategoryMenuThumbnailImageHandler.php
+++ /dev/null
@@ -1,110 +0,0 @@
-
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShop\PrestaShop\Adapter\Category\CommandHandler;
-
-use Category;
-use PrestaShop\PrestaShop\Core\Cache\Clearer\CacheClearerInterface;
-use PrestaShop\PrestaShop\Core\ConfigurationInterface;
-use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryMenuThumbnailImageCommand;
-use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\DeleteCategoryMenuThumbnailImageHandlerInterface;
-use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotDeleteImageException;
-use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryNotFoundException;
-use Symfony\Component\Filesystem\Exception\IOException;
-use Symfony\Component\Filesystem\Filesystem;
-
-/**
- * Handles command which deletes given category menu thumbnail.
- *
- * @internal
- */
-final class DeleteCategoryMenuThumbnailImageHandler implements DeleteCategoryMenuThumbnailImageHandlerInterface
-{
- /**
- * @var Filesystem
- */
- private $filesystem;
-
- /**
- * @var ConfigurationInterface
- */
- private $configuration;
-
- /**
- * @var CacheClearerInterface
- */
- private $smartyCacheClearer;
-
- /**
- * @param Filesystem $filesystem
- * @param ConfigurationInterface $configuration
- * @param CacheClearerInterface $smartyCacheClearer
- */
- public function __construct(
- Filesystem $filesystem,
- ConfigurationInterface $configuration,
- CacheClearerInterface $smartyCacheClearer
- ) {
- $this->filesystem = $filesystem;
- $this->configuration = $configuration;
- $this->smartyCacheClearer = $smartyCacheClearer;
- }
-
- /**
- * {@inheritdoc}
- */
- public function handle(DeleteCategoryMenuThumbnailImageCommand $command)
- {
- $categoryId = $command->getCategoryId();
- $menuThumbnailId = $command->getMenuThumbnailId();
-
- $category = new Category($categoryId->getValue());
-
- if ($category->id !== $categoryId->getValue()) {
- throw new CategoryNotFoundException(
- $categoryId,
- sprintf('Category with id "%d" was not found', $categoryId->getValue())
- );
- }
-
- $thumbnailPath = sprintf(
- '%s%s-%s_thumb.jpg',
- $this->configuration->get('_PS_CAT_IMG_DIR_'),
- $category->id,
- $menuThumbnailId->getValue()
- );
-
- try {
- if ($this->filesystem->exists($thumbnailPath)) {
- $this->filesystem->remove($thumbnailPath);
-
- $this->smartyCacheClearer->clear();
- }
- } catch (IOException $e) {
- throw new CannotDeleteImageException(sprintf('Cannot delete menu thumbnail with id "%s" for category with id "%s".', $menuThumbnailId->getValue(), $categoryId->getValue()), CannotDeleteImageException::MENU_THUMBNAIL_IMAGE, $e);
- }
- }
-}
diff --git a/src/Adapter/Category/CommandHandler/EditCategoryHandler.php b/src/Adapter/Category/CommandHandler/EditCategoryHandler.php
index 255620cdd6719..2ecfe30c08743 100644
--- a/src/Adapter/Category/CommandHandler/EditCategoryHandler.php
+++ b/src/Adapter/Category/CommandHandler/EditCategoryHandler.php
@@ -29,19 +29,19 @@
use Category;
use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
use PrestaShop\PrestaShop\Adapter\Image\Uploader\CategoryImageUploader;
-use PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Category\Command\EditCategoryCommand;
use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\EditCategoryHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotEditCategoryException;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotEditRootCategoryException;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryNotFoundException;
-use PrestaShop\PrestaShop\Core\Domain\Category\Exception\MenuThumbnailsLimitException;
/**
* Class EditCategoryHandler.
*
* @internal
*/
+#[AsCommandHandler]
final class EditCategoryHandler extends AbstractObjectModelHandler implements EditCategoryHandlerInterface
{
/**
@@ -49,17 +49,10 @@ final class EditCategoryHandler extends AbstractObjectModelHandler implements Ed
*/
private $categoryImageUploader;
- /**
- * @var MenuThumbnailAvailableKeyProvider
- */
- private $menuThumbnailAvailableKeyProvider;
-
public function __construct(
- CategoryImageUploader $categoryImageUploader,
- MenuThumbnailAvailableKeyProvider $menuThumbnailAvailableKeyProvider
+ CategoryImageUploader $categoryImageUploader
) {
$this->categoryImageUploader = $categoryImageUploader;
- $this->menuThumbnailAvailableKeyProvider = $menuThumbnailAvailableKeyProvider;
}
/**
@@ -70,11 +63,6 @@ public function __construct(
*/
public function handle(EditCategoryCommand $command)
{
- $availableKeys = $this->menuThumbnailAvailableKeyProvider->getAvailableKeys($command->getCategoryId()->getValue());
-
- if (count($command->getMenuThumbnailImages()) > count($availableKeys)) {
- throw new MenuThumbnailsLimitException('Maximum number of menu thumbnails exceeded for new category');
- }
$category = new Category($command->getCategoryId()->getValue());
if (!$category->id) {
@@ -90,8 +78,7 @@ public function handle(EditCategoryCommand $command)
$this->categoryImageUploader->uploadImages(
$command->getCategoryId(),
$command->getCoverImage(),
- $command->getThumbnailImage(),
- $command->getMenuThumbnailImages()
+ $command->getThumbnailImage()
);
}
diff --git a/src/Adapter/Category/CommandHandler/EditRootCategoryHandler.php b/src/Adapter/Category/CommandHandler/EditRootCategoryHandler.php
index 593d2e7562e50..beb8b83bc27b6 100644
--- a/src/Adapter/Category/CommandHandler/EditRootCategoryHandler.php
+++ b/src/Adapter/Category/CommandHandler/EditRootCategoryHandler.php
@@ -29,18 +29,18 @@
use Category;
use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
use PrestaShop\PrestaShop\Adapter\Image\Uploader\CategoryImageUploader;
-use PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Category\Command\EditRootCategoryCommand;
use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\EditRootCategoryHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotEditCategoryException;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotEditRootCategoryException;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryException;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryNotFoundException;
-use PrestaShop\PrestaShop\Core\Domain\Category\Exception\MenuThumbnailsLimitException;
/**
* Class EditRootCategoryHandler.
*/
+#[AsCommandHandler]
final class EditRootCategoryHandler extends AbstractObjectModelHandler implements EditRootCategoryHandlerInterface
{
/**
@@ -48,17 +48,10 @@ final class EditRootCategoryHandler extends AbstractObjectModelHandler implement
*/
private $categoryImageUploader;
- /**
- * @var MenuThumbnailAvailableKeyProvider
- */
- private $menuThumbnailAvailableKeyProvider;
-
public function __construct(
- CategoryImageUploader $categoryImageUploader,
- MenuThumbnailAvailableKeyProvider $menuThumbnailAvailableKeyProvider
+ CategoryImageUploader $categoryImageUploader
) {
$this->categoryImageUploader = $categoryImageUploader;
- $this->menuThumbnailAvailableKeyProvider = $menuThumbnailAvailableKeyProvider;
}
/**
@@ -70,16 +63,9 @@ public function __construct(
* @throws CannotEditRootCategoryException
* @throws CategoryException
* @throws CategoryNotFoundException
- * @throws MenuThumbnailsLimitException
*/
public function handle(EditRootCategoryCommand $command)
{
- $availableKeys = $this->menuThumbnailAvailableKeyProvider->getAvailableKeys($command->getCategoryId()->getValue());
-
- if (count($command->getMenuThumbnailImages()) > count($availableKeys)) {
- throw new MenuThumbnailsLimitException('Maximum number of menu thumbnails exceeded for new category');
- }
-
$category = new Category($command->getCategoryId()->getValue());
if (!$category->id) {
@@ -95,8 +81,7 @@ public function handle(EditRootCategoryCommand $command)
$this->categoryImageUploader->uploadImages(
$command->getCategoryId(),
$command->getCoverImage(),
- $command->getThumbnailImage(),
- $command->getMenuThumbnailImages()
+ $command->getThumbnailImage()
);
}
diff --git a/src/Adapter/Category/CommandHandler/SetCategoryIsEnabledHandler.php b/src/Adapter/Category/CommandHandler/SetCategoryIsEnabledHandler.php
index 729ed04bcd7f1..2b8ee083ef9a5 100644
--- a/src/Adapter/Category/CommandHandler/SetCategoryIsEnabledHandler.php
+++ b/src/Adapter/Category/CommandHandler/SetCategoryIsEnabledHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Category\CommandHandler;
use Category;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Category\Command\SetCategoryIsEnabledCommand;
use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\SetCategoryIsEnabledHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotUpdateCategoryStatusException;
@@ -35,6 +36,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class SetCategoryIsEnabledHandler implements SetCategoryIsEnabledHandlerInterface
{
/**
diff --git a/src/Adapter/Category/CommandHandler/UpdateCategoryPositionHandler.php b/src/Adapter/Category/CommandHandler/UpdateCategoryPositionHandler.php
index 211b308e3d5f4..850c15da26aea 100644
--- a/src/Adapter/Category/CommandHandler/UpdateCategoryPositionHandler.php
+++ b/src/Adapter/Category/CommandHandler/UpdateCategoryPositionHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Category\CommandHandler;
use Category;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Category\Command\UpdateCategoryPositionCommand;
use PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler\UpdateCategoryPositionHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryException;
@@ -35,6 +36,7 @@
/**
* Updates category position using legacy object model
*/
+#[AsCommandHandler]
final class UpdateCategoryPositionHandler implements UpdateCategoryPositionHandlerInterface
{
/**
@@ -48,7 +50,7 @@ public function handle(UpdateCategoryPositionCommand $command)
$position = null;
foreach ($command->getPositions() as $key => $value) {
- list(, $positionParentCategoryId, $positionCategoryId) = explode('_', $value);
+ [, $positionParentCategoryId, $positionCategoryId] = explode('_', $value);
if ((int) $positionParentCategoryId === $parentCategoryId && (int) $positionCategoryId === $categoryId) {
$position = $key;
diff --git a/src/Adapter/Category/QueryHandler/GetCategoriesTreeHandler.php b/src/Adapter/Category/QueryHandler/GetCategoriesTreeHandler.php
index ef9358eb83110..4ab01fe248121 100644
--- a/src/Adapter/Category/QueryHandler/GetCategoriesTreeHandler.php
+++ b/src/Adapter/Category/QueryHandler/GetCategoriesTreeHandler.php
@@ -31,6 +31,7 @@
use PrestaShop\PrestaShop\Adapter\ContextStateManager;
use PrestaShop\PrestaShop\Adapter\Shop\Repository\ShopRepository;
use PrestaShop\PrestaShop\Core\Category\NameBuilder\CategoryDisplayNameBuilder;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoriesTree;
use PrestaShop\PrestaShop\Core\Domain\Category\QueryHandler\GetCategoriesTreeHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Category\QueryResult\CategoryForTree;
@@ -41,6 +42,7 @@
/**
* Handles @see GetCategoriesTree using legacy object model
*/
+#[AsQueryHandler]
final class GetCategoriesTreeHandler implements GetCategoriesTreeHandlerInterface
{
/**
diff --git a/src/Adapter/Category/QueryHandler/GetCategoryForEditingHandler.php b/src/Adapter/Category/QueryHandler/GetCategoryForEditingHandler.php
index ede0b38351634..255587bb00309 100644
--- a/src/Adapter/Category/QueryHandler/GetCategoryForEditingHandler.php
+++ b/src/Adapter/Category/QueryHandler/GetCategoryForEditingHandler.php
@@ -31,19 +31,20 @@
use ImageManager;
use ImageType;
use PDO;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotEditRootCategoryException;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryForEditing;
use PrestaShop\PrestaShop\Core\Domain\Category\QueryHandler\GetCategoryForEditingHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Category\QueryResult\EditableCategory;
use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\CategoryId;
-use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\MenuThumbnailId;
use PrestaShop\PrestaShop\Core\Image\Parser\ImageTagSourceParserInterface;
use Shop;
/**
* Class GetCategoryForEditingHandler.
*/
+#[AsQueryHandler]
final class GetCategoryForEditingHandler implements GetCategoryForEditingHandlerInterface
{
/**
@@ -106,7 +107,6 @@ public function handle(GetCategoryForEditing $query)
(bool) $category->is_root_category,
$this->getCoverImage($query->getCategoryId()),
$this->getThumbnailImage($query->getCategoryId()),
- $this->getMenuThumbnailImages($query->getCategoryId()),
$subcategories->fetchAll(PDO::FETCH_COLUMN),
$category->additional_description
);
@@ -203,36 +203,4 @@ private function getThumbnailImage(CategoryId $categoryId)
return null;
}
-
- /**
- * @param CategoryId $categoryId
- *
- * @return array
- */
- private function getMenuThumbnailImages(CategoryId $categoryId)
- {
- $menuThumbnails = [];
-
- foreach (MenuThumbnailId::ALLOWED_ID_VALUES as $id) {
- $thumbnailPath = _PS_CAT_IMG_DIR_ . $categoryId->getValue() . '-' . $id . '_thumb.jpg';
-
- if (file_exists($thumbnailPath)) {
- $imageTag = ImageManager::thumbnail(
- $thumbnailPath,
- 'category_' . $categoryId->getValue() . '-' . $id . '_thumb.jpg',
- 100,
- 'jpg',
- true,
- true
- );
-
- $menuThumbnails[$id] = [
- 'path' => $this->imageTagSourceParser->parse($imageTag),
- 'id' => $id,
- ];
- }
- }
-
- return $menuThumbnails;
- }
}
diff --git a/src/Adapter/Category/QueryHandler/GetCategoryIsEnabledHandler.php b/src/Adapter/Category/QueryHandler/GetCategoryIsEnabledHandler.php
index c6ae80f845e7a..256b0b16da47d 100644
--- a/src/Adapter/Category/QueryHandler/GetCategoryIsEnabledHandler.php
+++ b/src/Adapter/Category/QueryHandler/GetCategoryIsEnabledHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Category\QueryHandler;
use Category;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryIsEnabled;
use PrestaShop\PrestaShop\Core\Domain\Category\QueryHandler\GetCategoryIsEnabledHandlerInterface;
@@ -34,6 +35,7 @@
/**
* @internal
*/
+#[AsQueryHandler]
final class GetCategoryIsEnabledHandler implements GetCategoryIsEnabledHandlerInterface
{
/**
diff --git a/src/Adapter/Configuration/CommandHandler/SwitchDebugModeHandler.php b/src/Adapter/Configuration/CommandHandler/SwitchDebugModeHandler.php
index 283d4ba629df5..3874b231be079 100644
--- a/src/Adapter/Configuration/CommandHandler/SwitchDebugModeHandler.php
+++ b/src/Adapter/Configuration/CommandHandler/SwitchDebugModeHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Configuration\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Debug\DebugMode;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Configuration\Command\SwitchDebugModeCommand;
use PrestaShop\PrestaShop\Core\Domain\Configuration\CommandHandler\SwitchDebugModeHandlerInterface;
@@ -35,6 +36,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class SwitchDebugModeHandler implements SwitchDebugModeHandlerInterface
{
/**
diff --git a/src/Adapter/Contact/CommandHandler/AddContactHandler.php b/src/Adapter/Contact/CommandHandler/AddContactHandler.php
index c6b807c55e7c2..30ff3c6856792 100644
--- a/src/Adapter/Contact/CommandHandler/AddContactHandler.php
+++ b/src/Adapter/Contact/CommandHandler/AddContactHandler.php
@@ -28,6 +28,7 @@
use Contact;
use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\CleanHtml;
use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\DefaultLanguage;
use PrestaShop\PrestaShop\Core\Domain\Contact\Command\AddContactCommand;
@@ -44,6 +45,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class AddContactHandler extends AbstractObjectModelHandler implements AddContactHandlerInterface
{
/**
diff --git a/src/Adapter/Contact/CommandHandler/EditContactHandler.php b/src/Adapter/Contact/CommandHandler/EditContactHandler.php
index 249fb9032950f..41f90fd2c419f 100644
--- a/src/Adapter/Contact/CommandHandler/EditContactHandler.php
+++ b/src/Adapter/Contact/CommandHandler/EditContactHandler.php
@@ -28,6 +28,7 @@
use Contact;
use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\CleanHtml;
use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\DefaultLanguage;
use PrestaShop\PrestaShop\Core\Domain\Contact\Command\EditContactCommand;
@@ -45,6 +46,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class EditContactHandler extends AbstractObjectModelHandler implements EditContactHandlerInterface
{
/**
diff --git a/src/Adapter/Contact/QueryHandler/GetContactForEditingHandler.php b/src/Adapter/Contact/QueryHandler/GetContactForEditingHandler.php
index a9085902aeb50..8acd421bd005a 100644
--- a/src/Adapter/Contact/QueryHandler/GetContactForEditingHandler.php
+++ b/src/Adapter/Contact/QueryHandler/GetContactForEditingHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Contact\QueryHandler;
use Contact;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Contact\Exception\ContactException;
use PrestaShop\PrestaShop\Core\Domain\Contact\Exception\ContactNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Contact\Query\GetContactForEditing;
@@ -40,6 +41,7 @@
*
* @internal
*/
+#[AsQueryHandler]
final class GetContactForEditingHandler implements GetContactForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Container/ContainerParametersExtension.php b/src/Adapter/Container/ContainerParametersExtension.php
index c5cf39e2a2ffa..04871bcfef223 100644
--- a/src/Adapter/Container/ContainerParametersExtension.php
+++ b/src/Adapter/Container/ContainerParametersExtension.php
@@ -80,7 +80,11 @@ public function build(ContainerBuilder $container)
$container->setParameter('kernel.cache_dir', $this->environment->getCacheDir());
//Init the active modules
- $container->setParameter('kernel.active_modules', (new ModuleRepository(_PS_ROOT_DIR_, _PS_MODULE_DIR_))->getActiveModules());
+ $activeModules = (new ModuleRepository(_PS_ROOT_DIR_, _PS_MODULE_DIR_))->getActiveModules();
+ /* @deprecated kernel.active_modules is deprecated. Use prestashop.installed_modules instead. */
+ $container->setParameter('kernel.active_modules', $activeModules);
+ $container->setParameter('prestashop.installed_modules', $activeModules);
+ $container->setParameter('prestashop.module_dir', _PS_MODULE_DIR_);
if (!$container->hasParameter('kernel.project_dir')) {
$container->setParameter('kernel.project_dir', _PS_ROOT_DIR_);
diff --git a/src/Adapter/ContainerBuilder.php b/src/Adapter/ContainerBuilder.php
index eddaa26f3f65b..b57a2f62e0b6b 100644
--- a/src/Adapter/ContainerBuilder.php
+++ b/src/Adapter/ContainerBuilder.php
@@ -50,6 +50,8 @@
/**
* Build the Container for PrestaShop Legacy.
+ *
+ * @deprecated since 9.0. Please use SymfonyContainer instead.
*/
class ContainerBuilder
{
@@ -243,11 +245,7 @@ private function loadServicesFromConfig(LegacyContainerBuilder $container)
*/
private function loadModulesAutoloader(ContainerInterface $container)
{
- if (!$container->hasParameter('kernel.active_modules')) {
- return;
- }
-
- $activeModules = $container->getParameter('kernel.active_modules');
+ $activeModules = $container->getParameter('prestashop.installed_modules');
/** @var array $activeModules */
foreach ($activeModules as $module) {
$autoloader = _PS_MODULE_DIR_ . $module . '/vendor/autoload.php';
diff --git a/src/Adapter/Country/CommandHandler/AddCountryHandler.php b/src/Adapter/Country/CommandHandler/AddCountryHandler.php
index 04d111fe0d959..fda9ba13c1a9a 100644
--- a/src/Adapter/Country/CommandHandler/AddCountryHandler.php
+++ b/src/Adapter/Country/CommandHandler/AddCountryHandler.php
@@ -30,6 +30,7 @@
use Country;
use PrestaShop\PrestaShop\Adapter\Country\Repository\CountryRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Country\Command\AddCountryCommand;
use PrestaShop\PrestaShop\Core\Domain\Country\CommandHandler\AddCountryHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Country\ValueObject\CountryId;
@@ -37,6 +38,7 @@
/**
* Handles creation of country and address format
*/
+#[AsCommandHandler]
class AddCountryHandler implements AddCountryHandlerInterface
{
/**
diff --git a/src/Adapter/Country/CommandHandler/DeleteCountryHandler.php b/src/Adapter/Country/CommandHandler/DeleteCountryHandler.php
index 862829481c3b9..09534f14bd728 100644
--- a/src/Adapter/Country/CommandHandler/DeleteCountryHandler.php
+++ b/src/Adapter/Country/CommandHandler/DeleteCountryHandler.php
@@ -30,12 +30,14 @@
use Country;
use PrestaShop\PrestaShop\Adapter\Country\Repository\CountryRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Country\Command\DeleteCountryCommand;
use PrestaShop\PrestaShop\Core\Domain\Country\CommandHandler\DeleteCountryHandlerInterface;
/**
* Handles country deletion
*/
+#[AsCommandHandler]
class DeleteCountryHandler implements DeleteCountryHandlerInterface
{
/**
diff --git a/src/Adapter/Country/CommandHandler/EditCountryHandler.php b/src/Adapter/Country/CommandHandler/EditCountryHandler.php
index 9a3d5d785379e..fb6a43b6b3900 100644
--- a/src/Adapter/Country/CommandHandler/EditCountryHandler.php
+++ b/src/Adapter/Country/CommandHandler/EditCountryHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Country\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Country\Repository\CountryRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Country\Command\EditCountryCommand;
use PrestaShop\PrestaShop\Core\Domain\Country\CommandHandler\EditCountryHandlerInterface;
/**
* Handles update of country and address format
*/
+#[AsCommandHandler]
class EditCountryHandler implements EditCountryHandlerInterface
{
/**
diff --git a/src/Adapter/Country/QueryHandler/GetCountryForEditingHandler.php b/src/Adapter/Country/QueryHandler/GetCountryForEditingHandler.php
index 1b2d5e1778af8..89e98ac63b22d 100644
--- a/src/Adapter/Country/QueryHandler/GetCountryForEditingHandler.php
+++ b/src/Adapter/Country/QueryHandler/GetCountryForEditingHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Country\QueryHandler;
use PrestaShop\PrestaShop\Adapter\Country\Repository\CountryRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Country\Query\GetCountryForEditing;
use PrestaShop\PrestaShop\Core\Domain\Country\QueryHandler\GetCountryForEditingHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Country\QueryResult\CountryForEditing;
@@ -36,6 +37,7 @@
/**
* Handles editable country query
*/
+#[AsQueryHandler]
class GetCountryForEditingHandler implements GetCountryForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Country/QueryHandler/GetCountryRequiredFieldsHandler.php b/src/Adapter/Country/QueryHandler/GetCountryRequiredFieldsHandler.php
index 276d12cb68a03..4a45f51cd05aa 100644
--- a/src/Adapter/Country/QueryHandler/GetCountryRequiredFieldsHandler.php
+++ b/src/Adapter/Country/QueryHandler/GetCountryRequiredFieldsHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Country\QueryHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Country\CountryRequiredFieldsProviderInterface;
use PrestaShop\PrestaShop\Core\Domain\Country\Query\GetCountryRequiredFields;
use PrestaShop\PrestaShop\Core\Domain\Country\QueryHandler\GetCountryRequiredFieldsHandlerInterface;
@@ -34,6 +35,7 @@
/**
* Handles and provides country state requirements
*/
+#[AsQueryHandler]
final class GetCountryRequiredFieldsHandler implements GetCountryRequiredFieldsHandlerInterface
{
/** @var CountryRequiredFieldsProviderInterface */
diff --git a/src/Adapter/CreditSlip/QueryHandler/GetCreditSlipIdsByDateRangeHandler.php b/src/Adapter/CreditSlip/QueryHandler/GetCreditSlipIdsByDateRangeHandler.php
index 6af8fd766a54e..e8258d0bd4bd1 100644
--- a/src/Adapter/CreditSlip/QueryHandler/GetCreditSlipIdsByDateRangeHandler.php
+++ b/src/Adapter/CreditSlip/QueryHandler/GetCreditSlipIdsByDateRangeHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\CreditSlip\QueryHandler;
use OrderSlip;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\CreditSlip\Exception\CreditSlipException;
use PrestaShop\PrestaShop\Core\Domain\CreditSlip\Exception\CreditSlipNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\CreditSlip\Query\GetCreditSlipIdsByDateRange;
@@ -37,6 +38,7 @@
/**
* Handles query which gets CreditSlipIds by provided date range
*/
+#[AsQueryHandler]
final class GetCreditSlipIdsByDateRangeHandler implements GetCreditSlipIdsByDateRangeHandlerInterface
{
/**
diff --git a/src/Adapter/Currency/CommandHandler/AbstractCurrencyHandler.php b/src/Adapter/Currency/CommandHandler/AbstractCurrencyHandler.php
index cb5e7c009ad2d..5f5a2f2c22972 100644
--- a/src/Adapter/Currency/CommandHandler/AbstractCurrencyHandler.php
+++ b/src/Adapter/Currency/CommandHandler/AbstractCurrencyHandler.php
@@ -30,7 +30,9 @@
use Currency;
use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
use PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddCurrencyCommand;
+use PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddUnofficialCurrencyCommand;
use PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditCurrencyCommand;
+use PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditUnofficialCurrencyCommand;
use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CannotCreateCurrencyException;
use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CannotDeleteDefaultCurrencyException;
use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CannotUpdateCurrencyException;
@@ -151,7 +153,7 @@ protected function applyPatternTransformations(Currency $entity, array $localize
/**
* @param Currency $entity
- * @param AddCurrencyCommand $command
+ * @param AddCurrencyCommand|AddUnofficialCurrencyCommand $command
*
* @throws CannotCreateCurrencyException
* @throws LanguageNotFoundException
@@ -159,7 +161,7 @@ protected function applyPatternTransformations(Currency $entity, array $localize
* @throws PrestaShopDatabaseException
* @throws PrestaShopException
*/
- protected function addEntity(Currency $entity, AddCurrencyCommand $command)
+ protected function addEntity(Currency $entity, AddCurrencyCommand|AddUnofficialCurrencyCommand $command)
{
$entity->iso_code = $command->getIsoCode()->getValue();
$entity->active = $command->isEnabled();
@@ -185,7 +187,7 @@ protected function addEntity(Currency $entity, AddCurrencyCommand $command)
/**
* @param Currency $entity
- * @param EditCurrencyCommand $command
+ * @param EditCurrencyCommand|EditUnofficialCurrencyCommand $command
*
* @throws CannotUpdateCurrencyException
* @throws LanguageNotFoundException
@@ -193,7 +195,7 @@ protected function addEntity(Currency $entity, AddCurrencyCommand $command)
* @throws PrestaShopDatabaseException
* @throws PrestaShopException
*/
- protected function updateEntity(Currency $entity, EditCurrencyCommand $command)
+ protected function updateEntity(Currency $entity, EditCurrencyCommand|EditUnofficialCurrencyCommand $command)
{
if (null !== $command->getExchangeRate()) {
$entity->conversion_rate = $command->getExchangeRate()->getValue();
diff --git a/src/Adapter/Currency/CommandHandler/AddOfficialCurrencyHandler.php b/src/Adapter/Currency/CommandHandler/AddOfficialCurrencyHandler.php
index 8494799e8bd05..6173d136f73e6 100644
--- a/src/Adapter/Currency/CommandHandler/AddOfficialCurrencyHandler.php
+++ b/src/Adapter/Currency/CommandHandler/AddOfficialCurrencyHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Currency\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Currency\CurrencyDataProviderInterface;
use PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddCurrencyCommand;
use PrestaShop\PrestaShop\Core\Domain\Currency\CommandHandler\AddCurrencyHandlerInterface;
@@ -47,6 +48,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class AddOfficialCurrencyHandler extends AbstractCurrencyHandler implements AddCurrencyHandlerInterface
{
/**
diff --git a/src/Adapter/Currency/CommandHandler/AddUnofficialCurrencyHandler.php b/src/Adapter/Currency/CommandHandler/AddUnofficialCurrencyHandler.php
index fac5509266668..e92b2e18062dc 100644
--- a/src/Adapter/Currency/CommandHandler/AddUnofficialCurrencyHandler.php
+++ b/src/Adapter/Currency/CommandHandler/AddUnofficialCurrencyHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Currency\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Currency\CurrencyDataProviderInterface;
use PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddUnofficialCurrencyCommand;
use PrestaShop\PrestaShop\Core\Domain\Currency\CommandHandler\AddUnofficialCurrencyHandlerInterface;
@@ -46,6 +47,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class AddUnofficialCurrencyHandler extends AbstractCurrencyHandler implements AddUnofficialCurrencyHandlerInterface
{
/**
diff --git a/src/Adapter/Currency/CommandHandler/BulkDeleteCurrenciesHandler.php b/src/Adapter/Currency/CommandHandler/BulkDeleteCurrenciesHandler.php
index 47d8e97c22008..35ed9be84f5b9 100644
--- a/src/Adapter/Currency/CommandHandler/BulkDeleteCurrenciesHandler.php
+++ b/src/Adapter/Currency/CommandHandler/BulkDeleteCurrenciesHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Currency\CommandHandler;
use Currency;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Currency\Command\BulkDeleteCurrenciesCommand;
use PrestaShop\PrestaShop\Core\Domain\Currency\CommandHandler\BulkDeleteCurrenciesHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\BulkDeleteCurrenciesException;
@@ -40,6 +41,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class BulkDeleteCurrenciesHandler extends AbstractCurrencyHandler implements BulkDeleteCurrenciesHandlerInterface
{
/**
diff --git a/src/Adapter/Currency/CommandHandler/BulkToggleCurrenciesStatusHandler.php b/src/Adapter/Currency/CommandHandler/BulkToggleCurrenciesStatusHandler.php
index 1960f14b4cbbf..37305e3ae8b3f 100644
--- a/src/Adapter/Currency/CommandHandler/BulkToggleCurrenciesStatusHandler.php
+++ b/src/Adapter/Currency/CommandHandler/BulkToggleCurrenciesStatusHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Currency\CommandHandler;
use Currency;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Currency\Command\BulkToggleCurrenciesStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Currency\CommandHandler\BulkToggleCurrenciesStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\BulkToggleCurrenciesException;
@@ -40,6 +41,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class BulkToggleCurrenciesStatusHandler extends AbstractCurrencyHandler implements BulkToggleCurrenciesStatusHandlerInterface
{
/**
diff --git a/src/Adapter/Currency/CommandHandler/CurrencyCommandValidator.php b/src/Adapter/Currency/CommandHandler/CurrencyCommandValidator.php
index 93658b4f3df28..5943f21a20502 100644
--- a/src/Adapter/Currency/CommandHandler/CurrencyCommandValidator.php
+++ b/src/Adapter/Currency/CommandHandler/CurrencyCommandValidator.php
@@ -30,6 +30,7 @@
use Currency;
use PrestaShop\PrestaShop\Core\Currency\CurrencyDataProviderInterface;
use PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditCurrencyCommand;
+use PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditUnofficialCurrencyCommand;
use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CannotDisableDefaultCurrencyException;
use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyConstraintException;
use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\DefaultCurrencyInMultiShopException;
@@ -110,11 +111,11 @@ public function assertCurrencyIsNotAvailableInDatabase(string $isoCode)
/**
* Prevents from default currency being disabled.
*
- * @param EditCurrencyCommand $command
+ * @param EditCurrencyCommand|EditUnofficialCurrencyCommand $command
*
* @throws CannotDisableDefaultCurrencyException
*/
- public function assertDefaultCurrencyIsNotBeingDisabled(EditCurrencyCommand $command)
+ public function assertDefaultCurrencyIsNotBeingDisabled(EditCurrencyCommand|EditUnofficialCurrencyCommand $command)
{
if (!$command->isEnabled() && $command->getCurrencyId()->getValue() === $this->defaultCurrencyId) {
throw new CannotDisableDefaultCurrencyException(sprintf('Currency with id "%s" is the default currency and cannot be disabled.', $command->getCurrencyId()->getValue()));
@@ -126,11 +127,11 @@ public function assertDefaultCurrencyIsNotBeingDisabled(EditCurrencyCommand $com
* from each shop and checks that the shop is not being disabled as well.
*
* @param Currency $currency
- * @param EditCurrencyCommand $command
+ * @param EditCurrencyCommand|EditUnofficialCurrencyCommand $command
*
* @throws DefaultCurrencyInMultiShopException
*/
- public function assertDefaultCurrencyIsNotBeingRemovedOrDisabledFromShop(Currency $currency, EditCurrencyCommand $command)
+ public function assertDefaultCurrencyIsNotBeingRemovedOrDisabledFromShop(Currency $currency, EditCurrencyCommand|EditUnofficialCurrencyCommand $command)
{
if (empty($command->getShopIds())) {
return;
diff --git a/src/Adapter/Currency/CommandHandler/DeleteCurrencyHandler.php b/src/Adapter/Currency/CommandHandler/DeleteCurrencyHandler.php
index ab4061155519d..0545f5d4187d7 100644
--- a/src/Adapter/Currency/CommandHandler/DeleteCurrencyHandler.php
+++ b/src/Adapter/Currency/CommandHandler/DeleteCurrencyHandler.php
@@ -28,6 +28,7 @@
use Configuration;
use Currency;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Currency\Command\DeleteCurrencyCommand;
use PrestaShop\PrestaShop\Core\Domain\Currency\CommandHandler\DeleteCurrencyHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CannotDeleteCurrencyException;
@@ -43,6 +44,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class DeleteCurrencyHandler implements DeleteCurrencyHandlerInterface
{
/**
diff --git a/src/Adapter/Currency/CommandHandler/EditOfficialCurrencyHandler.php b/src/Adapter/Currency/CommandHandler/EditOfficialCurrencyHandler.php
index ee33f9cd06835..a56e6b5e4c998 100644
--- a/src/Adapter/Currency/CommandHandler/EditOfficialCurrencyHandler.php
+++ b/src/Adapter/Currency/CommandHandler/EditOfficialCurrencyHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Currency\CommandHandler;
use Currency;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditCurrencyCommand;
use PrestaShop\PrestaShop\Core\Domain\Currency\CommandHandler\EditCurrencyHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CannotDisableDefaultCurrencyException;
@@ -43,6 +44,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class EditOfficialCurrencyHandler extends AbstractCurrencyHandler implements EditCurrencyHandlerInterface
{
/**
diff --git a/src/Adapter/Currency/CommandHandler/EditUnofficialCurrencyHandler.php b/src/Adapter/Currency/CommandHandler/EditUnofficialCurrencyHandler.php
index 9205c2824f35f..5a6b49dfe8d47 100644
--- a/src/Adapter/Currency/CommandHandler/EditUnofficialCurrencyHandler.php
+++ b/src/Adapter/Currency/CommandHandler/EditUnofficialCurrencyHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Currency\CommandHandler;
use Currency;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditUnofficialCurrencyCommand;
use PrestaShop\PrestaShop\Core\Domain\Currency\CommandHandler\EditUnofficialCurrencyHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CannotDisableDefaultCurrencyException;
@@ -45,6 +46,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class EditUnofficialCurrencyHandler extends AbstractCurrencyHandler implements EditUnofficialCurrencyHandlerInterface
{
/**
diff --git a/src/Adapter/Currency/CommandHandler/RefreshExchangeRatesHandler.php b/src/Adapter/Currency/CommandHandler/RefreshExchangeRatesHandler.php
index c2cad8b8081e3..92344bce66a90 100644
--- a/src/Adapter/Currency/CommandHandler/RefreshExchangeRatesHandler.php
+++ b/src/Adapter/Currency/CommandHandler/RefreshExchangeRatesHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Currency\CommandHandler;
use Currency;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Currency\Command\RefreshExchangeRatesCommand;
use PrestaShop\PrestaShop\Core\Domain\Currency\CommandHandler\RefreshExchangeRatesHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CannotRefreshExchangeRatesException;
@@ -37,6 +38,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class RefreshExchangeRatesHandler implements RefreshExchangeRatesHandlerInterface
{
/**
diff --git a/src/Adapter/Currency/CommandHandler/ToggleCurrencyStatusHandler.php b/src/Adapter/Currency/CommandHandler/ToggleCurrencyStatusHandler.php
index 6b125ff285222..b1cf7cbfff8fa 100644
--- a/src/Adapter/Currency/CommandHandler/ToggleCurrencyStatusHandler.php
+++ b/src/Adapter/Currency/CommandHandler/ToggleCurrencyStatusHandler.php
@@ -28,6 +28,7 @@
use Configuration;
use Currency;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Currency\Command\ToggleCurrencyStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Currency\CommandHandler\ToggleCurrencyStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CannotDisableDefaultCurrencyException;
@@ -43,6 +44,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class ToggleCurrencyStatusHandler implements ToggleCurrencyStatusHandlerInterface
{
/**
diff --git a/src/Adapter/Currency/QueryHandler/GetCurrencyExchangeRateHandler.php b/src/Adapter/Currency/QueryHandler/GetCurrencyExchangeRateHandler.php
index 0520b9aff7d66..f538f366423c4 100644
--- a/src/Adapter/Currency/QueryHandler/GetCurrencyExchangeRateHandler.php
+++ b/src/Adapter/Currency/QueryHandler/GetCurrencyExchangeRateHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Currency\QueryHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Currency\Exception\CurrencyFeedException;
use PrestaShop\PrestaShop\Core\Currency\ExchangeRateProvider;
use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\ExchangeRateNotFoundException;
@@ -37,6 +38,7 @@
* Class GetCurrencyExchangeRateHandler handles the GetCurrencyExchangeRate query
* and returns the exchange rate of a specified currency via a ExchangeRate value object.
*/
+#[AsQueryHandler]
class GetCurrencyExchangeRateHandler implements GetCurrencyExchangeRateHandlerInterface
{
/** @var ExchangeRateProvider */
diff --git a/src/Adapter/Currency/QueryHandler/GetCurrencyForEditingHandler.php b/src/Adapter/Currency/QueryHandler/GetCurrencyForEditingHandler.php
index 95bb772bc1e49..1048f80dc1e92 100644
--- a/src/Adapter/Currency/QueryHandler/GetCurrencyForEditingHandler.php
+++ b/src/Adapter/Currency/QueryHandler/GetCurrencyForEditingHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Currency\QueryHandler;
use Currency;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetCurrencyForEditing;
use PrestaShop\PrestaShop\Core\Domain\Currency\QueryHandler\GetCurrencyForEditingHandlerInterface;
@@ -38,6 +39,7 @@
*
* @internal
*/
+#[AsQueryHandler]
final class GetCurrencyForEditingHandler implements GetCurrencyForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Currency/QueryHandler/GetReferenceCurrencyHandler.php b/src/Adapter/Currency/QueryHandler/GetReferenceCurrencyHandler.php
index 2c7e4d79742cf..ceae8bf4bde15 100644
--- a/src/Adapter/Currency/QueryHandler/GetReferenceCurrencyHandler.php
+++ b/src/Adapter/Currency/QueryHandler/GetReferenceCurrencyHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Currency\QueryHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetReferenceCurrency;
use PrestaShop\PrestaShop\Core\Domain\Currency\QueryHandler\GetReferenceCurrencyHandlerInterface;
@@ -34,6 +35,7 @@
use PrestaShop\PrestaShop\Core\Localization\CLDR\CurrencyInterface;
use PrestaShop\PrestaShop\Core\Localization\CLDR\LocaleRepository;
+#[AsQueryHandler]
class GetReferenceCurrencyHandler implements GetReferenceCurrencyHandlerInterface
{
/**
diff --git a/src/Adapter/Customer/CommandHandler/AddCustomerHandler.php b/src/Adapter/Customer/CommandHandler/AddCustomerHandler.php
index 87d5e6e3ef10f..45a75ecf7a755 100644
--- a/src/Adapter/Customer/CommandHandler/AddCustomerHandler.php
+++ b/src/Adapter/Customer/CommandHandler/AddCustomerHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Customer\CommandHandler;
use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Crypto\Hashing;
use PrestaShop\PrestaShop\Core\Domain\Customer\Command\AddCustomerCommand;
use PrestaShop\PrestaShop\Core\Domain\Customer\CommandHandler\AddCustomerHandlerInterface;
@@ -42,6 +43,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class AddCustomerHandler extends AbstractCustomerHandler implements AddCustomerHandlerInterface
{
/**
diff --git a/src/Adapter/Customer/CommandHandler/BulkDeleteCustomerHandler.php b/src/Adapter/Customer/CommandHandler/BulkDeleteCustomerHandler.php
index b2f083602f167..56c9796f1295d 100644
--- a/src/Adapter/Customer/CommandHandler/BulkDeleteCustomerHandler.php
+++ b/src/Adapter/Customer/CommandHandler/BulkDeleteCustomerHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Customer\CommandHandler;
use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkDeleteCustomerCommand;
use PrestaShop\PrestaShop\Core\Domain\Customer\CommandHandler\BulkDeleteCustomerHandlerInterface;
@@ -35,6 +36,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class BulkDeleteCustomerHandler extends AbstractCustomerHandler implements BulkDeleteCustomerHandlerInterface
{
/**
diff --git a/src/Adapter/Customer/CommandHandler/BulkDisableCustomerHandler.php b/src/Adapter/Customer/CommandHandler/BulkDisableCustomerHandler.php
index d69e760aba39e..3ecd29e7581af 100644
--- a/src/Adapter/Customer/CommandHandler/BulkDisableCustomerHandler.php
+++ b/src/Adapter/Customer/CommandHandler/BulkDisableCustomerHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Customer\CommandHandler;
use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkDisableCustomerCommand;
use PrestaShop\PrestaShop\Core\Domain\Customer\CommandHandler\BulkDisableCustomerHandlerInterface;
@@ -35,6 +36,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class BulkDisableCustomerHandler extends AbstractCustomerHandler implements BulkDisableCustomerHandlerInterface
{
/**
diff --git a/src/Adapter/Customer/CommandHandler/BulkEnableCustomerHandler.php b/src/Adapter/Customer/CommandHandler/BulkEnableCustomerHandler.php
index 444db4f08f18e..5c515d55836f8 100644
--- a/src/Adapter/Customer/CommandHandler/BulkEnableCustomerHandler.php
+++ b/src/Adapter/Customer/CommandHandler/BulkEnableCustomerHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Customer\CommandHandler;
use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkEnableCustomerCommand;
use PrestaShop\PrestaShop\Core\Domain\Customer\CommandHandler\BulkEnableCustomerHandlerInterface;
@@ -35,6 +36,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class BulkEnableCustomerHandler extends AbstractCustomerHandler implements BulkEnableCustomerHandlerInterface
{
/**
diff --git a/src/Adapter/Customer/CommandHandler/DeleteCustomerHandler.php b/src/Adapter/Customer/CommandHandler/DeleteCustomerHandler.php
index d7732388a3db6..3803f5e02903e 100644
--- a/src/Adapter/Customer/CommandHandler/DeleteCustomerHandler.php
+++ b/src/Adapter/Customer/CommandHandler/DeleteCustomerHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Customer\CommandHandler;
use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Customer\Command\DeleteCustomerCommand;
use PrestaShop\PrestaShop\Core\Domain\Customer\CommandHandler\DeleteCustomerHandlerInterface;
@@ -35,6 +36,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class DeleteCustomerHandler extends AbstractCustomerHandler implements DeleteCustomerHandlerInterface
{
/**
diff --git a/src/Adapter/Customer/CommandHandler/EditCustomerHandler.php b/src/Adapter/Customer/CommandHandler/EditCustomerHandler.php
index 97805e6514647..563081118d3eb 100644
--- a/src/Adapter/Customer/CommandHandler/EditCustomerHandler.php
+++ b/src/Adapter/Customer/CommandHandler/EditCustomerHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Customer\CommandHandler;
use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Crypto\Hashing;
use PrestaShop\PrestaShop\Core\Domain\Customer\Command\EditCustomerCommand;
use PrestaShop\PrestaShop\Core\Domain\Customer\CommandHandler\EditCustomerHandlerInterface;
@@ -41,6 +42,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class EditCustomerHandler extends AbstractCustomerHandler implements EditCustomerHandlerInterface
{
/**
diff --git a/src/Adapter/Customer/CommandHandler/SetPrivateNoteAboutCustomerHandler.php b/src/Adapter/Customer/CommandHandler/SetPrivateNoteAboutCustomerHandler.php
index c1a7753735619..35000525d0f8f 100644
--- a/src/Adapter/Customer/CommandHandler/SetPrivateNoteAboutCustomerHandler.php
+++ b/src/Adapter/Customer/CommandHandler/SetPrivateNoteAboutCustomerHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Customer\CommandHandler;
use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Customer\Command\SetPrivateNoteAboutCustomerCommand;
use PrestaShop\PrestaShop\Core\Domain\Customer\CommandHandler\SetPrivateNoteAboutCustomerHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Customer\Exception\CustomerNotFoundException;
@@ -36,6 +37,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class SetPrivateNoteAboutCustomerHandler implements SetPrivateNoteAboutCustomerHandlerInterface
{
/**
diff --git a/src/Adapter/Customer/CommandHandler/SetRequiredFieldsForCustomerHandler.php b/src/Adapter/Customer/CommandHandler/SetRequiredFieldsForCustomerHandler.php
index 0080481f835a8..e06d7f8662eee 100644
--- a/src/Adapter/Customer/CommandHandler/SetRequiredFieldsForCustomerHandler.php
+++ b/src/Adapter/Customer/CommandHandler/SetRequiredFieldsForCustomerHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Customer\CommandHandler;
use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Customer\Command\SetRequiredFieldsForCustomerCommand;
use PrestaShop\PrestaShop\Core\Domain\Customer\CommandHandler\SetRequiredFieldsForCustomerHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Customer\Exception\CannotSetRequiredFieldsForCustomerException;
@@ -36,6 +37,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class SetRequiredFieldsForCustomerHandler implements SetRequiredFieldsForCustomerHandlerInterface
{
/**
diff --git a/src/Adapter/Customer/CommandHandler/TransformGuestToCustomerHandler.php b/src/Adapter/Customer/CommandHandler/TransformGuestToCustomerHandler.php
index c160663525cbf..fcfe1684459d3 100644
--- a/src/Adapter/Customer/CommandHandler/TransformGuestToCustomerHandler.php
+++ b/src/Adapter/Customer/CommandHandler/TransformGuestToCustomerHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Customer\CommandHandler;
use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Customer\Command\TransformGuestToCustomerCommand;
use PrestaShop\PrestaShop\Core\Domain\Customer\CommandHandler\TransformGuestToCustomerHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Customer\Exception\CustomerNotFoundException;
@@ -38,6 +39,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class TransformGuestToCustomerHandler implements TransformGuestToCustomerHandlerInterface
{
/**
diff --git a/src/Adapter/Customer/Group/CommandHandler/AddCustomerGroupHandler.php b/src/Adapter/Customer/Group/CommandHandler/AddCustomerGroupHandler.php
index 3d62f42a50339..44b105c60de0f 100644
--- a/src/Adapter/Customer/Group/CommandHandler/AddCustomerGroupHandler.php
+++ b/src/Adapter/Customer/Group/CommandHandler/AddCustomerGroupHandler.php
@@ -30,10 +30,12 @@
use Group as CustomerGroup;
use PrestaShop\PrestaShop\Adapter\Customer\Group\Repository\GroupRepository;
use PrestaShop\PrestaShop\Adapter\Customer\Group\Validate\CustomerGroupValidator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Customer\Group\Command\AddCustomerGroupCommand;
use PrestaShop\PrestaShop\Core\Domain\Customer\Group\CommandHandler\AddCustomerGroupHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Customer\Group\ValueObject\GroupId;
+#[AsCommandHandler]
class AddCustomerGroupHandler implements AddCustomerGroupHandlerInterface
{
/**
diff --git a/src/Adapter/Customer/Group/QueryHandler/GetCustomerGroupForEditingHandler.php b/src/Adapter/Customer/Group/QueryHandler/GetCustomerGroupForEditingHandler.php
index ac5efa0dbe26d..0d2bae53eb847 100644
--- a/src/Adapter/Customer/Group/QueryHandler/GetCustomerGroupForEditingHandler.php
+++ b/src/Adapter/Customer/Group/QueryHandler/GetCustomerGroupForEditingHandler.php
@@ -29,11 +29,13 @@
use PrestaShop\Decimal\DecimalNumber;
use PrestaShop\PrestaShop\Adapter\Customer\Group\Repository\GroupRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Customer\Group\Exception\GroupNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Customer\Group\Query\GetCustomerGroupForEditing;
use PrestaShop\PrestaShop\Core\Domain\Customer\Group\QueryHandler\GetCustomerGroupForEditingHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Customer\Group\QueryResult\EditableCustomerGroup;
+#[AsQueryHandler]
class GetCustomerGroupForEditingHandler implements GetCustomerGroupForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Customer/QueryHandler/GetCustomerCartsHandler.php b/src/Adapter/Customer/QueryHandler/GetCustomerCartsHandler.php
index 90be229fb30c0..2d1ce3a2c47ac 100644
--- a/src/Adapter/Customer/QueryHandler/GetCustomerCartsHandler.php
+++ b/src/Adapter/Customer/QueryHandler/GetCustomerCartsHandler.php
@@ -30,6 +30,7 @@
use Currency;
use Customer;
use PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\AbstractCustomerHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerCarts;
use PrestaShop\PrestaShop\Core\Domain\Customer\QueryHandler\GetCustomerCartsHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Customer\QueryResult\CartSummary;
@@ -39,6 +40,7 @@
/**
* Handles GetCustomerCartsQuery using legacy object models
*/
+#[AsQueryHandler]
final class GetCustomerCartsHandler extends AbstractCustomerHandler implements GetCustomerCartsHandlerInterface
{
/**
diff --git a/src/Adapter/Customer/QueryHandler/GetCustomerForAddressCreationHandler.php b/src/Adapter/Customer/QueryHandler/GetCustomerForAddressCreationHandler.php
index 4c0d7e7a44ca2..5a6a9cd659686 100644
--- a/src/Adapter/Customer/QueryHandler/GetCustomerForAddressCreationHandler.php
+++ b/src/Adapter/Customer/QueryHandler/GetCustomerForAddressCreationHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Customer\QueryHandler;
use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Customer\Exception\CustomerByEmailNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Customer\Exception\CustomerException;
use PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForAddressCreation;
@@ -37,6 +38,7 @@
/**
* Handles finding customer by email
*/
+#[AsQueryHandler]
final class GetCustomerForAddressCreationHandler implements GetCustomerForAddressCreationHandlerInterface
{
/**
diff --git a/src/Adapter/Customer/QueryHandler/GetCustomerForEditingHandler.php b/src/Adapter/Customer/QueryHandler/GetCustomerForEditingHandler.php
index 5deed8c34b1f2..4323423a97a8c 100644
--- a/src/Adapter/Customer/QueryHandler/GetCustomerForEditingHandler.php
+++ b/src/Adapter/Customer/QueryHandler/GetCustomerForEditingHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Customer\QueryHandler;
use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Customer\Exception\CustomerNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForEditing;
use PrestaShop\PrestaShop\Core\Domain\Customer\QueryHandler\GetCustomerForEditingHandlerInterface;
@@ -41,6 +42,7 @@
*
* @internal
*/
+#[AsQueryHandler]
final class GetCustomerForEditingHandler implements GetCustomerForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Customer/QueryHandler/GetCustomerForViewingHandler.php b/src/Adapter/Customer/QueryHandler/GetCustomerForViewingHandler.php
index 5527663a34ba7..c81eae6263fbc 100644
--- a/src/Adapter/Customer/QueryHandler/GetCustomerForViewingHandler.php
+++ b/src/Adapter/Customer/QueryHandler/GetCustomerForViewingHandler.php
@@ -34,6 +34,7 @@
use Group;
use Language;
use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Customer\Exception\CustomerNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForViewing;
use PrestaShop\PrestaShop\Core\Domain\Customer\QueryHandler\GetCustomerForViewingHandlerInterface;
@@ -58,6 +59,7 @@
*
* @internal
*/
+#[AsQueryHandler]
final class GetCustomerForViewingHandler implements GetCustomerForViewingHandlerInterface
{
/**
diff --git a/src/Adapter/Customer/QueryHandler/GetCustomerOrdersHandler.php b/src/Adapter/Customer/QueryHandler/GetCustomerOrdersHandler.php
index 0b4fe60c02453..80100536da0a3 100644
--- a/src/Adapter/Customer/QueryHandler/GetCustomerOrdersHandler.php
+++ b/src/Adapter/Customer/QueryHandler/GetCustomerOrdersHandler.php
@@ -30,6 +30,7 @@
use Customer;
use Order;
use PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\AbstractCustomerHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Customer\Exception\CustomerNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerOrders;
use PrestaShop\PrestaShop\Core\Domain\Customer\QueryHandler\GetCustomerOrdersHandlerInterface;
@@ -40,6 +41,7 @@
/**
* Handles GetCustomerOrders query using legacy object models
*/
+#[AsQueryHandler]
final class GetCustomerOrdersHandler extends AbstractCustomerHandler implements GetCustomerOrdersHandlerInterface
{
/**
diff --git a/src/Adapter/Customer/QueryHandler/GetRequiredFieldsForCustomerHandler.php b/src/Adapter/Customer/QueryHandler/GetRequiredFieldsForCustomerHandler.php
index 580b64a42faa8..b01567fa1d990 100644
--- a/src/Adapter/Customer/QueryHandler/GetRequiredFieldsForCustomerHandler.php
+++ b/src/Adapter/Customer/QueryHandler/GetRequiredFieldsForCustomerHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Customer\QueryHandler;
use Customer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetRequiredFieldsForCustomer;
use PrestaShop\PrestaShop\Core\Domain\Customer\QueryHandler\GetRequiredFieldsForCustomerHandlerInterface;
@@ -35,6 +36,7 @@
*
* @internal
*/
+#[AsQueryHandler]
final class GetRequiredFieldsForCustomerHandler implements GetRequiredFieldsForCustomerHandlerInterface
{
/**
diff --git a/src/Adapter/Customer/QueryHandler/SearchCustomersHandler.php b/src/Adapter/Customer/QueryHandler/SearchCustomersHandler.php
index 531534120b326..25562fa244fe1 100644
--- a/src/Adapter/Customer/QueryHandler/SearchCustomersHandler.php
+++ b/src/Adapter/Customer/QueryHandler/SearchCustomersHandler.php
@@ -29,6 +29,7 @@
use Customer;
use Group;
use PrestaShop\PrestaShop\Adapter\Configuration;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Customer\Query\SearchCustomers;
use PrestaShop\PrestaShop\Core\Domain\Customer\QueryHandler\SearchCustomersHandlerInterface;
@@ -37,6 +38,7 @@
*
* @internal
*/
+#[AsQueryHandler]
final class SearchCustomersHandler implements SearchCustomersHandlerInterface
{
/**
diff --git a/src/Adapter/Debug/DebugMode.php b/src/Adapter/Debug/DebugMode.php
index 82c78d072625e..ebc45db1ea844 100644
--- a/src/Adapter/Debug/DebugMode.php
+++ b/src/Adapter/Debug/DebugMode.php
@@ -46,6 +46,16 @@ class DebugMode
* @return bool Whether debug mode is enabled
*/
public function isDebugModeEnabled()
+ {
+ return 'false' !== Tools::strtolower($this->getCurrentDebugMode());
+ }
+
+ /**
+ * Get the current debug mode from the defines file.
+ *
+ * @return string|null
+ */
+ public function getCurrentDebugMode()
{
$definesClean = '';
$customDefinesPath = _PS_ROOT_DIR_ . '/config/defines_custom.inc.php';
@@ -55,14 +65,51 @@ public function isDebugModeEnabled()
$definesClean = php_strip_whitespace($customDefinesPath);
}
- if (!preg_match('/define\(\'_PS_MODE_DEV_\', ([a-zA-Z]+)\);/Ui', $definesClean, $debugModeValue)) {
+ if (!preg_match('/define\(\'_PS_MODE_DEV_\', ([^;]+)\);/Ui', $definesClean, $debugModeValue)) {
$definesClean = php_strip_whitespace($definesPath);
- if (!preg_match('/define\(\'_PS_MODE_DEV_\', ([a-zA-Z]+)\);/Ui', $definesClean, $debugModeValue)) {
- return false;
+ if (!preg_match('/define\(\'_PS_MODE_DEV_\', ([^;]+)\);/Ui', $definesClean, $debugModeValue)) {
+ return null;
}
}
- return 'true' === Tools::strtolower($debugModeValue[1]);
+ return $debugModeValue[1];
+ }
+
+ /**
+ * Create php code based on the debug mode configuration.
+ * Examples:
+ * define('_PS_MODE_DEV_', true);
+ * define('_PS_MODE_DEV_', isset($_COOKIE['debug']) && $_COOKIE['debug'] === 'debug_password');
+ * define('_PS_MODE_DEV_', isset($_COOKIE['debug']));
+ * define('_PS_MODE_DEV_', false);
+ *
+ * @param array $configuration {
+ * debug_mode: bool
+ * debug_cookie_name: string
+ * debug_cookie_value: string
+ * }
+ *
+ * @return string
+ */
+ public function createDebugModeFromConfiguration(array $configuration)
+ {
+ if (!$configuration['debug_mode']) {
+ return 'false';
+ }
+
+ if (empty($configuration['debug_cookie_name'])) {
+ return 'true';
+ }
+
+ $debug_cookie_name = stripslashes($configuration['debug_cookie_name']);
+
+ if (empty($configuration['debug_cookie_value'])) {
+ return "isset(\$_COOKIE['$debug_cookie_name'])";
+ }
+
+ $debug_cookie_value = stripslashes($configuration['debug_cookie_value']);
+
+ return "isset(\$_COOKIE['$debug_cookie_name']) && \$_COOKIE['$debug_cookie_name'] === '$debug_cookie_value'";
}
/**
@@ -118,11 +165,11 @@ private function updateDebugModeValueInMainFile($value)
$cleanedFileContent = php_strip_whitespace($filename);
$fileContent = Tools::file_get_contents($filename);
- if (!preg_match('/define\(\'_PS_MODE_DEV_\', ([a-zA-Z]+)\);/Ui', $cleanedFileContent)) {
+ if (!preg_match('/define\(\'_PS_MODE_DEV_\', ([^;]+)\);/Ui', $cleanedFileContent)) {
return self::DEBUG_MODE_ERROR_NO_DEFINITION_FOUND;
}
- $fileContent = preg_replace('/define\(\'_PS_MODE_DEV_\', ([a-zA-Z]+)\);/Ui', 'define(\'_PS_MODE_DEV_\', ' . $value . ');', $fileContent);
+ $fileContent = preg_replace('/define\(\'_PS_MODE_DEV_\', ([^;]+)\);/Ui', 'define(\'_PS_MODE_DEV_\', ' . $value . ');', $fileContent);
if (!@file_put_contents($filename, $fileContent)) {
return self::DEBUG_MODE_ERROR_NO_WRITE_ACCESS;
}
@@ -147,10 +194,10 @@ private function updateDebugModeValueInCustomFile($value)
$cleanedFileContent = php_strip_whitespace($customFileName);
$fileContent = Tools::file_get_contents($customFileName);
- if (!preg_match('/define\(\'_PS_MODE_DEV_\', ([a-zA-Z]+)\);/Ui', $cleanedFileContent)) {
+ if (!preg_match('/define\(\'_PS_MODE_DEV_\', ([^;]+)\);/Ui', $cleanedFileContent)) {
return self::DEBUG_MODE_ERROR_NO_DEFINITION_FOUND;
}
- $fileContent = preg_replace('/define\(\'_PS_MODE_DEV_\', ([a-zA-Z]+)\);/Ui', 'define(\'_PS_MODE_DEV_\', ' . $value . ');', $fileContent);
+ $fileContent = preg_replace('/define\(\'_PS_MODE_DEV_\', ([^;]+)\);/Ui', 'define(\'_PS_MODE_DEV_\', ' . $value . ');', $fileContent);
if (!@file_put_contents($customFileName, $fileContent)) {
return self::DEBUG_MODE_ERROR_NO_WRITE_ACCESS_CUSTOM;
@@ -170,7 +217,7 @@ private function updateDebugModeValueInCustomFile($value)
*
* @return int the debug mode
*/
- private function changePsModeDevValue($value)
+ public function changePsModeDevValue($value)
{
// Check custom defines file first
if ($this->isCustomDefinesReadable()) {
diff --git a/src/Adapter/Debug/DebugModeConfiguration.php b/src/Adapter/Debug/DebugModeConfiguration.php
index 0491c3a22d0fb..af3f9b89c4b54 100644
--- a/src/Adapter/Debug/DebugModeConfiguration.php
+++ b/src/Adapter/Debug/DebugModeConfiguration.php
@@ -91,6 +91,8 @@ public function getConfiguration()
return [
'disable_overrides' => $this->configuration->getBoolean('PS_DISABLE_OVERRIDES'),
'debug_mode' => $this->debugMode->isDebugModeEnabled(),
+ 'debug_cookie_name' => $this->configuration->get('PS_DEBUG_COOKIE_NAME'),
+ 'debug_cookie_value' => $this->configuration->get('PS_DEBUG_COOKIE_VALUE'),
'debug_profiling' => $this->debugProfiling->isProfilingEnabled(),
];
}
@@ -106,10 +108,21 @@ public function updateConfiguration(array $configuration)
// Set configuration
$this->configuration->set('PS_DISABLE_OVERRIDES', $configuration['disable_overrides']);
+ $this->configuration->set('PS_DEBUG_COOKIE_NAME', $configuration['debug_cookie_name']);
+ $this->configuration->set('PS_DEBUG_COOKIE_VALUE', $configuration['debug_cookie_value']);
+
+ if (empty($configuration['debug_cookie_name']) && !empty($configuration['debug_cookie_value'])) {
+ $errors[] = [
+ 'key' => 'Error: The cookie name is required when the cookie value is set.',
+ 'domain' => 'Admin.Advparameters.Notification',
+ 'parameters' => [],
+ ];
+ }
+
$this->classIndexCacheClearer->clear();
// Update Debug Mode
- $status = $this->updateDebugMode((bool) $configuration['debug_mode']);
+ $status = $this->updateDebugMode($configuration);
switch ($status) {
case DebugMode::DEBUG_MODE_ERROR_NO_WRITE_ACCESS_CUSTOM:
case DebugMode::DEBUG_MODE_ERROR_NO_READ_ACCESS:
@@ -169,26 +182,37 @@ public function updateConfiguration(array $configuration)
*/
public function validateConfiguration(array $configuration)
{
- return isset(
- $configuration['disable_overrides'],
- $configuration['debug_mode'],
- $configuration['debug_profiling']
- );
+ $keys = [
+ 'disable_overrides',
+ 'debug_mode',
+ 'debug_cookie_name',
+ 'debug_cookie_value',
+ 'debug_profiling',
+ ];
+ $array_keys = array_keys($configuration);
+
+ return count(array_intersect($keys, $array_keys)) === count($keys);
}
/**
* Change Debug mode value if needed.
*
- * @param bool $enableStatus
+ * @param array $configuration {
+ * debug_mode: bool
+ * debug_cookie_name: string
+ * debug_cookie_value: string
+ * }
*
* @return int|null Status of update
*/
- private function updateDebugMode(bool $enableStatus): ?int
+ private function updateDebugMode(array $configuration): ?int
{
- $currentDebugMode = $this->debugMode->isDebugModeEnabled();
+ $currentDebugMode = $this->debugMode->getCurrentDebugMode();
+
+ $newDebugMode = $this->debugMode->createDebugModeFromConfiguration($configuration);
- if ($enableStatus !== $currentDebugMode) {
- return (true === $enableStatus) ? $this->debugMode->enable() : $this->debugMode->disable();
+ if ($newDebugMode !== $currentDebugMode) {
+ return $this->debugMode->changePsModeDevValue($newDebugMode);
}
return null;
diff --git a/src/Adapter/EntityMapper.php b/src/Adapter/EntityMapper.php
index 3601e4664b5dd..201fd81df6710 100644
--- a/src/Adapter/EntityMapper.php
+++ b/src/Adapter/EntityMapper.php
@@ -95,7 +95,13 @@ public function load($id, $id_lang, $entity, $entity_defs, $id_shop, $should_cac
foreach ($object_datas as $key => $value) {
if (array_key_exists($key, $entity_defs['fields'])
|| array_key_exists($key, $objectVars)) {
- $entity->{$key} = $value;
+ if (isset($entity_defs['fields'][$key]['type']) && in_array($entity_defs['fields'][$key]['type'], [
+ \ObjectModel::TYPE_BOOL,
+ ])) {
+ $entity->{$key} = (string) $value;
+ } else {
+ $entity->{$key} = $value;
+ }
} else {
unset($object_datas[$key]);
}
diff --git a/src/Adapter/EntityTranslation/DataLangFactory.php b/src/Adapter/EntityTranslation/DataLangFactory.php
index ad8627a5fab79..1cd9e8977de1d 100644
--- a/src/Adapter/EntityTranslation/DataLangFactory.php
+++ b/src/Adapter/EntityTranslation/DataLangFactory.php
@@ -134,7 +134,7 @@ private function removeDbPrefixIfPresent(string $tableName): string
*/
private function ensureLangSuffix(string $tableName): string
{
- if (substr($tableName, -5) !== '_lang') {
+ if (!str_ends_with($tableName, '_lang')) {
$tableName .= '_lang';
}
diff --git a/src/Adapter/EntityTranslation/EntityTranslator.php b/src/Adapter/EntityTranslation/EntityTranslator.php
index bb90416035b15..92786f63f094c 100644
--- a/src/Adapter/EntityTranslation/EntityTranslator.php
+++ b/src/Adapter/EntityTranslation/EntityTranslator.php
@@ -230,7 +230,7 @@ protected function doTranslate(array $data, string $fieldName): string
private function buildTableNameFromDataLang(DataLangCore $dataLang): string
{
$tableName = $this->dataLang->getTableName();
- if (substr($tableName, 0, strlen($this->dbPrefix)) !== $this->dbPrefix) {
+ if (!str_starts_with($tableName, $this->dbPrefix)) {
$tableName = $this->dbPrefix . $tableName;
}
diff --git a/src/Adapter/Feature/CommandHandler/AddFeatureHandler.php b/src/Adapter/Feature/CommandHandler/AddFeatureHandler.php
index f7e4dc4befef5..d2baa7952b523 100644
--- a/src/Adapter/Feature/CommandHandler/AddFeatureHandler.php
+++ b/src/Adapter/Feature/CommandHandler/AddFeatureHandler.php
@@ -28,6 +28,7 @@
use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Feature\Command\AddFeatureCommand;
use PrestaShop\PrestaShop\Core\Domain\Feature\CommandHandler\AddFeatureHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureId;
@@ -35,6 +36,7 @@
/**
* Handles adding of features using legacy logic.
*/
+#[AsCommandHandler]
class AddFeatureHandler extends AbstractObjectModelHandler implements AddFeatureHandlerInterface
{
/**
diff --git a/src/Adapter/Feature/CommandHandler/AddFeatureValueHandler.php b/src/Adapter/Feature/CommandHandler/AddFeatureValueHandler.php
index effeef1e70053..c453ae23e4955 100644
--- a/src/Adapter/Feature/CommandHandler/AddFeatureValueHandler.php
+++ b/src/Adapter/Feature/CommandHandler/AddFeatureValueHandler.php
@@ -31,6 +31,7 @@
use FeatureValue;
use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository;
use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Feature\Command\AddFeatureValueCommand;
use PrestaShop\PrestaShop\Core\Domain\Feature\CommandHandler\AddFeatureValueHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureValueId;
@@ -38,6 +39,7 @@
/**
* Handles adding of feature value using legacy model.
*/
+#[AsCommandHandler]
class AddFeatureValueHandler implements AddFeatureValueHandlerInterface
{
/**
diff --git a/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureHandler.php b/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureHandler.php
index 5e2e595d9daac..55df4c0763827 100644
--- a/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureHandler.php
+++ b/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\Feature\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\AbstractBulkCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Exception\BulkCommandExceptionInterface;
use PrestaShop\PrestaShop\Core\Domain\Feature\Command\BulkDeleteFeatureCommand;
@@ -36,6 +37,7 @@
use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\FeatureException;
use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureId;
+#[AsCommandHandler]
class BulkDeleteFeatureHandler extends AbstractBulkCommandHandler implements BulkDeleteFeatureHandlerInterface
{
/**
@@ -68,10 +70,10 @@ protected function handleSingleAction(mixed $id, mixed $command): void
/**
* {@inheritDoc}
*/
- protected function buildBulkException(array $coughtExceptions): BulkCommandExceptionInterface
+ protected function buildBulkException(array $caughtExceptions): BulkCommandExceptionInterface
{
return new BulkFeatureException(
- $coughtExceptions,
+ $caughtExceptions,
'Errors occurred during Feature bulk delete action',
BulkFeatureException::FAILED_BULK_DELETE
);
diff --git a/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureValueHandler.php b/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureValueHandler.php
new file mode 100644
index 0000000000000..3129a5ae104e6
--- /dev/null
+++ b/src/Adapter/Feature/CommandHandler/BulkDeleteFeatureValueHandler.php
@@ -0,0 +1,84 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Feature\CommandHandler;
+
+use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
+use PrestaShop\PrestaShop\Core\Domain\AbstractBulkCommandHandler;
+use PrestaShop\PrestaShop\Core\Domain\Exception\BulkCommandExceptionInterface;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Command\BulkDeleteFeatureValueCommand;
+use PrestaShop\PrestaShop\Core\Domain\Feature\CommandHandler\BulkDeleteFeatureValueHandlerInterface;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\BulkFeatureValueException;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\FeatureValueException;
+use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureValueId;
+
+#[AsCommandHandler]
+class BulkDeleteFeatureValueHandler extends AbstractBulkCommandHandler implements BulkDeleteFeatureValueHandlerInterface
+{
+ public function __construct(
+ protected readonly FeatureValueRepository $featureValueRepository
+ ) {
+ }
+
+ public function handle(BulkDeleteFeatureValueCommand $command): void
+ {
+ $this->handleBulkAction($command->getFeatureValueIds(), FeatureValueException::class);
+ }
+
+ /**
+ * @param FeatureValueId $id
+ * @param mixed $command
+ *
+ * @return void
+ */
+ protected function handleSingleAction(mixed $id, mixed $command): void
+ {
+ $this->featureValueRepository->delete($id);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected function buildBulkException(array $caughtExceptions): BulkCommandExceptionInterface
+ {
+ return new BulkFeatureValueException(
+ $caughtExceptions,
+ 'Errors occurred during Feature value bulk delete action',
+ BulkFeatureValueException::FAILED_BULK_DELETE
+ );
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected function supports($id): bool
+ {
+ return $id instanceof FeatureValueId;
+ }
+}
diff --git a/src/Adapter/Feature/CommandHandler/DeleteFeatureHandler.php b/src/Adapter/Feature/CommandHandler/DeleteFeatureHandler.php
index 9e21623848ac7..b2a80bcf51307 100644
--- a/src/Adapter/Feature/CommandHandler/DeleteFeatureHandler.php
+++ b/src/Adapter/Feature/CommandHandler/DeleteFeatureHandler.php
@@ -28,9 +28,11 @@
namespace PrestaShop\PrestaShop\Adapter\Feature\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Feature\Command\DeleteFeatureCommand;
use PrestaShop\PrestaShop\Core\Domain\Feature\CommandHandler\DeleteFeatureHandlerInterface;
+#[AsCommandHandler]
class DeleteFeatureHandler implements DeleteFeatureHandlerInterface
{
/**
diff --git a/src/Adapter/Feature/CommandHandler/DeleteFeatureValueHandler.php b/src/Adapter/Feature/CommandHandler/DeleteFeatureValueHandler.php
new file mode 100644
index 0000000000000..d8c0bf40d651f
--- /dev/null
+++ b/src/Adapter/Feature/CommandHandler/DeleteFeatureValueHandler.php
@@ -0,0 +1,48 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Feature\CommandHandler;
+
+use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Command\DeleteFeatureValueCommand;
+use PrestaShop\PrestaShop\Core\Domain\Feature\CommandHandler\DeleteFeatureValueHandlerInterface;
+
+#[AsCommandHandler]
+class DeleteFeatureValueHandler implements DeleteFeatureValueHandlerInterface
+{
+ public function __construct(
+ protected readonly FeatureValueRepository $featureValueRepository
+ ) {
+ }
+
+ public function handle(DeleteFeatureValueCommand $command): void
+ {
+ $this->featureValueRepository->delete($command->getFeatureValueId());
+ }
+}
diff --git a/src/Adapter/Feature/CommandHandler/EditFeatureHandler.php b/src/Adapter/Feature/CommandHandler/EditFeatureHandler.php
index 3d74d9eb33c50..e35367bb55e02 100644
--- a/src/Adapter/Feature/CommandHandler/EditFeatureHandler.php
+++ b/src/Adapter/Feature/CommandHandler/EditFeatureHandler.php
@@ -28,6 +28,7 @@
use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Feature\Command\EditFeatureCommand;
use PrestaShop\PrestaShop\Core\Domain\Feature\CommandHandler\EditFeatureHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopId;
@@ -35,6 +36,7 @@
/**
* Handles feature editing.
*/
+#[AsCommandHandler]
class EditFeatureHandler extends AbstractObjectModelHandler implements EditFeatureHandlerInterface
{
/**
diff --git a/src/Adapter/Feature/CommandHandler/EditFeatureValueHandler.php b/src/Adapter/Feature/CommandHandler/EditFeatureValueHandler.php
index eb1ee4b9cc820..18dc6e4aa9275 100644
--- a/src/Adapter/Feature/CommandHandler/EditFeatureValueHandler.php
+++ b/src/Adapter/Feature/CommandHandler/EditFeatureValueHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Feature\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Feature\Command\EditFeatureValueCommand;
use PrestaShop\PrestaShop\Core\Domain\Feature\CommandHandler\EditFeatureValueHandlerInterface;
/**
* Handles edition of feature value using legacy model.
*/
+#[AsCommandHandler]
class EditFeatureValueHandler implements EditFeatureValueHandlerInterface
{
/**
diff --git a/src/Adapter/Feature/QueryHandler/GetFeatureForEditingHandler.php b/src/Adapter/Feature/QueryHandler/GetFeatureForEditingHandler.php
index da6ad2520f3bf..619b1ff2edaaa 100644
--- a/src/Adapter/Feature/QueryHandler/GetFeatureForEditingHandler.php
+++ b/src/Adapter/Feature/QueryHandler/GetFeatureForEditingHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Feature\QueryHandler;
use Feature;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\FeatureNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureForEditing;
use PrestaShop\PrestaShop\Core\Domain\Feature\QueryHandler\GetFeatureForEditingHandlerInterface;
@@ -35,6 +36,7 @@
/**
* Handles get feature for editing query.
*/
+#[AsQueryHandler]
final class GetFeatureForEditingHandler implements GetFeatureForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Feature/QueryHandler/GetFeatureValueForEditingHandler.php b/src/Adapter/Feature/QueryHandler/GetFeatureValueForEditingHandler.php
index af294689a3439..104205ba15be5 100644
--- a/src/Adapter/Feature/QueryHandler/GetFeatureValueForEditingHandler.php
+++ b/src/Adapter/Feature/QueryHandler/GetFeatureValueForEditingHandler.php
@@ -29,11 +29,13 @@
namespace PrestaShop\PrestaShop\Adapter\Feature\QueryHandler;
use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureValueForEditing;
use PrestaShop\PrestaShop\Core\Domain\Feature\QueryHandler\GetFeatureValueForEditingHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Feature\QueryResult\EditableFeatureValue;
use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureId;
+#[AsQueryHandler]
class GetFeatureValueForEditingHandler implements GetFeatureValueForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Feature/Repository/FeatureRepository.php b/src/Adapter/Feature/Repository/FeatureRepository.php
index 2e75b57187991..fa0947029f655 100644
--- a/src/Adapter/Feature/Repository/FeatureRepository.php
+++ b/src/Adapter/Feature/Repository/FeatureRepository.php
@@ -37,6 +37,7 @@
use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\CannotEditFeatureException;
use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\FeatureNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureId;
+use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopGroupId;
use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopId;
@@ -48,34 +49,11 @@
*/
class FeatureRepository extends AbstractMultiShopObjectModelRepository
{
- /**
- * @var Connection
- */
- protected $connection;
-
- /**
- * @var string
- */
- protected $dbPrefix;
-
- /**
- * @var FeatureValidator
- */
- private $featureValidator;
-
- /**
- * @param Connection $connection
- * @param string $dbPrefix
- * @param FeatureValidator $featureValidator
- */
public function __construct(
- Connection $connection,
- string $dbPrefix,
- FeatureValidator $featureValidator
+ protected readonly Connection $connection,
+ protected readonly string $dbPrefix,
+ protected readonly FeatureValidator $featureValidator
) {
- $this->connection = $connection;
- $this->dbPrefix = $dbPrefix;
- $this->featureValidator = $featureValidator;
}
public function get(FeatureId $featureId): Feature
@@ -142,6 +120,43 @@ public function assertExists(FeatureId $featureId): void
);
}
+ /**
+ * @param FeatureId $featureId
+ * @param LanguageId $languageId
+ *
+ * @return string
+ *
+ * @throws FeatureNotFoundException
+ */
+ public function getFeatureName(FeatureId $featureId, LanguageId $languageId): string
+ {
+ $featureIdValue = $featureId->getValue();
+ $result = $this->connection->createQueryBuilder()
+ ->select('fl.name')
+ ->from($this->dbPrefix . 'feature', 'f')
+ ->innerJoin(
+ 'f',
+ $this->dbPrefix . 'feature_lang',
+ 'fl',
+ 'f.id_feature = fl.id_feature'
+ )
+ ->andWhere('f.id_feature = :featureId')
+ ->andWhere('fl.id_lang = :languageId')
+ ->setParameters([
+ 'featureId' => $featureIdValue,
+ 'languageId' => $languageId->getValue(),
+ ])
+ ->execute()
+ ->fetchAssociative()
+ ;
+
+ if (!isset($result['name'])) {
+ throw new FeatureNotFoundException(sprintf('Feature with id "%d" name was not found', $featureIdValue));
+ }
+
+ return $result['name'];
+ }
+
/**
* @param int|null $limit
* @param int|null $offset
diff --git a/src/Adapter/Feature/Repository/FeatureValueRepository.php b/src/Adapter/Feature/Repository/FeatureValueRepository.php
index 60c4817d60ee3..1a15986e0ae2b 100644
--- a/src/Adapter/Feature/Repository/FeatureValueRepository.php
+++ b/src/Adapter/Feature/Repository/FeatureValueRepository.php
@@ -33,6 +33,7 @@
use FeatureValue;
use PrestaShop\PrestaShop\Adapter\Feature\Validate\FeatureValueValidator;
use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\CannotAddFeatureValueException;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\CannotDeleteFeatureValueException;
use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\CannotUpdateFeatureValueException;
use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\FeatureValueNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\InvalidFeatureValueIdException;
@@ -204,6 +205,11 @@ public function getFeatureValuesCount(?array $filters = []): int
return (int) $qb->execute()->fetch()['total_feature_values'];
}
+ public function delete(FeatureValueId $featureValueId): void
+ {
+ $this->deleteObjectModel($this->get($featureValueId), CannotDeleteFeatureValueException::class);
+ }
+
/**
* @param int $featureValueId
*
diff --git a/src/Adapter/File/Uploader/OrderStateFileUploader.php b/src/Adapter/File/Uploader/OrderStateFileUploader.php
new file mode 100644
index 0000000000000..54c9fdf25c8f5
--- /dev/null
+++ b/src/Adapter/File/Uploader/OrderStateFileUploader.php
@@ -0,0 +1,104 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\File\Uploader;
+
+use PrestaShop\PrestaShop\Core\Configuration\UploadSizeConfigurationInterface;
+use PrestaShop\PrestaShop\Core\Domain\OrderState\Exception\OrderStateConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\OrderState\Exception\OrderStateUploadFailedException;
+use PrestaShop\PrestaShop\Core\Domain\OrderState\OrderStateFileUploaderInterface;
+use Symfony\Component\HttpFoundation\File\Exception\FileException;
+
+/**
+ * Uploads order state file
+ */
+class OrderStateFileUploader implements OrderStateFileUploaderInterface
+{
+ /**
+ * @var UploadSizeConfigurationInterface
+ */
+ protected $uploadSizeConfiguration;
+
+ /**
+ * @param UploadSizeConfigurationInterface $uploadSizeConfiguration
+ */
+ public function __construct(UploadSizeConfigurationInterface $uploadSizeConfiguration)
+ {
+ $this->uploadSizeConfiguration = $uploadSizeConfiguration;
+ }
+
+ /**
+ * {@inheritdoc}
+ *
+ * @param bool $throwExceptionOnFailure
+ *
+ * @throws OrderStateConstraintException
+ * @throws OrderStateUploadFailedException
+ */
+ public function upload(
+ string $filePath,
+ int $id,
+ int $fileSize,
+ bool $throwExceptionOnFailure = true
+ ): void {
+ $this->checkFileAllowedForUpload($fileSize);
+ $this->uploadFile($filePath, $id);
+ }
+
+ /**
+ * @param string $filePath
+ * @param int $id
+ *
+ * @throws OrderStateUploadFailedException
+ */
+ protected function uploadFile(string $filePath, int $id): void
+ {
+ try {
+ move_uploaded_file($filePath, _PS_ORDER_STATE_IMG_DIR_ . $id . '.gif');
+ } catch (FileException $e) {
+ throw new OrderStateUploadFailedException(sprintf('Failed to copy the file %s.', $filePath), 0, $e);
+ }
+ }
+
+ /**
+ * @param int $fileSize
+ *
+ * @throws OrderStateConstraintException
+ */
+ protected function checkFileAllowedForUpload(int $fileSize): void
+ {
+ $maxFileSize = $this->uploadSizeConfiguration->getMaxUploadSizeInBytes();
+
+ if ($maxFileSize > 0 && $fileSize > $maxFileSize) {
+ throw new OrderStateConstraintException(
+ sprintf('Max file size allowed is "%s" bytes. Uploaded file size is "%s".', $maxFileSize, $fileSize),
+ OrderStateConstraintException::INVALID_FILE_SIZE
+ );
+ }
+ }
+}
diff --git a/src/Adapter/Form/ChoiceProvider/FeaturesChoiceProvider.php b/src/Adapter/Form/ChoiceProvider/FeaturesChoiceProvider.php
index 4e2d3057077af..1ccaa730535af 100644
--- a/src/Adapter/Form/ChoiceProvider/FeaturesChoiceProvider.php
+++ b/src/Adapter/Form/ChoiceProvider/FeaturesChoiceProvider.php
@@ -30,33 +30,16 @@
use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository;
use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use PrestaShop\PrestaShop\Core\ConfigurationInterface;
use PrestaShop\PrestaShop\Core\Form\FormChoiceProviderInterface;
class FeaturesChoiceProvider implements FormChoiceProviderInterface
{
- /**
- * @var FeatureRepository
- */
- private $featureRepository;
-
- /**
- * @var int
- */
- private $contextLanguageId;
-
- /**
- * @var int
- */
- private $defaultLanguageId;
-
public function __construct(
- FeatureRepository $featureRepository,
- LegacyContext $legacyContext,
- int $defaultLanguageId
+ protected readonly FeatureRepository $featureRepository,
+ protected readonly LegacyContext $legacyContext,
+ protected readonly ConfigurationInterface $configuration
) {
- $this->featureRepository = $featureRepository;
- $this->contextLanguageId = (int) $legacyContext->getLanguage()->getId();
- $this->defaultLanguageId = $defaultLanguageId;
}
/**
@@ -64,13 +47,15 @@ public function __construct(
*/
public function getChoices()
{
- $features = $this->featureRepository->getFeatures();
+ $defaultLangId = (int) $this->configuration->get('PS_LANG_DEFAULT');
+ $contextLangId = (int) $this->legacyContext->getLanguage()->getId();
+
$choices = [];
- foreach ($features as $feature) {
- if (!empty($feature['localized_names'][$this->contextLanguageId])) {
- $featureName = $feature['localized_names'][$this->contextLanguageId];
+ foreach ($this->featureRepository->getFeatures() as $feature) {
+ if (!empty($feature['localized_names'][$contextLangId])) {
+ $featureName = $feature['localized_names'][$contextLangId];
} else {
- $featureName = $feature['localized_names'][$this->defaultLanguageId];
+ $featureName = $feature['localized_names'][$defaultLangId];
}
$choices[$featureName] = $feature['id_feature'];
}
diff --git a/src/Adapter/Hook/CommandHandler/UpdateHookStatusCommandHandler.php b/src/Adapter/Hook/CommandHandler/UpdateHookStatusCommandHandler.php
index db7a2d8714a1b..91d9514d9394c 100644
--- a/src/Adapter/Hook/CommandHandler/UpdateHookStatusCommandHandler.php
+++ b/src/Adapter/Hook/CommandHandler/UpdateHookStatusCommandHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Hook\CommandHandler;
use Hook;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Hook\Command\UpdateHookStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Hook\CommandHandler\UpdateHookStatusCommandHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Hook\Exception\CannotUpdateHookException;
@@ -37,6 +38,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
class UpdateHookStatusCommandHandler implements UpdateHookStatusCommandHandlerInterface
{
/**
@@ -51,7 +53,7 @@ public function handle(UpdateHookStatusCommand $command)
throw new HookNotFoundException(sprintf('Hook with id "%d" was not found', $hookId));
}
- $hook->active = $command->getStatus();
+ $hook->active = $command->isActive();
if (!$hook->save()) {
throw new CannotUpdateHookException(sprintf('Cannot update status for hook with id "%d"', $hookId));
}
diff --git a/src/Adapter/Hook/HookDispatcher.php b/src/Adapter/Hook/HookDispatcher.php
index 512f633e772b9..87285cc56fa0a 100644
--- a/src/Adapter/Hook/HookDispatcher.php
+++ b/src/Adapter/Hook/HookDispatcher.php
@@ -102,7 +102,7 @@ public function __construct(
public function dispatch(object $event, string $eventName = null): object
{
if (!$event instanceof HookEvent) {
- throw new \Exception('HookDispatcher must dispatch a HookEvent subclass only. ' . get_class($event) . ' given.');
+ throw new \Exception('HookDispatcher must dispatch a HookEvent subclass only. ' . $event::class . ' given.');
}
if ($listeners = $this->getListeners(strtolower($eventName ?? ''))) {
diff --git a/src/Adapter/Hook/QueryHandler/GetHookHandler.php b/src/Adapter/Hook/QueryHandler/GetHookHandler.php
new file mode 100644
index 0000000000000..94972dcfe0856
--- /dev/null
+++ b/src/Adapter/Hook/QueryHandler/GetHookHandler.php
@@ -0,0 +1,59 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Hook\QueryHandler;
+
+use Hook;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
+use PrestaShop\PrestaShop\Core\Domain\Hook\Exception\HookNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHook;
+use PrestaShop\PrestaShop\Core\Domain\Hook\QueryHandler\GetHookHandlerInterface;
+use PrestaShop\PrestaShop\Core\Domain\Hook\QueryResult\Hook as HookQueryResult;
+
+#[AsQueryHandler]
+final class GetHookHandler implements GetHookHandlerInterface
+{
+ public function handle(GetHook $query)
+ {
+ $hookId = $query->getId()->getValue();
+ $hook = new Hook($hookId);
+
+ if ($hook->id !== $hookId) {
+ throw new HookNotFoundException(sprintf('Hook with id "%d" was not found.', $hookId));
+ }
+
+ return new HookQueryResult(
+ $hook->id,
+ (bool) $hook->active,
+ $hook->name,
+ $hook->title,
+ $hook->description
+ );
+ }
+}
diff --git a/src/Adapter/Hook/QueryHandler/GetHookStatusHandler.php b/src/Adapter/Hook/QueryHandler/GetHookStatusHandler.php
index 00b1cbff1ebdb..b74401228ab44 100644
--- a/src/Adapter/Hook/QueryHandler/GetHookStatusHandler.php
+++ b/src/Adapter/Hook/QueryHandler/GetHookStatusHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Hook\QueryHandler;
use Hook;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Hook\Exception\HookNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus;
use PrestaShop\PrestaShop\Core\Domain\Hook\QueryHandler\GetHookStatusHandlerInterface;
@@ -37,6 +38,7 @@
/**
* @internal
*/
+#[AsQueryHandler]
final class GetHookStatusHandler implements GetHookStatusHandlerInterface
{
/**
@@ -44,7 +46,7 @@ final class GetHookStatusHandler implements GetHookStatusHandlerInterface
*/
public function handle(GetHookStatus $query)
{
- $hookId = $query->getHookId()->getValue();
+ $hookId = $query->getId()->getValue();
$hook = new Hook($hookId);
if ($hook->id !== $hookId) {
diff --git a/src/Adapter/Image/ImageGenerator.php b/src/Adapter/Image/ImageGenerator.php
index 8904f3d5b5b14..3c68c9fec5584 100644
--- a/src/Adapter/Image/ImageGenerator.php
+++ b/src/Adapter/Image/ImageGenerator.php
@@ -30,11 +30,11 @@
use ImageManager;
use ImageType;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager;
use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
use PrestaShop\PrestaShop\Core\Image\Exception\ImageOptimizationException;
use PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration;
use PrestaShop\PrestaShop\Core\Image\Uploader\Exception\ImageUploadException;
-use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
use PrestaShopException;
/**
@@ -42,38 +42,29 @@
*/
class ImageGenerator
{
- /**
- * @var FeatureFlagRepository
- */
- private $featureFlagRepository;
-
- /**
- * @var ImageFormatConfiguration
- */
- private $imageFormatConfiguration;
-
- public function __construct(FeatureFlagRepository $featureFlagRepository, ImageFormatConfiguration $imageFormatConfiguration)
- {
- $this->featureFlagRepository = $featureFlagRepository;
- $this->imageFormatConfiguration = $imageFormatConfiguration;
+ public function __construct(
+ private readonly FeatureFlagManager $featureFlagManager,
+ private readonly ImageFormatConfiguration $imageFormatConfiguration
+ ) {
}
/**
* @param string $imagePath
* @param ImageType[] $imageTypes
+ * @param int $imageId
*
* @return bool
*
* @throws ImageOptimizationException
* @throws ImageUploadException
*/
- public function generateImagesByTypes(string $imagePath, array $imageTypes): bool
+ public function generateImagesByTypes(string $imagePath, array $imageTypes, int $imageId = 0): bool
{
$resized = true;
try {
foreach ($imageTypes as $imageType) {
- $resized &= $this->resize($imagePath, $imageType);
+ $resized &= $this->resize($imagePath, $imageType, $imageId);
}
} catch (PrestaShopException $e) {
throw new ImageOptimizationException('Unable to resize one or more of your pictures.');
@@ -91,10 +82,11 @@ public function generateImagesByTypes(string $imagePath, array $imageTypes): boo
*
* @param string $filePath
* @param ImageType $imageType
+ * @param int $imageId
*
* @return bool
*/
- protected function resize(string $filePath, ImageType $imageType): bool
+ protected function resize(string $filePath, ImageType $imageType, int $imageId = 0): bool
{
if (!is_file($filePath)) {
throw new ImageUploadException(sprintf('File "%s" does not exist', $filePath));
@@ -106,7 +98,7 @@ protected function resize(string $filePath, ImageType $imageType): bool
*
* In case of .jpg images, the actual format inside is decided by ImageManager.
*/
- if ($this->featureFlagRepository->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) {
+ if ($this->featureFlagManager->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) {
$configuredImageFormats = $this->imageFormatConfiguration->getGenerationFormats();
} else {
$configuredImageFormats = ['jpg'];
@@ -120,7 +112,7 @@ protected function resize(string $filePath, ImageType $imageType): bool
$forceFormat = ($imageFormat !== 'jpg');
if (!ImageManager::resize(
$filePath,
- sprintf('%s-%s.%s', rtrim($filePath, '.' . $imageFormat), stripslashes($imageType->name), $imageFormat),
+ sprintf('%s-%s.%s', dirname($filePath) . DIRECTORY_SEPARATOR . $imageId, stripslashes($imageType->name), $imageFormat),
$imageType->width,
$imageType->height,
$imageFormat,
diff --git a/src/Adapter/Image/ImageRetriever.php b/src/Adapter/Image/ImageRetriever.php
index 696c116e7e107..e635df150e86d 100644
--- a/src/Adapter/Image/ImageRetriever.php
+++ b/src/Adapter/Image/ImageRetriever.php
@@ -74,18 +74,21 @@ public function getAllProductImages(array $product, Language $language)
$language->id
);
+ // Get all product images that are related to this object
$images = $productInstance->getImages($language->id);
-
if (empty($images)) {
return [];
}
+ // Load all pairs of images assigned to combinations
$combinationImages = $productInstance->getCombinationImages($language->id);
if (!$combinationImages) {
$combinationImages = [];
}
- $imageToCombinations = [];
+ // And resolve them by id_image
+ // We can't assign them directly because the $images array keys are not id_image
+ $imageToCombinations = [];
foreach ($combinationImages as $imgs) {
foreach ($imgs as $img) {
$imageToCombinations[$img['id_image']][] = $img['id_product_attribute'];
@@ -96,11 +99,14 @@ public function getAllProductImages(array $product, Language $language)
$productInstance,
$imageToCombinations
) {
- $image = array_merge($this->getImage(
- $productInstance,
- $image['id_image']
- ), $image);
+ // Now let's fetch extra information about thumbnail sizes etc. and add this information.
+ // getImage also resolves a proper image legend, if it was missing in $image originally.
+ $image = array_merge(
+ $image,
+ $this->getImage($productInstance, $image['id_image'])
+ );
+ // Assign a list of variants related to the given image
if (isset($imageToCombinations[$image['id_image']])) {
$image['associatedVariants'] = $imageToCombinations[$image['id_image']];
} else {
@@ -137,7 +143,7 @@ public function getProductImages(array $product, Language $language)
/**
* @param Product|Store|Category|Manufacturer|Supplier $object
- * @param int $id_image
+ * @param int|string $id_image Identifier of the image
*
* @return array|null
*
@@ -150,7 +156,7 @@ public function getImage($object, $id_image)
}
// Resolve functions we will use to get image links from Link class
- if (get_class($object) === 'Product') {
+ if ($object::class === 'Product') {
$type = 'products';
$getImageURL = 'getImageLink';
// Product images are the only exception in path structure, they are placed in folder
@@ -159,15 +165,15 @@ public function getImage($object, $id_image)
rtrim(_PS_PRODUCT_IMG_DIR_, DIRECTORY_SEPARATOR),
rtrim(Image::getImgFolderStatic($id_image), DIRECTORY_SEPARATOR),
]);
- } elseif (get_class($object) === 'Store') {
+ } elseif ($object::class === 'Store') {
$type = 'stores';
$getImageURL = 'getStoreImageLink';
$imageFolderPath = rtrim(_PS_STORE_IMG_DIR_, DIRECTORY_SEPARATOR);
- } elseif (get_class($object) === 'Manufacturer') {
+ } elseif ($object::class === 'Manufacturer') {
$type = 'manufacturers';
$getImageURL = 'getManufacturerImageLink';
$imageFolderPath = rtrim(_PS_MANU_IMG_DIR_, DIRECTORY_SEPARATOR);
- } elseif (get_class($object) === 'Supplier') {
+ } elseif ($object::class === 'Supplier') {
$type = 'suppliers';
$getImageURL = 'getSupplierImageLink';
$imageFolderPath = rtrim(_PS_SUPP_IMG_DIR_, DIRECTORY_SEPARATOR);
@@ -210,6 +216,19 @@ public function getImage($object, $id_image)
$image_types = ImageType::getImagesTypes($type, true);
foreach ($image_types as $image_type) {
$sources = [];
+ $formattedName = ImageType::getFormattedName('small');
+
+ if ($type === 'categories' && $formattedName === $image_type['name']) {
+ $originalFileName = $id_image . '_thumb.jpg';
+ } else {
+ $originalFileName = $id_image . '.jpg';
+ }
+
+ // Get path of original uploaded image we will use to get thumbnails (original image extension is always .jpg)
+ $originalImagePath = implode(DIRECTORY_SEPARATOR, [
+ $imageFolderPath,
+ $originalFileName,
+ ]);
foreach ($configuredImageFormats as $imageFormat) {
// Generate the thumbnail
@@ -217,7 +236,7 @@ public function getImage($object, $id_image)
// Get the URL of the thumb and add it to sources
// Manufacturer and supplier use only IDs
- if (get_class($object) === 'Manufacturer' || get_class($object) === 'Supplier') {
+ if ($object::class === 'Manufacturer' || $object::class === 'Supplier') {
$sources[$imageFormat] = $this->link->$getImageURL($id_image, $image_type['name'], $imageFormat);
// Products, categories and stores pass both rewrite and ID
} else {
@@ -267,13 +286,13 @@ public function getImage($object, $id_image)
/**
* @param string $originalImagePath
* @param string $imageFolderPath
- * @param int $idImage
+ * @param int|string $idImage
* @param array $imageTypeData
* @param string $imageFormat
*
* @return void
*/
- private function checkOrGenerateImageType(string $originalImagePath, string $imageFolderPath, int $idImage, array $imageTypeData, string $imageFormat)
+ private function checkOrGenerateImageType(string $originalImagePath, string $imageFolderPath, int|string $idImage, array $imageTypeData, string $imageFormat)
{
$fileName = sprintf('%s-%s.%s', $idImage, $imageTypeData['name'], $imageFormat);
$resizedImagePath = implode(DIRECTORY_SEPARATOR, [
diff --git a/src/Adapter/Image/Uploader/CategoryImageUploader.php b/src/Adapter/Image/Uploader/CategoryImageUploader.php
index 0621c170cf3a6..92f09ffcbfa10 100644
--- a/src/Adapter/Image/Uploader/CategoryImageUploader.php
+++ b/src/Adapter/Image/Uploader/CategoryImageUploader.php
@@ -45,32 +45,23 @@ class CategoryImageUploader
*/
private $categoryThumbnailUploader;
- /**
- * @var ImageUploaderInterface
- */
- private $categoryMenuThumbnailUploader;
-
public function __construct(
ImageUploaderInterface $categoryCoverUploader,
- ImageUploaderInterface $categoryThumbnailUploader,
- ImageUploaderInterface $categoryMenuThumbnailUploader
+ ImageUploaderInterface $categoryThumbnailUploader
) {
$this->categoryCoverUploader = $categoryCoverUploader;
$this->categoryThumbnailUploader = $categoryThumbnailUploader;
- $this->categoryMenuThumbnailUploader = $categoryMenuThumbnailUploader;
}
/**
* @param CategoryId $categoryId
* @param UploadedFile|null $coverImage
* @param UploadedFile|null $thumbnailImage
- * @param UploadedFile[] $menuThumbnailImages
*/
public function uploadImages(
CategoryId $categoryId,
UploadedFile $coverImage = null,
- UploadedFile $thumbnailImage = null,
- array $menuThumbnailImages = []
+ UploadedFile $thumbnailImage = null
): void {
if (null !== $coverImage) {
$this->categoryCoverUploader->upload($categoryId->getValue(), $coverImage);
@@ -79,11 +70,5 @@ public function uploadImages(
if (null !== $thumbnailImage) {
$this->categoryThumbnailUploader->upload($categoryId->getValue(), $thumbnailImage);
}
-
- if (!empty($menuThumbnailImages)) {
- foreach ($menuThumbnailImages as $menuThumbnail) {
- $this->categoryMenuThumbnailUploader->upload($categoryId->getValue(), $menuThumbnail);
- }
- }
}
}
diff --git a/src/Adapter/Image/Uploader/CategoryMenuThumbnailUploader.php b/src/Adapter/Image/Uploader/CategoryMenuThumbnailUploader.php
deleted file mode 100644
index c6b5ec2d2a372..0000000000000
--- a/src/Adapter/Image/Uploader/CategoryMenuThumbnailUploader.php
+++ /dev/null
@@ -1,125 +0,0 @@
-
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShop\PrestaShop\Adapter\Image\Uploader;
-
-use HelperImageUploader;
-use ImageManager;
-use PrestaShop\PrestaShop\Core\Cache\Clearer\CacheClearerInterface;
-use PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider;
-use PrestaShop\PrestaShop\Core\Domain\Category\Exception\MenuThumbnailsLimitException;
-use PrestaShop\PrestaShop\Core\Image\Uploader\Exception\ImageUploadException;
-use PrestaShop\PrestaShop\Core\Image\Uploader\Exception\MemoryLimitException;
-use PrestaShop\PrestaShop\Core\Image\Uploader\ImageUploaderInterface;
-use Symfony\Component\HttpFoundation\File\UploadedFile;
-
-/**
- * Class CategoryMenuThumbnailUploader.
- */
-final class CategoryMenuThumbnailUploader extends AbstractImageUploader implements ImageUploaderInterface
-{
- /**
- * @var CacheClearerInterface
- */
- private $cacheClearer;
-
- /**
- * @var MenuThumbnailAvailableKeyProvider
- */
- private $menuThumbnailAvailableKeyProvider;
-
- /**
- * @param CacheClearerInterface $cacheClearer
- * @param MenuThumbnailAvailableKeyProvider $menuThumbnailAvailableKeyProvider
- */
- public function __construct(
- CacheClearerInterface $cacheClearer,
- MenuThumbnailAvailableKeyProvider $menuThumbnailAvailableKeyProvider
- ) {
- $this->cacheClearer = $cacheClearer;
- $this->menuThumbnailAvailableKeyProvider = $menuThumbnailAvailableKeyProvider;
- }
-
- /**
- * {@inheritdoc}
- *
- * @throws ImageUploadException
- */
- public function upload($categoryId, UploadedFile $uploadedImage)
- {
- $this->checkImageIsAllowedForUpload($uploadedImage);
-
- $availableKeys = $this->menuThumbnailAvailableKeyProvider->getAvailableKeys($categoryId);
-
- // HelperImageUploader::process() expects
- // uploaded file to be available in $_FILES
- $_FILES['thumbnail'] = [
- 'error' => [$uploadedImage->getError()],
- 'name' => [$uploadedImage->getClientOriginalName()],
- 'size' => [$uploadedImage->getSize()],
- 'tmp_name' => [$uploadedImage->getPathname()],
- 'type' => [$uploadedImage->getMimeType()],
- ];
-
- $helper = new HelperImageUploader('thumbnail');
- $uploadedFiles = $helper->process();
-
- if (count($availableKeys) < count($uploadedFiles)) {
- throw new MenuThumbnailsLimitException(sprintf('Maximum number of menu thumbnails was reached for category "%s"', $categoryId));
- }
-
- foreach ($uploadedFiles as &$uploadedFile) {
- $key = array_shift($availableKeys);
-
- // Evaluate the memory required to resize the image: if it's too much, you can't resize it.
- if (isset($uploadedFile['save_path']) && !ImageManager::checkImageMemoryLimit($uploadedFile['save_path'])) {
- throw new MemoryLimitException(sprintf('Cannot resize menu thumbnail for category with id "%s" due to reached memory limit.', $categoryId));
- }
-
- // Copy new image
- if (!isset($uploadedFile['save_path'])
- || !ImageManager::resize($uploadedFile['save_path'], _PS_CAT_IMG_DIR_ . $categoryId . '-' . $key . '_thumb.jpg')
- ) {
- throw new ImageUploadException('An error occurred while uploading the image.');
- }
-
- if (isset($uploadedFile['save_path']) && is_file($uploadedFile['save_path'])) {
- unlink($uploadedFile['save_path']);
- }
-
- // Necessary to prevent hacking
- if (isset($uploadedFile['save_path'])) {
- unset($uploadedFile['save_path']);
- }
-
- if (isset($uploadedFile['tmp_name'])) {
- unset($uploadedFile['tmp_name']);
- }
- }
-
- $this->cacheClearer->clear();
- }
-}
diff --git a/src/Adapter/Image/Uploader/ManufacturerImageUploader.php b/src/Adapter/Image/Uploader/ManufacturerImageUploader.php
index b8d664ced16fa..cdc6474373901 100644
--- a/src/Adapter/Image/Uploader/ManufacturerImageUploader.php
+++ b/src/Adapter/Image/Uploader/ManufacturerImageUploader.php
@@ -84,13 +84,25 @@ private function generateDifferentSizeImages($manufacturerId)
) {
$imageTypes = ImageType::getImagesTypes('manufacturers');
+ /** @var \PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration $imageFormatConfiguration */
+ $imageFormatConfiguration = \PrestaShop\PrestaShop\Adapter\ServiceLocator::get('PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration');
+ $configuredImageFormats = $imageFormatConfiguration->getGenerationFormats();
+
foreach ($imageTypes as $imageType) {
- $resized &= ImageManager::resize(
- _PS_MANU_IMG_DIR_ . $manufacturerId . '.jpg',
- _PS_MANU_IMG_DIR_ . $manufacturerId . '-' . stripslashes($imageType['name']) . '.jpg',
- (int) $imageType['width'],
- (int) $imageType['height']
- );
+ foreach ($configuredImageFormats as $imageFormat) {
+ // For JPG images, we let Imagemanager decide what to do and choose between JPG/PNG.
+ // For webp and avif extensions, we want it to follow our command and ignore the original format.
+ $forceFormat = ($imageFormat !== 'jpg');
+
+ $resized &= ImageManager::resize(
+ _PS_MANU_IMG_DIR_ . $manufacturerId . '.jpg',
+ _PS_MANU_IMG_DIR_ . $manufacturerId . '-' . stripslashes($imageType['name']) . '.' . $imageFormat,
+ (int) $imageType['width'],
+ (int) $imageType['height'],
+ $imageFormat,
+ $forceFormat
+ );
+ }
}
$currentLogo = _PS_TMP_IMG_DIR_ . 'manufacturer_mini_' . $manufacturerId . '.jpg';
diff --git a/src/Adapter/Import/Handler/ProductImportHandler.php b/src/Adapter/Import/Handler/ProductImportHandler.php
index 0432fdd9b9fcb..0cddab0e0f5ca 100644
--- a/src/Adapter/Import/Handler/ProductImportHandler.php
+++ b/src/Adapter/Import/Handler/ProductImportHandler.php
@@ -52,14 +52,11 @@
use Shop;
use SpecificPrice;
use StockAvailable;
-use StockManagerFactory;
use Supplier;
use Symfony\Contracts\Translation\TranslatorInterface;
use Tag;
use TaxManagerFactory;
use TaxRulesGroup;
-use Warehouse;
-use WarehouseProductLocation;
/**
* Class ProductImportHandler is responsible for product import.
@@ -182,8 +179,6 @@ public function __construct(
'customizable' => 0,
'uploadable_files' => 0,
'text_fields' => 0,
- 'advanced_stock_management' => 0,
- 'depends_on_stock' => 0,
'is_virtual' => 0,
];
$this->shopAddress = $shopAddress;
@@ -1228,72 +1223,6 @@ private function saveFeatures(Product $product, ImportConfigInterface $importCon
*/
private function saveStock(Product $product, $validateOnly, $productExists)
{
- $asmEnabled = $this->configuration->getBoolean('PS_ADVANCED_STOCK_MANAGEMENT');
-
- // set advanced stock managment
- if (!$validateOnly) {
- /* @phpstan-ignore-next-line Data of the property `advanced_stock_management` comes from database */
- if ($product->advanced_stock_management != 1 && $product->advanced_stock_management != 0) {
- $this->warning(
- $this->translator->trans(
- 'Advanced stock management has incorrect value. Not set for product %name%',
- ['%name%' => $product->name[$this->languageId]],
- 'Admin.Advparameters.Notification'
- )
- );
- } elseif (!$asmEnabled && $product->advanced_stock_management == 1) {
- $this->warning(
- $this->translator->trans(
- 'Advanced stock management is not enabled, cannot enable on product %name%',
- ['%name%' => $product->name[$this->languageId]],
- 'Admin.Advparameters.Notification'
- )
- );
- } elseif ($productExists) {
- $product->setAdvancedStockManagement($product->advanced_stock_management);
- }
- // automaticly disable depends on stock, if a_s_m set to disabled
- if (StockAvailable::dependsOnStock($product->id) == 1 && $product->advanced_stock_management == 0) {
- StockAvailable::setProductDependsOnStock($product->id, false);
- }
- }
-
- // Check if warehouse exists
- if (isset($product->warehouse) && $product->warehouse) {
- if (!$asmEnabled) {
- $this->warning(
- $this->translator->trans(
- 'Advanced stock management is not enabled, warehouse not set on product %name%',
- ['%name%' => $product->name[$this->languageId]],
- 'Admin.Advparameters.Notification'
- )
- );
- } elseif (!$validateOnly) {
- if (Warehouse::exists($product->warehouse)) {
- // Get already associated warehouses
- $associatedWarehousesCollection = WarehouseProductLocation::getCollection($product->id);
- // Delete any entry in warehouse for this product
- foreach ($associatedWarehousesCollection as $awc) {
- $awc->delete();
- }
- $warehouseLocationEntity = new WarehouseProductLocation();
- $warehouseLocationEntity->id_product = $product->id;
- $warehouseLocationEntity->id_product_attribute = 0;
- $warehouseLocationEntity->id_warehouse = $product->warehouse;
- $warehouseLocationEntity->save();
- StockAvailable::synchronize($product->id);
- } else {
- $this->warning(
- $this->translator->trans(
- 'Warehouse did not exist, cannot set on product %name%',
- ['%name%' => $product->name[$this->languageId]],
- 'Admin.Advparameters.Notification'
- )
- );
- }
- }
- }
-
if ($this->isMultistoreEnabled) {
$shopIds = $product->id_shop_list;
} else {
@@ -1302,62 +1231,7 @@ private function saveStock(Product $product, $validateOnly, $productExists)
];
}
- // stock available
- if (isset($product->depends_on_stock)) {
- /* @phpstan-ignore-next-line Data of the property `depends_on_stock` comes from database */
- if ($product->depends_on_stock != 0 && $product->depends_on_stock != 1) {
- $this->warning(
- $this->translator->trans(
- 'Incorrect value for "Depends on stock" for product %name%',
- ['%name%' => $product->name[$this->languageId]],
- 'Admin.Advparameters.Notification'
- )
- );
- /* @phpstan-ignore-next-line Data of properties `advanced_stock_management` & `depends_on_stock` comes from database */
- } elseif ((!$product->advanced_stock_management || $product->advanced_stock_management == 0) && $product->depends_on_stock == 1) {
- $this->warning(
- $this->translator->trans(
- 'Advanced stock management is not enabled, cannot set "Depends on stock" for product %name%',
- ['%name%' => $product->name[$this->languageId]],
- 'Admin.Advparameters.Notification'
- )
- );
- } elseif (!$validateOnly) {
- StockAvailable::setProductDependsOnStock($product->id, $product->depends_on_stock);
- }
-
- // This code allows us to set qty and disable depends on stock
- if (!$validateOnly) {
- // if depends on stock and quantity, add quantity to stock
- if ($product->depends_on_stock == 1) {
- $stockManager = StockManagerFactory::getManager();
- $price = str_replace(',', '.', (string) $product->wholesale_price);
- if ($price == 0) {
- $price = 0.000001;
- }
- $price = round(floatval($price), 6);
- $warehouse = new Warehouse($product->warehouse);
- $productAdded = $stockManager->addProduct(
- (int) $product->id,
- 0,
- $warehouse,
- (int) $product->quantity,
- 1,
- $price,
- true
- );
-
- if ($productAdded) {
- StockAvailable::synchronize((int) $product->id);
- }
- } else {
- foreach ($shopIds as $shop) {
- StockAvailable::setQuantity((int) $product->id, 0, (int) $product->quantity, (int) $shop);
- }
- }
- }
- } elseif (!$validateOnly) {
- // if not depends_on_stock set, use normal qty
+ if (!$validateOnly) {
foreach ($shopIds as $shop) {
StockAvailable::setQuantity((int) $product->id, 0, (int) $product->quantity, (int) $shop);
}
diff --git a/src/Adapter/Import/ImageCopier.php b/src/Adapter/Import/ImageCopier.php
index c1a57924f96da..3c244990baeeb 100644
--- a/src/Adapter/Import/ImageCopier.php
+++ b/src/Adapter/Import/ImageCopier.php
@@ -234,7 +234,7 @@ private function getBestPath($targetWidth, $targetHeight, $pathInfos)
$pathInfos = array_reverse($pathInfos);
$path = '';
foreach ($pathInfos as $pathInfo) {
- list($width, $height, $path) = $pathInfo;
+ [$width, $height, $path] = $pathInfo;
if ($width >= $targetWidth && $height >= $targetHeight) {
return $path;
}
diff --git a/src/Adapter/Import/ImportEntityDeleter.php b/src/Adapter/Import/ImportEntityDeleter.php
index 095a1fac8dd42..dc51fb27ad711 100644
--- a/src/Adapter/Import/ImportEntityDeleter.php
+++ b/src/Adapter/Import/ImportEntityDeleter.php
@@ -221,13 +221,11 @@ private function deleteProducts()
'product_group_reduction_cache',
'product_sale',
'product_supplier',
- 'warehouse_product_location',
'stock',
'stock_available',
'stock_mvt',
'customization',
'customization_field',
- 'supply_order_detail',
'product_attribute',
'product_attribute_shop',
'product_attribute_combination',
diff --git a/src/Adapter/Language/CommandHandler/AddLanguageHandler.php b/src/Adapter/Language/CommandHandler/AddLanguageHandler.php
index a4b3fae36d167..462a592f733b8 100644
--- a/src/Adapter/Language/CommandHandler/AddLanguageHandler.php
+++ b/src/Adapter/Language/CommandHandler/AddLanguageHandler.php
@@ -29,6 +29,7 @@
use Language;
use PrestaShop\PrestaShop\Adapter\File\RobotsTextFileGenerator;
use PrestaShop\PrestaShop\Adapter\Image\ImageValidator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Language\Command\AddLanguageCommand;
use PrestaShop\PrestaShop\Core\Domain\Language\CommandHandler\AddLanguageHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Language\Exception\LanguageConstraintException;
@@ -41,6 +42,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class AddLanguageHandler extends AbstractLanguageHandler implements AddLanguageHandlerInterface
{
/**
diff --git a/src/Adapter/Language/CommandHandler/BulkDeleteLanguagesHandler.php b/src/Adapter/Language/CommandHandler/BulkDeleteLanguagesHandler.php
index 06f472f8b05b0..4c079591a0666 100644
--- a/src/Adapter/Language/CommandHandler/BulkDeleteLanguagesHandler.php
+++ b/src/Adapter/Language/CommandHandler/BulkDeleteLanguagesHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Language\CommandHandler;
use PrestaShop\PrestaShop\Adapter\File\RobotsTextFileGenerator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Language\Command\BulkDeleteLanguagesCommand;
use PrestaShop\PrestaShop\Core\Domain\Language\CommandHandler\BulkDeleteLanguagesHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Language\Exception\DefaultLanguageException;
@@ -38,6 +39,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class BulkDeleteLanguagesHandler extends AbstractLanguageHandler implements BulkDeleteLanguagesHandlerInterface
{
/**
diff --git a/src/Adapter/Language/CommandHandler/BulkToggleLanguagesStatusHandler.php b/src/Adapter/Language/CommandHandler/BulkToggleLanguagesStatusHandler.php
index 31da14bf9bd0b..c1bf5dc683d8c 100644
--- a/src/Adapter/Language/CommandHandler/BulkToggleLanguagesStatusHandler.php
+++ b/src/Adapter/Language/CommandHandler/BulkToggleLanguagesStatusHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Language\CommandHandler;
use PrestaShop\PrestaShop\Adapter\File\RobotsTextFileGenerator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Language\Command\BulkToggleLanguagesStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Language\CommandHandler\BulkToggleLanguagesStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Language\Exception\LanguageException;
@@ -36,6 +37,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class BulkToggleLanguagesStatusHandler extends AbstractLanguageHandler implements BulkToggleLanguagesStatusHandlerInterface
{
/**
diff --git a/src/Adapter/Language/CommandHandler/DeleteLanguageHandler.php b/src/Adapter/Language/CommandHandler/DeleteLanguageHandler.php
index 1beea0b7b302f..dd6686c29877b 100644
--- a/src/Adapter/Language/CommandHandler/DeleteLanguageHandler.php
+++ b/src/Adapter/Language/CommandHandler/DeleteLanguageHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Language\CommandHandler;
use PrestaShop\PrestaShop\Adapter\File\RobotsTextFileGenerator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Language\Command\DeleteLanguageCommand;
use PrestaShop\PrestaShop\Core\Domain\Language\CommandHandler\DeleteLanguageHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Language\Exception\DefaultLanguageException;
@@ -38,6 +39,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class DeleteLanguageHandler extends AbstractLanguageHandler implements DeleteLanguageHandlerInterface
{
/**
diff --git a/src/Adapter/Language/CommandHandler/EditLanguageHandler.php b/src/Adapter/Language/CommandHandler/EditLanguageHandler.php
index dd0b8747ca265..ab2efa2b535b3 100644
--- a/src/Adapter/Language/CommandHandler/EditLanguageHandler.php
+++ b/src/Adapter/Language/CommandHandler/EditLanguageHandler.php
@@ -30,6 +30,7 @@
use Db;
use Language;
use PrestaShop\PrestaShop\Adapter\Image\ImageValidator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Language\Command\EditLanguageCommand;
use PrestaShop\PrestaShop\Core\Domain\Language\CommandHandler\EditLanguageHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Language\Exception\CannotDisableDefaultLanguageException;
@@ -42,6 +43,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class EditLanguageHandler extends AbstractLanguageHandler implements EditLanguageHandlerInterface
{
/**
diff --git a/src/Adapter/Language/CommandHandler/ToggleLanguageStatusHandler.php b/src/Adapter/Language/CommandHandler/ToggleLanguageStatusHandler.php
index 840f73b7997b8..ec8aee7e03118 100644
--- a/src/Adapter/Language/CommandHandler/ToggleLanguageStatusHandler.php
+++ b/src/Adapter/Language/CommandHandler/ToggleLanguageStatusHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Language\CommandHandler;
use PrestaShop\PrestaShop\Adapter\File\RobotsTextFileGenerator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Language\Command\ToggleLanguageStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Language\CommandHandler\ToggleLanguageStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Language\Exception\LanguageException;
@@ -36,6 +37,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class ToggleLanguageStatusHandler extends AbstractLanguageHandler implements ToggleLanguageStatusHandlerInterface
{
/**
diff --git a/src/Adapter/Language/ContextLanguageProvider.php b/src/Adapter/Language/ContextLanguageProvider.php
new file mode 100644
index 0000000000000..9df0b970c719b
--- /dev/null
+++ b/src/Adapter/Language/ContextLanguageProvider.php
@@ -0,0 +1,55 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Language;
+
+use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use PrestaShop\PrestaShop\Core\Exception\CoreException;
+use PrestaShop\PrestaShop\Core\Language\ContextLanguageProviderInterface;
+
+/**
+ * @experimental This will be refactored once the Context replacement architecture is decided
+ */
+class ContextLanguageProvider implements ContextLanguageProviderInterface
+{
+ public function __construct(
+ protected readonly LegacyContext $context
+ ) {
+ }
+
+ public function getLanguageId(): int
+ {
+ $langId = (int) $this->context->getContext()->language->id;
+
+ if (!$langId) {
+ throw new CoreException('Context language is missing');
+ }
+
+ return $langId;
+ }
+}
diff --git a/src/Adapter/Language/LanguageCopier.php b/src/Adapter/Language/LanguageCopier.php
index a808a98dfd574..bf06fb36dddd9 100644
--- a/src/Adapter/Language/LanguageCopier.php
+++ b/src/Adapter/Language/LanguageCopier.php
@@ -224,7 +224,7 @@ private function validateConfig(LanguageCopierConfigInterface $config)
private function isModuleContext($source, $destination, $language)
{
// Legacy condition
- return false !== strpos($destination, 'modules') && basename($source) === $language . '.php';
+ return str_contains($destination, 'modules') && basename($source) === $language . '.php';
}
/**
diff --git a/src/Adapter/Language/QueryHandler/GetLanguageForEditingHandler.php b/src/Adapter/Language/QueryHandler/GetLanguageForEditingHandler.php
index 793c45ef24e96..bbf13670561b6 100644
--- a/src/Adapter/Language/QueryHandler/GetLanguageForEditingHandler.php
+++ b/src/Adapter/Language/QueryHandler/GetLanguageForEditingHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Language\QueryHandler;
use Language;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Language\Exception\LanguageNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Language\Query\GetLanguageForEditing;
use PrestaShop\PrestaShop\Core\Domain\Language\QueryHandler\GetLanguageForEditingHandlerInterface;
@@ -40,6 +41,7 @@
*
* @internal
*/
+#[AsQueryHandler]
final class GetLanguageForEditingHandler implements GetLanguageForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/LegacyContext.php b/src/Adapter/LegacyContext.php
index 73a9dfd6662e2..84b771bd0742f 100644
--- a/src/Adapter/LegacyContext.php
+++ b/src/Adapter/LegacyContext.php
@@ -122,7 +122,7 @@ public function getCountryId(): int
*
* @param string $controller the controller name
* @param bool $withToken
- * @param array $extraParams
+ * @param array $extraParams
*
* @return string
*/
diff --git a/src/Adapter/LegacyHookSubscriber.php b/src/Adapter/LegacyHookSubscriber.php
index 66b97bb807593..dd28f1580151c 100644
--- a/src/Adapter/LegacyHookSubscriber.php
+++ b/src/Adapter/LegacyHookSubscriber.php
@@ -106,7 +106,7 @@ public static function getSubscribedEvents()
*/
public function __call($name, $args)
{
- if (strpos($name, 'call_') !== 0) {
+ if (!str_starts_with($name, 'call_')) {
throw new \BadMethodCallException('The call to \'' . $name . '\' is not recognized.');
}
@@ -118,7 +118,7 @@ public function __call($name, $args)
}
$moduleId = (int) $ids[1];
- list($event, $hookName) = $args;
+ [$event, $hookName] = $args;
$content = Hook::exec(
$hookName,
diff --git a/src/Adapter/MailTemplate/MailPreviewVariablesBuilder.php b/src/Adapter/MailTemplate/MailPreviewVariablesBuilder.php
index 876074f1b6d31..a923240dde24b 100644
--- a/src/Adapter/MailTemplate/MailPreviewVariablesBuilder.php
+++ b/src/Adapter/MailTemplate/MailPreviewVariablesBuilder.php
@@ -170,6 +170,9 @@ protected function trans($id, $parameters = [], $domain = null, $local = null)
private function buildOrderVariables(LayoutInterface $mailLayout)
{
$orders = Order::getOrdersWithInformations(1);
+ if (!isset($orders[0]['id_order'])) {
+ return [];
+ }
$order = new Order($orders[0]['id_order']);
if (self::ORDER_CONFIRMATION == $mailLayout->getName()) {
diff --git a/src/Adapter/MailTemplate/MailTemplateTwigRenderer.php b/src/Adapter/MailTemplate/MailTemplateTwigRenderer.php
index 589f8157cee22..a04b8f1adf50f 100644
--- a/src/Adapter/MailTemplate/MailTemplateTwigRenderer.php
+++ b/src/Adapter/MailTemplate/MailTemplateTwigRenderer.php
@@ -171,7 +171,7 @@ private function getMailLayoutTransformations(LayoutInterface $mailLayout, $temp
$templateTransformations = new TransformationCollection();
/** @var TransformationInterface $transformation */
foreach ($this->transformations as $transformation) {
- if (get_class($transformation) == 'PrestaShop\PrestaShop\Core\MailTemplate\Transformation\CSSInlineTransformation' && $themeName == 'modern') {
+ if ($transformation::class == 'PrestaShop\PrestaShop\Core\MailTemplate\Transformation\CSSInlineTransformation' && $themeName == 'modern') {
continue;
}
if ($templateType !== $transformation->getType()) {
diff --git a/src/Adapter/Manufacturer/CommandHandler/AddManufacturerHandler.php b/src/Adapter/Manufacturer/CommandHandler/AddManufacturerHandler.php
index f247cc0d9e91c..75cdc6258fc6a 100644
--- a/src/Adapter/Manufacturer/CommandHandler/AddManufacturerHandler.php
+++ b/src/Adapter/Manufacturer/CommandHandler/AddManufacturerHandler.php
@@ -28,6 +28,7 @@
use Manufacturer;
use PrestaShop\PrestaShop\Adapter\Manufacturer\AbstractManufacturerHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\AddManufacturerCommand;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\CommandHandler\AddManufacturerHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Exception\ManufacturerException;
@@ -36,6 +37,7 @@
/**
* Handles command which adds new manufacturer using legacy object model
*/
+#[AsCommandHandler]
final class AddManufacturerHandler extends AbstractManufacturerHandler implements AddManufacturerHandlerInterface
{
/**
diff --git a/src/Adapter/Manufacturer/CommandHandler/BulkDeleteManufacturerHandler.php b/src/Adapter/Manufacturer/CommandHandler/BulkDeleteManufacturerHandler.php
index 561d7c1008f8a..ac7634c54104b 100644
--- a/src/Adapter/Manufacturer/CommandHandler/BulkDeleteManufacturerHandler.php
+++ b/src/Adapter/Manufacturer/CommandHandler/BulkDeleteManufacturerHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\BulkDeleteManufacturerCommand;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\CommandHandler\BulkDeleteManufacturerHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Exception\DeleteManufacturerException;
@@ -33,6 +34,7 @@
/**
* Handles command which deletes manufacturers in bulk action
*/
+#[AsCommandHandler]
final class BulkDeleteManufacturerHandler extends AbstractManufacturerCommandHandler implements BulkDeleteManufacturerHandlerInterface
{
/**
diff --git a/src/Adapter/Manufacturer/CommandHandler/BulkToggleManufacturerStatusHandler.php b/src/Adapter/Manufacturer/CommandHandler/BulkToggleManufacturerStatusHandler.php
index 59b510fca84da..aa2a5e4a39f4a 100644
--- a/src/Adapter/Manufacturer/CommandHandler/BulkToggleManufacturerStatusHandler.php
+++ b/src/Adapter/Manufacturer/CommandHandler/BulkToggleManufacturerStatusHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\BulkToggleManufacturerStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\CommandHandler\BulkToggleManufacturerStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Exception\UpdateManufacturerException;
@@ -33,6 +34,7 @@
/**
* Handles command which toggles manufacturer status in bulk action
*/
+#[AsCommandHandler]
final class BulkToggleManufacturerStatusHandler extends AbstractManufacturerCommandHandler implements BulkToggleManufacturerStatusHandlerInterface
{
/**
diff --git a/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerHandler.php b/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerHandler.php
index 45d621b71f74d..e2c89804a1cd7 100644
--- a/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerHandler.php
+++ b/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\DeleteManufacturerCommand;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\CommandHandler\DeleteManufacturerHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Exception\DeleteManufacturerException;
@@ -33,6 +34,7 @@
/**
* Handles command which deletes manufacturer using legacy object model
*/
+#[AsCommandHandler]
final class DeleteManufacturerHandler extends AbstractManufacturerCommandHandler implements DeleteManufacturerHandlerInterface
{
/**
diff --git a/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerLogoImageHandler.php b/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerLogoImageHandler.php
index f059213ec36bb..574781c5315b9 100644
--- a/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerLogoImageHandler.php
+++ b/src/Adapter/Manufacturer/CommandHandler/DeleteManufacturerLogoImageHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler;
use ImageType;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\DeleteManufacturerLogoImageCommand;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\CommandHandler\DeleteManufacturerLogoImageHandlerInterface;
use Symfony\Component\Filesystem\Filesystem;
@@ -36,6 +37,7 @@
/**
* Handles command which deletes manufacturer cover image using legacy object model
*/
+#[AsCommandHandler]
class DeleteManufacturerLogoImageHandler extends AbstractManufacturerCommandHandler implements DeleteManufacturerLogoImageHandlerInterface
{
/**
@@ -63,15 +65,31 @@ public function handle(DeleteManufacturerLogoImageCommand $command): void
$imageTypes = ImageType::getImagesTypes('manufacturers');
+ /** @var \PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration $imageFormatConfiguration */
+ $imageFormatConfiguration = \PrestaShop\PrestaShop\Adapter\ServiceLocator::get('PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration');
+ $configuredImageFormats = $imageFormatConfiguration->getGenerationFormats();
+
foreach ($imageTypes as $imageType) {
- $path = sprintf(
- '%s%s-%s.jpg',
- $this->imageDir,
- $command->getManufacturerId()->getValue(),
- stripslashes($imageType['name'])
- );
- if ($fs->exists($path)) {
- $fs->remove($path);
+ foreach ($configuredImageFormats as $imageFormat) {
+ $path = sprintf(
+ '%s%s-%s.' . $imageFormat,
+ $this->imageDir,
+ $command->getManufacturerId()->getValue(),
+ stripslashes($imageType['name'])
+ );
+ if ($fs->exists($path)) {
+ $fs->remove($path);
+ }
+
+ $path = sprintf(
+ '%s%s-%s2x.' . $imageFormat,
+ $this->imageDir,
+ $command->getManufacturerId()->getValue(),
+ stripslashes($imageType['name'])
+ );
+ if ($fs->exists($path)) {
+ $fs->remove($path);
+ }
}
}
diff --git a/src/Adapter/Manufacturer/CommandHandler/EditManufacturerHandler.php b/src/Adapter/Manufacturer/CommandHandler/EditManufacturerHandler.php
index a44ca3d17b66b..f91acedca916a 100644
--- a/src/Adapter/Manufacturer/CommandHandler/EditManufacturerHandler.php
+++ b/src/Adapter/Manufacturer/CommandHandler/EditManufacturerHandler.php
@@ -28,6 +28,7 @@
use Manufacturer;
use PrestaShop\PrestaShop\Adapter\Manufacturer\AbstractManufacturerHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\EditManufacturerCommand;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\CommandHandler\EditManufacturerHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Exception\ManufacturerException;
@@ -36,6 +37,7 @@
/**
* Handles command which edits manufacturer using legacy object model
*/
+#[AsCommandHandler]
final class EditManufacturerHandler extends AbstractManufacturerHandler implements EditManufacturerHandlerInterface
{
/**
diff --git a/src/Adapter/Manufacturer/CommandHandler/ToggleManufacturerStatusHandler.php b/src/Adapter/Manufacturer/CommandHandler/ToggleManufacturerStatusHandler.php
index d8f19099cdfa6..7e5123a44375c 100644
--- a/src/Adapter/Manufacturer/CommandHandler/ToggleManufacturerStatusHandler.php
+++ b/src/Adapter/Manufacturer/CommandHandler/ToggleManufacturerStatusHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\ToggleManufacturerStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\CommandHandler\ToggleManufacturerStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Exception\UpdateManufacturerException;
@@ -33,6 +34,7 @@
/**
* Handles command which toggles manufacturer status
*/
+#[AsCommandHandler]
final class ToggleManufacturerStatusHandler extends AbstractManufacturerCommandHandler implements ToggleManufacturerStatusHandlerInterface
{
/**
diff --git a/src/Adapter/Manufacturer/QueryHandler/GetManufacturerForEditingHandler.php b/src/Adapter/Manufacturer/QueryHandler/GetManufacturerForEditingHandler.php
index 1adb47253dbb9..33774f6651d8e 100644
--- a/src/Adapter/Manufacturer/QueryHandler/GetManufacturerForEditingHandler.php
+++ b/src/Adapter/Manufacturer/QueryHandler/GetManufacturerForEditingHandler.php
@@ -28,6 +28,7 @@
use ImageManager;
use PrestaShop\PrestaShop\Adapter\Manufacturer\AbstractManufacturerHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Query\GetManufacturerForEditing;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\QueryHandler\GetManufacturerForEditingHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\QueryResult\EditableManufacturer;
@@ -37,6 +38,7 @@
/**
* Handles query which gets manufacturer for editing
*/
+#[AsQueryHandler]
final class GetManufacturerForEditingHandler extends AbstractManufacturerHandler implements GetManufacturerForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Manufacturer/QueryHandler/GetManufacturerForViewingHandler.php b/src/Adapter/Manufacturer/QueryHandler/GetManufacturerForViewingHandler.php
index 9d36539c5ad8c..e913b93e0d38d 100644
--- a/src/Adapter/Manufacturer/QueryHandler/GetManufacturerForViewingHandler.php
+++ b/src/Adapter/Manufacturer/QueryHandler/GetManufacturerForViewingHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Manufacturer\QueryHandler;
use Manufacturer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Exception\ManufacturerNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Manufacturer\Query\GetManufacturerForViewing;
@@ -38,6 +39,7 @@
/**
* Handles getting manufacturer for viewing query using legacy object model
*/
+#[AsQueryHandler]
final class GetManufacturerForViewingHandler implements GetManufacturerForViewingHandlerInterface
{
/**
diff --git a/src/Adapter/Meta/CommandHandler/AddMetaHandler.php b/src/Adapter/Meta/CommandHandler/AddMetaHandler.php
index 7cf16394c7f45..88c51fe86a434 100644
--- a/src/Adapter/Meta/CommandHandler/AddMetaHandler.php
+++ b/src/Adapter/Meta/CommandHandler/AddMetaHandler.php
@@ -28,6 +28,7 @@
use Meta;
use PrestaShop\PrestaShop\Adapter\Meta\MetaDataProvider;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\DefaultLanguage;
use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\IsUrlRewrite;
use PrestaShop\PrestaShop\Core\Domain\Meta\Command\AddMetaCommand;
@@ -45,6 +46,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class AddMetaHandler implements AddMetaHandlerInterface
{
/**
diff --git a/src/Adapter/Meta/CommandHandler/EditMetaHandler.php b/src/Adapter/Meta/CommandHandler/EditMetaHandler.php
index 03c2e16071b0c..22e5f54fff3e8 100644
--- a/src/Adapter/Meta/CommandHandler/EditMetaHandler.php
+++ b/src/Adapter/Meta/CommandHandler/EditMetaHandler.php
@@ -28,6 +28,7 @@
use Meta;
use PrestaShop\PrestaShop\Adapter\Meta\MetaDataProvider;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\DefaultLanguage;
use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\IsUrlRewrite;
use PrestaShop\PrestaShop\Core\Domain\Meta\Command\EditMetaCommand;
@@ -44,6 +45,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class EditMetaHandler implements EditMetaHandlerInterface
{
/**
diff --git a/src/Adapter/Meta/MetaDataProvider.php b/src/Adapter/Meta/MetaDataProvider.php
index 8cf2d562060af..1e97f998b3e55 100644
--- a/src/Adapter/Meta/MetaDataProvider.php
+++ b/src/Adapter/Meta/MetaDataProvider.php
@@ -138,6 +138,6 @@ public function getNotConfiguredModuleMetaPageNames()
*/
private function isModuleFile($fileName)
{
- return 0 === strncmp($fileName, 'module-', 7);
+ return str_starts_with($fileName, 'module-');
}
}
diff --git a/src/Adapter/Meta/QueryHandler/GetMetaForEditingHandler.php b/src/Adapter/Meta/QueryHandler/GetMetaForEditingHandler.php
index 6d47a77d20d1b..3e51d1e366b5c 100644
--- a/src/Adapter/Meta/QueryHandler/GetMetaForEditingHandler.php
+++ b/src/Adapter/Meta/QueryHandler/GetMetaForEditingHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Meta\QueryHandler;
use Meta;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Meta\Exception\MetaNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Meta\Query\GetMetaForEditing;
use PrestaShop\PrestaShop\Core\Domain\Meta\QueryHandler\GetMetaForEditingHandlerInterface;
@@ -37,6 +38,7 @@
*
* @internal
*/
+#[AsQueryHandler]
final class GetMetaForEditingHandler implements GetMetaForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Meta/QueryHandler/GetPagesForLayoutCustomizationHandler.php b/src/Adapter/Meta/QueryHandler/GetPagesForLayoutCustomizationHandler.php
index 78cd3adb12d31..6853ae5a34d14 100644
--- a/src/Adapter/Meta/QueryHandler/GetPagesForLayoutCustomizationHandler.php
+++ b/src/Adapter/Meta/QueryHandler/GetPagesForLayoutCustomizationHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Meta\QueryHandler;
use Meta;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Meta\Query\GetPagesForLayoutCustomization;
use PrestaShop\PrestaShop\Core\Domain\Meta\QueryHandler\GetPagesForLayoutCustomizationHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Meta\QueryResult\LayoutCustomizationPage;
@@ -34,6 +35,7 @@
/**
* Class GetMetaPagesListHandler.
*/
+#[AsQueryHandler]
final class GetPagesForLayoutCustomizationHandler implements GetPagesForLayoutCustomizationHandlerInterface
{
/**
diff --git a/src/Adapter/Module/AdminModuleDataProvider.php b/src/Adapter/Module/AdminModuleDataProvider.php
index 64069889b23ea..0d92c299607bb 100644
--- a/src/Adapter/Module/AdminModuleDataProvider.php
+++ b/src/Adapter/Module/AdminModuleDataProvider.php
@@ -260,11 +260,13 @@ public function setActionUrls(ModuleCollection $modules, ?string $specific_actio
if (!$module->isConfigurable()) {
unset($urls['configure']);
}
- } else {
+ } elseif ($module->isUninstalled()) {
$urls = [
'install' => $urls['install'],
'delete' => $urls['delete'],
];
+ } else {
+ $urls = ['install' => $urls['install']];
}
// Go through the actions and remove all actions that the current environment
@@ -319,9 +321,9 @@ protected function applyModuleFilters(array $modules, array $filters)
// Instead of looping on the whole module list, we use $module_ids which can already be reduced
// thanks to the previous array_intersect(...)
foreach ($modules as $key => $module) {
- if (strpos($module->displayName, $keyword) !== false
- || strpos($module->name, $keyword) !== false
- || strpos($module->description, $keyword) !== false) {
+ if (str_contains($module->displayName, $keyword)
+ || str_contains($module->name, $keyword)
+ || str_contains($module->description, $keyword)) {
$search_result[] = $key;
}
}
diff --git a/src/Adapter/Module/CommandHandler/BulkToggleModuleStatusHandler.php b/src/Adapter/Module/CommandHandler/BulkToggleModuleStatusHandler.php
index 31d1fd74e0aab..3bf2209900a81 100755
--- a/src/Adapter/Module/CommandHandler/BulkToggleModuleStatusHandler.php
+++ b/src/Adapter/Module/CommandHandler/BulkToggleModuleStatusHandler.php
@@ -30,6 +30,7 @@
use Module;
use PrestaShop\PrestaShop\Core\Cache\Clearer\CacheClearerInterface;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Module\Command\BulkToggleModuleStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Module\CommandHandler\BulkToggleModuleStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Module\ModuleManager;
@@ -39,6 +40,7 @@
/**
* Bulk toggles Module status
*/
+#[AsCommandHandler]
class BulkToggleModuleStatusHandler implements BulkToggleModuleStatusHandlerInterface
{
/**
diff --git a/src/Adapter/Module/Module.php b/src/Adapter/Module/Module.php
index 6a3886b1b0de3..28e51bdc750af 100644
--- a/src/Adapter/Module/Module.php
+++ b/src/Adapter/Module/Module.php
@@ -231,6 +231,11 @@ public function isInstalled(): bool
return (bool) $this->database->get('installed');
}
+ public function isUninstalled(): bool
+ {
+ return !$this->isInstalled() && $this->disk->get('is_present');
+ }
+
public function isConfigurable(): bool
{
return (bool) $this->attributes->get('is_configurable');
diff --git a/src/Adapter/Module/ModuleDataProvider.php b/src/Adapter/Module/ModuleDataProvider.php
index b8ced9ce6dfa1..8113787e820b3 100755
--- a/src/Adapter/Module/ModuleDataProvider.php
+++ b/src/Adapter/Module/ModuleDataProvider.php
@@ -144,7 +144,6 @@ public function getInstalled(): array
$id_shops = (new Context())->getContextListShopID();
if (count($id_shops) > 0) {
- $select .= ', ms.`id_module` as active';
$from .= ' LEFT JOIN `' . _DB_PREFIX_ . 'module_shop` ms ON ms.`id_module` = m.`id_module`';
$from .= ' AND ms.`id_shop` IN (' . implode(',', array_map('intval', $id_shops)) . ')';
}
@@ -155,9 +154,7 @@ public function getInstalled(): array
/** @var array{id: int, name:string, version: string, installed: int}|array{id: int, name:string, version: string, installed: int, active:int} $module */
foreach ($results as $module) {
$module['installed'] = (bool) $module['installed'];
- if (array_key_exists('active', $module)) {
- $module['active'] = (bool) $module['active'];
- }
+ $module['active'] = $this->isModuleActive($module['id'], $id_shops);
$modules[$module['name']] = $module;
}
@@ -341,4 +338,18 @@ public function isOnDisk($name)
return file_exists($path);
}
+
+ /**
+ * Checks if the module is active on at least one shop of the context.
+ */
+ private function isModuleActive(int $id, array $id_shops): bool
+ {
+ $result = Db::getInstance()->getRow('SELECT m.`active`, ms.`id_module` as `shop_active`
+ FROM `' . _DB_PREFIX_ . 'module` m
+ LEFT JOIN `' . _DB_PREFIX_ . 'module_shop` ms ON m.`id_module` = ms.`id_module`
+ WHERE m.`id_module` = ' . $id . '
+ AND ms.`id_shop` IN (' . implode(',', $id_shops) . ')');
+
+ return !empty($result);
+ }
}
diff --git a/src/Adapter/Notification/CommandHandler/UpdateEmployeeNotificationLastElementHandler.php b/src/Adapter/Notification/CommandHandler/UpdateEmployeeNotificationLastElementHandler.php
index 9f554cb780d43..68a04065fef5d 100644
--- a/src/Adapter/Notification/CommandHandler/UpdateEmployeeNotificationLastElementHandler.php
+++ b/src/Adapter/Notification/CommandHandler/UpdateEmployeeNotificationLastElementHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Notification\CommandHandler;
use Notification;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Notification\Command\UpdateEmployeeNotificationLastElementCommand;
use PrestaShop\PrestaShop\Core\Domain\Notification\CommandHandler\UpdateEmployeeNotificationLastElementCommandHandlerInterface;
@@ -35,6 +36,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class UpdateEmployeeNotificationLastElementHandler implements UpdateEmployeeNotificationLastElementCommandHandlerInterface
{
/**
diff --git a/src/Adapter/Notification/QueryHandler/GetNotificationLastElementsHandler.php b/src/Adapter/Notification/QueryHandler/GetNotificationLastElementsHandler.php
index eafe8e9724568..190860b657e4c 100644
--- a/src/Adapter/Notification/QueryHandler/GetNotificationLastElementsHandler.php
+++ b/src/Adapter/Notification/QueryHandler/GetNotificationLastElementsHandler.php
@@ -28,6 +28,7 @@
use Notification;
use PrestaShop\PrestaShop\Adapter\Admin\NotificationsConfiguration;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Notification\Query\GetNotificationLastElements;
use PrestaShop\PrestaShop\Core\Domain\Notification\QueryHandler\GetNotificationLastElementsHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Notification\QueryResult\NotificationResult;
@@ -39,6 +40,7 @@
*
* @internal
*/
+#[AsQueryHandler]
final class GetNotificationLastElementsHandler implements GetNotificationLastElementsHandlerInterface
{
/**
diff --git a/src/Adapter/Order/CommandHandler/AbstractOrderCommandHandler.php b/src/Adapter/Order/CommandHandler/AbstractOrderCommandHandler.php
index 5bcf2821a7633..d706b6bc95000 100644
--- a/src/Adapter/Order/CommandHandler/AbstractOrderCommandHandler.php
+++ b/src/Adapter/Order/CommandHandler/AbstractOrderCommandHandler.php
@@ -29,23 +29,17 @@
use Address;
use Cart;
use Configuration;
-use Context;
use Country;
use Currency;
use Customer;
use Order;
use OrderDetail;
-use Pack;
use PrestaShop\PrestaShop\Adapter\ContextStateManager;
use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
use PrestaShop\PrestaShop\Adapter\StockManager;
-use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
use Product;
use Shop;
use StockAvailable;
-use StockManagerFactory;
-use StockMvt;
-use Warehouse;
/**
* Abstracts reusable functionality for Order subdomain handlers.
@@ -65,116 +59,29 @@ protected function reinjectQuantity(OrderDetail $orderDetail, $productQuantity,
$reinjectableQuantity = (int) $orderDetail->product_quantity - (int) $orderDetail->product_quantity_reinjected;
$quantityToReinject = $productQuantity > $reinjectableQuantity ? $reinjectableQuantity : $productQuantity;
- $product = new Product(
+ StockAvailable::updateQuantity(
$orderDetail->product_id,
- false,
- (int) Context::getContext()->language->id,
- (int) $orderDetail->id_shop
+ $orderDetail->product_attribute_id,
+ $quantityToReinject,
+ $orderDetail->id_shop,
+ true,
+ [
+ 'id_order' => $orderDetail->id_order,
+ 'id_stock_mvt_reason' => Configuration::get('PS_STOCK_CUSTOMER_RETURN_REASON'),
+ ]
);
- if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')
- && $product->advanced_stock_management
- && $orderDetail->id_warehouse != 0
- ) {
- $manager = StockManagerFactory::getManager();
- $movements = StockMvt::getNegativeStockMvts(
- $orderDetail->id_order,
- $orderDetail->product_id,
- $orderDetail->product_attribute_id,
- $quantityToReinject
- );
-
- foreach ($movements as $movement) {
- if ($quantityToReinject > $movement['physical_quantity']) {
- $quantityToReinject = $movement['physical_quantity'];
- }
-
- if (Pack::isPack((int) $product->id)) {
- // Gets items
- if ($product->pack_stock_type == Pack::STOCK_TYPE_PRODUCTS_ONLY
- || $product->pack_stock_type == Pack::STOCK_TYPE_PACK_BOTH
- || ($product->pack_stock_type == Pack::STOCK_TYPE_DEFAULT
- && Configuration::get('PS_PACK_STOCK_TYPE') > 0)
- ) {
- $products_pack = Pack::getItems((int) $product->id, (int) Configuration::get('PS_LANG_DEFAULT'));
- // Foreach item
- foreach ($products_pack as $product_pack) {
- if ($product_pack->advanced_stock_management == 1) {
- $manager->addProduct(
- $product_pack->id,
- $product_pack->id_pack_product_attribute,
- new Warehouse($movement['id_warehouse']),
- $product_pack->pack_quantity * $quantityToReinject,
- null,
- $movement['price_te']
- );
- }
- }
- }
-
- if ($product->pack_stock_type == Pack::STOCK_TYPE_PACK_ONLY
- || $product->pack_stock_type == Pack::STOCK_TYPE_PACK_BOTH
- || (
- $product->pack_stock_type == Pack::STOCK_TYPE_DEFAULT
- && (Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PACK_ONLY
- || Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PACK_BOTH)
- )
- ) {
- $manager->addProduct(
- $orderDetail->product_id,
- $orderDetail->product_attribute_id,
- new Warehouse($movement['id_warehouse']),
- $quantityToReinject,
- null,
- $movement['price_te']
- );
- }
- } else {
- $manager->addProduct(
- $orderDetail->product_id,
- $orderDetail->product_attribute_id,
- new Warehouse($movement['id_warehouse']),
- $quantityToReinject,
- null,
- $movement['price_te']
- );
- }
- }
-
- $productId = $orderDetail->product_id;
-
- if ($delete) {
- $orderDetail->delete();
- }
-
- StockAvailable::synchronize($productId);
- } elseif ($orderDetail->id_warehouse == 0) {
- StockAvailable::updateQuantity(
- $orderDetail->product_id,
- $orderDetail->product_attribute_id,
- $quantityToReinject,
- $orderDetail->id_shop,
- true,
- [
- 'id_order' => $orderDetail->id_order,
- 'id_stock_mvt_reason' => Configuration::get('PS_STOCK_CUSTOMER_RETURN_REASON'),
- ]
- );
-
- // sync all stock
- (new StockManager())->updatePhysicalProductQuantity(
- (int) $orderDetail->id_shop,
- (int) Configuration::get('PS_OS_ERROR'),
- (int) Configuration::get('PS_OS_CANCELED'),
- null,
- (int) $orderDetail->id_order
- );
+ // sync all stock
+ (new StockManager())->updatePhysicalProductQuantity(
+ (int) $orderDetail->id_shop,
+ (int) Configuration::get('PS_OS_ERROR'),
+ (int) Configuration::get('PS_OS_CANCELED'),
+ null,
+ (int) $orderDetail->id_order
+ );
- if ($delete) {
- $orderDetail->delete();
- }
- } else {
- throw new OrderException('This product cannot be re-stocked.');
+ if ($delete) {
+ $orderDetail->delete();
}
}
diff --git a/src/Adapter/Order/CommandHandler/AddCartRuleToOrderHandler.php b/src/Adapter/Order/CommandHandler/AddCartRuleToOrderHandler.php
index 48a43e5ceb9bc..a8da35efd9c04 100644
--- a/src/Adapter/Order/CommandHandler/AddCartRuleToOrderHandler.php
+++ b/src/Adapter/Order/CommandHandler/AddCartRuleToOrderHandler.php
@@ -37,6 +37,7 @@
use PrestaShop\PrestaShop\Adapter\ContextStateManager;
use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
use PrestaShop\PrestaShop\Adapter\Order\OrderAmountUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\InvalidCartRuleDiscountValueException;
use PrestaShop\PrestaShop\Core\Domain\Order\Command\AddCartRuleToOrderCommand;
use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\AddCartRuleToOrderHandlerInterface;
@@ -49,6 +50,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class AddCartRuleToOrderHandler extends AbstractOrderHandler implements AddCartRuleToOrderHandlerInterface
{
/**
diff --git a/src/Adapter/Order/CommandHandler/AddOrderFromBackOfficeHandler.php b/src/Adapter/Order/CommandHandler/AddOrderFromBackOfficeHandler.php
index 642a4c5cb26da..201f21229fa47 100644
--- a/src/Adapter/Order/CommandHandler/AddOrderFromBackOfficeHandler.php
+++ b/src/Adapter/Order/CommandHandler/AddOrderFromBackOfficeHandler.php
@@ -39,6 +39,7 @@
use Module;
use PaymentModule;
use PrestaShop\PrestaShop\Adapter\ContextStateManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Order\Command\AddOrderFromBackOfficeCommand;
use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\AddOrderFromBackOfficeHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderConstraintException;
@@ -49,6 +50,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class AddOrderFromBackOfficeHandler extends AbstractOrderCommandHandler implements AddOrderFromBackOfficeHandlerInterface
{
/**
diff --git a/src/Adapter/Order/CommandHandler/AddPaymentHandler.php b/src/Adapter/Order/CommandHandler/AddPaymentHandler.php
index 6d7ef9d44cb73..f6d9721d704c8 100644
--- a/src/Adapter/Order/CommandHandler/AddPaymentHandler.php
+++ b/src/Adapter/Order/CommandHandler/AddPaymentHandler.php
@@ -29,6 +29,7 @@
use Currency;
use OrderInvoice;
use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
use PrestaShop\PrestaShop\Core\Domain\Order\Payment\Command\AddPaymentCommand;
use PrestaShop\PrestaShop\Core\Domain\Order\Payment\CommandHandler\AddPaymentHandlerInterface;
@@ -37,6 +38,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class AddPaymentHandler extends AbstractOrderHandler implements AddPaymentHandlerInterface
{
/**
diff --git a/src/Adapter/Order/CommandHandler/AddProductToOrderHandler.php b/src/Adapter/Order/CommandHandler/AddProductToOrderHandler.php
index 6f98efc774207..49de3d8fd1e57 100644
--- a/src/Adapter/Order/CommandHandler/AddProductToOrderHandler.php
+++ b/src/Adapter/Order/CommandHandler/AddProductToOrderHandler.php
@@ -49,6 +49,7 @@
use PrestaShop\PrestaShop\Adapter\Order\OrderAmountUpdater;
use PrestaShop\PrestaShop\Adapter\Order\OrderDetailUpdater;
use PrestaShop\PrestaShop\Adapter\Order\OrderProductQuantityUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\DuplicateProductInOrderException;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\DuplicateProductInOrderInvoiceException;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
@@ -67,6 +68,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class AddProductToOrderHandler extends AbstractOrderHandler implements AddProductToOrderHandlerInterface
{
/**
@@ -209,7 +211,6 @@ public function handle(AddProductToOrderCommand $command)
$command->getProductPriceTaxExcluded(),
$command->getProductPriceTaxIncluded()
);
- StockAvailable::synchronize($product->id);
$this->updateAffectedOrderDetails(
$order,
diff --git a/src/Adapter/Order/CommandHandler/BulkChangeOrderStatusHandler.php b/src/Adapter/Order/CommandHandler/BulkChangeOrderStatusHandler.php
index 992cb4f8bad4e..bb76d0daf7eae 100644
--- a/src/Adapter/Order/CommandHandler/BulkChangeOrderStatusHandler.php
+++ b/src/Adapter/Order/CommandHandler/BulkChangeOrderStatusHandler.php
@@ -32,17 +32,18 @@
use Order;
use OrderHistory;
use OrderState;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Order\Command\BulkChangeOrderStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\BulkChangeOrderStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\ChangeOrderStatusException;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Order\ValueObject\OrderId;
-use StockAvailable;
/**
* @internal
*/
+#[AsCommandHandler]
final class BulkChangeOrderStatusHandler implements BulkChangeOrderStatusHandlerInterface
{
/**
@@ -95,14 +96,6 @@ public function handle(BulkChangeOrderStatusCommand $command)
continue;
}
-
- if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
- foreach ($order->getProducts() as $product) {
- if (StockAvailable::dependsOnStock($product['product_id'])) {
- StockAvailable::synchronize($product['product_id'], (int) $product['id_shop']);
- }
- }
- }
}
if (!empty($ordersWithFailedToUpdateStatus)
diff --git a/src/Adapter/Order/CommandHandler/CancelOrderProductHandler.php b/src/Adapter/Order/CommandHandler/CancelOrderProductHandler.php
index 02f7caa9274af..3f56ed50961c2 100644
--- a/src/Adapter/Order/CommandHandler/CancelOrderProductHandler.php
+++ b/src/Adapter/Order/CommandHandler/CancelOrderProductHandler.php
@@ -34,6 +34,7 @@
use OrderHistory;
use OrderInvoice;
use PrestaShop\PrestaShop\Adapter\Order\OrderProductQuantityUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Order\CancellationActionType;
use PrestaShop\PrestaShop\Core\Domain\Order\Command\CancelOrderProductCommand;
use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\CancelOrderProductHandlerInterface;
@@ -45,6 +46,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class CancelOrderProductHandler extends AbstractOrderCommandHandler implements CancelOrderProductHandlerInterface
{
/**
@@ -199,6 +201,7 @@ private function cancelProducts(Order $order, array $orderDetails)
$newQuantity = max((int) $orderDetail->product_quantity - (int) $qty_cancel_product, 0);
$orderInvoice = $orderDetail->id_order_invoice != 0 ? new OrderInvoice($orderDetail->id_order_invoice) : null;
$this->orderProductQuantityUpdater->update($order, $orderDetail, $newQuantity, $orderInvoice);
+ // Hook called only for the shop concerned
Hook::exec('actionProductCancel', ['order' => $order, 'id_order_detail' => (int) $orderDetail->id_order_detail, 'cancel_quantity' => $qty_cancel_product, 'action' => CancellationActionType::CANCEL_PRODUCT], null, false, true, false, $order->id_shop);
}
}
diff --git a/src/Adapter/Order/CommandHandler/ChangeOrderCurrencyHandler.php b/src/Adapter/Order/CommandHandler/ChangeOrderCurrencyHandler.php
index 70bcdb482eebd..cb7024468d0ff 100644
--- a/src/Adapter/Order/CommandHandler/ChangeOrderCurrencyHandler.php
+++ b/src/Adapter/Order/CommandHandler/ChangeOrderCurrencyHandler.php
@@ -34,6 +34,7 @@
use OrderDetail;
use OrderInvoice;
use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderCurrencyCommand;
use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\ChangeOrderCurrencyHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
@@ -45,6 +46,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class ChangeOrderCurrencyHandler extends AbstractOrderHandler implements ChangeOrderCurrencyHandlerInterface
{
/**
diff --git a/src/Adapter/Order/CommandHandler/ChangeOrderDeliveryAddressHandler.php b/src/Adapter/Order/CommandHandler/ChangeOrderDeliveryAddressHandler.php
index 2d2f3796d39b2..d6d0b52a901f7 100644
--- a/src/Adapter/Order/CommandHandler/ChangeOrderDeliveryAddressHandler.php
+++ b/src/Adapter/Order/CommandHandler/ChangeOrderDeliveryAddressHandler.php
@@ -37,6 +37,7 @@
use PrestaShop\PrestaShop\Adapter\Order\OrderAmountUpdater;
use PrestaShop\PrestaShop\Adapter\Order\OrderDetailUpdater;
use PrestaShop\PrestaShop\Adapter\Order\OrderProductQuantityUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderDeliveryAddressCommand;
use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\ChangeOrderDeliveryAddressHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
@@ -45,6 +46,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class ChangeOrderDeliveryAddressHandler extends AbstractOrderCommandHandler implements ChangeOrderDeliveryAddressHandlerInterface
{
/**
diff --git a/src/Adapter/Order/CommandHandler/ChangeOrderInvoiceAddressHandler.php b/src/Adapter/Order/CommandHandler/ChangeOrderInvoiceAddressHandler.php
index f916fdb441aca..35497461cddcc 100644
--- a/src/Adapter/Order/CommandHandler/ChangeOrderInvoiceAddressHandler.php
+++ b/src/Adapter/Order/CommandHandler/ChangeOrderInvoiceAddressHandler.php
@@ -31,6 +31,7 @@
use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
use PrestaShop\PrestaShop\Adapter\Order\OrderAmountUpdater;
use PrestaShop\PrestaShop\Adapter\Order\OrderDetailUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderInvoiceAddressCommand;
use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\ChangeOrderInvoiceAddressHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
@@ -39,6 +40,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class ChangeOrderInvoiceAddressHandler extends AbstractOrderHandler implements ChangeOrderInvoiceAddressHandlerInterface
{
/**
diff --git a/src/Adapter/Order/CommandHandler/DeleteCartRuleFromOrderHandler.php b/src/Adapter/Order/CommandHandler/DeleteCartRuleFromOrderHandler.php
index 0af8bdc0ecfa8..b7542a69e6e29 100644
--- a/src/Adapter/Order/CommandHandler/DeleteCartRuleFromOrderHandler.php
+++ b/src/Adapter/Order/CommandHandler/DeleteCartRuleFromOrderHandler.php
@@ -39,6 +39,7 @@
use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
use PrestaShop\PrestaShop\Adapter\Order\OrderAmountUpdater;
use PrestaShop\PrestaShop\Adapter\Order\OrderProductQuantityUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Order\Command\DeleteCartRuleFromOrderCommand;
use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\DeleteCartRuleFromOrderHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
@@ -48,6 +49,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class DeleteCartRuleFromOrderHandler extends AbstractOrderHandler implements DeleteCartRuleFromOrderHandlerInterface
{
/**
diff --git a/src/Adapter/Order/CommandHandler/DeleteProductFromOrderHandler.php b/src/Adapter/Order/CommandHandler/DeleteProductFromOrderHandler.php
index 36e0908241621..9dd15fd0282c7 100644
--- a/src/Adapter/Order/CommandHandler/DeleteProductFromOrderHandler.php
+++ b/src/Adapter/Order/CommandHandler/DeleteProductFromOrderHandler.php
@@ -35,6 +35,7 @@
use OrderInvoice;
use PrestaShop\PrestaShop\Adapter\ContextStateManager;
use PrestaShop\PrestaShop\Adapter\Order\OrderProductQuantityUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\DeleteProductFromOrderCommand;
@@ -46,6 +47,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class DeleteProductFromOrderHandler extends AbstractOrderCommandHandler implements DeleteProductFromOrderHandlerInterface
{
/**
diff --git a/src/Adapter/Order/CommandHandler/DuplicateOrderCartHandler.php b/src/Adapter/Order/CommandHandler/DuplicateOrderCartHandler.php
index 274c133b847e2..c7a475fad3942 100644
--- a/src/Adapter/Order/CommandHandler/DuplicateOrderCartHandler.php
+++ b/src/Adapter/Order/CommandHandler/DuplicateOrderCartHandler.php
@@ -30,6 +30,7 @@
use Currency;
use Customer;
use PrestaShop\PrestaShop\Adapter\ContextStateManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Cart\ValueObject\CartId;
use PrestaShop\PrestaShop\Core\Domain\Order\Command\DuplicateOrderCartCommand;
use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\DuplicateOrderCartHandlerInterface;
@@ -39,6 +40,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class DuplicateOrderCartHandler implements DuplicateOrderCartHandlerInterface
{
/**
diff --git a/src/Adapter/Order/CommandHandler/GenerateInvoiceHandler.php b/src/Adapter/Order/CommandHandler/GenerateInvoiceHandler.php
index b230a051cddd4..9751de4d8693c 100644
--- a/src/Adapter/Order/CommandHandler/GenerateInvoiceHandler.php
+++ b/src/Adapter/Order/CommandHandler/GenerateInvoiceHandler.php
@@ -28,6 +28,7 @@
use Configuration;
use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
use PrestaShop\PrestaShop\Core\Domain\Order\Invoice\Command\GenerateInvoiceCommand;
use PrestaShop\PrestaShop\Core\Domain\Order\Invoice\CommandHandler\GenerateOrderInvoiceHandlerInterface;
@@ -35,6 +36,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class GenerateInvoiceHandler extends AbstractOrderHandler implements GenerateOrderInvoiceHandlerInterface
{
/**
diff --git a/src/Adapter/Order/CommandHandler/IssuePartialRefundHandler.php b/src/Adapter/Order/CommandHandler/IssuePartialRefundHandler.php
index d5c4f013beec7..d14d289191e73 100644
--- a/src/Adapter/Order/CommandHandler/IssuePartialRefundHandler.php
+++ b/src/Adapter/Order/CommandHandler/IssuePartialRefundHandler.php
@@ -35,6 +35,7 @@
use PrestaShop\PrestaShop\Adapter\Order\Refund\OrderRefundUpdater;
use PrestaShop\PrestaShop\Adapter\Order\Refund\OrderSlipCreator;
use PrestaShop\PrestaShop\Adapter\Order\Refund\VoucherGenerator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\ConfigurationInterface;
use PrestaShop\PrestaShop\Core\Domain\Order\CancellationActionType;
use PrestaShop\PrestaShop\Core\Domain\Order\Command\IssuePartialRefundCommand;
@@ -45,6 +46,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class IssuePartialRefundHandler extends AbstractOrderCommandHandler implements IssuePartialRefundHandlerInterface
{
/**
@@ -146,6 +148,7 @@ private function issuePartialRefund(IssuePartialRefundCommand $command, Order $o
if ($shouldReinjectProducts) {
$this->reinjectQuantity($orderDetail, $productRefund['quantity']);
}
+ // Hook called only for the shop concerned
Hook::exec('actionProductCancel', ['order' => $order, 'id_order_detail' => (int) $orderDetailId, 'cancel_quantity' => $productRefund['quantity'], 'cancel_amount' => $productRefund['amount'], 'action' => CancellationActionType::PARTIAL_REFUND], null, false, true, false, $order->id_shop);
}
diff --git a/src/Adapter/Order/CommandHandler/IssueReturnProductHandler.php b/src/Adapter/Order/CommandHandler/IssueReturnProductHandler.php
index b2cd8e6ea6f36..3a785f9c25e0f 100644
--- a/src/Adapter/Order/CommandHandler/IssueReturnProductHandler.php
+++ b/src/Adapter/Order/CommandHandler/IssueReturnProductHandler.php
@@ -37,6 +37,7 @@
use PrestaShop\PrestaShop\Adapter\Order\Refund\OrderRefundUpdater;
use PrestaShop\PrestaShop\Adapter\Order\Refund\OrderSlipCreator;
use PrestaShop\PrestaShop\Adapter\Order\Refund\VoucherGenerator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\ConfigurationInterface;
use PrestaShop\PrestaShop\Core\Domain\Order\CancellationActionType;
use PrestaShop\PrestaShop\Core\Domain\Order\Command\IssueReturnProductCommand;
@@ -48,6 +49,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
class IssueReturnProductHandler extends AbstractOrderCommandHandler implements IssueReturnProductHandlerInterface
{
/**
@@ -147,6 +149,7 @@ private function issueReturn(IssueReturnProductCommand $command, Order $order):
if ($command->restockRefundedProducts()) {
$this->reinjectQuantity($orderDetail, $productRefund['quantity']);
}
+ // Hook called only for the shop concerned
Hook::exec('actionProductCancel', ['order' => $order, 'id_order_detail' => (int) $orderDetailId, 'cancel_quantity' => $productRefund['quantity'], 'action' => CancellationActionType::RETURN_PRODUCT], null, false, true, false, $order->id_shop);
}
diff --git a/src/Adapter/Order/CommandHandler/IssueStandardRefundHandler.php b/src/Adapter/Order/CommandHandler/IssueStandardRefundHandler.php
index 0cbe8b99f5851..0a19849768455 100644
--- a/src/Adapter/Order/CommandHandler/IssueStandardRefundHandler.php
+++ b/src/Adapter/Order/CommandHandler/IssueStandardRefundHandler.php
@@ -36,6 +36,7 @@
use PrestaShop\PrestaShop\Adapter\Order\Refund\OrderRefundUpdater;
use PrestaShop\PrestaShop\Adapter\Order\Refund\OrderSlipCreator;
use PrestaShop\PrestaShop\Adapter\Order\Refund\VoucherGenerator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\ConfigurationInterface;
use PrestaShop\PrestaShop\Core\Domain\Order\CancellationActionType;
use PrestaShop\PrestaShop\Core\Domain\Order\Command\IssueStandardRefundCommand;
@@ -47,6 +48,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
class IssueStandardRefundHandler extends AbstractOrderCommandHandler implements IssueStandardRefundHandlerInterface
{
/**
@@ -156,6 +158,7 @@ private function issueStandardRefund(IssueStandardRefundCommand $command, Order
$orderDetail = $orderRefundSummary->getOrderDetailById($orderDetailId);
// For standard refund the order is necessarily NOT delivered yet, so reinjection is automatic
$this->reinjectQuantity($orderDetail, $productRefund['quantity']);
+ // Hook called only for the shop concerned
Hook::exec('actionProductCancel', ['order' => $order, 'id_order_detail' => (int) $orderDetailId, 'cancel_quantity' => $productRefund['quantity'], 'action' => CancellationActionType::STANDARD_REFUND], null, false, true, false, $order->id_shop);
}
diff --git a/src/Adapter/Order/CommandHandler/ResendOrderEmailHandler.php b/src/Adapter/Order/CommandHandler/ResendOrderEmailHandler.php
index 2d90bc4d91f9a..1832d468afeb6 100644
--- a/src/Adapter/Order/CommandHandler/ResendOrderEmailHandler.php
+++ b/src/Adapter/Order/CommandHandler/ResendOrderEmailHandler.php
@@ -30,6 +30,7 @@
use Configuration;
use OrderHistory;
use OrderState;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Order\Command\ResendOrderEmailCommand;
use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\ResendOrderEmailHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderEmailSendException;
@@ -39,6 +40,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class ResendOrderEmailHandler extends AbstractOrderCommandHandler implements ResendOrderEmailHandlerInterface
{
/**
diff --git a/src/Adapter/Order/CommandHandler/SendProcessOrderEmailHandler.php b/src/Adapter/Order/CommandHandler/SendProcessOrderEmailHandler.php
index cd072d5ef129f..ee85165a92d53 100644
--- a/src/Adapter/Order/CommandHandler/SendProcessOrderEmailHandler.php
+++ b/src/Adapter/Order/CommandHandler/SendProcessOrderEmailHandler.php
@@ -31,6 +31,7 @@
use Language;
use Link;
use Mail;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Cart\Exception\CartNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Cart\ValueObject\CartId;
use PrestaShop\PrestaShop\Core\Domain\Customer\Exception\CustomerNotFoundException;
@@ -45,6 +46,7 @@
/**
* Handles SendProcessOrderEmail command using legacy object model
*/
+#[AsCommandHandler]
class SendProcessOrderEmailHandler implements SendProcessOrderEmailHandlerInterface
{
/**
diff --git a/src/Adapter/Order/CommandHandler/SetInternalOrderNoteHandler.php b/src/Adapter/Order/CommandHandler/SetInternalOrderNoteHandler.php
index 28562bbacc06b..3d0e20d0c145e 100644
--- a/src/Adapter/Order/CommandHandler/SetInternalOrderNoteHandler.php
+++ b/src/Adapter/Order/CommandHandler/SetInternalOrderNoteHandler.php
@@ -30,6 +30,7 @@
use Order;
use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Order\Command\SetInternalOrderNoteCommand;
use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\SetInternalOrderNoteHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderConstraintException;
@@ -41,6 +42,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class SetInternalOrderNoteHandler extends AbstractOrderHandler implements SetInternalOrderNoteHandlerInterface
{
/**
diff --git a/src/Adapter/Order/CommandHandler/UpdateInvoiceNoteHandler.php b/src/Adapter/Order/CommandHandler/UpdateInvoiceNoteHandler.php
index bfb2d682e9406..f6f4102e662c1 100644
--- a/src/Adapter/Order/CommandHandler/UpdateInvoiceNoteHandler.php
+++ b/src/Adapter/Order/CommandHandler/UpdateInvoiceNoteHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Order\CommandHandler;
use OrderInvoice;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Order\Invoice\Command\UpdateInvoiceNoteCommand;
use PrestaShop\PrestaShop\Core\Domain\Order\Invoice\CommandHandler\UpdateInvoiceNoteHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Order\Invoice\Exception\InvoiceException;
@@ -36,6 +37,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class UpdateInvoiceNoteHandler implements UpdateInvoiceNoteHandlerInterface
{
/**
diff --git a/src/Adapter/Order/CommandHandler/UpdateOrderShippingDetailsHandler.php b/src/Adapter/Order/CommandHandler/UpdateOrderShippingDetailsHandler.php
index f89ebde47d834..0e15d4ada1dbb 100644
--- a/src/Adapter/Order/CommandHandler/UpdateOrderShippingDetailsHandler.php
+++ b/src/Adapter/Order/CommandHandler/UpdateOrderShippingDetailsHandler.php
@@ -35,6 +35,7 @@
use PrestaShop\PrestaShop\Adapter\ContextStateManager;
use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
use PrestaShop\PrestaShop\Adapter\Order\OrderAmountUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Order\Command\UpdateOrderShippingDetailsCommand;
use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\UpdateOrderShippingDetailsHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
@@ -44,6 +45,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class UpdateOrderShippingDetailsHandler extends AbstractOrderHandler implements UpdateOrderShippingDetailsHandlerInterface
{
/**
@@ -122,6 +124,7 @@ public function handle(UpdateOrderShippingDetailsCommand $command)
$customer = new Customer((int) $order->id_customer);
$carrier = new Carrier((int) $order->id_carrier, (int) $order->getAssociatedLanguage()->getId());
+ // Hook called only for the shop concerned
Hook::exec('actionAdminOrdersTrackingNumberUpdate', [
'order' => $order,
'customer' => $customer,
diff --git a/src/Adapter/Order/CommandHandler/UpdateOrderStatusHandler.php b/src/Adapter/Order/CommandHandler/UpdateOrderStatusHandler.php
index e6210ed04087b..259cd89e7eb8d 100644
--- a/src/Adapter/Order/CommandHandler/UpdateOrderStatusHandler.php
+++ b/src/Adapter/Order/CommandHandler/UpdateOrderStatusHandler.php
@@ -32,15 +32,16 @@
use OrderHistory;
use OrderState;
use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Order\Command\UpdateOrderStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Order\CommandHandler\UpdateOrderStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\ChangeOrderStatusException;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
-use StockAvailable;
/**
* @internal
*/
+#[AsCommandHandler]
final class UpdateOrderStatusHandler extends AbstractOrderHandler implements UpdateOrderStatusHandlerInterface
{
/**
@@ -79,18 +80,7 @@ public function handle(UpdateOrderStatusCommand $command)
}
// Save all changes
- $historyAdded = $history->addWithemail(true, $templateVars);
-
- if ($historyAdded) {
- // synchronizes quantities if needed..
- if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) {
- foreach ($order->getProducts() as $product) {
- if (StockAvailable::dependsOnStock($product['product_id'])) {
- StockAvailable::synchronize($product['product_id'], (int) $product['id_shop']);
- }
- }
- }
-
+ if ($history->addWithemail(true, $templateVars)) {
return;
}
diff --git a/src/Adapter/Order/CommandHandler/UpdateProductInOrderHandler.php b/src/Adapter/Order/CommandHandler/UpdateProductInOrderHandler.php
index 4d126f60227b3..3a0cee5591c2b 100644
--- a/src/Adapter/Order/CommandHandler/UpdateProductInOrderHandler.php
+++ b/src/Adapter/Order/CommandHandler/UpdateProductInOrderHandler.php
@@ -37,6 +37,7 @@
use PrestaShop\PrestaShop\Adapter\ContextStateManager;
use PrestaShop\PrestaShop\Adapter\Order\OrderDetailUpdater;
use PrestaShop\PrestaShop\Adapter\Order\OrderProductQuantityUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\CannotEditDeliveredOrderProductException;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\CannotFindProductInOrderException;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\DuplicateProductInOrderInvoiceException;
@@ -51,6 +52,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
final class UpdateProductInOrderHandler extends AbstractOrderCommandHandler implements UpdateProductInOrderHandlerInterface
{
/**
diff --git a/src/Adapter/Order/GeneralConfiguration.php b/src/Adapter/Order/GeneralConfiguration.php
index 4ad2b361653a1..a87fdfa60a178 100644
--- a/src/Adapter/Order/GeneralConfiguration.php
+++ b/src/Adapter/Order/GeneralConfiguration.php
@@ -43,7 +43,6 @@ class GeneralConfiguration extends AbstractMultistoreConfiguration
'disable_reordering_option',
'purchase_minimum_value',
'recalculate_shipping_cost',
- 'allow_multishipping',
'allow_delayed_shipping',
'enable_tos',
'tos_cms_id',
@@ -63,7 +62,6 @@ public function getConfiguration()
'disable_reordering_option' => (bool) $this->configuration->get('PS_DISALLOW_HISTORY_REORDERING', false, $shopConstraint),
'purchase_minimum_value' => (float) $this->configuration->get('PS_PURCHASE_MINIMUM', 0, $shopConstraint),
'recalculate_shipping_cost' => (bool) $this->configuration->get('PS_ORDER_RECALCULATE_SHIPPING', false, $shopConstraint),
- 'allow_multishipping' => (bool) $this->configuration->get('PS_ALLOW_MULTISHIPPING', false, $shopConstraint),
'allow_delayed_shipping' => (bool) $this->configuration->get('PS_SHIP_WHEN_AVAILABLE', false, $shopConstraint),
'enable_tos' => (bool) $this->configuration->get('PS_CONDITIONS', false, $shopConstraint),
'tos_cms_id' => (int) $this->configuration->get('PS_CONDITIONS_CMS_ID', 0, $shopConstraint),
@@ -84,7 +82,6 @@ public function updateConfiguration(array $configuration)
$this->updateConfigurationValue('PS_DISALLOW_HISTORY_REORDERING', 'disable_reordering_option', $configuration, $shopConstraint);
$this->updateConfigurationValue('PS_PURCHASE_MINIMUM', 'purchase_minimum_value', $configuration, $shopConstraint);
$this->updateConfigurationValue('PS_ORDER_RECALCULATE_SHIPPING', 'recalculate_shipping_cost', $configuration, $shopConstraint);
- $this->updateConfigurationValue('PS_ALLOW_MULTISHIPPING', 'allow_multishipping', $configuration, $shopConstraint);
$this->updateConfigurationValue('PS_SHIP_WHEN_AVAILABLE', 'allow_delayed_shipping', $configuration, $shopConstraint);
$this->updateConfigurationValue('PS_CONDITIONS', 'enable_tos', $configuration, $shopConstraint);
$this->updateConfigurationValue('PS_CONDITIONS_CMS_ID', 'tos_cms_id', $configuration, $shopConstraint);
@@ -106,7 +103,6 @@ protected function buildResolver(): OptionsResolver
->setAllowedTypes('disable_reordering_option', 'bool')
->setAllowedTypes('purchase_minimum_value', 'float')
->setAllowedTypes('recalculate_shipping_cost', 'bool')
- ->setAllowedTypes('allow_multishipping', 'bool')
->setAllowedTypes('allow_delayed_shipping', 'bool')
->setAllowedTypes('enable_tos', 'bool')
->setAllowedTypes('tos_cms_id', 'int')
diff --git a/src/Adapter/Order/OrderDetailUpdater.php b/src/Adapter/Order/OrderDetailUpdater.php
index 02d26392af2bb..23e08836b2806 100644
--- a/src/Adapter/Order/OrderDetailUpdater.php
+++ b/src/Adapter/Order/OrderDetailUpdater.php
@@ -88,7 +88,7 @@ public function updateOrderDetail(
DecimalNumber $priceTaxExcluded,
DecimalNumber $priceTaxIncluded
): void {
- list($roundType, $computingPrecision, $taxAddress) = $this->prepareOrderContext($order);
+ [$roundType, $computingPrecision, $taxAddress] = $this->prepareOrderContext($order);
try {
$ecotax = new DecimalNumber((string) $orderDetail->ecotax);
@@ -136,7 +136,7 @@ public function updateOrderDetailsForProduct(
DecimalNumber $priceTaxExcluded,
DecimalNumber $priceTaxIncluded
): void {
- list($roundType, $computingPrecision, $taxAddress) = $this->prepareOrderContext($order);
+ [$roundType, $computingPrecision, $taxAddress] = $this->prepareOrderContext($order);
try {
$this->applyUpdatesForProduct(
@@ -159,7 +159,7 @@ public function updateOrderDetailsForProduct(
*/
public function updateOrderDetailsTaxes(Order $order): void
{
- list($roundType, $computingPrecision, $taxAddress) = $this->prepareOrderContext($order);
+ [$roundType, $computingPrecision, $taxAddress] = $this->prepareOrderContext($order);
try {
$orderDetailsData = $order->getProducts();
diff --git a/src/Adapter/Order/OrderProductQuantityUpdater.php b/src/Adapter/Order/OrderProductQuantityUpdater.php
index 84964b5763d9e..1dfd3d57f59b9 100644
--- a/src/Adapter/Order/OrderProductQuantityUpdater.php
+++ b/src/Adapter/Order/OrderProductQuantityUpdater.php
@@ -30,7 +30,6 @@
use Cart;
use Configuration;
-use Context;
use Currency;
use Customer;
use Customization;
@@ -38,7 +37,6 @@
use Order;
use OrderDetail;
use OrderInvoice;
-use Pack;
use PrestaShop\PrestaShop\Adapter\Cart\Comparator\CartProductsComparator;
use PrestaShop\PrestaShop\Adapter\Cart\Comparator\CartProductUpdate;
use PrestaShop\PrestaShop\Adapter\ContextStateManager;
@@ -49,9 +47,6 @@
use Product;
use Shop;
use StockAvailable;
-use StockManagerFactory;
-use StockMvt;
-use Warehouse;
/**
* Increase or decrease quantity of an order's product.
@@ -389,116 +384,29 @@ protected function reinjectQuantity(
$reinjectableQuantity = $oldQuantity - $newQuantity;
$quantityToReinject = $oldQuantity > $reinjectableQuantity ? $reinjectableQuantity : $oldQuantity;
- $product = new Product(
+ StockAvailable::updateQuantity(
$orderDetail->product_id,
- false,
- (int) Context::getContext()->language->id,
- (int) $orderDetail->id_shop
+ $orderDetail->product_attribute_id,
+ $quantityToReinject,
+ $orderDetail->id_shop,
+ true,
+ [
+ 'id_order' => $orderDetail->id_order,
+ 'id_stock_mvt_reason' => Configuration::get('PS_STOCK_CUSTOMER_RETURN_REASON'),
+ ]
);
- if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')
- && $product->advanced_stock_management
- && $orderDetail->id_warehouse != 0
- ) {
- $manager = StockManagerFactory::getManager();
- $movements = StockMvt::getNegativeStockMvts(
- $orderDetail->id_order,
- $orderDetail->product_id,
- $orderDetail->product_attribute_id,
- $quantityToReinject
- );
-
- foreach ($movements as $movement) {
- if ($quantityToReinject > $movement['physical_quantity']) {
- $quantityToReinject = $movement['physical_quantity'];
- }
-
- if (Pack::isPack((int) $product->id)) {
- // Gets items
- if ($product->pack_stock_type == Pack::STOCK_TYPE_PRODUCTS_ONLY
- || $product->pack_stock_type == Pack::STOCK_TYPE_PACK_BOTH
- || ($product->pack_stock_type == Pack::STOCK_TYPE_DEFAULT
- && Configuration::get('PS_PACK_STOCK_TYPE') > 0)
- ) {
- $products_pack = Pack::getItems((int) $product->id, (int) Configuration::get('PS_LANG_DEFAULT'));
- // Foreach item
- foreach ($products_pack as $product_pack) {
- if ($product_pack->advanced_stock_management == 1) {
- $manager->addProduct(
- $product_pack->id,
- $product_pack->id_pack_product_attribute,
- new Warehouse($movement['id_warehouse']),
- $product_pack->pack_quantity * $quantityToReinject,
- null,
- $movement['price_te']
- );
- }
- }
- }
-
- if ($product->pack_stock_type == Pack::STOCK_TYPE_PACK_ONLY
- || $product->pack_stock_type == Pack::STOCK_TYPE_PACK_BOTH
- || (
- $product->pack_stock_type == Pack::STOCK_TYPE_DEFAULT
- && (Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PACK_ONLY
- || Configuration::get('PS_PACK_STOCK_TYPE') == Pack::STOCK_TYPE_PACK_BOTH)
- )
- ) {
- $manager->addProduct(
- $orderDetail->product_id,
- $orderDetail->product_attribute_id,
- new Warehouse($movement['id_warehouse']),
- $quantityToReinject,
- null,
- $movement['price_te']
- );
- }
- } else {
- $manager->addProduct(
- $orderDetail->product_id,
- $orderDetail->product_attribute_id,
- new Warehouse($movement['id_warehouse']),
- $quantityToReinject,
- null,
- $movement['price_te']
- );
- }
- }
-
- $productId = $orderDetail->product_id;
-
- if ($delete) {
- $orderDetail->delete();
- }
-
- StockAvailable::synchronize($productId);
- } elseif ($orderDetail->id_warehouse == 0) {
- StockAvailable::updateQuantity(
- $orderDetail->product_id,
- $orderDetail->product_attribute_id,
- $quantityToReinject,
- $orderDetail->id_shop,
- true,
- [
- 'id_order' => $orderDetail->id_order,
- 'id_stock_mvt_reason' => Configuration::get('PS_STOCK_CUSTOMER_RETURN_REASON'),
- ]
- );
-
- // sync all stock
- (new StockManager())->updatePhysicalProductQuantity(
- (int) $orderDetail->id_shop,
- (int) Configuration::get('PS_OS_ERROR'),
- (int) Configuration::get('PS_OS_CANCELED'),
- null,
- (int) $orderDetail->id_order
- );
+ // sync all stock
+ (new StockManager())->updatePhysicalProductQuantity(
+ (int) $orderDetail->id_shop,
+ (int) Configuration::get('PS_OS_ERROR'),
+ (int) Configuration::get('PS_OS_CANCELED'),
+ null,
+ (int) $orderDetail->id_order
+ );
- if ($delete) {
- $orderDetail->delete();
- }
- } else {
- throw new OrderException('This product cannot be re-stocked.');
+ if ($delete) {
+ $orderDetail->delete();
}
}
diff --git a/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php b/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php
index 7ccce7243b32a..27e6b13ab972a 100644
--- a/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php
+++ b/src/Adapter/Order/QueryHandler/GetOrderForViewingHandler.php
@@ -50,6 +50,7 @@
use PrestaShop\PrestaShop\Adapter\Customer\CustomerDataProvider;
use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
use PrestaShop\PrestaShop\Core\Address\AddressFormatterInterface;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Address\ValueObject\AddressId;
use PrestaShop\PrestaShop\Core\Domain\Exception\InvalidSortingException;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
@@ -97,6 +98,7 @@
*
* @internal
*/
+#[AsQueryHandler]
final class GetOrderForViewingHandler extends AbstractOrderHandler implements GetOrderForViewingHandlerInterface
{
/**
@@ -533,7 +535,8 @@ private function getOrderShipping(Order $order): OrderShippingForViewing
if ($carrier->is_module) {
$module = Module::getInstanceByName($carrier->external_module_name);
- if (method_exists($module, 'displayInfoByCart')) {
+ // We need to check if this module is still installed and if it implements the method
+ if (Validate::isLoadedObject($module) && method_exists($module, 'displayInfoByCart')) {
$carrierModuleInfo = $module->displayInfoByCart($order->id_cart);
}
}
@@ -541,9 +544,13 @@ private function getOrderShipping(Order $order): OrderShippingForViewing
if (!$order->isVirtual()) {
foreach ($shipping as $item) {
if ($taxCalculationMethod == PS_TAX_INC) {
- $price = Tools::displayPrice($item['shipping_cost_tax_incl'], $currency);
+ $price = $item['shipping_cost_tax_incl']
+ ? $this->locale->formatPrice($item['shipping_cost_tax_incl'], $currency->iso_code)
+ : $item['shipping_cost_tax_incl'];
} else {
- $price = Tools::displayPrice($item['shipping_cost_tax_excl'], $currency);
+ $price = $item['shipping_cost_tax_excl']
+ ? $this->locale->formatPrice($item['shipping_cost_tax_excl'], $currency->iso_code)
+ : $item['shipping_cost_tax_excl'];
}
$trackingUrl = null;
@@ -766,13 +773,13 @@ private function getOrderPrices(Order $order): OrderPricesForViewing
new DecimalNumber((string) $shippingRefundable),
new DecimalNumber((string) $taxesAmount),
new DecimalNumber((string) $totalAmount),
- Tools::displayPrice($productsPrice, $currency),
- Tools::displayPrice($discountsAmount, $currency),
- Tools::displayPrice($wrappingPrice, $currency),
- Tools::displayPrice($shippingPrice, $currency),
- Tools::displayPrice($shippingRefundable, $currency),
- Tools::displayPrice($taxesAmount, $currency),
- Tools::displayPrice($totalAmount, $currency)
+ $this->locale->formatPrice($productsPrice, $currency->iso_code),
+ $this->locale->formatPrice($discountsAmount, $currency->iso_code),
+ $this->locale->formatPrice($wrappingPrice, $currency->iso_code),
+ $this->locale->formatPrice($shippingPrice, $currency->iso_code),
+ $this->locale->formatPrice($shippingRefundable, $currency->iso_code),
+ $this->locale->formatPrice($taxesAmount, $currency->iso_code),
+ $this->locale->formatPrice($totalAmount, $currency->iso_code)
);
}
@@ -796,7 +803,7 @@ private function getOrderDiscounts(Order $order): OrderDiscountsForViewing
(int) $discount['id_order_cart_rule'],
$discount['name'],
new DecimalNumber((string) $discountAmount),
- Tools::displayPrice($discountAmount, $currency)
+ $this->locale->formatPrice($discountAmount, $currency->iso_code)
);
}
diff --git a/src/Adapter/Order/QueryHandler/GetOrderPreviewHandler.php b/src/Adapter/Order/QueryHandler/GetOrderPreviewHandler.php
index 9d600c74f14dc..0a1b0aad468b5 100644
--- a/src/Adapter/Order/QueryHandler/GetOrderPreviewHandler.php
+++ b/src/Adapter/Order/QueryHandler/GetOrderPreviewHandler.php
@@ -37,6 +37,7 @@
use PrestaShop\PrestaShop\Adapter\Address\AddressFormatter;
use PrestaShop\PrestaShop\Adapter\Entity\Address;
use PrestaShop\PrestaShop\Core\Address\AddressFormatterInterface;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Address\ValueObject\AddressId;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderPreview;
@@ -55,6 +56,7 @@
/**
* Handles GetOrderPreview query using legacy object model
*/
+#[AsQueryHandler]
final class GetOrderPreviewHandler implements GetOrderPreviewHandlerInterface
{
/**
diff --git a/src/Adapter/Order/QueryHandler/GetOrderProductsForViewingHandler.php b/src/Adapter/Order/QueryHandler/GetOrderProductsForViewingHandler.php
index 9775b9b86031c..b6543259c1e89 100644
--- a/src/Adapter/Order/QueryHandler/GetOrderProductsForViewingHandler.php
+++ b/src/Adapter/Order/QueryHandler/GetOrderProductsForViewingHandler.php
@@ -37,6 +37,7 @@
use Pack;
use PrestaShop\Decimal\DecimalNumber;
use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderProductsForViewing;
use PrestaShop\PrestaShop\Core\Domain\Order\QueryHandler\GetOrderProductsForViewingHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Order\QueryResult\OrderProductCustomizationForViewing;
@@ -50,12 +51,11 @@
use Product;
use Shop;
use StockAvailable;
-use Warehouse;
-use WarehouseProductLocation;
/**
* Handles GetOrderProductsForViewing query using legacy object models
*/
+#[AsQueryHandler]
final class GetOrderProductsForViewingHandler extends AbstractOrderHandler implements GetOrderProductsForViewingHandlerInterface
{
/**
@@ -138,20 +138,6 @@ public function handle(GetOrderProductsForViewing $query): OrderProductsForViewi
$product['refund_history'] = OrderSlip::getProductSlipDetail($product['id_order_detail']);
$product['return_history'] = OrderReturn::getProductReturnDetail($product['id_order_detail']);
- if ($product['id_warehouse'] != 0) {
- $warehouse = new Warehouse((int) $product['id_warehouse']);
- $product['warehouse_name'] = $warehouse->name;
- $warehouse_location = WarehouseProductLocation::getProductLocation($product['product_id'], $product['product_attribute_id'], $product['id_warehouse']);
- if (!empty($warehouse_location)) {
- $product['warehouse_location'] = $warehouse_location;
- } else {
- $product['warehouse_location'] = false;
- }
- } else {
- $product['warehouse_name'] = '--';
- $product['warehouse_location'] = false;
- }
-
$pack_items = $product['cache_is_pack'] ? Pack::getItemTable($product['id_product'], $this->contextLanguageId, true) : [];
foreach ($pack_items as &$pack_item) {
$pack_item['current_stock'] = StockAvailable::getQuantityAvailableByProduct($pack_item['id_product'], $pack_item['id_product_attribute'], $pack_item['id_shop']);
diff --git a/src/Adapter/Order/Refund/OrderProductRemover.php b/src/Adapter/Order/Refund/OrderProductRemover.php
index 4d86a5735e211..40121a4d85ff1 100644
--- a/src/Adapter/Order/Refund/OrderProductRemover.php
+++ b/src/Adapter/Order/Refund/OrderProductRemover.php
@@ -61,6 +61,7 @@ public function deleteProductFromOrder(
): CartProductsComparator {
$cart = new Cart($order->id_cart);
+ $this->removeSpecificProductCartRules($order, $orderDetail);
// Important to remove order cart rule before the product is removed, so that cart rule can detect if it's applied on it
$this->deleteOrderCartRule($order, $orderDetail, $cart);
@@ -231,4 +232,35 @@ private function deleteSpecificPrice(
$specificPrice->delete();
}
}
+
+ /**
+ * This method removes cart rules which was applied to specific product when that product is being deleted.
+ *
+ * @param Order $order
+ * @param OrderDetail $orderDetail
+ *
+ * @return void
+ */
+ private function removeSpecificProductCartRules(
+ Order $order,
+ OrderDetail $orderDetail
+ ): void {
+ foreach ($order->getCartRules() as $orderCartRule) {
+ $cartRuleId = (int) $orderCartRule['id_cart_rule'];
+ $cartRule = new CartRule($cartRuleId);
+
+ if ($cartRuleId === (int) $cartRule->id && (int) $cartRule->reduction_product !== (int) $orderDetail->product_id) {
+ continue;
+ }
+
+ $orderCartRuleId = (int) $orderCartRule['id_order_cart_rule'];
+ $orderCartRuleObj = new OrderCartRule($orderCartRuleId);
+ if ((int) $orderCartRuleObj->id !== $orderCartRuleId) {
+ continue;
+ }
+
+ $orderCartRuleObj->deleted = true;
+ $orderCartRuleObj->save();
+ }
+ }
}
diff --git a/src/Adapter/Order/Refund/OrderSlipCreator.php b/src/Adapter/Order/Refund/OrderSlipCreator.php
index da8367a6cada5..f06d0c71e69df 100644
--- a/src/Adapter/Order/Refund/OrderSlipCreator.php
+++ b/src/Adapter/Order/Refund/OrderSlipCreator.php
@@ -42,7 +42,6 @@
use PrestaShop\PrestaShop\Core\Domain\Order\VoucherRefundType;
use PrestaShopDatabaseException;
use PrestaShopException;
-use StockAvailable;
use Symfony\Contracts\Translation\TranslatorInterface;
use TaxCalculator;
use TaxManagerFactory;
@@ -104,6 +103,8 @@ public function create(
}
$fullQuantityList = array_map(function ($orderDetail) { return $orderDetail['quantity']; }, $orderRefundSummary->getProductRefunds());
+
+ // Hook called only for the shop concerned
Hook::exec('actionOrderSlipAdd', [
'order' => $order,
'productList' => $orderRefundSummary->getProductRefunds(),
@@ -144,13 +145,6 @@ public function create(
true,
(int) $order->id_shop
);
-
- /** @var OrderDetail $orderDetail */
- foreach ($orderRefundSummary->getOrderDetails() as $orderDetail) {
- if ($this->configuration->get('PS_ADVANCED_STOCK_MANAGEMENT')) {
- StockAvailable::synchronize($orderDetail->product_id);
- }
- }
} else {
throw new InvalidCancelProductException(InvalidCancelProductException::INVALID_AMOUNT);
}
diff --git a/src/Adapter/OrderMessage/CommandHandler/AddOrderMessageHandler.php b/src/Adapter/OrderMessage/CommandHandler/AddOrderMessageHandler.php
index 3139cfd05e66b..45702ad350654 100644
--- a/src/Adapter/OrderMessage/CommandHandler/AddOrderMessageHandler.php
+++ b/src/Adapter/OrderMessage/CommandHandler/AddOrderMessageHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler;
use OrderMessage;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\AddOrderMessageCommand;
use PrestaShop\PrestaShop\Core\Domain\OrderMessage\CommandHandler\AddOrderMessageHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\OrderMessage\Exception\OrderMessageException;
@@ -39,6 +40,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class AddOrderMessageHandler implements AddOrderMessageHandlerInterface
{
/**
diff --git a/src/Adapter/OrderMessage/CommandHandler/BulkDeleteOrderMessageHandler.php b/src/Adapter/OrderMessage/CommandHandler/BulkDeleteOrderMessageHandler.php
index cd9b22a6c9574..1360ebcaa7b14 100644
--- a/src/Adapter/OrderMessage/CommandHandler/BulkDeleteOrderMessageHandler.php
+++ b/src/Adapter/OrderMessage/CommandHandler/BulkDeleteOrderMessageHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler;
use PrestaShop\PrestaShop\Adapter\OrderMessage\AbstractOrderMessageHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\BulkDeleteOrderMessageCommand;
use PrestaShop\PrestaShop\Core\Domain\OrderMessage\CommandHandler\BulkDeleteOrderMessageHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\OrderMessage\Exception\OrderMessageException;
@@ -37,6 +38,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class BulkDeleteOrderMessageHandler extends AbstractOrderMessageHandler implements BulkDeleteOrderMessageHandlerInterface
{
/**
diff --git a/src/Adapter/OrderMessage/CommandHandler/DeleteOrderMessageHandler.php b/src/Adapter/OrderMessage/CommandHandler/DeleteOrderMessageHandler.php
index 2ed4e5389bbd9..4b42775cb5696 100644
--- a/src/Adapter/OrderMessage/CommandHandler/DeleteOrderMessageHandler.php
+++ b/src/Adapter/OrderMessage/CommandHandler/DeleteOrderMessageHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler;
use PrestaShop\PrestaShop\Adapter\OrderMessage\AbstractOrderMessageHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\DeleteOrderMessageCommand;
use PrestaShop\PrestaShop\Core\Domain\OrderMessage\CommandHandler\DeleteOrderMessageHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\OrderMessage\Exception\OrderMessageException;
@@ -37,6 +38,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class DeleteOrderMessageHandler extends AbstractOrderMessageHandler implements DeleteOrderMessageHandlerInterface
{
/**
diff --git a/src/Adapter/OrderMessage/CommandHandler/EditOrderMessageHandler.php b/src/Adapter/OrderMessage/CommandHandler/EditOrderMessageHandler.php
index af98153157410..7cc6310452139 100644
--- a/src/Adapter/OrderMessage/CommandHandler/EditOrderMessageHandler.php
+++ b/src/Adapter/OrderMessage/CommandHandler/EditOrderMessageHandler.php
@@ -28,6 +28,7 @@
use OrderMessage;
use PrestaShop\PrestaShop\Adapter\OrderMessage\AbstractOrderMessageHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\EditOrderMessageCommand;
use PrestaShop\PrestaShop\Core\Domain\OrderMessage\CommandHandler\EditOrderMessageHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\OrderMessage\Exception\OrderMessageException;
@@ -39,6 +40,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class EditOrderMessageHandler extends AbstractOrderMessageHandler implements EditOrderMessageHandlerInterface
{
/**
diff --git a/src/Adapter/OrderMessage/QueryHandler/GetOrderMessageForEditingHandler.php b/src/Adapter/OrderMessage/QueryHandler/GetOrderMessageForEditingHandler.php
index 99936fff23139..a92bce4f3f047 100644
--- a/src/Adapter/OrderMessage/QueryHandler/GetOrderMessageForEditingHandler.php
+++ b/src/Adapter/OrderMessage/QueryHandler/GetOrderMessageForEditingHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\OrderMessage\QueryHandler;
use PrestaShop\PrestaShop\Adapter\OrderMessage\AbstractOrderMessageHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\OrderMessage\Query\GetOrderMessageForEditing;
use PrestaShop\PrestaShop\Core\Domain\OrderMessage\QueryHandler\GetOrderMessageForEditingHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\OrderMessage\QueryResult\EditableOrderMessage;
@@ -36,6 +37,7 @@
*
* @internal
*/
+#[AsQueryHandler]
final class GetOrderMessageForEditingHandler extends AbstractOrderMessageHandler implements GetOrderMessageForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/OrderReturn/CommandHandler/UpdateOrderReturnStateHandler.php b/src/Adapter/OrderReturn/CommandHandler/UpdateOrderReturnStateHandler.php
index bf7663c0b6fae..4f9d621c3c3ed 100644
--- a/src/Adapter/OrderReturn/CommandHandler/UpdateOrderReturnStateHandler.php
+++ b/src/Adapter/OrderReturn/CommandHandler/UpdateOrderReturnStateHandler.php
@@ -31,10 +31,12 @@
use OrderReturn;
use PrestaShop\PrestaShop\Adapter\OrderReturn\Repository\OrderReturnRepository;
use PrestaShop\PrestaShop\Adapter\OrderReturnState\Repository\OrderReturnStateRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\OrderReturn\Command\UpdateOrderReturnStateCommand;
use PrestaShop\PrestaShop\Core\Domain\OrderReturn\CommandHandler\UpdateOrderReturnStateHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\OrderReturn\Exception\OrderReturnException;
+#[AsCommandHandler]
class UpdateOrderReturnStateHandler implements UpdateOrderReturnStateHandlerInterface
{
/**
diff --git a/src/Adapter/OrderReturn/QueryHandler/GetOrderReturnForEditingHandler.php b/src/Adapter/OrderReturn/QueryHandler/GetOrderReturnForEditingHandler.php
index abc997bef2b7f..c83711a308485 100644
--- a/src/Adapter/OrderReturn/QueryHandler/GetOrderReturnForEditingHandler.php
+++ b/src/Adapter/OrderReturn/QueryHandler/GetOrderReturnForEditingHandler.php
@@ -32,6 +32,7 @@
use PrestaShop\PrestaShop\Adapter\Customer\Repository\CustomerRepository;
use PrestaShop\PrestaShop\Adapter\Order\Repository\OrderRepository;
use PrestaShop\PrestaShop\Adapter\OrderReturn\Repository\OrderReturnRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Customer\ValueObject\CustomerId;
use PrestaShop\PrestaShop\Core\Domain\Order\ValueObject\OrderId;
use PrestaShop\PrestaShop\Core\Domain\OrderReturn\Query\GetOrderReturnForEditing;
@@ -41,6 +42,7 @@
/**
* Handles query which gets order return for editing
*/
+#[AsQueryHandler]
class GetOrderReturnForEditingHandler implements GetOrderReturnForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/OrderReturnState/CommandHandler/AddOrderReturnStateHandler.php b/src/Adapter/OrderReturnState/CommandHandler/AddOrderReturnStateHandler.php
index 26a3624e89abe..a6bcfbcb1641d 100644
--- a/src/Adapter/OrderReturnState/CommandHandler/AddOrderReturnStateHandler.php
+++ b/src/Adapter/OrderReturnState/CommandHandler/AddOrderReturnStateHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler;
use OrderReturnState;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\AddOrderReturnStateCommand;
use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\CommandHandler\AddOrderReturnStateHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Exception\OrderReturnStateException;
@@ -38,6 +39,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class AddOrderReturnStateHandler extends AbstractOrderReturnStateHandler implements AddOrderReturnStateHandlerInterface
{
/**
diff --git a/src/Adapter/OrderReturnState/CommandHandler/BulkDeleteOrderReturnStateHandler.php b/src/Adapter/OrderReturnState/CommandHandler/BulkDeleteOrderReturnStateHandler.php
index 6121d18d59195..958d58f1dff94 100644
--- a/src/Adapter/OrderReturnState/CommandHandler/BulkDeleteOrderReturnStateHandler.php
+++ b/src/Adapter/OrderReturnState/CommandHandler/BulkDeleteOrderReturnStateHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\BulkDeleteOrderReturnStateCommand;
use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\CommandHandler\BulkDeleteOrderReturnStateHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Exception\BulkDeleteOrderReturnStateException;
@@ -36,6 +37,7 @@
/**
* Handles command which deletes OrderReturnStates in bulk action
*/
+#[AsCommandHandler]
class BulkDeleteOrderReturnStateHandler extends AbstractOrderReturnStateHandler implements BulkDeleteOrderReturnStateHandlerInterface
{
/**
diff --git a/src/Adapter/OrderReturnState/CommandHandler/DeleteOrderReturnStateHandler.php b/src/Adapter/OrderReturnState/CommandHandler/DeleteOrderReturnStateHandler.php
index 4b09453addcc9..6071d578a1b66 100644
--- a/src/Adapter/OrderReturnState/CommandHandler/DeleteOrderReturnStateHandler.php
+++ b/src/Adapter/OrderReturnState/CommandHandler/DeleteOrderReturnStateHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\DeleteOrderReturnStateCommand;
use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\CommandHandler\DeleteOrderReturnStateHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Exception\DeleteOrderReturnStateException;
@@ -35,6 +36,7 @@
/**
* Handles command which deletes order states
*/
+#[AsCommandHandler]
class DeleteOrderReturnStateHandler extends AbstractOrderReturnStateHandler implements DeleteOrderReturnStateHandlerInterface
{
/**
diff --git a/src/Adapter/OrderReturnState/CommandHandler/EditOrderReturnStateHandler.php b/src/Adapter/OrderReturnState/CommandHandler/EditOrderReturnStateHandler.php
index fc9b66e333de6..b9b69e1ac44af 100644
--- a/src/Adapter/OrderReturnState/CommandHandler/EditOrderReturnStateHandler.php
+++ b/src/Adapter/OrderReturnState/CommandHandler/EditOrderReturnStateHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler;
use OrderReturnState;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\EditOrderReturnStateCommand;
use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\CommandHandler\EditOrderReturnStateHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Exception\OrderReturnStateException;
@@ -37,6 +38,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class EditOrderReturnStateHandler extends AbstractOrderReturnStateHandler implements EditOrderReturnStateHandlerInterface
{
/**
diff --git a/src/Adapter/OrderReturnState/QueryHandler/GetOrderReturnStateForEditingHandler.php b/src/Adapter/OrderReturnState/QueryHandler/GetOrderReturnStateForEditingHandler.php
index cc31493f9bcc3..45d1f81e53423 100644
--- a/src/Adapter/OrderReturnState/QueryHandler/GetOrderReturnStateForEditingHandler.php
+++ b/src/Adapter/OrderReturnState/QueryHandler/GetOrderReturnStateForEditingHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\OrderReturnState\QueryHandler;
use OrderReturnState;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Exception\OrderReturnStateNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Query\GetOrderReturnStateForEditing;
use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\QueryHandler\GetOrderReturnStateForEditingHandlerInterface;
@@ -38,6 +39,7 @@
*
* @internal
*/
+#[AsQueryHandler]
final class GetOrderReturnStateForEditingHandler implements GetOrderReturnStateForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/OrderState/CommandHandler/AddOrderStateHandler.php b/src/Adapter/OrderState/CommandHandler/AddOrderStateHandler.php
index e1e1718ca569a..aa10fb256a0ab 100644
--- a/src/Adapter/OrderState/CommandHandler/AddOrderStateHandler.php
+++ b/src/Adapter/OrderState/CommandHandler/AddOrderStateHandler.php
@@ -28,9 +28,11 @@
namespace PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler;
use OrderState;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\OrderState\Command\AddOrderStateCommand;
use PrestaShop\PrestaShop\Core\Domain\OrderState\CommandHandler\AddOrderStateHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\OrderState\Exception\OrderStateException;
+use PrestaShop\PrestaShop\Core\Domain\OrderState\OrderStateFileUploaderInterface;
use PrestaShop\PrestaShop\Core\Domain\OrderState\ValueObject\OrderStateId;
/**
@@ -38,8 +40,22 @@
*
* @internal
*/
+#[AsCommandHandler]
final class AddOrderStateHandler extends AbstractOrderStateHandler implements AddOrderStateHandlerInterface
{
+ /**
+ * @var OrderStateFileUploaderInterface
+ */
+ protected $fileUploader;
+
+ /**
+ * @param OrderStateFileUploaderInterface $fileUploader
+ */
+ public function __construct(OrderStateFileUploaderInterface $fileUploader)
+ {
+ $this->fileUploader = $fileUploader;
+ }
+
/**
* {@inheritdoc}
*/
@@ -55,6 +71,9 @@ public function handle(AddOrderStateCommand $command)
}
$orderState->add();
+ if ($command->getFilePathName()) {
+ $this->fileUploader->upload($command->getFilePathName(), (int) $orderState->id, $command->getFileSize());
+ }
return new OrderStateId((int) $orderState->id);
}
@@ -72,6 +91,8 @@ private function fillOrderStateWithCommandData(OrderState $orderState, AddOrderS
$orderState->shipped = $command->isShipped();
$orderState->paid = $command->isPaid();
$orderState->delivery = $command->isDelivery();
- $orderState->template = $command->getLocalizedTemplates();
+ if ($command->isSendEmailEnabled()) {
+ $orderState->template = $command->getLocalizedTemplates();
+ }
}
}
diff --git a/src/Adapter/OrderState/CommandHandler/BulkDeleteOrderStateHandler.php b/src/Adapter/OrderState/CommandHandler/BulkDeleteOrderStateHandler.php
index cabcd351c6349..1cb4dbbeac45c 100644
--- a/src/Adapter/OrderState/CommandHandler/BulkDeleteOrderStateHandler.php
+++ b/src/Adapter/OrderState/CommandHandler/BulkDeleteOrderStateHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\OrderState\Command\BulkDeleteOrderStateCommand;
use PrestaShop\PrestaShop\Core\Domain\OrderState\CommandHandler\BulkDeleteOrderStateHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\OrderState\Exception\BulkDeleteOrderStateException;
@@ -36,6 +37,7 @@
/**
* Handles command which deletes OrderStatees in bulk action
*/
+#[AsCommandHandler]
class BulkDeleteOrderStateHandler extends AbstractOrderStateHandler implements BulkDeleteOrderStateHandlerInterface
{
/**
diff --git a/src/Adapter/OrderState/CommandHandler/DeleteOrderStateHandler.php b/src/Adapter/OrderState/CommandHandler/DeleteOrderStateHandler.php
index e887718e5bbd8..c1f51bdcb16c2 100644
--- a/src/Adapter/OrderState/CommandHandler/DeleteOrderStateHandler.php
+++ b/src/Adapter/OrderState/CommandHandler/DeleteOrderStateHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\OrderState\Command\DeleteOrderStateCommand;
use PrestaShop\PrestaShop\Core\Domain\OrderState\CommandHandler\DeleteOrderStateHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\OrderState\Exception\DeleteOrderStateException;
@@ -35,6 +36,7 @@
/**
* Handles command which deletes order states
*/
+#[AsCommandHandler]
class DeleteOrderStateHandler extends AbstractOrderStateHandler implements DeleteOrderStateHandlerInterface
{
/**
diff --git a/src/Adapter/OrderState/CommandHandler/EditOrderStateHandler.php b/src/Adapter/OrderState/CommandHandler/EditOrderStateHandler.php
index 6d4cd61385f98..4f94c8dfb052c 100644
--- a/src/Adapter/OrderState/CommandHandler/EditOrderStateHandler.php
+++ b/src/Adapter/OrderState/CommandHandler/EditOrderStateHandler.php
@@ -28,18 +28,34 @@
namespace PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler;
use OrderState;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\OrderState\Command\EditOrderStateCommand;
use PrestaShop\PrestaShop\Core\Domain\OrderState\CommandHandler\EditOrderStateHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\OrderState\Exception\MissingOrderStateRequiredFieldsException;
use PrestaShop\PrestaShop\Core\Domain\OrderState\Exception\OrderStateException;
+use PrestaShop\PrestaShop\Core\Domain\OrderState\OrderStateFileUploaderInterface;
/**
* Handles commands which edits given order state with provided data.
*
* @internal
*/
+#[AsCommandHandler]
final class EditOrderStateHandler extends AbstractOrderStateHandler implements EditOrderStateHandlerInterface
{
+ /**
+ * @var OrderStateFileUploaderInterface
+ */
+ protected $fileUploader;
+
+ /**
+ * @param OrderStateFileUploaderInterface $fileUploader
+ */
+ public function __construct(OrderStateFileUploaderInterface $fileUploader)
+ {
+ $this->fileUploader = $fileUploader;
+ }
+
/**
* {@inheritdoc}
*/
@@ -61,6 +77,10 @@ public function handle(EditOrderStateCommand $command)
if (false === $orderState->update()) {
throw new OrderStateException('Failed to update order state');
}
+
+ if ($command->getFilePathName()) {
+ $this->fileUploader->upload($command->getFilePathName(), $orderStateId->getValue(), $command->getFileSize());
+ }
}
/**
@@ -107,6 +127,10 @@ private function updateOrderStateWithCommandData(OrderState $orderState, EditOrd
if (null !== $command->isSendEmailEnabled()) {
$orderState->send_email = $command->isSendEmailEnabled();
+
+ if ($orderState->send_email && null !== $command->getTemplate()) {
+ $orderState->template = $command->getTemplate();
+ }
}
if (null !== $command->isPdfInvoice()) {
@@ -128,9 +152,5 @@ private function updateOrderStateWithCommandData(OrderState $orderState, EditOrd
if (null !== $command->isDelivery()) {
$orderState->delivery = $command->isDelivery();
}
-
- if (null !== $command->getTemplate()) {
- $orderState->template = $command->getTemplate();
- }
}
}
diff --git a/src/Adapter/OrderState/QueryHandler/GetOrderStateForEditingHandler.php b/src/Adapter/OrderState/QueryHandler/GetOrderStateForEditingHandler.php
index 7891e7299aed2..5863e0bdaa4d3 100644
--- a/src/Adapter/OrderState/QueryHandler/GetOrderStateForEditingHandler.php
+++ b/src/Adapter/OrderState/QueryHandler/GetOrderStateForEditingHandler.php
@@ -28,16 +28,19 @@
namespace PrestaShop\PrestaShop\Adapter\OrderState\QueryHandler;
use OrderState;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\OrderState\Exception\OrderStateNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\OrderState\Query\GetOrderStateForEditing;
use PrestaShop\PrestaShop\Core\Domain\OrderState\QueryHandler\GetOrderStateForEditingHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\OrderState\QueryResult\EditableOrderState;
+use SplFileInfo;
/**
* Handles command that gets orderState for editing
*
* @internal
*/
+#[AsQueryHandler]
final class GetOrderStateForEditingHandler implements GetOrderStateForEditingHandlerInterface
{
/**
@@ -52,9 +55,13 @@ public function handle(GetOrderStateForEditing $query)
throw new OrderStateNotFoundException($orderStateId, sprintf('OrderState with id "%s" was not found', $orderStateId->getValue()));
}
+ $filePath = _PS_ORDER_STATE_IMG_DIR_ . $orderState->id . '.gif';
+ $file = file_exists($filePath) ? new SplFileInfo($filePath) : null;
+
return new EditableOrderState(
$orderStateId,
$orderState->name,
+ $file,
$orderState->color,
(bool) $orderState->logable,
(bool) $orderState->invoice,
diff --git a/src/Adapter/PDF/DeliverySlipPdfGenerator.php b/src/Adapter/PDF/DeliverySlipPdfGenerator.php
index 179e87c35f908..89a1e6ad18b78 100644
--- a/src/Adapter/PDF/DeliverySlipPdfGenerator.php
+++ b/src/Adapter/PDF/DeliverySlipPdfGenerator.php
@@ -61,7 +61,7 @@ public function __construct(TranslatorInterface $translator)
public function generatePDF(array $orderId)
{
if (count($orderId) !== 1) {
- throw new CoreException(sprintf('"%s" supports generating delivery slip for single order only.', get_class($this)));
+ throw new CoreException(sprintf('"%s" supports generating delivery slip for single order only.', self::class));
}
$orderId = reset($orderId);
diff --git a/src/Adapter/PDF/InvoicePdfGenerator.php b/src/Adapter/PDF/InvoicePdfGenerator.php
index d90d16603efcc..5757e04814ce2 100644
--- a/src/Adapter/PDF/InvoicePdfGenerator.php
+++ b/src/Adapter/PDF/InvoicePdfGenerator.php
@@ -48,7 +48,7 @@ final class InvoicePdfGenerator implements PDFGeneratorInterface
public function generatePDF(array $invoiceId): void
{
if (count($invoiceId) !== 1) {
- throw new CoreException(sprintf('"%s" supports generating PDF for single invoice only.', get_class($this)));
+ throw new CoreException(sprintf('"%s" supports generating PDF for single invoice only.', self::class));
}
$invoiceId = reset($invoiceId);
diff --git a/src/Adapter/PDF/OrderInvoicePdfGenerator.php b/src/Adapter/PDF/OrderInvoicePdfGenerator.php
index be353338b8df6..5a8169c2c7bcd 100644
--- a/src/Adapter/PDF/OrderInvoicePdfGenerator.php
+++ b/src/Adapter/PDF/OrderInvoicePdfGenerator.php
@@ -60,7 +60,7 @@ public function __construct(TranslatorInterface $translator)
public function generatePDF(array $orderId)
{
if (count($orderId) !== 1) {
- throw new CoreException(sprintf('"%s" supports generating invoice for single order only.', get_class($this)));
+ throw new CoreException(sprintf('"%s" supports generating invoice for single order only.', self::class));
}
$orderId = reset($orderId);
diff --git a/src/Adapter/Preferences/PreferencesConfiguration.php b/src/Adapter/Preferences/PreferencesConfiguration.php
index e35f551184ec1..94de452fd324e 100644
--- a/src/Adapter/Preferences/PreferencesConfiguration.php
+++ b/src/Adapter/Preferences/PreferencesConfiguration.php
@@ -63,7 +63,6 @@ public function getConfiguration()
'display_manufacturers' => $this->configuration->getBoolean('PS_DISPLAY_MANUFACTURERS'),
'display_best_sellers' => $this->configuration->getBoolean('PS_DISPLAY_BEST_SELLERS'),
'multishop_feature_active' => $this->configuration->getBoolean('PS_MULTISHOP_FEATURE_ACTIVE'),
- 'shop_activity' => $this->configuration->get('PS_SHOP_ACTIVITY'),
];
}
@@ -105,7 +104,6 @@ public function updateConfiguration(array $configuration)
$this->configuration->set('PS_DISPLAY_MANUFACTURERS', $configuration['display_manufacturers']);
$this->configuration->set('PS_DISPLAY_BEST_SELLERS', $configuration['display_best_sellers']);
$this->configuration->set('PS_MULTISHOP_FEATURE_ACTIVE', $configuration['multishop_feature_active']);
- $this->configuration->set('PS_SHOP_ACTIVITY', $configuration['shop_activity']);
return [];
}
diff --git a/src/Adapter/Presenter/AbstractLazyArray.php b/src/Adapter/Presenter/AbstractLazyArray.php
index 0d6eb94cdc8d8..882eda2ede36c 100644
--- a/src/Adapter/Presenter/AbstractLazyArray.php
+++ b/src/Adapter/Presenter/AbstractLazyArray.php
@@ -89,11 +89,11 @@ abstract class AbstractLazyArray implements Iterator, ArrayAccess, Countable, Js
public function __construct()
{
$this->arrayAccessList = new ArrayObject();
- $reflectionClass = new ReflectionClass(get_class($this));
+ $reflectionClass = new ReflectionClass(static::class);
$methods = $reflectionClass->getMethods(ReflectionMethod::IS_PUBLIC);
foreach ($methods as $method) {
$methodDoc = $method->getDocComment();
- if (strpos($methodDoc, '@arrayAccess') !== false) {
+ if (str_contains($methodDoc, '@arrayAccess')) {
$this->arrayAccessList->offsetSet(
$this->convertMethodNameToIndex($method->getName()),
[
@@ -394,7 +394,7 @@ public function offsetSet($offset, $value, $force = false): void
if (!$force && $this->arrayAccessList->offsetExists($offset)) {
$result = $this->arrayAccessList->offsetGet($offset);
if ($result['type'] !== 'variable') {
- throw new RuntimeException('Trying to set the index ' . print_r($offset, true) . ' of the LazyArray ' . get_class($this) . ' already defined by a method is not allowed');
+ throw new RuntimeException('Trying to set the index ' . print_r($offset, true) . ' of the LazyArray ' . static::class . ' already defined by a method is not allowed');
}
}
$this->arrayAccessList->offsetSet($offset, [
@@ -415,7 +415,7 @@ public function offsetUnset($offset, $force = false): void
if ($force || $result['type'] === 'variable') {
$this->arrayAccessList->offsetUnset($offset);
} else {
- throw new RuntimeException('Trying to unset the index ' . print_r($offset, true) . ' of the LazyArray ' . get_class($this) . ' already defined by a method is not allowed');
+ throw new RuntimeException('Trying to unset the index ' . print_r($offset, true) . ' of the LazyArray ' . static::class . ' already defined by a method is not allowed');
}
}
diff --git a/src/Adapter/Presenter/Cart/CartPresenter.php b/src/Adapter/Presenter/Cart/CartPresenter.php
index 446968dd03494..040475ad7761c 100644
--- a/src/Adapter/Presenter/Cart/CartPresenter.php
+++ b/src/Adapter/Presenter/Cart/CartPresenter.php
@@ -152,13 +152,14 @@ private function presentProduct(array $rawProduct)
}
}
+ $rawProduct['price'] = Tools::ps_round($rawProduct['price'], Context::getContext()->getComputingPrecision());
+ $rawProduct['price_wt'] = Tools::ps_round($rawProduct['price_wt'], Context::getContext()->getComputingPrecision());
+
if ($this->includeTaxes()) {
- $rawProduct['price_amount'] = $rawProduct['price_wt'];
- $rawProduct['price'] = $this->priceFormatter->format($rawProduct['price_wt']);
+ $rawProduct['price_amount'] = $rawProduct['price'] = $rawProduct['price_wt'];
$rawProduct['unit_price'] = $rawProduct['unit_price_tax_included'];
} else {
- $rawProduct['price_amount'] = $rawProduct['price'];
- $rawProduct['price'] = $rawProduct['price_tax_exc'] = $this->priceFormatter->format($rawProduct['price']);
+ $rawProduct['price_amount'] = $rawProduct['price_tax_exc'] = $rawProduct['price'];
$rawProduct['unit_price'] = $rawProduct['unit_price_tax_excluded'];
}
@@ -308,22 +309,19 @@ public function addCustomizedData(array $products, Cart $cart)
/**
* @param Cart $cart
- * @param bool $shouldSeparateGifts
- *
- * @return array
*
* @throws \Exception
*/
- public function present($cart, $shouldSeparateGifts = false)
+ public function present($cart, bool $shouldSeparateGifts = false): array
{
- $cache_id = 'presentedCart_' . (int) $shouldSeparateGifts;
+ $cache_id = 'presentedCart_' . (int) $shouldSeparateGifts . $cart->id;
if (Cache::isStored($cache_id)) {
return Cache::retrieve($cache_id);
}
+
if (!is_a($cart, 'Cart')) {
throw new \Exception('CartPresenter can only present instance of Cart');
}
-
if ($shouldSeparateGifts) {
$rawProducts = $cart->getProductsWithSeparatedGifts();
} else {
@@ -680,7 +678,7 @@ protected function getAttributesArrayFromString($attributes)
}
foreach ($matches['attribute'] as $attribute) {
- list($key, $value) = explode(':', $attribute);
+ [$key, $value] = explode(':', $attribute);
$attributesArray[trim($key)] = ltrim($value);
}
diff --git a/src/Adapter/Presenter/Category/CategoryLazyArray.php b/src/Adapter/Presenter/Category/CategoryLazyArray.php
new file mode 100644
index 0000000000000..03a4afab8c854
--- /dev/null
+++ b/src/Adapter/Presenter/Category/CategoryLazyArray.php
@@ -0,0 +1,135 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Presenter\Category;
+
+use Category;
+use Language;
+use Link;
+use PrestaShop\PrestaShop\Adapter\Image\ImageRetriever;
+use PrestaShop\PrestaShop\Adapter\Presenter\AbstractLazyArray;
+
+class CategoryLazyArray extends AbstractLazyArray
+{
+ /**
+ * @var ImageRetriever
+ */
+ private $imageRetriever;
+
+ /**
+ * @var Link
+ */
+ private $link;
+
+ /**
+ * @var array
+ */
+ protected $category;
+
+ /**
+ * @var Language
+ */
+ private $language;
+
+ public function __construct(
+ array $category,
+ Language $language,
+ ImageRetriever $imageRetriever,
+ Link $link
+ ) {
+ $this->category = $category;
+ $this->language = $language;
+ $this->imageRetriever = $imageRetriever;
+ $this->link = $link;
+
+ parent::__construct();
+ $this->appendArray($this->category);
+ }
+
+ /**
+ * @arrayAccess
+ *
+ * @return string
+ */
+ public function getUrl()
+ {
+ return $this->link->getCategoryLink(
+ $this->category['id'],
+ $this->category['link_rewrite']
+ );
+ }
+
+ /**
+ * @arrayAccess
+ *
+ * This method returns standardized category image array created from CATEGORYID.jpg, with one exception.
+ * One thumbnail size - CATEGORYID-small_default.jpg is generated from CATEGORYID_thumb.jpg instead.
+ * This must be resolved in the future.
+ *
+ * @return array|null
+ */
+ public function getImage()
+ {
+ /*
+ * Category is a bit different that other objects. It's image ID is defined by a special id_image property.
+ * When constructing Category object model, this value is a numeric ID if image exists or false if it doesn't.
+ * In case of getSubCategories method, this value is a numeric ID if image exists OR a default "not found" image if it doesn't.
+ */
+ if (empty($this->category['id_image'])) {
+ return null;
+ }
+
+ return $this->imageRetriever->getImage(
+ new Category($this->category['id'], $this->language->getId()),
+ $this->category['id_image']
+ );
+ }
+
+ /**
+ * @arrayAccess
+ *
+ * @return array|null
+ */
+ public function getCover()
+ {
+ return $this->getImage();
+ }
+
+ /**
+ * @todo This should return category thumbnail image (miniatures of CATEGORYID_thumb.jpg) instead,
+ * after support in ImageRetriever is implemented.
+ *
+ * @arrayAccess
+ *
+ * @return array|null
+ */
+ public function getThumbnail()
+ {
+ return $this->getImage();
+ }
+}
diff --git a/src/Adapter/Presenter/Category/CategoryPresenter.php b/src/Adapter/Presenter/Category/CategoryPresenter.php
new file mode 100644
index 0000000000000..7846f21532ec4
--- /dev/null
+++ b/src/Adapter/Presenter/Category/CategoryPresenter.php
@@ -0,0 +1,89 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\Presenter\Category;
+
+use Category;
+use Hook;
+use Language;
+use Link;
+use PrestaShop\PrestaShop\Adapter\Image\ImageRetriever;
+
+class CategoryPresenter
+{
+ /**
+ * @var ImageRetriever
+ */
+ protected $imageRetriever;
+
+ /**
+ * @var Link
+ */
+ protected $link;
+
+ public function __construct(Link $link)
+ {
+ $this->link = $link;
+ $this->imageRetriever = new ImageRetriever($link);
+ }
+
+ /**
+ * @param array|Category $category Category object or an array
+ * @param Language $language
+ *
+ * @return CategoryLazyArray
+ */
+ public function present(array|Category $category, Language $language)
+ {
+ // Convert to array if a Category object was passed
+ if (is_object($category)) {
+ $category = (array) $category;
+ }
+
+ // Normalize IDs
+ if (empty($category['id_category'])) {
+ $category['id_category'] = $category['id'];
+ }
+ if (empty($category['id'])) {
+ $category['id'] = $category['id_category'];
+ }
+
+ $categoryLazyArray = new CategoryLazyArray(
+ $category,
+ $language,
+ $this->imageRetriever,
+ $this->link
+ );
+
+ Hook::exec('actionPresentCategory',
+ ['presentedCategory' => &$categoryLazyArray]
+ );
+
+ return $categoryLazyArray;
+ }
+}
diff --git a/src/Adapter/Presenter/Manufacturer/ManufacturerLazyArray.php b/src/Adapter/Presenter/Manufacturer/ManufacturerLazyArray.php
index 454834fc814c6..35494354d2f13 100644
--- a/src/Adapter/Presenter/Manufacturer/ManufacturerLazyArray.php
+++ b/src/Adapter/Presenter/Manufacturer/ManufacturerLazyArray.php
@@ -66,26 +66,7 @@ public function __construct(
$this->link = $link;
parent::__construct();
- }
-
- /**
- * @arrayAccess
- *
- * @return int
- */
- public function getId()
- {
- return $this->manufacturer['id_manufacturer'];
- }
-
- /**
- * @arrayAccess
- *
- * @return string
- */
- public function getName()
- {
- return $this->manufacturer['name'];
+ $this->appendArray($this->manufacturer);
}
/**
@@ -98,26 +79,6 @@ public function getText()
return $this->manufacturer['short_description'];
}
- /**
- * @arrayAccess
- *
- * @return string
- */
- public function getShortDescription()
- {
- return $this->manufacturer['short_description'];
- }
-
- /**
- * @arrayAccess
- *
- * @return string
- */
- public function getDescription()
- {
- return $this->manufacturer['description'];
- }
-
/**
* @arrayAccess
*
diff --git a/src/Adapter/Presenter/Manufacturer/ManufacturerPresenter.php b/src/Adapter/Presenter/Manufacturer/ManufacturerPresenter.php
index 1a51133e7319c..99c1373e51c42 100644
--- a/src/Adapter/Presenter/Manufacturer/ManufacturerPresenter.php
+++ b/src/Adapter/Presenter/Manufacturer/ManufacturerPresenter.php
@@ -56,7 +56,7 @@ public function __construct(Link $link)
*
* @return ManufacturerLazyArray
*/
- public function present($manufacturer, $language)
+ public function present(array|Manufacturer $manufacturer, Language $language)
{
// Convert to array if a Manufacturer object was passed
if (is_object($manufacturer)) {
diff --git a/src/Adapter/Presenter/Object/ObjectPresenter.php b/src/Adapter/Presenter/Object/ObjectPresenter.php
index cce2bb329032c..a17536b177b5f 100644
--- a/src/Adapter/Presenter/Object/ObjectPresenter.php
+++ b/src/Adapter/Presenter/Object/ObjectPresenter.php
@@ -70,6 +70,7 @@ public function present($object)
private function filterHtmlContent($type, &$presentedObject, $htmlFields)
{
if (!empty($htmlFields) && is_array($htmlFields)) {
+ // Chained hook call - if multiple modules are hooked here, they will receive the result of the previous one as a parameter
$filteredHtml = Hook::exec(
'filterHtmlContent',
[
diff --git a/src/Adapter/Presenter/Product/ProductLazyArray.php b/src/Adapter/Presenter/Product/ProductLazyArray.php
index 5fde96b6924d6..47360c3864695 100644
--- a/src/Adapter/Presenter/Product/ProductLazyArray.php
+++ b/src/Adapter/Presenter/Product/ProductLazyArray.php
@@ -26,6 +26,8 @@
namespace PrestaShop\PrestaShop\Adapter\Presenter\Product;
+use Combination;
+use Context;
use DateTime;
use Language;
use Link;
@@ -365,17 +367,36 @@ public function getReferenceToDisplay()
}
/**
+ * Returns all product features, not grouped yet for performance reasons.
+ *
* @arrayAccess
*
- * @return array|null
+ * @return array
*/
- public function getGroupedFeatures()
+ public function getFeatures()
{
- if ($this->product['features']) {
- return $this->buildGroupedFeatures($this->product['features']);
+ /*
+ * If features were not loaded yet, we will ask for them if needed - usually on product page.
+ * However, if really hunting performance and you know you will need features in listing for bunch of products,
+ * fetch them with one query (in more performant way) and pass them here when constructing this object.
+ */
+ if (!isset($this->product['features'])) {
+ $this->product['features'] = Product::getFrontFeaturesStatic((int) $this->language->id, $this->product['id_product']);
}
- return null;
+ return $this->product['features'];
+ }
+
+ /**
+ * Returns all product feature values nicely grouped by feature name.
+ *
+ * @arrayAccess
+ *
+ * @return array
+ */
+ public function getGroupedFeatures()
+ {
+ return $this->buildGroupedFeatures($this->getFeatures());
}
/**
@@ -490,7 +511,7 @@ public function getFlags()
if ($this->product['new']) {
$flags['new'] = [
'type' => 'new',
- 'label' => $this->translator->trans('New', [], 'Shop.Theme.Catalog'),
+ 'label' => $this->translator->trans('New', [], 'Shop.Theme.Global'),
];
}
@@ -764,20 +785,18 @@ private function addPriceInformation(ProductPresentationSettings $settings, arra
$presNegativeReduction = $negativeReduction->round(2, Rounding::ROUND_HALF_UP);
// TODO: add percent sign according to locale preferences
- $this->product['discount_percentage'] = Tools::displayNumber($presNegativeReduction) . '%';
- $this->product['discount_percentage_absolute'] = Tools::displayNumber($presAbsoluteReduction) . '%';
+ $this->product['discount_percentage'] = Context::getContext()->getCurrentLocale()->formatNumber($presNegativeReduction) . '%';
+ $this->product['discount_percentage_absolute'] = Context::getContext()->getCurrentLocale()->formatNumber($presAbsoluteReduction) . '%';
if ($settings->include_taxes) {
$regular_price = $product['price_without_reduction'];
- $this->product['discount_amount'] = $this->priceFormatter->format(
- $product['reduction']
- );
} else {
$regular_price = $product['price_without_reduction_without_tax'];
- $this->product['discount_amount'] = $this->priceFormatter->format(
- $product['reduction_without_tax']
- );
}
- $this->product['discount_amount_to_display'] = '-' . $this->product['discount_amount'];
+ // We must calculate the real amount of discount.
+ // see @https://github.com/PrestaShop/PrestaShop/issues/32924
+ $product['reduction'] = $regular_price - $price;
+ $this->product['discount_amount'] = $this->priceFormatter->format($product['reduction']);
+ $this->product['discount_amount_to_display'] = '-' . $this->priceFormatter->format($product['reduction']);
}
$this->product['price_amount'] = $price;
@@ -1028,6 +1047,26 @@ public function addQuantityInformation(
}
}
+ /**
+ * Returns extra price associated with current combination, if provided
+ *
+ * @arrayAccess
+ *
+ * @return float
+ */
+ public function getAttributePrice()
+ {
+ if (!isset($this->product['attribute_price'])) {
+ if (!empty($this->product['id_product_attribute'])) {
+ $this->product['attribute_price'] = (float) Combination::getPrice($this->product['id_product_attribute']);
+ } else {
+ $this->product['attribute_price'] = 0;
+ }
+ }
+
+ return (float) $this->product['attribute_price'];
+ }
+
/**
* @param string $key
*
@@ -1058,7 +1097,6 @@ protected function getProductAttributeWhitelist()
'active',
'add_to_cart_url',
'additional_shipping_cost',
- 'advanced_stock_management',
'allow_oosp',
'attachments',
'attribute_price',
diff --git a/src/Adapter/Presenter/Supplier/SupplierLazyArray.php b/src/Adapter/Presenter/Supplier/SupplierLazyArray.php
new file mode 100644
index 0000000000000..cd31d0e7c2cf4
--- /dev/null
+++ b/src/Adapter/Presenter/Supplier/SupplierLazyArray.php
@@ -0,0 +1,111 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Adapter\Presenter\Supplier;
+
+use Language;
+use Link;
+use PrestaShop\PrestaShop\Adapter\Image\ImageRetriever;
+use PrestaShop\PrestaShop\Adapter\Presenter\AbstractLazyArray;
+use Supplier;
+
+class SupplierLazyArray extends AbstractLazyArray
+{
+ /**
+ * @var ImageRetriever
+ */
+ private $imageRetriever;
+
+ /**
+ * @var Link
+ */
+ private $link;
+
+ /**
+ * @var array
+ */
+ protected $supplier;
+
+ /**
+ * @var Language
+ */
+ private $language;
+
+ public function __construct(
+ array $supplier,
+ Language $language,
+ ImageRetriever $imageRetriever,
+ Link $link
+ ) {
+ $this->supplier = $supplier;
+ $this->language = $language;
+ $this->imageRetriever = $imageRetriever;
+ $this->link = $link;
+
+ parent::__construct();
+ $this->appendArray($this->supplier);
+ }
+
+ /**
+ * @arrayAccess
+ *
+ * @return string
+ */
+ public function getUrl()
+ {
+ return $this->link->getSupplierLink($this->supplier['id']);
+ }
+
+ /**
+ * @arrayAccess
+ *
+ * @return array|null
+ */
+ public function getImage()
+ {
+ return $this->imageRetriever->getImage(
+ new Supplier($this->supplier['id'], $this->language->getId()),
+ $this->supplier['id']
+ );
+ }
+
+ /**
+ * @arrayAccess
+ *
+ * @return int
+ */
+ public function getNbProducts()
+ {
+ if (!isset($this->supplier['nb_products'])) {
+ $this->supplier['nb_products'] = count(
+ (new Supplier($this->supplier['id'], $this->language->getId()))
+ ->getProductsLite($this->language->getId())
+ );
+ }
+
+ return $this->supplier['nb_products'];
+ }
+}
diff --git a/src/Adapter/Presenter/Supplier/SupplierPresenter.php b/src/Adapter/Presenter/Supplier/SupplierPresenter.php
new file mode 100644
index 0000000000000..f28bc1a241c55
--- /dev/null
+++ b/src/Adapter/Presenter/Supplier/SupplierPresenter.php
@@ -0,0 +1,87 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Adapter\Presenter\Supplier;
+
+use Hook;
+use Language;
+use Link;
+use PrestaShop\PrestaShop\Adapter\Image\ImageRetriever;
+use Supplier;
+
+class SupplierPresenter
+{
+ /**
+ * @var ImageRetriever
+ */
+ protected $imageRetriever;
+
+ /**
+ * @var Link
+ */
+ protected $link;
+
+ public function __construct(Link $link)
+ {
+ $this->link = $link;
+ $this->imageRetriever = new ImageRetriever($link);
+ }
+
+ /**
+ * @param array|Supplier $supplier Supplier object or an array
+ * @param Language $language
+ *
+ * @return SupplierLazyArray
+ */
+ public function present(array|Supplier $supplier, Language $language)
+ {
+ // Convert to array if a Supplier object was passed
+ if (is_object($supplier)) {
+ $supplier = (array) $supplier;
+ }
+
+ // Normalize IDs
+ if (empty($supplier['id_supplier'])) {
+ $supplier['id_supplier'] = $supplier['id'];
+ }
+ if (empty($supplier['id'])) {
+ $supplier['id'] = $supplier['id_supplier'];
+ }
+
+ $supplierLazyArray = new SupplierLazyArray(
+ $supplier,
+ $language,
+ $this->imageRetriever,
+ $this->link
+ );
+
+ Hook::exec('actionPresentSupplier',
+ ['presentedSupplier' => &$supplierLazyArray]
+ );
+
+ return $supplierLazyArray;
+ }
+}
diff --git a/src/Adapter/Product/AdminProductDataProvider.php b/src/Adapter/Product/AdminProductDataProvider.php
index 4a82f9c4684ed..838cfef7ccee2 100644
--- a/src/Adapter/Product/AdminProductDataProvider.php
+++ b/src/Adapter/Product/AdminProductDataProvider.php
@@ -129,7 +129,7 @@ public function isColumnFiltered()
{
$filters = $this->getPersistedFilterParameters();
foreach ($filters as $filterKey => $filterValue) {
- if (strpos($filterKey, 'filter_column_') === 0 && $filterValue !== '') {
+ if (str_starts_with($filterKey, 'filter_column_') && $filterValue !== '') {
return true; // break at first column filter found
}
}
@@ -218,7 +218,7 @@ public function getCatalogProductList(
$showPositionColumn = $this->isCategoryFiltered();
if ($orderBy == 'position_ordering' && $showPositionColumn) {
foreach ($filterParams as $key => $param) {
- if (strpos($key, 'filter_column_') === 0) {
+ if (str_starts_with($key, 'filter_column_')) {
$filterParams[$key] = '';
}
}
@@ -322,7 +322,7 @@ public function getCatalogProductList(
if (!$filterValue && $filterValue !== '0') {
continue;
}
- if (strpos($filterParam, 'filter_column_') === 0) {
+ if (str_starts_with($filterParam, 'filter_column_')) {
$filterValue = Db::getInstance()->escape($filterValue, in_array($filterParam, [
'filter_column_id_product',
'filter_column_sav_quantity',
diff --git a/src/Adapter/Product/AdminProductDataUpdater.php b/src/Adapter/Product/AdminProductDataUpdater.php
index 0ed3e5958ecea..3576a313b9ec5 100644
--- a/src/Adapter/Product/AdminProductDataUpdater.php
+++ b/src/Adapter/Product/AdminProductDataUpdater.php
@@ -262,7 +262,7 @@ public function sortProductIdList(array $productList, $filterParams)
}
foreach ($filterParams as $k => $v) {
- if ($v == '' || strpos($k, 'filter_') !== 0) {
+ if ($v == '' || !str_starts_with($k, 'filter_')) {
continue;
}
if ($k == 'filter_category') {
diff --git a/src/Adapter/Product/AdminProductWrapper.php b/src/Adapter/Product/AdminProductWrapper.php
index 82989d40fa346..88750d9a7adf2 100644
--- a/src/Adapter/Product/AdminProductWrapper.php
+++ b/src/Adapter/Product/AdminProductWrapper.php
@@ -194,7 +194,6 @@ public function processProductAttribute($product, $combinationValues)
$combinationValues['attribute_mpn']
);
- StockAvailable::setProductDependsOnStock((int) $product->id, $product->depends_on_stock, null, $id_product_attribute);
StockAvailable::setProductOutOfStock((int) $product->id, $product->out_of_stock, null, $id_product_attribute);
StockAvailable::setLocation((int) $product->id, $combinationValues['attribute_location'], null, $id_product_attribute);
@@ -224,8 +223,6 @@ public function processProductAttribute($product, $combinationValues)
/**
* Update a quantity for a product or a combination.
*
- * Does not work in Advanced stock management.
- *
* @param Product $product
* @param int $quantity
* @param int $forAttributeId
@@ -257,20 +254,6 @@ public function processLocation(Product $product, $location)
StockAvailable::setLocation($product->id, $location);
}
- /**
- * Set if a product depends on stock (ASM). For a product or a combination.
- *
- * Does work only in Advanced stock management.
- *
- * @param Product $product
- * @param bool $dependsOnStock
- * @param int $forAttributeId
- */
- public function processDependsOnStock(Product $product, $dependsOnStock, $forAttributeId = 0)
- {
- StockAvailable::setProductDependsOnStock((int) $product->id, $dependsOnStock, null, $forAttributeId);
- }
-
/**
* Add/Update a SpecificPrice object.
*
@@ -945,7 +928,7 @@ public function getPreviewUrlDeactivate($preview_url)
$admin_dir = dirname($_SERVER['PHP_SELF']);
$admin_dir = substr($admin_dir, strrpos($admin_dir, '/') + 1);
- $preview_url_deactivate = $preview_url . ((strpos($preview_url, '?') === false) ? '?' : '&') . 'adtoken=' . $token . '&ad=' . $admin_dir . '&id_employee=' . (int) $context->employee->id . '&preview=1';
+ $preview_url_deactivate = $preview_url . ((!str_contains($preview_url, '?')) ? '?' : '&') . 'adtoken=' . $token . '&ad=' . $admin_dir . '&id_employee=' . (int) $context->employee->id . '&preview=1';
return $preview_url_deactivate;
}
diff --git a/src/Adapter/Product/Attachment/CommandHandler/RemoveAllAssociatedProductAttachmentsHandler.php b/src/Adapter/Product/Attachment/CommandHandler/RemoveAllAssociatedProductAttachmentsHandler.php
index 4cbfd81c217a4..0e750b315d965 100644
--- a/src/Adapter/Product/Attachment/CommandHandler/RemoveAllAssociatedProductAttachmentsHandler.php
+++ b/src/Adapter/Product/Attachment/CommandHandler/RemoveAllAssociatedProductAttachmentsHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\Attachment\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\Update\ProductAttachmentUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Attachment\Command\RemoveAllAssociatedProductAttachmentsCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Attachment\CommandHandler\RemoveAllAssociatedProductAttachmentsHandlerInterface;
/**
* Removes all product-attachment associations for given product
*/
+#[AsCommandHandler]
final class RemoveAllAssociatedProductAttachmentsHandler implements RemoveAllAssociatedProductAttachmentsHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Attachment/CommandHandler/SetAssociatedProductAttachmentsHandler.php b/src/Adapter/Product/Attachment/CommandHandler/SetAssociatedProductAttachmentsHandler.php
index 54996888548a3..6f11f332ff3f1 100644
--- a/src/Adapter/Product/Attachment/CommandHandler/SetAssociatedProductAttachmentsHandler.php
+++ b/src/Adapter/Product/Attachment/CommandHandler/SetAssociatedProductAttachmentsHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\Attachment\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\Update\ProductAttachmentUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Attachment\Command\SetAssociatedProductAttachmentsCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Attachment\CommandHandler\SetAssociatedProductAttachmentsHandlerInterface;
/**
* Handles @see SetAssociatedProductAttachmentsCommand using legacy object model
*/
+#[AsCommandHandler]
final class SetAssociatedProductAttachmentsHandler implements SetAssociatedProductAttachmentsHandlerInterface
{
/**
diff --git a/src/Adapter/Product/AttributeGroup/QueryHandler/GetProductAttributeGroupsHandler.php b/src/Adapter/Product/AttributeGroup/QueryHandler/GetProductAttributeGroupsHandler.php
index c44a8c98c4e44..e1cbd36f34a0e 100644
--- a/src/Adapter/Product/AttributeGroup/QueryHandler/GetProductAttributeGroupsHandler.php
+++ b/src/Adapter/Product/AttributeGroup/QueryHandler/GetProductAttributeGroupsHandler.php
@@ -32,12 +32,14 @@
use PrestaShop\PrestaShop\Adapter\AttributeGroup\QueryHandler\AbstractAttributeGroupQueryHandler;
use PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository;
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Query\GetProductAttributeGroups;
use PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\QueryHandler\GetProductAttributeGroupsHandlerInterface;
/**
* Handles the query GetProductAttributeGroups using adapter repository
*/
+#[AsQueryHandler]
class GetProductAttributeGroupsHandler extends AbstractAttributeGroupQueryHandler implements GetProductAttributeGroupsHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Combination/CommandHandler/BulkDeleteCombinationHandler.php b/src/Adapter/Product/Combination/CommandHandler/BulkDeleteCombinationHandler.php
index 5ca9d30cada8c..a1383f614529f 100644
--- a/src/Adapter/Product/Combination/CommandHandler/BulkDeleteCombinationHandler.php
+++ b/src/Adapter/Product/Combination/CommandHandler/BulkDeleteCombinationHandler.php
@@ -28,12 +28,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationDeleter;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\BulkDeleteCombinationCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\CommandHandler\BulkDeleteCombinationHandlerInterface;
/**
* Deletes multiple combinations using legacy object model
*/
+#[AsCommandHandler]
class BulkDeleteCombinationHandler implements BulkDeleteCombinationHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Combination/CommandHandler/DeleteCombinationHandler.php b/src/Adapter/Product/Combination/CommandHandler/DeleteCombinationHandler.php
index a99d453f83444..a7b5ba6e46daa 100644
--- a/src/Adapter/Product/Combination/CommandHandler/DeleteCombinationHandler.php
+++ b/src/Adapter/Product/Combination/CommandHandler/DeleteCombinationHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationDeleter;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\DeleteCombinationCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\CommandHandler\DeleteCombinationHandlerInterface;
/**
* Handles @see DeleteCombinationCommand using adapter udpater service
*/
+#[AsCommandHandler]
class DeleteCombinationHandler implements DeleteCombinationHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Combination/CommandHandler/GenerateProductCombinationsHandler.php b/src/Adapter/Product/Combination/CommandHandler/GenerateProductCombinationsHandler.php
index 5698ac2ff135c..caf0323eaa740 100644
--- a/src/Adapter/Product/Combination/CommandHandler/GenerateProductCombinationsHandler.php
+++ b/src/Adapter/Product/Combination/CommandHandler/GenerateProductCombinationsHandler.php
@@ -30,12 +30,14 @@
use PrestaShop\PrestaShop\Adapter\Product\Combination\Create\CombinationCreator;
use PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\GenerateProductCombinationsCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\CommandHandler\GenerateProductCombinationsHandlerInterface;
/**
* Handles @see GenerateProductCombinationsCommand using legacy object model
*/
+#[AsCommandHandler]
final class GenerateProductCombinationsHandler implements GenerateProductCombinationsHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Combination/CommandHandler/RemoveAllCombinationImagesHandler.php b/src/Adapter/Product/Combination/CommandHandler/RemoveAllCombinationImagesHandler.php
index 698fe193ad4bc..caaea212c0576 100644
--- a/src/Adapter/Product/Combination/CommandHandler/RemoveAllCombinationImagesHandler.php
+++ b/src/Adapter/Product/Combination/CommandHandler/RemoveAllCombinationImagesHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationImagesUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\RemoveAllCombinationImagesCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\CommandHandler\RemoveAllCombinationImagesHandlerInterface;
/**
* Handles @see RemoveAllCombinationImagesCommand using adapter udpater service
*/
+#[AsCommandHandler]
final class RemoveAllCombinationImagesHandler implements RemoveAllCombinationImagesHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Combination/CommandHandler/SetCombinationImagesHandler.php b/src/Adapter/Product/Combination/CommandHandler/SetCombinationImagesHandler.php
index 27e30a818c7f5..c4ac14c75e3d4 100644
--- a/src/Adapter/Product/Combination/CommandHandler/SetCombinationImagesHandler.php
+++ b/src/Adapter/Product/Combination/CommandHandler/SetCombinationImagesHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationImagesUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\SetCombinationImagesCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\CommandHandler\SetCombinationImagesHandlerInterface;
/**
* Handles @see SetCombinationImagesCommand using adapter udpater service
*/
+#[AsCommandHandler]
final class SetCombinationImagesHandler implements SetCombinationImagesHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationHandler.php b/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationHandler.php
index 9fef2044660e4..39f983aa8a601 100644
--- a/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationHandler.php
+++ b/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationHandler.php
@@ -31,6 +31,7 @@
use PrestaShop\PrestaShop\Adapter\Product\Combination\Repository\CombinationRepository;
use PrestaShop\PrestaShop\Adapter\Product\Combination\Update\DefaultCombinationUpdater;
use PrestaShop\PrestaShop\Adapter\Product\Combination\Update\Filler\CombinationFillerInterface;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\CommandHandler\UpdateCombinationHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Exception\CannotUpdateCombinationException;
@@ -38,6 +39,7 @@
/**
* Handles the @see UpdateCombinationCommand using legacy object model
*/
+#[AsCommandHandler]
class UpdateCombinationHandler implements UpdateCombinationHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationStockAvailableHandler.php b/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationStockAvailableHandler.php
index 4a9054ffc9b9f..ee08a4ad00e40 100644
--- a/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationStockAvailableHandler.php
+++ b/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationStockAvailableHandler.php
@@ -30,6 +30,7 @@
use PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationStockProperties;
use PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationStockUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationStockAvailableCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\CommandHandler\UpdateCombinationStockAvailableHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\Stock\ValueObject\StockModification;
@@ -37,6 +38,7 @@
/**
* Updates combination stock available using legacy object model
*/
+#[AsCommandHandler]
class UpdateCombinationStockAvailableHandler implements UpdateCombinationStockAvailableHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationSuppliersHandler.php b/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationSuppliersHandler.php
index 784b497e29255..456c4c6b28307 100644
--- a/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationSuppliersHandler.php
+++ b/src/Adapter/Product/Combination/CommandHandler/UpdateCombinationSuppliersHandler.php
@@ -31,9 +31,11 @@
use PrestaShop\PrestaShop\Adapter\Product\Combination\Repository\CombinationRepository;
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository;
use PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationSuppliersCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\CommandHandler\UpdateCombinationSuppliersHandlerInterface;
+#[AsCommandHandler]
class UpdateCombinationSuppliersHandler extends AbstractProductSupplierHandler implements UpdateCombinationSuppliersHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Combination/QueryHandler/GetCombinationForEditingHandler.php b/src/Adapter/Product/Combination/QueryHandler/GetCombinationForEditingHandler.php
index d4c57d47a8108..f47badb0ae95b 100644
--- a/src/Adapter/Product/Combination/QueryHandler/GetCombinationForEditingHandler.php
+++ b/src/Adapter/Product/Combination/QueryHandler/GetCombinationForEditingHandler.php
@@ -37,6 +37,7 @@
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
use PrestaShop\PrestaShop\Adapter\Product\Stock\Repository\StockAvailableRepository;
use PrestaShop\PrestaShop\Adapter\Tax\TaxComputer;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Configuration\ShopConfigurationInterface;
use PrestaShop\PrestaShop\Core\Domain\Country\ValueObject\CountryId;
use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
@@ -60,6 +61,7 @@
/**
* Handles @see GetCombinationForEditing query using legacy object model
*/
+#[AsQueryHandler]
class GetCombinationForEditingHandler implements GetCombinationForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Combination/QueryHandler/GetCombinationSuppliersHandler.php b/src/Adapter/Product/Combination/QueryHandler/GetCombinationSuppliersHandler.php
index 74e6c0ac2238f..9735c9e9b1b49 100644
--- a/src/Adapter/Product/Combination/QueryHandler/GetCombinationSuppliersHandler.php
+++ b/src/Adapter/Product/Combination/QueryHandler/GetCombinationSuppliersHandler.php
@@ -30,9 +30,11 @@
use PrestaShop\PrestaShop\Adapter\Product\AbstractProductSupplierHandler;
use PrestaShop\PrestaShop\Adapter\Product\Combination\Repository\CombinationRepository;
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationSuppliers;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryHandler\GetCombinationSuppliersHandlerInterface;
+#[AsQueryHandler]
class GetCombinationSuppliersHandler extends AbstractProductSupplierHandler implements GetCombinationSuppliersHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Combination/QueryHandler/GetEditableCombinationsListHandler.php b/src/Adapter/Product/Combination/QueryHandler/GetEditableCombinationsListHandler.php
index 8d2191ee2b04f..65ced47113fb9 100644
--- a/src/Adapter/Product/Combination/QueryHandler/GetEditableCombinationsListHandler.php
+++ b/src/Adapter/Product/Combination/QueryHandler/GetEditableCombinationsListHandler.php
@@ -33,6 +33,7 @@
use PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository;
use PrestaShop\PrestaShop\Adapter\Product\Image\ProductImagePathFactory;
use PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\CombinationAttributeInformation;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Exception\CombinationException;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetEditableCombinationsList;
@@ -48,6 +49,7 @@
/**
* Handles @see GetEditableCombinationsList using legacy object model
*/
+#[AsQueryHandler]
final class GetEditableCombinationsListHandler implements GetEditableCombinationsListHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Combination/QueryHandler/SearchCombinationsForAssociationHandler.php b/src/Adapter/Product/Combination/QueryHandler/SearchCombinationsForAssociationHandler.php
index 9f52280ee30ae..f328d22cb181e 100644
--- a/src/Adapter/Product/Combination/QueryHandler/SearchCombinationsForAssociationHandler.php
+++ b/src/Adapter/Product/Combination/QueryHandler/SearchCombinationsForAssociationHandler.php
@@ -31,6 +31,7 @@
use PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository;
use PrestaShop\PrestaShop\Adapter\Product\Image\ProductImagePathFactory;
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\SearchCombinationsForAssociation;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryHandler\SearchCombinationsForAssociationHandlerInterface;
@@ -40,6 +41,7 @@
use PrestaShop\PrestaShop\Core\Domain\Product\Image\ValueObject\ImageId;
use PrestaShop\PrestaShop\Core\Product\Combination\NameBuilder\CombinationNameBuilderInterface;
+#[AsQueryHandler]
class SearchCombinationsForAssociationHandler implements SearchCombinationsForAssociationHandlerInterface
{
/**
diff --git a/src/Adapter/Product/CommandHandler/AddProductHandler.php b/src/Adapter/Product/CommandHandler/AddProductHandler.php
index bfd70b68f3644..b9138c58726ac 100644
--- a/src/Adapter/Product/CommandHandler/AddProductHandler.php
+++ b/src/Adapter/Product/CommandHandler/AddProductHandler.php
@@ -30,6 +30,7 @@
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
use PrestaShop\PrestaShop\Adapter\Tools;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Command\AddProductCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\AddProductHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\ValueObject\ProductId;
@@ -37,6 +38,7 @@
/**
* Handles @see AddProductCommand using legacy object model
*/
+#[AsCommandHandler]
final class AddProductHandler implements AddProductHandlerInterface
{
/**
diff --git a/src/Adapter/Product/CommandHandler/AssignProductToCategoryHandler.php b/src/Adapter/Product/CommandHandler/AssignProductToCategoryHandler.php
index 296338ab0af6e..83d9b03105a10 100644
--- a/src/Adapter/Product/CommandHandler/AssignProductToCategoryHandler.php
+++ b/src/Adapter/Product/CommandHandler/AssignProductToCategoryHandler.php
@@ -28,6 +28,7 @@
use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Command\AssignProductToCategoryCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\AssignProductToCategoryHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\Exception\CannotAssignProductToCategoryException;
@@ -37,6 +38,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class AssignProductToCategoryHandler extends AbstractObjectModelHandler implements AssignProductToCategoryHandlerInterface
{
/**
diff --git a/src/Adapter/Product/CommandHandler/BulkDeleteProductHandler.php b/src/Adapter/Product/CommandHandler/BulkDeleteProductHandler.php
index af257e1d929ce..7f42d90e5c290 100644
--- a/src/Adapter/Product/CommandHandler/BulkDeleteProductHandler.php
+++ b/src/Adapter/Product/CommandHandler/BulkDeleteProductHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\ProductDeleter;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkDeleteProductCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\BulkDeleteProductHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\Exception\BulkProductException;
@@ -39,6 +40,7 @@
/**
* Handles command which deletes products in bulk action
*/
+#[AsCommandHandler]
final class BulkDeleteProductHandler extends AbstractBulkHandler implements BulkDeleteProductHandlerInterface
{
/**
diff --git a/src/Adapter/Product/CommandHandler/BulkDuplicateProductHandler.php b/src/Adapter/Product/CommandHandler/BulkDuplicateProductHandler.php
index 1f84f53c26e58..9885951eda732 100644
--- a/src/Adapter/Product/CommandHandler/BulkDuplicateProductHandler.php
+++ b/src/Adapter/Product/CommandHandler/BulkDuplicateProductHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\Update\ProductDuplicator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkDuplicateProductCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\BulkDuplicateProductHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\Exception\BulkProductException;
@@ -38,6 +39,7 @@
/**
* Handles command which deletes addresses in bulk action
*/
+#[AsCommandHandler]
class BulkDuplicateProductHandler extends AbstractBulkHandler implements BulkDuplicateProductHandlerInterface
{
/**
diff --git a/src/Adapter/Product/CommandHandler/BulkUpdateProductStatusHandler.php b/src/Adapter/Product/CommandHandler/BulkUpdateProductStatusHandler.php
index 1be645a139056..5bb3cd1fb1044 100644
--- a/src/Adapter/Product/CommandHandler/BulkUpdateProductStatusHandler.php
+++ b/src/Adapter/Product/CommandHandler/BulkUpdateProductStatusHandler.php
@@ -30,6 +30,7 @@
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
use PrestaShop\PrestaShop\Adapter\Product\Update\ProductIndexationUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkUpdateProductStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\BulkUpdateProductStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\Exception\BulkProductException;
@@ -40,6 +41,7 @@
/**
* Handles command which deletes addresses in bulk action
*/
+#[AsCommandHandler]
class BulkUpdateProductStatusHandler extends AbstractBulkHandler implements BulkUpdateProductStatusHandlerInterface
{
/**
diff --git a/src/Adapter/Product/CommandHandler/DeleteProductHandler.php b/src/Adapter/Product/CommandHandler/DeleteProductHandler.php
index 5af7900659c0a..7ce0cfe5e6aa7 100644
--- a/src/Adapter/Product/CommandHandler/DeleteProductHandler.php
+++ b/src/Adapter/Product/CommandHandler/DeleteProductHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\ProductDeleter;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Command\DeleteProductCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\DeleteProductHandlerInterface;
/**
* Handles @see DeleteProductCommand using legacy object model
*/
+#[AsCommandHandler]
class DeleteProductHandler implements DeleteProductHandlerInterface
{
/**
diff --git a/src/Adapter/Product/CommandHandler/DuplicateProductHandler.php b/src/Adapter/Product/CommandHandler/DuplicateProductHandler.php
index 7b33c360c03e0..98cdb4ec352ef 100644
--- a/src/Adapter/Product/CommandHandler/DuplicateProductHandler.php
+++ b/src/Adapter/Product/CommandHandler/DuplicateProductHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\Update\ProductDuplicator;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Command\DuplicateProductCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\DuplicateProductHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\ValueObject\ProductId;
@@ -36,6 +37,7 @@
/**
* Handles @see DuplicateProductCommand
*/
+#[AsCommandHandler]
final class DuplicateProductHandler implements DuplicateProductHandlerInterface
{
/**
diff --git a/src/Adapter/Product/CommandHandler/RemoveAllAssociatedProductCategoriesHandler.php b/src/Adapter/Product/CommandHandler/RemoveAllAssociatedProductCategoriesHandler.php
index d6230a30418fe..8b370c377ce69 100644
--- a/src/Adapter/Product/CommandHandler/RemoveAllAssociatedProductCategoriesHandler.php
+++ b/src/Adapter/Product/CommandHandler/RemoveAllAssociatedProductCategoriesHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\Update\ProductCategoryUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllAssociatedProductCategoriesCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\RemoveAllAssociatedProductCategoriesHandlerInterface;
/**
* Handles @see RemoveAllAssociatedProductCategoriesCommand using legacy object model
*/
+#[AsCommandHandler]
final class RemoveAllAssociatedProductCategoriesHandler implements RemoveAllAssociatedProductCategoriesHandlerInterface
{
/**
diff --git a/src/Adapter/Product/CommandHandler/RemoveAllProductTagsHandler.php b/src/Adapter/Product/CommandHandler/RemoveAllProductTagsHandler.php
index 76dc06f4eb4eb..6aeb3990e7080 100644
--- a/src/Adapter/Product/CommandHandler/RemoveAllProductTagsHandler.php
+++ b/src/Adapter/Product/CommandHandler/RemoveAllProductTagsHandler.php
@@ -30,9 +30,11 @@
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
use PrestaShop\PrestaShop\Adapter\Product\Update\ProductTagUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllProductTagsCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\RemoveAllProductTagsHandlerInterface;
+#[AsCommandHandler]
final class RemoveAllProductTagsHandler implements RemoveAllProductTagsHandlerInterface
{
/**
diff --git a/src/Adapter/Product/CommandHandler/RemoveAllRelatedProductsHandler.php b/src/Adapter/Product/CommandHandler/RemoveAllRelatedProductsHandler.php
index 5514af3204b1b..a7488a0b4e4d5 100644
--- a/src/Adapter/Product/CommandHandler/RemoveAllRelatedProductsHandler.php
+++ b/src/Adapter/Product/CommandHandler/RemoveAllRelatedProductsHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\Update\RelatedProductsUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllRelatedProductsCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\RemoveAllRelatedProductsHandlerInterface;
/**
* Handles @see RemoveAllRelatedProductsCommand using legacy object model
*/
+#[AsCommandHandler]
final class RemoveAllRelatedProductsHandler implements RemoveAllRelatedProductsHandlerInterface
{
/**
diff --git a/src/Adapter/Product/CommandHandler/SetAssociatedProductCategoriesHandler.php b/src/Adapter/Product/CommandHandler/SetAssociatedProductCategoriesHandler.php
index 00876cd0f03ae..88d8e5be740ed 100644
--- a/src/Adapter/Product/CommandHandler/SetAssociatedProductCategoriesHandler.php
+++ b/src/Adapter/Product/CommandHandler/SetAssociatedProductCategoriesHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\Update\ProductCategoryUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Command\SetAssociatedProductCategoriesCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\SetAssociatedProductCategoriesHandlerInterface;
/**
* Handles @var SetAssociatedProductCategoriesCommand using legacy object model
*/
+#[AsCommandHandler]
final class SetAssociatedProductCategoriesHandler implements SetAssociatedProductCategoriesHandlerInterface
{
/**
diff --git a/src/Adapter/Product/CommandHandler/SetCarriersHandler.php b/src/Adapter/Product/CommandHandler/SetCarriersHandler.php
index 9373e1bac33ac..3185997520c85 100644
--- a/src/Adapter/Product/CommandHandler/SetCarriersHandler.php
+++ b/src/Adapter/Product/CommandHandler/SetCarriersHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Command\SetCarriersCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\SetCarriersHandlerInterface;
/**
* Handles @var SetCarriersCommand using repository
*/
+#[AsCommandHandler]
class SetCarriersHandler implements SetCarriersHandlerInterface
{
/**
diff --git a/src/Adapter/Product/CommandHandler/SetProductTagsHandler.php b/src/Adapter/Product/CommandHandler/SetProductTagsHandler.php
index dd30f9e5dfb4a..ae3ceb784fe69 100644
--- a/src/Adapter/Product/CommandHandler/SetProductTagsHandler.php
+++ b/src/Adapter/Product/CommandHandler/SetProductTagsHandler.php
@@ -30,12 +30,14 @@
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
use PrestaShop\PrestaShop\Adapter\Product\Update\ProductTagUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Command\SetProductTagsCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\UpdateProductTagsHandlerInterface;
/**
* Handles UpdateProductTagsCommand using legacy object model
*/
+#[AsCommandHandler]
final class SetProductTagsHandler implements UpdateProductTagsHandlerInterface
{
/**
diff --git a/src/Adapter/Product/CommandHandler/SetRelatedProductsHandler.php b/src/Adapter/Product/CommandHandler/SetRelatedProductsHandler.php
index 368dfdbdb02ec..ca4a6c2900c40 100644
--- a/src/Adapter/Product/CommandHandler/SetRelatedProductsHandler.php
+++ b/src/Adapter/Product/CommandHandler/SetRelatedProductsHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\Update\RelatedProductsUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Command\SetRelatedProductsCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\SetRelatedProductsHandlerInterface;
/**
* handles @see SetRelatedProductsCommand using legacy object models
*/
+#[AsCommandHandler]
final class SetRelatedProductsHandler implements SetRelatedProductsHandlerInterface
{
/**
diff --git a/src/Adapter/Product/CommandHandler/UpdateProductHandler.php b/src/Adapter/Product/CommandHandler/UpdateProductHandler.php
index d991a7378259c..c2afe19696546 100644
--- a/src/Adapter/Product/CommandHandler/UpdateProductHandler.php
+++ b/src/Adapter/Product/CommandHandler/UpdateProductHandler.php
@@ -30,6 +30,7 @@
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
use PrestaShop\PrestaShop\Adapter\Product\Update\Filler\ProductFillerInterface;
use PrestaShop\PrestaShop\Adapter\Product\Update\ProductIndexationUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\UpdateProductHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\Exception\CannotUpdateProductException;
@@ -37,6 +38,7 @@
/**
* Handles the @see UpdateProductCommand using legacy object model
*/
+#[AsCommandHandler]
class UpdateProductHandler implements UpdateProductHandlerInterface
{
/**
diff --git a/src/Adapter/Product/CommandHandler/UpdateProductTypeHandler.php b/src/Adapter/Product/CommandHandler/UpdateProductTypeHandler.php
index 34e232291411a..ba789ca393741 100644
--- a/src/Adapter/Product/CommandHandler/UpdateProductTypeHandler.php
+++ b/src/Adapter/Product/CommandHandler/UpdateProductTypeHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\Update\ProductTypeUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductTypeCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\UpdateProductTypeHandlerInterface;
/**
* Handle @see UpdateProductTypeCommand
*/
+#[AsCommandHandler]
class UpdateProductTypeHandler implements UpdateProductTypeHandlerInterface
{
/**
diff --git a/src/Adapter/Product/CommandHandler/UpdateProductsPositionsHandler.php b/src/Adapter/Product/CommandHandler/UpdateProductsPositionsHandler.php
index b962107090c22..ce2c176c25154 100644
--- a/src/Adapter/Product/CommandHandler/UpdateProductsPositionsHandler.php
+++ b/src/Adapter/Product/CommandHandler/UpdateProductsPositionsHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\Product\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Position\ValueObject\RowPosition;
use PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductsPositionsCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\CommandHandler\UpdateProductsPositionsHandlerInterface;
@@ -41,6 +42,7 @@
/**
* Updates category position using legacy object model
*/
+#[AsCommandHandler]
class UpdateProductsPositionsHandler implements UpdateProductsPositionsHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Customization/CommandHandler/RemoveAllCustomizationFieldsFromProductHandler.php b/src/Adapter/Product/Customization/CommandHandler/RemoveAllCustomizationFieldsFromProductHandler.php
index b034ace64bd8b..a1dfdbe2ed8b9 100644
--- a/src/Adapter/Product/Customization/CommandHandler/RemoveAllCustomizationFieldsFromProductHandler.php
+++ b/src/Adapter/Product/Customization/CommandHandler/RemoveAllCustomizationFieldsFromProductHandler.php
@@ -31,6 +31,7 @@
use PrestaShop\PrestaShop\Adapter\Product\Customization\Update\CustomizationFieldDeleter;
use PrestaShop\PrestaShop\Adapter\Product\Customization\Update\ProductCustomizationFieldUpdater;
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Customization\Command\RemoveAllCustomizationFieldsFromProductCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Customization\CommandHandler\RemoveAllCustomizationFieldsFromProductHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\Customization\ValueObject\CustomizationFieldId;
@@ -38,6 +39,7 @@
/**
* Handles @see RemoveAllCustomizationFieldsFromProductCommand using legacy object model
*/
+#[AsCommandHandler]
final class RemoveAllCustomizationFieldsFromProductHandler implements RemoveAllCustomizationFieldsFromProductHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Customization/CommandHandler/SetProductCustomizationFieldsHandler.php b/src/Adapter/Product/Customization/CommandHandler/SetProductCustomizationFieldsHandler.php
index fa1eb0ad29bf8..3338267821506 100644
--- a/src/Adapter/Product/Customization/CommandHandler/SetProductCustomizationFieldsHandler.php
+++ b/src/Adapter/Product/Customization/CommandHandler/SetProductCustomizationFieldsHandler.php
@@ -31,6 +31,7 @@
use CustomizationField;
use PrestaShop\PrestaShop\Adapter\Product\Customization\Repository\CustomizationFieldRepository;
use PrestaShop\PrestaShop\Adapter\Product\Customization\Update\ProductCustomizationFieldUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Customization\Command\SetProductCustomizationFieldsCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Customization\CommandHandler\SetProductCustomizationFieldsHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\Customization\CustomizationField as CustomizationFieldDTO;
@@ -40,6 +41,7 @@
/**
* Handles @see SetProductCustomizationFieldsCommand using legacy object model
*/
+#[AsCommandHandler]
class SetProductCustomizationFieldsHandler implements SetProductCustomizationFieldsHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Customization/QueryHandler/GetProductCustomizationFieldsHandler.php b/src/Adapter/Product/Customization/QueryHandler/GetProductCustomizationFieldsHandler.php
index ee96378f92872..23d737e1fdb1e 100644
--- a/src/Adapter/Product/Customization/QueryHandler/GetProductCustomizationFieldsHandler.php
+++ b/src/Adapter/Product/Customization/QueryHandler/GetProductCustomizationFieldsHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Product\Customization\QueryHandler;
use PrestaShop\PrestaShop\Adapter\Product\Customization\Repository\CustomizationFieldRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Customization\Query\GetProductCustomizationFields;
use PrestaShop\PrestaShop\Core\Domain\Product\Customization\QueryHandler\GetProductCustomizationFieldsHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\Customization\QueryResult\CustomizationField;
@@ -38,6 +39,7 @@
/**
* Defines contract to handle @var GetProductCustomizationFields query
*/
+#[AsQueryHandler]
final class GetProductCustomizationFieldsHandler implements GetProductCustomizationFieldsHandlerInterface
{
/**
diff --git a/src/Adapter/Product/FeatureValue/CommandHandler/RemoveAllFeatureValuesFromProductHandler.php b/src/Adapter/Product/FeatureValue/CommandHandler/RemoveAllFeatureValuesFromProductHandler.php
index 085768253ccaa..047940f02df2f 100644
--- a/src/Adapter/Product/FeatureValue/CommandHandler/RemoveAllFeatureValuesFromProductHandler.php
+++ b/src/Adapter/Product/FeatureValue/CommandHandler/RemoveAllFeatureValuesFromProductHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\FeatureValue\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\FeatureValue\Update\ProductFeatureValueUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Command\RemoveAllFeatureValuesFromProductCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\CommandHandler\RemoveAllFeatureValuesFromProductHandlerInterface;
/**
* Handles @see RemoveAllFeatureValuesFromProductCommand using legacy object model
*/
+#[AsCommandHandler]
class RemoveAllFeatureValuesFromProductHandler implements RemoveAllFeatureValuesFromProductHandlerInterface
{
/**
diff --git a/src/Adapter/Product/FeatureValue/CommandHandler/SetProductFeatureValuesHandler.php b/src/Adapter/Product/FeatureValue/CommandHandler/SetProductFeatureValuesHandler.php
index 2a0d0bc9a9def..5294b3652d01a 100644
--- a/src/Adapter/Product/FeatureValue/CommandHandler/SetProductFeatureValuesHandler.php
+++ b/src/Adapter/Product/FeatureValue/CommandHandler/SetProductFeatureValuesHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\FeatureValue\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\FeatureValue\Update\ProductFeatureValueUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Command\SetProductFeatureValuesCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\CommandHandler\SetProductFeatureValuesHandlerInterface;
/**
* Handles @see SetProductFeatureValuesCommand using legacy object model
*/
+#[AsCommandHandler]
class SetProductFeatureValuesHandler implements SetProductFeatureValuesHandlerInterface
{
/**
diff --git a/src/Adapter/Product/FeatureValue/QueryHandler/GetProductFeatureValuesHandler.php b/src/Adapter/Product/FeatureValue/QueryHandler/GetProductFeatureValuesHandler.php
index 36e834a881076..2648d711f3549 100644
--- a/src/Adapter/Product/FeatureValue/QueryHandler/GetProductFeatureValuesHandler.php
+++ b/src/Adapter/Product/FeatureValue/QueryHandler/GetProductFeatureValuesHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Product\FeatureValue\QueryHandler;
use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Query\GetProductFeatureValues;
use PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\QueryHandler\GetProductFeatureValuesHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\QueryResult\ProductFeatureValue;
@@ -36,6 +37,7 @@
/**
* Defines contract to handle @var GetProductFeatureValues query
*/
+#[AsQueryHandler]
class GetProductFeatureValuesHandler implements GetProductFeatureValuesHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Image/CommandHandler/AddProductImageHandler.php b/src/Adapter/Product/Image/CommandHandler/AddProductImageHandler.php
index c85a096ebd328..71969575d24b1 100644
--- a/src/Adapter/Product/Image/CommandHandler/AddProductImageHandler.php
+++ b/src/Adapter/Product/Image/CommandHandler/AddProductImageHandler.php
@@ -31,6 +31,7 @@
use PrestaShop\PrestaShop\Adapter\Image\ProductImageFileValidator;
use PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository;
use PrestaShop\PrestaShop\Adapter\Product\Image\Uploader\ProductImageUploader;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\AddProductImageCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Image\CommandHandler\AddProductImageHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\Image\ValueObject\ImageId;
@@ -38,6 +39,7 @@
/**
* Handles @see AddProductImageCommand
*/
+#[AsCommandHandler]
final class AddProductImageHandler implements AddProductImageHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Image/CommandHandler/DeleteProductImageHandler.php b/src/Adapter/Product/Image/CommandHandler/DeleteProductImageHandler.php
index 16e150012e023..499014569db3c 100644
--- a/src/Adapter/Product/Image/CommandHandler/DeleteProductImageHandler.php
+++ b/src/Adapter/Product/Image/CommandHandler/DeleteProductImageHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\Image\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\Image\Update\ProductImageUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\DeleteProductImageCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Image\CommandHandler\DeleteProductImageHandlerInterface;
/**
* Handles @see DeleteProductImageCommand
*/
+#[AsCommandHandler]
class DeleteProductImageHandler implements DeleteProductImageHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Image/CommandHandler/SetProductImagesForAllShopHandler.php b/src/Adapter/Product/Image/CommandHandler/SetProductImagesForAllShopHandler.php
index f9faf5c301664..091c0db9ffb7a 100644
--- a/src/Adapter/Product/Image/CommandHandler/SetProductImagesForAllShopHandler.php
+++ b/src/Adapter/Product/Image/CommandHandler/SetProductImagesForAllShopHandler.php
@@ -31,6 +31,7 @@
use Image;
use PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository;
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\ProductImageSetting;
use PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\SetProductImagesForAllShopCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Image\CommandHandler\SetProductImagesForAllShopHandlerInterface;
@@ -39,6 +40,7 @@
use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopId;
+#[AsCommandHandler]
class SetProductImagesForAllShopHandler implements SetProductImagesForAllShopHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Image/CommandHandler/UpdateProductImageHandler.php b/src/Adapter/Product/Image/CommandHandler/UpdateProductImageHandler.php
index d20bb32ef1051..3692389d88ec6 100644
--- a/src/Adapter/Product/Image/CommandHandler/UpdateProductImageHandler.php
+++ b/src/Adapter/Product/Image/CommandHandler/UpdateProductImageHandler.php
@@ -32,12 +32,14 @@
use PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository;
use PrestaShop\PrestaShop\Adapter\Product\Image\Update\ProductImageUpdater;
use PrestaShop\PrestaShop\Adapter\Product\Image\Uploader\ProductImageUploader;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\UpdateProductImageCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Image\CommandHandler\UpdateProductImageHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\Image\Exception\CannotUpdateProductImageException;
use PrestaShop\PrestaShop\Core\Domain\Shop\Exception\InvalidShopConstraintException;
use PrestaShop\PrestaShop\Core\Domain\Shop\Exception\ShopAssociationNotFound;
+#[AsCommandHandler]
class UpdateProductImageHandler implements UpdateProductImageHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Image/QueryHandler/GetProductImageHandler.php b/src/Adapter/Product/Image/QueryHandler/GetProductImageHandler.php
index a800a27347bf4..18c199ab79326 100644
--- a/src/Adapter/Product/Image/QueryHandler/GetProductImageHandler.php
+++ b/src/Adapter/Product/Image/QueryHandler/GetProductImageHandler.php
@@ -31,6 +31,7 @@
use Image;
use PrestaShop\PrestaShop\Adapter\Product\Image\ProductImagePathFactory;
use PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetProductImage;
use PrestaShop\PrestaShop\Core\Domain\Product\Image\QueryHandler\GetProductImageHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\Image\QueryResult\ProductImage;
@@ -41,6 +42,7 @@
/**
* Handles @see GetProductImage query
*/
+#[AsQueryHandler]
class GetProductImageHandler implements GetProductImageHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Image/QueryHandler/GetProductImagesHandler.php b/src/Adapter/Product/Image/QueryHandler/GetProductImagesHandler.php
index 8e2fb4c0ae7d0..677ac0c45b754 100644
--- a/src/Adapter/Product/Image/QueryHandler/GetProductImagesHandler.php
+++ b/src/Adapter/Product/Image/QueryHandler/GetProductImagesHandler.php
@@ -32,6 +32,7 @@
use PrestaShop\PrestaShop\Adapter\Product\Image\ProductImagePathFactory;
use PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository;
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetProductImages;
use PrestaShop\PrestaShop\Core\Domain\Product\Image\QueryHandler\GetProductImagesHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\Image\QueryResult\ProductImage;
@@ -43,6 +44,7 @@
/**
* Handles @see GetProductImages query
*/
+#[AsQueryHandler]
final class GetProductImagesHandler implements GetProductImagesHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Image/QueryHandler/GetShopProductImagesHandler.php b/src/Adapter/Product/Image/QueryHandler/GetShopProductImagesHandler.php
index 2cef0713d2a91..283498f150df7 100644
--- a/src/Adapter/Product/Image/QueryHandler/GetShopProductImagesHandler.php
+++ b/src/Adapter/Product/Image/QueryHandler/GetShopProductImagesHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Product\Image\QueryHandler;
use PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetShopProductImages;
use PrestaShop\PrestaShop\Core\Domain\Product\Image\QueryHandler\GetShopProductImagesHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\Image\QueryResult\Shop\ShopProductImagesCollection;
@@ -36,6 +37,7 @@
/**
* Handles @see GetShopProductImages query
*/
+#[AsQueryHandler]
final class GetShopProductImagesHandler implements GetShopProductImagesHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Image/Uploader/ProductImageUploader.php b/src/Adapter/Product/Image/Uploader/ProductImageUploader.php
index b1175d3f62ec7..faa81e530df81 100644
--- a/src/Adapter/Product/Image/Uploader/ProductImageUploader.php
+++ b/src/Adapter/Product/Image/Uploader/ProductImageUploader.php
@@ -119,7 +119,7 @@ public function upload(Image $image, string $filePath): string
$this->createDestinationDirectory($imageId, $productId);
$destinationPath = $this->productImagePathFactory->getPath($imageId);
$this->uploadFromTemp($filePath, $destinationPath);
- $this->imageGenerator->generateImagesByTypes($destinationPath, $this->productImageRepository->getProductImageTypes());
+ $this->imageGenerator->generateImagesByTypes($destinationPath, $this->productImageRepository->getProductImageTypes(), $imageId->getValue());
$this->hookDispatcher->dispatchWithParameters(
'actionWatermark',
diff --git a/src/Adapter/Product/ListParametersUpdater.php b/src/Adapter/Product/ListParametersUpdater.php
index 89b3f3a6e51c3..bb194e588af7a 100644
--- a/src/Adapter/Product/ListParametersUpdater.php
+++ b/src/Adapter/Product/ListParametersUpdater.php
@@ -49,7 +49,7 @@ public function cleanFiltersForPositionOrdering($filterParameters, $orderBy, $ha
{
if ($orderBy == 'position_ordering' && $hasCategoryFilter) {
foreach (array_keys($filterParameters) as $key) {
- if (strpos($key, 'filter_column_') === 0) {
+ if (str_starts_with($key, 'filter_column_')) {
$filterParameters[$key] = '';
}
}
diff --git a/src/Adapter/Product/Pack/CommandHandler/RemoveAllProductsFromPackHandler.php b/src/Adapter/Product/Pack/CommandHandler/RemoveAllProductsFromPackHandler.php
index d5e979996a12a..fc9ded8828622 100644
--- a/src/Adapter/Product/Pack/CommandHandler/RemoveAllProductsFromPackHandler.php
+++ b/src/Adapter/Product/Pack/CommandHandler/RemoveAllProductsFromPackHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\Pack\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\Pack\Update\ProductPackUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Pack\Command\RemoveAllProductsFromPackCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Pack\CommandHandler\RemoveAllProductsFromPackHandlerInterface;
/**
* Handles @see RemoveAllProductsFromPackCommand using legacy object model
*/
+#[AsCommandHandler]
final class RemoveAllProductsFromPackHandler implements RemoveAllProductsFromPackHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Pack/CommandHandler/SetPackProductsHandler.php b/src/Adapter/Product/Pack/CommandHandler/SetPackProductsHandler.php
index 40acdeae0256a..f57327510dc91 100644
--- a/src/Adapter/Product/Pack/CommandHandler/SetPackProductsHandler.php
+++ b/src/Adapter/Product/Pack/CommandHandler/SetPackProductsHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\Pack\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\Pack\Update\ProductPackUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Pack\Command\SetPackProductsCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Pack\CommandHandler\SetPackProductsHandlerInterface;
/**
* Handles @see SetPackProductsCommand using legacy object model
*/
+#[AsCommandHandler]
final class SetPackProductsHandler implements SetPackProductsHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Pack/QueryHandler/GetPackedProductsHandler.php b/src/Adapter/Product/Pack/QueryHandler/GetPackedProductsHandler.php
index c577d9ac74fa5..ef837fd1780d3 100644
--- a/src/Adapter/Product/Pack/QueryHandler/GetPackedProductsHandler.php
+++ b/src/Adapter/Product/Pack/QueryHandler/GetPackedProductsHandler.php
@@ -33,6 +33,7 @@
use PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository;
use PrestaShop\PrestaShop\Adapter\Product\Pack\Repository\ProductPackRepository;
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\ValueObject\CombinationId;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\ValueObject\NoCombinationId;
@@ -49,6 +50,7 @@
/**
* Handles GetPackedProducts query using legacy object model
*/
+#[AsQueryHandler]
class GetPackedProductsHandler implements GetPackedProductsHandlerInterface
{
/**
diff --git a/src/Adapter/Product/PriceFormatter.php b/src/Adapter/Product/PriceFormatter.php
index 9ab11cddb7748..2eb6494b7a44e 100644
--- a/src/Adapter/Product/PriceFormatter.php
+++ b/src/Adapter/Product/PriceFormatter.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Product;
+use Context;
use Currency;
use Tools;
@@ -53,7 +54,12 @@ public function convertAmount($price, $currency = null)
*/
public function format($price, $currency = null)
{
- return Tools::displayPrice($price, $currency);
+ $context = Context::getContext();
+ $priceCurrency = is_array($currency) ? $currency['iso_code'] : null;
+ $priceCurrency = !$priceCurrency && $currency instanceof Currency ? $currency->iso_code : $priceCurrency;
+ $priceCurrency = !$priceCurrency ? $context->currency->iso_code : $priceCurrency;
+
+ return Tools::getContextLocale($context)->formatPrice($price, $priceCurrency);
}
/**
diff --git a/src/Adapter/Product/QueryHandler/GetProductForEditingHandler.php b/src/Adapter/Product/QueryHandler/GetProductForEditingHandler.php
index 451188a9ac2d4..704e359bf850c 100644
--- a/src/Adapter/Product/QueryHandler/GetProductForEditingHandler.php
+++ b/src/Adapter/Product/QueryHandler/GetProductForEditingHandler.php
@@ -41,6 +41,7 @@
use PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Repository\VirtualProductFileRepository;
use PrestaShop\PrestaShop\Adapter\Tax\TaxComputer;
use PrestaShop\PrestaShop\Core\Category\NameBuilder\CategoryDisplayNameBuilder;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Attachment\QueryResult\AttachmentInformation;
use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\CategoryId;
use PrestaShop\PrestaShop\Core\Domain\Country\ValueObject\CountryId;
@@ -76,6 +77,7 @@
/**
* Handles the query @see GetProductForEditing using legacy ObjectModel
*/
+#[AsQueryHandler]
class GetProductForEditingHandler implements GetProductForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Product/QueryHandler/GetProductIsEnabledHandler.php b/src/Adapter/Product/QueryHandler/GetProductIsEnabledHandler.php
index d4a267147ea0f..3c3516310b78d 100644
--- a/src/Adapter/Product/QueryHandler/GetProductIsEnabledHandler.php
+++ b/src/Adapter/Product/QueryHandler/GetProductIsEnabledHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Product\QueryHandler;
use PrestaShop\PrestaShop\Adapter\Entity\Product;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Exception\ProductNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Product\Query\GetProductIsEnabled;
use PrestaShop\PrestaShop\Core\Domain\Product\QueryHandler\GetProductIsEnabledHandlerInterface;
@@ -34,6 +35,7 @@
/**
* @internal
*/
+#[AsQueryHandler]
final class GetProductIsEnabledHandler implements GetProductIsEnabledHandlerInterface
{
/**
diff --git a/src/Adapter/Product/QueryHandler/GetProductSupplierOptionsHandler.php b/src/Adapter/Product/QueryHandler/GetProductSupplierOptionsHandler.php
index c6e32bbc2dfc2..0590442214ad6 100644
--- a/src/Adapter/Product/QueryHandler/GetProductSupplierOptionsHandler.php
+++ b/src/Adapter/Product/QueryHandler/GetProductSupplierOptionsHandler.php
@@ -31,6 +31,7 @@
use PrestaShop\PrestaShop\Adapter\Product\AbstractProductSupplierHandler;
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Query\GetProductSupplierOptions;
use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\QueryHandler\GetProductSupplierOptionsHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\QueryResult\ProductSupplierOptions;
@@ -40,6 +41,7 @@
/**
* Handles @see GetProductSupplierOptions query
*/
+#[AsQueryHandler]
class GetProductSupplierOptionsHandler extends AbstractProductSupplierHandler implements GetProductSupplierOptionsHandlerInterface
{
/**
diff --git a/src/Adapter/Product/QueryHandler/GetRelatedProductsHandler.php b/src/Adapter/Product/QueryHandler/GetRelatedProductsHandler.php
index 3515df7193806..4edd810a4365c 100644
--- a/src/Adapter/Product/QueryHandler/GetRelatedProductsHandler.php
+++ b/src/Adapter/Product/QueryHandler/GetRelatedProductsHandler.php
@@ -31,11 +31,13 @@
use PrestaShop\PrestaShop\Adapter\Product\Image\ProductImagePathFactory;
use PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository;
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Query\GetRelatedProducts;
use PrestaShop\PrestaShop\Core\Domain\Product\QueryHandler\GetRelatedProductsHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\QueryResult\RelatedProduct;
use PrestaShop\PrestaShop\Core\Domain\Product\ValueObject\ProductId;
+#[AsQueryHandler]
class GetRelatedProductsHandler implements GetRelatedProductsHandlerInterface
{
/**
diff --git a/src/Adapter/Product/QueryHandler/SearchProductsForAssociationHandler.php b/src/Adapter/Product/QueryHandler/SearchProductsForAssociationHandler.php
index 4a0057c466ab4..c6eec613b7e9a 100644
--- a/src/Adapter/Product/QueryHandler/SearchProductsForAssociationHandler.php
+++ b/src/Adapter/Product/QueryHandler/SearchProductsForAssociationHandler.php
@@ -30,11 +30,13 @@
use PrestaShop\PrestaShop\Adapter\Product\Image\ProductImagePathFactory;
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Image\ValueObject\ImageId;
use PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProductsForAssociation;
use PrestaShop\PrestaShop\Core\Domain\Product\QueryHandler\SearchProductsForAssociationHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\QueryResult\ProductForAssociation;
+#[AsQueryHandler]
class SearchProductsForAssociationHandler implements SearchProductsForAssociationHandlerInterface
{
/**
diff --git a/src/Adapter/Product/QueryHandler/SearchProductsHandler.php b/src/Adapter/Product/QueryHandler/SearchProductsHandler.php
index 8a6583071ed05..6e8257c0fdf6f 100644
--- a/src/Adapter/Product/QueryHandler/SearchProductsHandler.php
+++ b/src/Adapter/Product/QueryHandler/SearchProductsHandler.php
@@ -36,6 +36,7 @@
use PrestaShop\PrestaShop\Adapter\Currency\CurrencyDataProvider;
use PrestaShop\PrestaShop\Adapter\Order\AbstractOrderHandler;
use PrestaShop\PrestaShop\Adapter\Tools;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProducts;
use PrestaShop\PrestaShop\Core\Domain\Product\QueryHandler\SearchProductsHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\QueryResult\FoundProduct;
@@ -49,6 +50,7 @@
/**
* Handles products search using legacy object model
*/
+#[AsQueryHandler]
final class SearchProductsHandler extends AbstractOrderHandler implements SearchProductsHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Repository/ProductRepository.php b/src/Adapter/Product/Repository/ProductRepository.php
index f65b55ba9974e..bf3e196280cad 100644
--- a/src/Adapter/Product/Repository/ProductRepository.php
+++ b/src/Adapter/Product/Repository/ProductRepository.php
@@ -889,26 +889,27 @@ protected function getSearchQueryBuilder(
->addGroupBy('p.id_product')
;
- $dbSearchPhrase = sprintf('"%%%s%%"', $searchPhrase);
$qb->where($qb->expr()->or(
- $qb->expr()->like('pl.name', $dbSearchPhrase),
+ $qb->expr()->like('pl.name', ':dbSearchPhrase'),
// Product references
- $qb->expr()->like('p.isbn', $dbSearchPhrase),
- $qb->expr()->like('p.upc', $dbSearchPhrase),
- $qb->expr()->like('p.mpn', $dbSearchPhrase),
- $qb->expr()->like('p.reference', $dbSearchPhrase),
- $qb->expr()->like('p.ean13', $dbSearchPhrase),
- $qb->expr()->like('p.supplier_reference', $dbSearchPhrase),
+ $qb->expr()->like('p.isbn', ':dbSearchPhrase'),
+ $qb->expr()->like('p.upc', ':dbSearchPhrase'),
+ $qb->expr()->like('p.mpn', ':dbSearchPhrase'),
+ $qb->expr()->like('p.reference', ':dbSearchPhrase'),
+ $qb->expr()->like('p.ean13', ':dbSearchPhrase'),
+ $qb->expr()->like('p.supplier_reference', ':dbSearchPhrase'),
// Combination attributes
- $qb->expr()->like('pa.isbn', $dbSearchPhrase),
- $qb->expr()->like('pa.upc', $dbSearchPhrase),
- $qb->expr()->like('pa.mpn', $dbSearchPhrase),
- $qb->expr()->like('pa.reference', $dbSearchPhrase),
- $qb->expr()->like('pa.ean13', $dbSearchPhrase),
- $qb->expr()->like('pa.supplier_reference', $dbSearchPhrase)
+ $qb->expr()->like('pa.isbn', ':dbSearchPhrase'),
+ $qb->expr()->like('pa.upc', ':dbSearchPhrase'),
+ $qb->expr()->like('pa.mpn', ':dbSearchPhrase'),
+ $qb->expr()->like('pa.reference', ':dbSearchPhrase'),
+ $qb->expr()->like('pa.ean13', ':dbSearchPhrase'),
+ $qb->expr()->like('pa.supplier_reference', ':dbSearchPhrase')
));
+ $dbSearchPhrase = sprintf('%%%s%%', $searchPhrase);
+ $qb->setParameter(':dbSearchPhrase', $dbSearchPhrase);
if (!empty($filters)) {
foreach ($filters as $type => $filter) {
diff --git a/src/Adapter/Product/Shop/CommandHandler/SetProductShopsHandler.php b/src/Adapter/Product/Shop/CommandHandler/SetProductShopsHandler.php
index 7d4afdb3637c3..9df80a07b4289 100644
--- a/src/Adapter/Product/Shop/CommandHandler/SetProductShopsHandler.php
+++ b/src/Adapter/Product/Shop/CommandHandler/SetProductShopsHandler.php
@@ -30,11 +30,13 @@
use PrestaShop\PrestaShop\Adapter\Product\ProductDeleter;
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
use PrestaShop\PrestaShop\Adapter\Product\Update\ProductShopUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Exception\InvalidProductShopAssociationException;
use PrestaShop\PrestaShop\Core\Domain\Product\Shop\Command\SetProductShopsCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Shop\CommandHandler\SetProductShopsHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopId;
+#[AsCommandHandler]
class SetProductShopsHandler implements SetProductShopsHandlerInterface
{
/**
diff --git a/src/Adapter/Product/SpecificPrice/CommandHandler/AddSpecificPriceHandler.php b/src/Adapter/Product/SpecificPrice/CommandHandler/AddSpecificPriceHandler.php
index aea5045c851ba..c7113552666f7 100644
--- a/src/Adapter/Product/SpecificPrice/CommandHandler/AddSpecificPriceHandler.php
+++ b/src/Adapter/Product/SpecificPrice/CommandHandler/AddSpecificPriceHandler.php
@@ -30,6 +30,7 @@
use PrestaShop\Decimal\DecimalNumber;
use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\AddSpecificPriceCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\CommandHandler\AddSpecificPriceHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Exception\SpecificPriceConstraintException;
@@ -42,6 +43,7 @@
/**
* Handles AddProductSpecificPriceCommand using legacy object model
*/
+#[AsCommandHandler]
class AddSpecificPriceHandler implements AddSpecificPriceHandlerInterface
{
/**
diff --git a/src/Adapter/Product/SpecificPrice/CommandHandler/DeleteSpecificPriceHandler.php b/src/Adapter/Product/SpecificPrice/CommandHandler/DeleteSpecificPriceHandler.php
index 3415e5461952c..5eb45a8754493 100644
--- a/src/Adapter/Product/SpecificPrice/CommandHandler/DeleteSpecificPriceHandler.php
+++ b/src/Adapter/Product/SpecificPrice/CommandHandler/DeleteSpecificPriceHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\DeleteSpecificPriceCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\CommandHandler\DeleteSpecificPriceHandlerInterface;
/**
* Handles DeleteSpecificPriceCommand using legacy object model
*/
+#[AsCommandHandler]
class DeleteSpecificPriceHandler implements DeleteSpecificPriceHandlerInterface
{
/**
diff --git a/src/Adapter/Product/SpecificPrice/CommandHandler/EditSpecificPriceHandler.php b/src/Adapter/Product/SpecificPrice/CommandHandler/EditSpecificPriceHandler.php
index 54cabdcbda275..29dd4c5ea9fb0 100644
--- a/src/Adapter/Product/SpecificPrice/CommandHandler/EditSpecificPriceHandler.php
+++ b/src/Adapter/Product/SpecificPrice/CommandHandler/EditSpecificPriceHandler.php
@@ -29,6 +29,7 @@
use PrestaShop\Decimal\DecimalNumber;
use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\EditSpecificPriceCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\CommandHandler\EditSpecificPriceHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\ValueObject\Reduction;
@@ -38,6 +39,7 @@
/**
* Handles @see EditSpecificPriceCommand using legacy object model
*/
+#[AsCommandHandler]
class EditSpecificPriceHandler implements EditSpecificPriceHandlerInterface
{
/**
diff --git a/src/Adapter/Product/SpecificPrice/CommandHandler/RemoveSpecificPricePriorityForProductHandler.php b/src/Adapter/Product/SpecificPrice/CommandHandler/RemoveSpecificPricePriorityForProductHandler.php
index 48952291aa96a..8bf22379223c1 100644
--- a/src/Adapter/Product/SpecificPrice/CommandHandler/RemoveSpecificPricePriorityForProductHandler.php
+++ b/src/Adapter/Product/SpecificPrice/CommandHandler/RemoveSpecificPricePriorityForProductHandler.php
@@ -28,9 +28,11 @@
namespace PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\RemoveSpecificPricePriorityForProductCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\CommandHandler\RemoveSpecificPricePriorityForProductHandlerInterface;
+#[AsCommandHandler]
class RemoveSpecificPricePriorityForProductHandler implements RemoveSpecificPricePriorityForProductHandlerInterface
{
/**
diff --git a/src/Adapter/Product/SpecificPrice/CommandHandler/SetSpecificPricePriorityForProductHandler.php b/src/Adapter/Product/SpecificPrice/CommandHandler/SetSpecificPricePriorityForProductHandler.php
index 7d008f47be5de..0da1e3b1dd145 100644
--- a/src/Adapter/Product/SpecificPrice/CommandHandler/SetSpecificPricePriorityForProductHandler.php
+++ b/src/Adapter/Product/SpecificPrice/CommandHandler/SetSpecificPricePriorityForProductHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\SetSpecificPricePriorityForProductCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\CommandHandler\SetSpecificPricePriorityForProductHandlerInterface;
/**
* Handles @see SetSpecificPricePriorityForProductCommand using legacy obj model
*/
+#[AsCommandHandler]
class SetSpecificPricePriorityForProductHandler implements SetSpecificPricePriorityForProductHandlerInterface
{
/**
diff --git a/src/Adapter/Product/SpecificPrice/QueryHandler/GetSpecificPriceForEditingHandler.php b/src/Adapter/Product/SpecificPrice/QueryHandler/GetSpecificPriceForEditingHandler.php
index ad1e3db65f6ed..2f57eef51bf09 100644
--- a/src/Adapter/Product/SpecificPrice/QueryHandler/GetSpecificPriceForEditingHandler.php
+++ b/src/Adapter/Product/SpecificPrice/QueryHandler/GetSpecificPriceForEditingHandler.php
@@ -31,6 +31,7 @@
use PrestaShop\Decimal\DecimalNumber;
use PrestaShop\PrestaShop\Adapter\Customer\Repository\CustomerRepository;
use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Customer\ValueObject\CustomerId;
use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Query\GetSpecificPriceForEditing;
use PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\QueryHandler\GetSpecificPriceForEditingHandlerInterface;
@@ -45,6 +46,7 @@
/**
* Handles @see GetSpecificPriceForEditing using legacy object model
*/
+#[AsQueryHandler]
class GetSpecificPriceForEditingHandler implements GetSpecificPriceForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Product/SpecificPrice/QueryHandler/GetSpecificPriceListHandler.php b/src/Adapter/Product/SpecificPrice/QueryHandler/GetSpecificPriceListHandler.php
index dd2e7852d61fe..cfca284573f05 100644
--- a/src/Adapter/Product/SpecificPrice/QueryHandler/GetSpecificPriceListHandler.php
+++ b/src/Adapter/Product/SpecificPrice/QueryHandler/GetSpecificPriceListHandler.php
@@ -31,6 +31,7 @@
use PrestaShop\Decimal\DecimalNumber;
use PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository;
use PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\CombinationAttributeInformation;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Exception\CombinationException;
@@ -48,6 +49,7 @@
/**
* Handles @see GetSpecificPriceList using legacy object model
*/
+#[AsQueryHandler]
class GetSpecificPriceListHandler implements GetSpecificPriceListHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Stock/CommandHandler/UpdateProductStockAvailableHandler.php b/src/Adapter/Product/Stock/CommandHandler/UpdateProductStockAvailableHandler.php
index 318441ec7ec6d..1979d498ee4a1 100644
--- a/src/Adapter/Product/Stock/CommandHandler/UpdateProductStockAvailableHandler.php
+++ b/src/Adapter/Product/Stock/CommandHandler/UpdateProductStockAvailableHandler.php
@@ -31,6 +31,7 @@
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository;
use PrestaShop\PrestaShop\Adapter\Product\Stock\Update\ProductStockProperties;
use PrestaShop\PrestaShop\Adapter\Product\Stock\Update\ProductStockUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Stock\Command\UpdateProductStockAvailableCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Stock\CommandHandler\UpdateProductStockHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\Stock\ValueObject\StockModification;
@@ -39,6 +40,7 @@
/**
* Updates product stock using legacy object model
*/
+#[AsCommandHandler]
class UpdateProductStockAvailableHandler implements UpdateProductStockHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Stock/QueryHandler/GetCombinationStockMovementsHandler.php b/src/Adapter/Product/Stock/QueryHandler/GetCombinationStockMovementsHandler.php
index 98f98260ea3e9..4fe44b1062a54 100644
--- a/src/Adapter/Product/Stock/QueryHandler/GetCombinationStockMovementsHandler.php
+++ b/src/Adapter/Product/Stock/QueryHandler/GetCombinationStockMovementsHandler.php
@@ -28,12 +28,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\Stock\QueryHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Stock\Query\GetCombinationStockMovements;
use PrestaShop\PrestaShop\Core\Domain\Product\Stock\QueryHandler\GetCombinationStockMovementsHandlerInterface;
/**
* Handles @see GetCombinationStockMovements using the adapter repositories.
*/
+#[AsQueryHandler]
class GetCombinationStockMovementsHandler extends AbstractGetStockMovementsHandler implements GetCombinationStockMovementsHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Stock/QueryHandler/GetProductStockMovementsHandler.php b/src/Adapter/Product/Stock/QueryHandler/GetProductStockMovementsHandler.php
index c007eded2c389..14e0bf61b5a55 100644
--- a/src/Adapter/Product/Stock/QueryHandler/GetProductStockMovementsHandler.php
+++ b/src/Adapter/Product/Stock/QueryHandler/GetProductStockMovementsHandler.php
@@ -28,12 +28,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\Stock\QueryHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Stock\Query\GetProductStockMovements;
use PrestaShop\PrestaShop\Core\Domain\Product\Stock\QueryHandler\GetProductStockMovementsHandlerInterface;
/**
* Handles @see GetProductStockMovements using the adapter repositories.
*/
+#[AsQueryHandler]
class GetProductStockMovementsHandler extends AbstractGetStockMovementsHandler implements GetProductStockMovementsHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Stock/Update/ProductStockUpdater.php b/src/Adapter/Product/Stock/Update/ProductStockUpdater.php
index 758592ec68cec..786a722321589 100644
--- a/src/Adapter/Product/Stock/Update/ProductStockUpdater.php
+++ b/src/Adapter/Product/Stock/Update/ProductStockUpdater.php
@@ -121,10 +121,6 @@ public function update(ProductId $productId, ProductStockProperties $properties,
}
$this->updateStockByShopConstraint($stockAvailable, $properties, $shopConstraint);
-
- if ($this->isAdvancedStockEnabled($shopConstraint) && $product->depends_on_stock) {
- StockAvailable::synchronize($product->id);
- }
}
/**
@@ -185,10 +181,6 @@ public function resetStock(ProductId $productId, ShopConstraint $shopConstraint)
new OrderStateId((int) $this->configuration->get('PS_OS_ERROR', null, $shopConstraint)),
new OrderStateId((int) $this->configuration->get('PS_OS_CANCELED', null, $shopConstraint))
);
-
- if ($this->isAdvancedStockEnabled($shopConstraint)) {
- StockAvailable::synchronize($productId->getValue(), $shopId->getValue());
- }
}
}
@@ -323,9 +315,4 @@ private function saveMovement(StockAvailable $stockAvailable, StockModification
]
);
}
-
- private function isAdvancedStockEnabled(ShopConstraint $shopConstraint): bool
- {
- return (bool) $this->configuration->get('PS_ADVANCED_STOCK_MANAGEMENT', null, $shopConstraint);
- }
}
diff --git a/src/Adapter/Product/Stock/Validate/StockAvailableValidator.php b/src/Adapter/Product/Stock/Validate/StockAvailableValidator.php
index 966d10afad29a..19fe746fff187 100644
--- a/src/Adapter/Product/Stock/Validate/StockAvailableValidator.php
+++ b/src/Adapter/Product/Stock/Validate/StockAvailableValidator.php
@@ -48,7 +48,6 @@ public function validate(StockAvailable $stockAvailable): void
$this->validateStockAvailableProperty($stockAvailable, 'quantity', ProductStockConstraintException::INVALID_QUANTITY);
$this->validateStockAvailableProperty($stockAvailable, 'location', ProductStockConstraintException::INVALID_LOCATION);
$this->validateStockAvailableProperty($stockAvailable, 'out_of_stock', ProductStockConstraintException::INVALID_OUT_OF_STOCK);
- $this->validateStockAvailableProperty($stockAvailable, 'depends_on_stock');
$this->validateStockAvailableProperty($stockAvailable, 'id_product');
$this->validateStockAvailableProperty($stockAvailable, 'id_product_attribute');
$this->validateStockAvailableProperty($stockAvailable, 'id_shop');
diff --git a/src/Adapter/Product/Supplier/CommandHandler/RemoveAllAssociatedProductSuppliersHandler.php b/src/Adapter/Product/Supplier/CommandHandler/RemoveAllAssociatedProductSuppliersHandler.php
index a72963e450974..884eef8847a23 100644
--- a/src/Adapter/Product/Supplier/CommandHandler/RemoveAllAssociatedProductSuppliersHandler.php
+++ b/src/Adapter/Product/Supplier/CommandHandler/RemoveAllAssociatedProductSuppliersHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\RemoveAllAssociatedProductSuppliersCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\CommandHandler\RemoveAllAssociatedProductSuppliersHandlerInterface;
/**
* Handles @see RemoveAllAssociatedProductSuppliersCommand using legacy object model
*/
+#[AsCommandHandler]
final class RemoveAllAssociatedProductSuppliersHandler implements RemoveAllAssociatedProductSuppliersHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Supplier/CommandHandler/SetProductDefaultSupplierHandler.php b/src/Adapter/Product/Supplier/CommandHandler/SetProductDefaultSupplierHandler.php
index 81b59d2da4fe7..d4ce33b4ce0a1 100644
--- a/src/Adapter/Product/Supplier/CommandHandler/SetProductDefaultSupplierHandler.php
+++ b/src/Adapter/Product/Supplier/CommandHandler/SetProductDefaultSupplierHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\SetProductDefaultSupplierCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\CommandHandler\SetProductDefaultSupplierHandlerInterface;
/**
* Handles @see SetProductDefaultSupplierCommand using legacy object model
*/
+#[AsCommandHandler]
class SetProductDefaultSupplierHandler implements SetProductDefaultSupplierHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Supplier/CommandHandler/SetSuppliersHandler.php b/src/Adapter/Product/Supplier/CommandHandler/SetSuppliersHandler.php
index 4b9e677326afe..9273f1c71ea84 100644
--- a/src/Adapter/Product/Supplier/CommandHandler/SetSuppliersHandler.php
+++ b/src/Adapter/Product/Supplier/CommandHandler/SetSuppliersHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\SetSuppliersCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\CommandHandler\SetSuppliersHandlerInterface;
/**
* Handles @see SetSuppliersCommand using legacy object model
*/
+#[AsCommandHandler]
class SetSuppliersHandler implements SetSuppliersHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Supplier/CommandHandler/UpdateProductSuppliersHandler.php b/src/Adapter/Product/Supplier/CommandHandler/UpdateProductSuppliersHandler.php
index 7e6a9f200f3f8..8da2d37aa2214 100644
--- a/src/Adapter/Product/Supplier/CommandHandler/UpdateProductSuppliersHandler.php
+++ b/src/Adapter/Product/Supplier/CommandHandler/UpdateProductSuppliersHandler.php
@@ -31,12 +31,14 @@
use PrestaShop\PrestaShop\Adapter\Product\AbstractProductSupplierHandler;
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository;
use PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\UpdateProductSuppliersCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\CommandHandler\UpdateProductSuppliersHandlerInterface;
/**
* Handles @see UpdateProductSuppliersCommand using legacy object model
*/
+#[AsCommandHandler]
final class UpdateProductSuppliersHandler extends AbstractProductSupplierHandler implements UpdateProductSuppliersHandlerInterface
{
/**
diff --git a/src/Adapter/Product/Supplier/QueryHandler/GetAssociatedSuppliersHandler.php b/src/Adapter/Product/Supplier/QueryHandler/GetAssociatedSuppliersHandler.php
index c9544390a6b24..6d753ade46b71 100644
--- a/src/Adapter/Product/Supplier/QueryHandler/GetAssociatedSuppliersHandler.php
+++ b/src/Adapter/Product/Supplier/QueryHandler/GetAssociatedSuppliersHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\Supplier\QueryHandler;
use PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Query\GetAssociatedSuppliers;
use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\QueryHandler\GetAssociatedSuppliersHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\Supplier\QueryResult\AssociatedSuppliers;
use PrestaShop\PrestaShop\Core\Domain\Supplier\ValueObject\NoSupplierId;
use PrestaShop\PrestaShop\Core\Domain\Supplier\ValueObject\SupplierId;
+#[AsQueryHandler]
class GetAssociatedSuppliersHandler implements GetAssociatedSuppliersHandlerInterface
{
/**
diff --git a/src/Adapter/Product/VirtualProduct/CommandHandler/AddVirtualProductFileHandler.php b/src/Adapter/Product/VirtualProduct/CommandHandler/AddVirtualProductFileHandler.php
index 3f8bfa58c3be9..d49e00bcc8394 100644
--- a/src/Adapter/Product/VirtualProduct/CommandHandler/AddVirtualProductFileHandler.php
+++ b/src/Adapter/Product/VirtualProduct/CommandHandler/AddVirtualProductFileHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\AddVirtualProductFileCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\CommandHandler\AddVirtualProductFileHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\ValueObject\VirtualProductFileId;
@@ -40,6 +41,7 @@
*
* Legacy object ProductDownload is referred as VirtualProductFile in Core
*/
+#[AsCommandHandler]
final class AddVirtualProductFileHandler implements AddVirtualProductFileHandlerInterface
{
/**
diff --git a/src/Adapter/Product/VirtualProduct/CommandHandler/DeleteVirtualProductFileHandler.php b/src/Adapter/Product/VirtualProduct/CommandHandler/DeleteVirtualProductFileHandler.php
index d0af89202eaac..e1dd034a604f3 100644
--- a/src/Adapter/Product/VirtualProduct/CommandHandler/DeleteVirtualProductFileHandler.php
+++ b/src/Adapter/Product/VirtualProduct/CommandHandler/DeleteVirtualProductFileHandler.php
@@ -28,12 +28,14 @@
namespace PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\DeleteVirtualProductFileCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\CommandHandler\DeleteVirtualProductFileHandlerInterface;
/**
* Deletes virtual product file using legacy object model
*/
+#[AsCommandHandler]
class DeleteVirtualProductFileHandler implements DeleteVirtualProductFileHandlerInterface
{
/**
diff --git a/src/Adapter/Product/VirtualProduct/CommandHandler/UpdateVirtualProductFileHandler.php b/src/Adapter/Product/VirtualProduct/CommandHandler/UpdateVirtualProductFileHandler.php
index c153865604efc..653156f436739 100644
--- a/src/Adapter/Product/VirtualProduct/CommandHandler/UpdateVirtualProductFileHandler.php
+++ b/src/Adapter/Product/VirtualProduct/CommandHandler/UpdateVirtualProductFileHandler.php
@@ -29,6 +29,7 @@
use PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Repository\VirtualProductFileRepository;
use PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\UpdateVirtualProductFileCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\CommandHandler\UpdateVirtualProductFileHandlerInterface;
use PrestaShop\PrestaShop\Core\Util\DateTime\DateTime;
@@ -37,6 +38,7 @@
/**
* Updates VirtualProductFile using legacy object model. (ProductDownload is referenced as VirtualProduct in core)
*/
+#[AsCommandHandler]
final class UpdateVirtualProductFileHandler implements UpdateVirtualProductFileHandlerInterface
{
/**
diff --git a/src/Adapter/Profile/CommandHandler/AddProfileHandler.php b/src/Adapter/Profile/CommandHandler/AddProfileHandler.php
index f0bd4d88eb181..f1911b02991bd 100644
--- a/src/Adapter/Profile/CommandHandler/AddProfileHandler.php
+++ b/src/Adapter/Profile/CommandHandler/AddProfileHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Profile\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Profile\Command\AddProfileCommand;
use PrestaShop\PrestaShop\Core\Domain\Profile\CommandHandler\AddProfileHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Profile\Exception\ProfileException;
@@ -35,6 +36,7 @@
/**
* Adds new employee profile using legacy object model
*/
+#[AsCommandHandler]
final class AddProfileHandler implements AddProfileHandlerInterface
{
/**
diff --git a/src/Adapter/Profile/CommandHandler/BulkDeleteProfileHandler.php b/src/Adapter/Profile/CommandHandler/BulkDeleteProfileHandler.php
index 7d569204ab0e9..533a6bc6dd6cf 100644
--- a/src/Adapter/Profile/CommandHandler/BulkDeleteProfileHandler.php
+++ b/src/Adapter/Profile/CommandHandler/BulkDeleteProfileHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Profile\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Profile\Command\BulkDeleteProfileCommand;
use PrestaShop\PrestaShop\Core\Domain\Profile\CommandHandler\BulkDeleteProfileHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Profile\Exception\CannotDeleteSuperAdminProfileException;
@@ -41,6 +42,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class BulkDeleteProfileHandler extends AbstractProfileHandler implements BulkDeleteProfileHandlerInterface
{
/**
@@ -69,6 +71,7 @@ public function __construct($superAdminProfileId, ContextEmployeeProviderInterfa
public function handle(BulkDeleteProfileCommand $command)
{
$entityIds = $command->getProfileIds();
+ $exceptionToThrowLater = null;
foreach ($entityIds as $entityId) {
$entityIdValue = $entityId->getValue();
@@ -95,7 +98,17 @@ public function handle(BulkDeleteProfileCommand $command)
}
} catch (PrestaShopException $e) {
throw new ProfileException(sprintf('Unexpected error occurred when deleting Profile with id %s', var_export($entityIdValue, true)), 0, $e);
+ } catch (FailedToDeleteProfileException $e) {
+ if ($e->getCode() === FailedToDeleteProfileException::PROFILE_IS_ASSIGNED_TO_CONTEXT_EMPLOYEE) {
+ $exceptionToThrowLater = $e;
+ continue;
+ }
+ throw $e;
}
}
+
+ if ($exceptionToThrowLater) {
+ throw $exceptionToThrowLater;
+ }
}
}
diff --git a/src/Adapter/Profile/CommandHandler/DeleteProfileHandler.php b/src/Adapter/Profile/CommandHandler/DeleteProfileHandler.php
index e2e87a2e16596..6b26dd04ae564 100644
--- a/src/Adapter/Profile/CommandHandler/DeleteProfileHandler.php
+++ b/src/Adapter/Profile/CommandHandler/DeleteProfileHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Profile\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Profile\Command\DeleteProfileCommand;
use PrestaShop\PrestaShop\Core\Domain\Profile\CommandHandler\DeleteProfileHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Profile\Exception\CannotDeleteSuperAdminProfileException;
@@ -41,6 +42,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class DeleteProfileHandler extends AbstractProfileHandler implements DeleteProfileHandlerInterface
{
/**
diff --git a/src/Adapter/Profile/CommandHandler/EditProfileHandler.php b/src/Adapter/Profile/CommandHandler/EditProfileHandler.php
index 9d147e2f2c8ce..43923d833f818 100644
--- a/src/Adapter/Profile/CommandHandler/EditProfileHandler.php
+++ b/src/Adapter/Profile/CommandHandler/EditProfileHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Profile\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Profile\Command\EditProfileCommand;
use PrestaShop\PrestaShop\Core\Domain\Profile\CommandHandler\EditProfileHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Profile\Exception\ProfileException;
@@ -36,6 +37,7 @@
/**
* Edits Profile using legacy object model
*/
+#[AsCommandHandler]
final class EditProfileHandler implements EditProfileHandlerInterface
{
/**
diff --git a/src/Adapter/Profile/Employee/CommandHandler/AbstractEmployeeHandler.php b/src/Adapter/Profile/Employee/CommandHandler/AbstractEmployeeHandler.php
index b5130ca122606..f9785272deba7 100644
--- a/src/Adapter/Profile/Employee/CommandHandler/AbstractEmployeeHandler.php
+++ b/src/Adapter/Profile/Employee/CommandHandler/AbstractEmployeeHandler.php
@@ -30,11 +30,9 @@
use Employee;
use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
use PrestaShop\PrestaShop\Core\Domain\Employee\Exception\AdminEmployeeException;
-use PrestaShop\PrestaShop\Core\Domain\Employee\Exception\CannotDeleteWarehouseManagerException;
use PrestaShop\PrestaShop\Core\Domain\Employee\Exception\EmployeeCannotChangeItselfException;
use PrestaShop\PrestaShop\Core\Domain\Employee\Exception\EmployeeNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Employee\ValueObject\EmployeeId;
-use Warehouse;
/**
* Class AbstractEmployeeStatusHandler.
@@ -77,22 +75,4 @@ protected function assertLoggedInEmployeeIsNotTheSameAsBeingUpdatedEmployee(Empl
throw new EmployeeCannotChangeItselfException('Employee cannot change status of itself.', EmployeeCannotChangeItselfException::CANNOT_CHANGE_STATUS);
}
}
-
- /**
- * Make sure that given employee does not manage any warehouse.
- *
- * Even though Warehouse feature was removed in 1.7
- * but the code related to it still exists
- * thus assertion is kept for BC i guess.
- *
- * @param Employee $employee
- */
- protected function assertEmployeeDoesNotManageWarehouse(Employee $employee)
- {
- $warehouses = Warehouse::getWarehousesByEmployee($employee->id);
-
- if (count($warehouses) > 0) {
- throw new CannotDeleteWarehouseManagerException(sprintf('Employee with id %s is warehouse manager and cannot be deleted.', $employee->id));
- }
- }
}
diff --git a/src/Adapter/Profile/Employee/CommandHandler/AddEmployeeHandler.php b/src/Adapter/Profile/Employee/CommandHandler/AddEmployeeHandler.php
index 502590730e24c..891414a4b255e 100644
--- a/src/Adapter/Profile/Employee/CommandHandler/AddEmployeeHandler.php
+++ b/src/Adapter/Profile/Employee/CommandHandler/AddEmployeeHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler;
use Employee;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Crypto\Hashing;
use PrestaShop\PrestaShop\Core\Domain\Employee\Command\AddEmployeeCommand;
use PrestaShop\PrestaShop\Core\Domain\Employee\CommandHandler\AddEmployeeHandlerInterface;
@@ -42,6 +43,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class AddEmployeeHandler extends AbstractEmployeeHandler implements AddEmployeeHandlerInterface
{
/**
diff --git a/src/Adapter/Profile/Employee/CommandHandler/BulkDeleteEmployeeHandler.php b/src/Adapter/Profile/Employee/CommandHandler/BulkDeleteEmployeeHandler.php
index 0374ebed96c80..749cc6f0cc3ea 100644
--- a/src/Adapter/Profile/Employee/CommandHandler/BulkDeleteEmployeeHandler.php
+++ b/src/Adapter/Profile/Employee/CommandHandler/BulkDeleteEmployeeHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler;
use Employee;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkDeleteEmployeeCommand;
use PrestaShop\PrestaShop\Core\Domain\Employee\CommandHandler\BulkDeleteEmployeeHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Employee\Exception\CannotDeleteEmployeeException;
@@ -34,6 +35,7 @@
/**
* Class BulkDeleteEmployeeHandler.
*/
+#[AsCommandHandler]
final class BulkDeleteEmployeeHandler extends AbstractEmployeeHandler implements BulkDeleteEmployeeHandlerInterface
{
/**
@@ -47,7 +49,6 @@ public function handle(BulkDeleteEmployeeCommand $command)
$this->assertEmployeeWasFoundById($employeeId, $employee);
$this->assertLoggedInEmployeeIsNotTheSameAsBeingUpdatedEmployee($employee);
$this->assertEmployeeIsNotTheOnlyAdminInShop($employee);
- $this->assertEmployeeDoesNotManageWarehouse($employee);
if (!$employee->delete()) {
throw new CannotDeleteEmployeeException($employeeId, sprintf('Cannot delete employee with id "%s".', $employeeId->getValue()));
diff --git a/src/Adapter/Profile/Employee/CommandHandler/BulkUpdateEmployeeStatusHandler.php b/src/Adapter/Profile/Employee/CommandHandler/BulkUpdateEmployeeStatusHandler.php
index ed3cbcd96510f..6395e8abf0b35 100644
--- a/src/Adapter/Profile/Employee/CommandHandler/BulkUpdateEmployeeStatusHandler.php
+++ b/src/Adapter/Profile/Employee/CommandHandler/BulkUpdateEmployeeStatusHandler.php
@@ -27,12 +27,14 @@
namespace PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler;
use Employee;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkUpdateEmployeeStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Employee\CommandHandler\BulkUpdateEmployeeStatusHandlerInterface;
/**
* Class BulkUpdateEmployeeStatusHandler.
*/
+#[AsCommandHandler]
final class BulkUpdateEmployeeStatusHandler extends AbstractEmployeeHandler implements BulkUpdateEmployeeStatusHandlerInterface
{
/**
diff --git a/src/Adapter/Profile/Employee/CommandHandler/DeleteEmployeeHandler.php b/src/Adapter/Profile/Employee/CommandHandler/DeleteEmployeeHandler.php
index d26cd017aaa2e..b337bb8c55ee8 100644
--- a/src/Adapter/Profile/Employee/CommandHandler/DeleteEmployeeHandler.php
+++ b/src/Adapter/Profile/Employee/CommandHandler/DeleteEmployeeHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler;
use Employee;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Employee\Command\DeleteEmployeeCommand;
use PrestaShop\PrestaShop\Core\Domain\Employee\CommandHandler\DeleteEmployeeHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Employee\Exception\CannotDeleteEmployeeException;
@@ -34,6 +35,7 @@
/**
* Class DeleteEmployeeHandler.
*/
+#[AsCommandHandler]
final class DeleteEmployeeHandler extends AbstractEmployeeHandler implements DeleteEmployeeHandlerInterface
{
/**
@@ -47,7 +49,6 @@ public function handle(DeleteEmployeeCommand $command)
$this->assertEmployeeWasFoundById($employeeId, $employee);
$this->assertLoggedInEmployeeIsNotTheSameAsBeingUpdatedEmployee($employee);
$this->assertEmployeeIsNotTheOnlyAdminInShop($employee);
- $this->assertEmployeeDoesNotManageWarehouse($employee);
if (!$employee->delete()) {
throw new CannotDeleteEmployeeException($employeeId, sprintf('Cannot delete employee with id "%s".', $employeeId->getValue()));
diff --git a/src/Adapter/Profile/Employee/CommandHandler/EditEmployeeHandler.php b/src/Adapter/Profile/Employee/CommandHandler/EditEmployeeHandler.php
index 05032a019f7e4..e78639cfe583c 100644
--- a/src/Adapter/Profile/Employee/CommandHandler/EditEmployeeHandler.php
+++ b/src/Adapter/Profile/Employee/CommandHandler/EditEmployeeHandler.php
@@ -28,6 +28,7 @@
use Employee;
use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Crypto\Hashing;
use PrestaShop\PrestaShop\Core\Domain\Employee\Command\EditEmployeeCommand;
use PrestaShop\PrestaShop\Core\Domain\Employee\CommandHandler\EditEmployeeHandlerInterface;
@@ -44,6 +45,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class EditEmployeeHandler extends AbstractEmployeeHandler implements EditEmployeeHandlerInterface
{
/**
diff --git a/src/Adapter/Profile/Employee/CommandHandler/ToggleEmployeeStatusHandler.php b/src/Adapter/Profile/Employee/CommandHandler/ToggleEmployeeStatusHandler.php
index 90307344dee7b..3e12bbc9daa9e 100644
--- a/src/Adapter/Profile/Employee/CommandHandler/ToggleEmployeeStatusHandler.php
+++ b/src/Adapter/Profile/Employee/CommandHandler/ToggleEmployeeStatusHandler.php
@@ -27,12 +27,14 @@
namespace PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler;
use Employee;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Employee\Command\ToggleEmployeeStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Employee\CommandHandler\ToggleEmployeeStatusHandlerInterface;
/**
* Class ToggleEmployeeStatusHandler encapsulates Employee status toggling using legacy Employee object model.
*/
+#[AsCommandHandler]
final class ToggleEmployeeStatusHandler extends AbstractEmployeeHandler implements ToggleEmployeeStatusHandlerInterface
{
/**
diff --git a/src/Adapter/Profile/Employee/QueryHandler/GetEmployeeEmailByIdHandler.php b/src/Adapter/Profile/Employee/QueryHandler/GetEmployeeEmailByIdHandler.php
index 3ab5907740b89..40ac21a643058 100644
--- a/src/Adapter/Profile/Employee/QueryHandler/GetEmployeeEmailByIdHandler.php
+++ b/src/Adapter/Profile/Employee/QueryHandler/GetEmployeeEmailByIdHandler.php
@@ -27,10 +27,12 @@
namespace PrestaShop\PrestaShop\Adapter\Profile\Employee\QueryHandler;
use PrestaShop\PrestaShop\Adapter\Profile\Employee\AbstractEmployeeHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Employee\Query\GetEmployeeEmailById;
use PrestaShop\PrestaShop\Core\Domain\Employee\QueryHandler\GetEmployeeEmailByIdHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\ValueObject\Email;
+#[AsQueryHandler]
final class GetEmployeeEmailByIdHandler extends AbstractEmployeeHandler implements GetEmployeeEmailByIdHandlerInterface
{
/**
diff --git a/src/Adapter/Profile/Employee/QueryHandler/GetEmployeeForEditingHandler.php b/src/Adapter/Profile/Employee/QueryHandler/GetEmployeeForEditingHandler.php
index f73b6a67c1fbf..c81e20112ed7b 100644
--- a/src/Adapter/Profile/Employee/QueryHandler/GetEmployeeForEditingHandler.php
+++ b/src/Adapter/Profile/Employee/QueryHandler/GetEmployeeForEditingHandler.php
@@ -28,6 +28,7 @@
use Employee;
use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Employee\Exception\EmployeeNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Employee\Query\GetEmployeeForEditing;
use PrestaShop\PrestaShop\Core\Domain\Employee\QueryHandler\GetEmployeeForEditingHandlerInterface;
@@ -41,6 +42,7 @@
/**
* Handles command that gets employee for editing.
*/
+#[AsQueryHandler]
final class GetEmployeeForEditingHandler extends AbstractObjectModelHandler implements GetEmployeeForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Profile/Permission/CommandHandler/UpdateModulePermissionsHandler.php b/src/Adapter/Profile/Permission/CommandHandler/UpdateModulePermissionsHandler.php
index 5e72292d689f2..fade25ec2e6df 100644
--- a/src/Adapter/Profile/Permission/CommandHandler/UpdateModulePermissionsHandler.php
+++ b/src/Adapter/Profile/Permission/CommandHandler/UpdateModulePermissionsHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Profile\Permission\CommandHandler;
use Access;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Command\UpdateModulePermissionsCommand;
use PrestaShop\PrestaShop\Core\Domain\Profile\Permission\CommandHandler\UpdateModulePermissionsHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Exception\PermissionUpdateException;
@@ -38,6 +39,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class UpdateModulePermissionsHandler implements UpdateModulePermissionsHandlerInterface
{
/**
diff --git a/src/Adapter/Profile/Permission/CommandHandler/UpdateTabPermissionsHandler.php b/src/Adapter/Profile/Permission/CommandHandler/UpdateTabPermissionsHandler.php
index 4847a0ccac5d1..87542e17d65a3 100644
--- a/src/Adapter/Profile/Permission/CommandHandler/UpdateTabPermissionsHandler.php
+++ b/src/Adapter/Profile/Permission/CommandHandler/UpdateTabPermissionsHandler.php
@@ -30,6 +30,7 @@
use Access;
use Exception;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Command\UpdateTabPermissionsCommand;
use PrestaShop\PrestaShop\Core\Domain\Profile\Permission\CommandHandler\UpdateTabPermissionsHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Exception\PermissionUpdateException;
@@ -40,6 +41,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class UpdateTabPermissionsHandler implements UpdateTabPermissionsHandlerInterface
{
/**
diff --git a/src/Adapter/Profile/Permission/QueryHandler/GetPermissionsForConfigurationHandler.php b/src/Adapter/Profile/Permission/QueryHandler/GetPermissionsForConfigurationHandler.php
index c632a213599c1..9b2e2eaacfeeb 100644
--- a/src/Adapter/Profile/Permission/QueryHandler/GetPermissionsForConfigurationHandler.php
+++ b/src/Adapter/Profile/Permission/QueryHandler/GetPermissionsForConfigurationHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Profile\Permission\QueryHandler;
use Module;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Query\GetPermissionsForConfiguration;
use PrestaShop\PrestaShop\Core\Domain\Profile\Permission\QueryHandler\GetPermissionsForConfigurationHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Profile\Permission\QueryResult\ConfigurablePermissions;
@@ -44,6 +45,7 @@
*
* @internal
*/
+#[AsQueryHandler]
class GetPermissionsForConfigurationHandler implements GetPermissionsForConfigurationHandlerInterface
{
/**
diff --git a/src/Adapter/Profile/QueryHandler/GetProfileForEditingHandler.php b/src/Adapter/Profile/QueryHandler/GetProfileForEditingHandler.php
index 9c66da8b004fb..7168ded690c21 100644
--- a/src/Adapter/Profile/QueryHandler/GetProfileForEditingHandler.php
+++ b/src/Adapter/Profile/QueryHandler/GetProfileForEditingHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Profile\QueryHandler;
use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Profile\Exception\ProfileNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Profile\Query\GetProfileForEditing;
use PrestaShop\PrestaShop\Core\Domain\Profile\QueryHandler\GetProfileForEditingHandlerInterface;
@@ -38,6 +39,7 @@
/**
* Gets Profile for editing using legacy object model
*/
+#[AsQueryHandler]
final class GetProfileForEditingHandler extends AbstractObjectModelHandler implements GetProfileForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/QuickAccess/Repository/QuickAccessRepository.php b/src/Adapter/QuickAccess/Repository/QuickAccessRepository.php
new file mode 100644
index 0000000000000..aea472ae170c5
--- /dev/null
+++ b/src/Adapter/QuickAccess/Repository/QuickAccessRepository.php
@@ -0,0 +1,66 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Adapter\QuickAccess\Repository;
+
+use Doctrine\DBAL\Connection;
+use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
+use PrestaShop\PrestaShop\Core\QuickAccess\QuickAccessRepositoryInterface;
+use PrestaShop\PrestaShop\Core\Repository\AbstractObjectModelRepository;
+
+class QuickAccessRepository extends AbstractObjectModelRepository implements QuickAccessRepositoryInterface
+{
+ public function __construct(
+ private Connection $connection,
+ private string $dbPrefix
+ ) {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function fetchAll(LanguageId $languageId): array
+ {
+ $qb = $this->connection->createQueryBuilder();
+ $qb
+ ->select('q.id_quick_access, q.new_window, q.link, ql.name')
+ ->from($this->dbPrefix . 'quick_access', 'q')
+ ->innerJoin(
+ 'q',
+ $this->dbPrefix . 'quick_access_lang',
+ 'ql',
+ 'q.id_quick_access = ql.id_quick_access'
+ )
+ ->where('ql.id_lang = :languageId')
+ ->addOrderBy('ql.name', 'ASC')
+ ->setParameter('languageId', $languageId->getValue())
+ ;
+
+ return $qb->execute()->fetchAllAssociative();
+ }
+}
diff --git a/src/Adapter/Requirement/CheckRequirements.php b/src/Adapter/Requirement/CheckRequirements.php
index d159383feb606..35894e1c77731 100644
--- a/src/Adapter/Requirement/CheckRequirements.php
+++ b/src/Adapter/Requirement/CheckRequirements.php
@@ -101,6 +101,7 @@ private function getErrorMessages()
'json' => $this->translator->trans('Enable the JSON extension on your server.', [], 'Admin.Advparameters.Notification'),
'mbstring' => $this->translator->trans('Enable the Mbstring extension on your server.', [], 'Admin.Advparameters.Notification'),
'openssl' => $this->translator->trans('Enable the OpenSSL extension on your server.', [], 'Admin.Advparameters.Notification'),
+ 'openssl_key_generation' => $this->translator->trans('Unable to generate private keys using openssl_pkey_new. Check your OpenSSL configuration, especially the path to openssl.cafile.', [], 'Admin.Advparameters.Notification'),
'pdo_mysql' => $this->translator->trans('Enable the PDO Mysql extension on your server.', [], 'Admin.Advparameters.Notification'),
'simplexml' => $this->translator->trans('Enable the XML extension on your server.', [], 'Admin.Advparameters.Notification'),
'zip' => $this->translator->trans('Enable the ZIP extension on your server.', [], 'Admin.Advparameters.Notification'),
diff --git a/src/Adapter/SearchEngine/CommandHandler/AddSearchEngineHandler.php b/src/Adapter/SearchEngine/CommandHandler/AddSearchEngineHandler.php
index bb370f255f762..3944ac0c1e62d 100644
--- a/src/Adapter/SearchEngine/CommandHandler/AddSearchEngineHandler.php
+++ b/src/Adapter/SearchEngine/CommandHandler/AddSearchEngineHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler;
use PrestaShop\PrestaShop\Adapter\SearchEngine\AbstractSearchEngineHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\AddSearchEngineCommand;
use PrestaShop\PrestaShop\Core\Domain\SearchEngine\CommandHandler\AddSearchEngineHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\SearchEngine\Exception\SearchEngineException;
@@ -39,6 +40,7 @@
/**
* Handles command what is responsible for creating new search engine.
*/
+#[AsCommandHandler]
final class AddSearchEngineHandler extends AbstractSearchEngineHandler implements AddSearchEngineHandlerInterface
{
/**
diff --git a/src/Adapter/SearchEngine/CommandHandler/BulkDeleteSearchEngineHandler.php b/src/Adapter/SearchEngine/CommandHandler/BulkDeleteSearchEngineHandler.php
index e4cd1c18cb538..851e013ee7cb5 100644
--- a/src/Adapter/SearchEngine/CommandHandler/BulkDeleteSearchEngineHandler.php
+++ b/src/Adapter/SearchEngine/CommandHandler/BulkDeleteSearchEngineHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler;
use PrestaShop\PrestaShop\Adapter\SearchEngine\AbstractSearchEngineHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\BulkDeleteSearchEngineCommand;
use PrestaShop\PrestaShop\Core\Domain\SearchEngine\CommandHandler\BulkDeleteSearchEngineHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\SearchEngine\Exception\DeleteSearchEngineException;
@@ -38,6 +39,7 @@
/**
* Handles command that deletes Search Engines in bulk action.
*/
+#[AsCommandHandler]
final class BulkDeleteSearchEngineHandler extends AbstractSearchEngineHandler implements BulkDeleteSearchEngineHandlerInterface
{
/**
diff --git a/src/Adapter/SearchEngine/CommandHandler/DeleteSearchEngineHandler.php b/src/Adapter/SearchEngine/CommandHandler/DeleteSearchEngineHandler.php
index ca9289744638b..0961adb0a5230 100644
--- a/src/Adapter/SearchEngine/CommandHandler/DeleteSearchEngineHandler.php
+++ b/src/Adapter/SearchEngine/CommandHandler/DeleteSearchEngineHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler;
use PrestaShop\PrestaShop\Adapter\SearchEngine\AbstractSearchEngineHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\DeleteSearchEngineCommand;
use PrestaShop\PrestaShop\Core\Domain\SearchEngine\CommandHandler\DeleteSearchEngineHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\SearchEngine\Exception\DeleteSearchEngineException;
@@ -38,6 +39,7 @@
/**
* Handles command that deletes Search Engine.
*/
+#[AsCommandHandler]
final class DeleteSearchEngineHandler extends AbstractSearchEngineHandler implements DeleteSearchEngineHandlerInterface
{
/**
diff --git a/src/Adapter/SearchEngine/CommandHandler/EditSearchEngineHandler.php b/src/Adapter/SearchEngine/CommandHandler/EditSearchEngineHandler.php
index a56d203f8454c..3139b65a644dc 100644
--- a/src/Adapter/SearchEngine/CommandHandler/EditSearchEngineHandler.php
+++ b/src/Adapter/SearchEngine/CommandHandler/EditSearchEngineHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler;
use PrestaShop\PrestaShop\Adapter\SearchEngine\AbstractSearchEngineHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\EditSearchEngineCommand;
use PrestaShop\PrestaShop\Core\Domain\SearchEngine\CommandHandler\EditSearchEngineHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\SearchEngine\Exception\SearchEngineException;
@@ -37,6 +38,7 @@
/**
* Handles command what edits search engine.
*/
+#[AsCommandHandler]
final class EditSearchEngineHandler extends AbstractSearchEngineHandler implements EditSearchEngineHandlerInterface
{
/**
diff --git a/src/Adapter/SearchEngine/QueryHandler/GetSearchEngineForEditingHandler.php b/src/Adapter/SearchEngine/QueryHandler/GetSearchEngineForEditingHandler.php
index d88d73b59b079..c87eb4fff331e 100644
--- a/src/Adapter/SearchEngine/QueryHandler/GetSearchEngineForEditingHandler.php
+++ b/src/Adapter/SearchEngine/QueryHandler/GetSearchEngineForEditingHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\SearchEngine\QueryHandler;
use PrestaShop\PrestaShop\Adapter\SearchEngine\AbstractSearchEngineHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\SearchEngine\Exception\SearchEngineException;
use PrestaShop\PrestaShop\Core\Domain\SearchEngine\Query\GetSearchEngineForEditing;
use PrestaShop\PrestaShop\Core\Domain\SearchEngine\QueryHandler\GetSearchEngineForEditingHandlerInterface;
@@ -37,6 +38,7 @@
/**
* Handles query what gets search engine for editing.
*/
+#[AsQueryHandler]
final class GetSearchEngineForEditingHandler extends AbstractSearchEngineHandler implements GetSearchEngineForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Security/Admin.php b/src/Adapter/Security/Admin.php
index c84ac76d57290..c8f3c6f676cfc 100644
--- a/src/Adapter/Security/Admin.php
+++ b/src/Adapter/Security/Admin.php
@@ -98,7 +98,7 @@ public function onKernelRequest(RequestEvent $event)
//if employee loggdin in legacy context, authenticate him into sf2 security context
if (isset($this->legacyContext->employee) && $this->legacyContext->employee->isLoggedBack()) {
- $user = $this->userProvider->loadUserByUsername($this->legacyContext->employee->email);
+ $user = $this->userProvider->loadUserByIdentifier($this->legacyContext->employee->email);
$token = new UsernamePasswordToken($user, 'admin', $user->getRoles());
$this->securityTokenStorage->setToken($token);
diff --git a/src/Adapter/Security/CommandHandler/BulkDeleteCustomerSessionsHandler.php b/src/Adapter/Security/CommandHandler/BulkDeleteCustomerSessionsHandler.php
index 4209198fb9242..3be961f464e76 100644
--- a/src/Adapter/Security/CommandHandler/BulkDeleteCustomerSessionsHandler.php
+++ b/src/Adapter/Security/CommandHandler/BulkDeleteCustomerSessionsHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Security\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Session\Repository\CustomerSessionRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Security\Command\BulkDeleteCustomerSessionsCommand;
use PrestaShop\PrestaShop\Core\Domain\Security\CommandHandler\BulkDeleteCustomerSessionsHandlerInterface;
@@ -37,6 +38,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class BulkDeleteCustomerSessionsHandler implements BulkDeleteCustomerSessionsHandlerInterface
{
/**
diff --git a/src/Adapter/Security/CommandHandler/BulkDeleteEmployeeSessionsHandler.php b/src/Adapter/Security/CommandHandler/BulkDeleteEmployeeSessionsHandler.php
index 6cf7e737196ef..8a3c045ce28ff 100644
--- a/src/Adapter/Security/CommandHandler/BulkDeleteEmployeeSessionsHandler.php
+++ b/src/Adapter/Security/CommandHandler/BulkDeleteEmployeeSessionsHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Security\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Session\Repository\EmployeeSessionRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Security\Command\BulkDeleteEmployeeSessionsCommand;
use PrestaShop\PrestaShop\Core\Domain\Security\CommandHandler\BulkDeleteEmployeeSessionsHandlerInterface;
@@ -37,6 +38,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class BulkDeleteEmployeeSessionsHandler implements BulkDeleteEmployeeSessionsHandlerInterface
{
/**
diff --git a/src/Adapter/Security/CommandHandler/ClearOutdatedCustomerSessionHandler.php b/src/Adapter/Security/CommandHandler/ClearOutdatedCustomerSessionHandler.php
index 9fc280f1a6100..af02e3f64cb0e 100644
--- a/src/Adapter/Security/CommandHandler/ClearOutdatedCustomerSessionHandler.php
+++ b/src/Adapter/Security/CommandHandler/ClearOutdatedCustomerSessionHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Security\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Session\Repository\CustomerSessionRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Security\Command\ClearOutdatedCustomerSessionCommand;
use PrestaShop\PrestaShop\Core\Domain\Security\CommandHandler\ClearOutdatedCustomerSessionHandlerInterface;
@@ -37,6 +38,7 @@
*
* @internal
*/
+#[AsCommandHandler]
class ClearOutdatedCustomerSessionHandler implements ClearOutdatedCustomerSessionHandlerInterface
{
/**
diff --git a/src/Adapter/Security/CommandHandler/ClearOutdatedEmployeeSessionHandler.php b/src/Adapter/Security/CommandHandler/ClearOutdatedEmployeeSessionHandler.php
index a3b3d34d80ba7..a298a925b8eb6 100644
--- a/src/Adapter/Security/CommandHandler/ClearOutdatedEmployeeSessionHandler.php
+++ b/src/Adapter/Security/CommandHandler/ClearOutdatedEmployeeSessionHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Security\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Session\Repository\EmployeeSessionRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Security\Command\ClearOutdatedEmployeeSessionCommand;
use PrestaShop\PrestaShop\Core\Domain\Security\CommandHandler\ClearOutdatedEmployeeSessionHandlerInterface;
@@ -37,6 +38,7 @@
*
* @internal
*/
+#[AsCommandHandler]
class ClearOutdatedEmployeeSessionHandler implements ClearOutdatedEmployeeSessionHandlerInterface
{
/**
diff --git a/src/Adapter/Security/CommandHandler/DeleteCustomerSessionHandler.php b/src/Adapter/Security/CommandHandler/DeleteCustomerSessionHandler.php
index dc39a67982744..8ebb5901f53ea 100644
--- a/src/Adapter/Security/CommandHandler/DeleteCustomerSessionHandler.php
+++ b/src/Adapter/Security/CommandHandler/DeleteCustomerSessionHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Security\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Session\Repository\CustomerSessionRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Security\Command\DeleteCustomerSessionCommand;
use PrestaShop\PrestaShop\Core\Domain\Security\CommandHandler\DeleteCustomerSessionHandlerInterface;
@@ -37,6 +38,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class DeleteCustomerSessionHandler implements DeleteCustomerSessionHandlerInterface
{
/**
diff --git a/src/Adapter/Security/CommandHandler/DeleteEmployeeSessionHandler.php b/src/Adapter/Security/CommandHandler/DeleteEmployeeSessionHandler.php
index 518f124e81dc1..da498055ea2e1 100644
--- a/src/Adapter/Security/CommandHandler/DeleteEmployeeSessionHandler.php
+++ b/src/Adapter/Security/CommandHandler/DeleteEmployeeSessionHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Security\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Session\Repository\EmployeeSessionRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Security\Command\DeleteEmployeeSessionCommand;
use PrestaShop\PrestaShop\Core\Domain\Security\CommandHandler\DeleteEmployeeSessionHandlerInterface;
@@ -37,6 +38,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class DeleteEmployeeSessionHandler implements DeleteEmployeeSessionHandlerInterface
{
/**
diff --git a/src/Adapter/Shop/CommandHandler/UploadLogosHandler.php b/src/Adapter/Shop/CommandHandler/UploadLogosHandler.php
index 0e23e392038e4..c4a953d803342 100644
--- a/src/Adapter/Shop/CommandHandler/UploadLogosHandler.php
+++ b/src/Adapter/Shop/CommandHandler/UploadLogosHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Shop\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\ConfigurationInterface;
use PrestaShop\PrestaShop\Core\Domain\Exception\FileUploadException;
use PrestaShop\PrestaShop\Core\Domain\Shop\Command\UploadLogosCommand;
@@ -40,6 +41,7 @@
/**
* Class UploadLogosHandler
*/
+#[AsCommandHandler]
final class UploadLogosHandler implements UploadLogosHandlerInterface
{
/**
diff --git a/src/Adapter/Shop/QueryHandler/GetLogosPathsHandler.php b/src/Adapter/Shop/QueryHandler/GetLogosPathsHandler.php
index 95d79639ec9a0..7180e3626f59e 100644
--- a/src/Adapter/Shop/QueryHandler/GetLogosPathsHandler.php
+++ b/src/Adapter/Shop/QueryHandler/GetLogosPathsHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Shop\QueryHandler;
use Configuration;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Shop\Query\GetLogosPaths;
use PrestaShop\PrestaShop\Core\Domain\Shop\QueryHandler\GetLogosPathsHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Shop\QueryResult\LogosPaths;
@@ -34,6 +35,7 @@
/**
* Responsible for providing header, email, invoice and favicon logo paths for specific shop context.
*/
+#[AsQueryHandler]
final class GetLogosPathsHandler implements GetLogosPathsHandlerInterface
{
/**
diff --git a/src/Adapter/Shop/QueryHandler/SearchShopsHandler.php b/src/Adapter/Shop/QueryHandler/SearchShopsHandler.php
index 2765811e2a20b..5b58aee6d4709 100644
--- a/src/Adapter/Shop/QueryHandler/SearchShopsHandler.php
+++ b/src/Adapter/Shop/QueryHandler/SearchShopsHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\Shop\QueryHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Shop\Query\SearchShops;
use PrestaShop\PrestaShop\Core\Domain\Shop\QueryHandler\SearchShopsHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Shop\QueryResult\FoundShop;
@@ -38,6 +39,7 @@
/**
* Responsible for getting shops for a given search term.
*/
+#[AsQueryHandler]
final class SearchShopsHandler implements SearchShopsHandlerInterface
{
/**
diff --git a/src/Adapter/Shop/Url/ProductPreviewProvider.php b/src/Adapter/Shop/Url/ProductPreviewProvider.php
index 2ccca0c2bac05..65f3e4752f7c1 100644
--- a/src/Adapter/Shop/Url/ProductPreviewProvider.php
+++ b/src/Adapter/Shop/Url/ProductPreviewProvider.php
@@ -86,7 +86,7 @@ public function getUrl(?int $productId = null, ?bool $active = true, ?int $shopI
$preview_url = sprintf(
'%s%sadtoken=%s&id_employee=%d&preview=1',
$preview_url,
- ((strpos($preview_url, '?') === false) ? '?' : '&'),
+ ((!str_contains($preview_url, '?')) ? '?' : '&'),
$token,
$this->employeeId
);
diff --git a/src/Adapter/SqlManager/CommandHandler/AddSqlRequestHandler.php b/src/Adapter/SqlManager/CommandHandler/AddSqlRequestHandler.php
index 467a4b69ddd26..365093388aa71 100644
--- a/src/Adapter/SqlManager/CommandHandler/AddSqlRequestHandler.php
+++ b/src/Adapter/SqlManager/CommandHandler/AddSqlRequestHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\AddSqlRequestCommand;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\CommandHandler\AddSqlRequestHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Exception\CannotAddSqlRequestException;
@@ -39,6 +40,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class AddSqlRequestHandler extends AbstractSqlRequestHandler implements AddSqlRequestHandlerInterface
{
/**
diff --git a/src/Adapter/SqlManager/CommandHandler/BulkDeleteSqlRequestHandler.php b/src/Adapter/SqlManager/CommandHandler/BulkDeleteSqlRequestHandler.php
index 3c507a8a814d5..3f7d77b7f2acd 100644
--- a/src/Adapter/SqlManager/CommandHandler/BulkDeleteSqlRequestHandler.php
+++ b/src/Adapter/SqlManager/CommandHandler/BulkDeleteSqlRequestHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\BulkDeleteSqlRequestCommand;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\CommandHandler\BulkDeleteSqlRequestHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Exception\CannotDeleteSqlRequestException;
@@ -36,6 +37,7 @@
/**
* Class BulkDeleteSqlRequestHandler handles bulk delete of SqlRequest command.
*/
+#[AsCommandHandler]
final class BulkDeleteSqlRequestHandler implements BulkDeleteSqlRequestHandlerInterface
{
/**
diff --git a/src/Adapter/SqlManager/CommandHandler/DeleteSqlRequestHandler.php b/src/Adapter/SqlManager/CommandHandler/DeleteSqlRequestHandler.php
index ccc5d4eaca829..c7569e5aa7040 100644
--- a/src/Adapter/SqlManager/CommandHandler/DeleteSqlRequestHandler.php
+++ b/src/Adapter/SqlManager/CommandHandler/DeleteSqlRequestHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\DeleteSqlRequestCommand;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\CommandHandler\DeleteSqlRequestHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Exception\CannotDeleteSqlRequestException;
@@ -39,6 +40,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class DeleteSqlRequestHandler implements DeleteSqlRequestHandlerInterface
{
/**
diff --git a/src/Adapter/SqlManager/CommandHandler/EditSqlRequestHandler.php b/src/Adapter/SqlManager/CommandHandler/EditSqlRequestHandler.php
index 424deca9721e7..e89c7f6fbd78d 100644
--- a/src/Adapter/SqlManager/CommandHandler/EditSqlRequestHandler.php
+++ b/src/Adapter/SqlManager/CommandHandler/EditSqlRequestHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\EditSqlRequestCommand;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\CommandHandler\EditSqlRequestHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Exception\CannotEditSqlRequestException;
@@ -39,6 +40,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class EditSqlRequestHandler extends AbstractSqlRequestHandler implements EditSqlRequestHandlerInterface
{
/**
diff --git a/src/Adapter/SqlManager/QueryHandler/GetDatabaseTableFieldsListHandler.php b/src/Adapter/SqlManager/QueryHandler/GetDatabaseTableFieldsListHandler.php
index f1cdb1f3e2c63..4510a496965cb 100644
--- a/src/Adapter/SqlManager/QueryHandler/GetDatabaseTableFieldsListHandler.php
+++ b/src/Adapter/SqlManager/QueryHandler/GetDatabaseTableFieldsListHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\DatabaseTableFields;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetDatabaseTableFieldsList;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\QueryHandler\GetDatabaseTableFieldsListHandlerInterface;
@@ -37,6 +38,7 @@
*
* @internal
*/
+#[AsQueryHandler]
final class GetDatabaseTableFieldsListHandler implements GetDatabaseTableFieldsListHandlerInterface
{
/**
diff --git a/src/Adapter/SqlManager/QueryHandler/GetDatabaseTablesListHandler.php b/src/Adapter/SqlManager/QueryHandler/GetDatabaseTablesListHandler.php
index 5653832f5aa2e..aa1023543066c 100644
--- a/src/Adapter/SqlManager/QueryHandler/GetDatabaseTablesListHandler.php
+++ b/src/Adapter/SqlManager/QueryHandler/GetDatabaseTablesListHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\DatabaseTablesList;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetDatabaseTablesList;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\QueryHandler\GetDatabaseTablesListHandlerInterface;
@@ -36,6 +37,7 @@
*
* @internal
*/
+#[AsQueryHandler]
final class GetDatabaseTablesListHandler implements GetDatabaseTablesListHandlerInterface
{
/**
diff --git a/src/Adapter/SqlManager/QueryHandler/GetSqlRequestExecutionResultHandler.php b/src/Adapter/SqlManager/QueryHandler/GetSqlRequestExecutionResultHandler.php
index 96c336d476ddd..25c56567ef01c 100644
--- a/src/Adapter/SqlManager/QueryHandler/GetSqlRequestExecutionResultHandler.php
+++ b/src/Adapter/SqlManager/QueryHandler/GetSqlRequestExecutionResultHandler.php
@@ -28,6 +28,7 @@
use Db;
use PHPSQLParser\PHPSQLParser;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Exception\SqlRequestException;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Exception\SqlRequestNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestExecutionResult;
@@ -41,6 +42,7 @@
*
* @internal
*/
+#[AsQueryHandler]
final class GetSqlRequestExecutionResultHandler implements GetSqlRequestExecutionResultHandlerInterface
{
/**
diff --git a/src/Adapter/SqlManager/QueryHandler/GetSqlRequestForEditingHandler.php b/src/Adapter/SqlManager/QueryHandler/GetSqlRequestForEditingHandler.php
index 10a65ae90c2bb..9746c320f69da 100644
--- a/src/Adapter/SqlManager/QueryHandler/GetSqlRequestForEditingHandler.php
+++ b/src/Adapter/SqlManager/QueryHandler/GetSqlRequestForEditingHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\EditableSqlRequest;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Exception\SqlRequestException;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Exception\SqlRequestNotFoundException;
@@ -39,6 +40,7 @@
*
* @internal
*/
+#[AsQueryHandler]
final class GetSqlRequestForEditingHandler implements GetSqlRequestForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/State/CommandHandler/AddStateHandler.php b/src/Adapter/State/CommandHandler/AddStateHandler.php
index 329ba3f3211b3..fd9cd42defb4f 100644
--- a/src/Adapter/State/CommandHandler/AddStateHandler.php
+++ b/src/Adapter/State/CommandHandler/AddStateHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\State\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\State\Command\AddStateCommand;
use PrestaShop\PrestaShop\Core\Domain\State\CommandHandler\AddStateHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\State\Exception\CannotAddStateException;
@@ -40,6 +41,7 @@
/**
* Handles creation of state
*/
+#[AsCommandHandler]
class AddStateHandler implements AddStateHandlerInterface
{
/**
diff --git a/src/Adapter/State/CommandHandler/BulkDeleteStateHandler.php b/src/Adapter/State/CommandHandler/BulkDeleteStateHandler.php
index 1d36f905c1847..bb0cdb085d05c 100644
--- a/src/Adapter/State/CommandHandler/BulkDeleteStateHandler.php
+++ b/src/Adapter/State/CommandHandler/BulkDeleteStateHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\State\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\State\Command\BulkDeleteStateCommand;
use PrestaShop\PrestaShop\Core\Domain\State\CommandHandler\BulkDeleteStateHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\State\Exception\DeleteStateException;
@@ -37,6 +38,7 @@
/**
* Handles command that bulk delete states
*/
+#[AsCommandHandler]
class BulkDeleteStateHandler implements BulkDeleteStateHandlerInterface
{
/**
diff --git a/src/Adapter/State/CommandHandler/BulkToggleStateStatusHandler.php b/src/Adapter/State/CommandHandler/BulkToggleStateStatusHandler.php
index 2468953f784fc..c620b896cef3f 100644
--- a/src/Adapter/State/CommandHandler/BulkToggleStateStatusHandler.php
+++ b/src/Adapter/State/CommandHandler/BulkToggleStateStatusHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\State\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\State\Command\BulkToggleStateStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\State\CommandHandler\BulkToggleStateStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\State\Exception\CannotToggleStateStatusException;
@@ -39,6 +40,7 @@
/**
* Handles command that toggles states status in bulk action
*/
+#[AsCommandHandler]
class BulkToggleStateStatusHandler implements BulkToggleStateStatusHandlerInterface
{
/**
diff --git a/src/Adapter/State/CommandHandler/DeleteStateHandler.php b/src/Adapter/State/CommandHandler/DeleteStateHandler.php
index 9e1f015d9257a..97192c88dc775 100644
--- a/src/Adapter/State/CommandHandler/DeleteStateHandler.php
+++ b/src/Adapter/State/CommandHandler/DeleteStateHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\State\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\State\Command\DeleteStateCommand;
use PrestaShop\PrestaShop\Core\Domain\State\CommandHandler\DeleteStateHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\State\Exception\DeleteStateException;
@@ -37,6 +38,7 @@
/**
* Handles command that delete state
*/
+#[AsCommandHandler]
class DeleteStateHandler implements DeleteStateHandlerInterface
{
/**
diff --git a/src/Adapter/State/CommandHandler/EditStateHandler.php b/src/Adapter/State/CommandHandler/EditStateHandler.php
index 67f5805c1ae2f..5f6b1bb47ce0a 100644
--- a/src/Adapter/State/CommandHandler/EditStateHandler.php
+++ b/src/Adapter/State/CommandHandler/EditStateHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\State\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\State\Command\EditStateCommand;
use PrestaShop\PrestaShop\Core\Domain\State\CommandHandler\EditStateHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\State\Exception\CannotUpdateStateException;
@@ -41,6 +42,7 @@
/**
* Handles state editing
*/
+#[AsCommandHandler]
class EditStateHandler implements EditStateHandlerInterface
{
/**
diff --git a/src/Adapter/State/CommandHandler/ToggleStateStatusHandler.php b/src/Adapter/State/CommandHandler/ToggleStateStatusHandler.php
index b283df8436ec4..d1da3ed45d3b1 100644
--- a/src/Adapter/State/CommandHandler/ToggleStateStatusHandler.php
+++ b/src/Adapter/State/CommandHandler/ToggleStateStatusHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\State\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\State\Command\ToggleStateStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\State\CommandHandler\ToggleStateStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\State\Exception\CannotToggleStateStatusException;
@@ -36,6 +37,7 @@
use PrestaShopException;
use State;
+#[AsCommandHandler]
class ToggleStateStatusHandler implements ToggleStateStatusHandlerInterface
{
/**
diff --git a/src/Adapter/State/QueryHandler/GetStateForEditingHandler.php b/src/Adapter/State/QueryHandler/GetStateForEditingHandler.php
index 62f90974520f1..3d08861a0ab5a 100644
--- a/src/Adapter/State/QueryHandler/GetStateForEditingHandler.php
+++ b/src/Adapter/State/QueryHandler/GetStateForEditingHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\State\QueryHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Country\ValueObject\CountryId;
use PrestaShop\PrestaShop\Core\Domain\State\Exception\StateNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\State\Query\GetStateForEditing;
@@ -41,6 +42,7 @@
*
* @internal
*/
+#[AsQueryHandler]
class GetStateForEditingHandler implements GetStateForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/StockManager.php b/src/Adapter/StockManager.php
index 3ecebe0c1a4f1..889f493d4b8ab 100644
--- a/src/Adapter/StockManager.php
+++ b/src/Adapter/StockManager.php
@@ -27,7 +27,6 @@
namespace PrestaShop\PrestaShop\Adapter;
use Db;
-use PrestaShop\PrestaShop\Adapter\Configuration as ConfigurationAdapter;
use PrestaShop\PrestaShop\Adapter\Shop\Context as ShopAdapter;
use PrestaShopBundle\Service\DataProvider\StockInterface;
use StockAvailable;
@@ -43,7 +42,7 @@ class StockManager implements StockInterface
* Gets available stock for a given product / combination / shop.
*
* @param object $product
- * @param null $id_product_attribute
+ * @param int|null $id_product_attribute
* @param int|null $id_shop
*
* @return StockAvailable
@@ -84,10 +83,17 @@ public function getStockAvailableByProduct($product, $id_product_attribute = nul
* Returns True if Stocks are managed by a module (or by legacy ASM).
*
* @return bool True if Stocks are managed by a module (or by legacy ASM)
+ *
+ * @deprecated Since 9.0 and will be removed in 10.0
*/
public function isAsmGloballyActivated()
{
- return (bool) (new ConfigurationAdapter())->get('PS_ADVANCED_STOCK_MANAGEMENT');
+ @trigger_error(sprintf(
+ '%s is deprecated since 9.0 and will be removed in 10.0.',
+ __METHOD__
+ ), E_USER_DEPRECATED);
+
+ return false;
}
/**
@@ -230,7 +236,7 @@ public function getStockAvailableIdByProductId($productId, $productAttributeId =
* @param int $productId
* @param int $shopId Optional : gets context if null @see Context::getContext()
*
- * @return bool : depends on stock @see $depends_on_stock
+ * @return bool True if product is orderable when out of stock
*/
public function outOfStock($productId, $shopId = null)
{
diff --git a/src/Adapter/Store/CommandHandler/BulkDeleteStoreHandler.php b/src/Adapter/Store/CommandHandler/BulkDeleteStoreHandler.php
index 8de1668c12700..d92d92426e29e 100644
--- a/src/Adapter/Store/CommandHandler/BulkDeleteStoreHandler.php
+++ b/src/Adapter/Store/CommandHandler/BulkDeleteStoreHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\Store\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Store\Command\BulkDeleteStoreCommand;
use PrestaShop\PrestaShop\Core\Domain\Store\CommandHandler\BulkDeleteStoreHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Store\Exception\CannotDeleteStoreException;
@@ -36,6 +37,7 @@
/**
* Handles command that deletes stores
*/
+#[AsCommandHandler]
class BulkDeleteStoreHandler implements BulkDeleteStoreHandlerInterface
{
/**
diff --git a/src/Adapter/Store/CommandHandler/BulkUpdateStoreStatusHandler.php b/src/Adapter/Store/CommandHandler/BulkUpdateStoreStatusHandler.php
index a7320ef8d196d..2e189ed09dbf6 100644
--- a/src/Adapter/Store/CommandHandler/BulkUpdateStoreStatusHandler.php
+++ b/src/Adapter/Store/CommandHandler/BulkUpdateStoreStatusHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\Store\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Store\Command\BulkUpdateStoreStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Store\CommandHandler\BulkUpdateStoreStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Store\Exception\CannotToggleStoreStatusException;
@@ -36,6 +37,7 @@
/**
* Handles command that toggle store status
*/
+#[AsCommandHandler]
class BulkUpdateStoreStatusHandler implements BulkUpdateStoreStatusHandlerInterface
{
/**
diff --git a/src/Adapter/Store/CommandHandler/DeleteStoreHandler.php b/src/Adapter/Store/CommandHandler/DeleteStoreHandler.php
index 56d1deff10242..f937609ab761c 100644
--- a/src/Adapter/Store/CommandHandler/DeleteStoreHandler.php
+++ b/src/Adapter/Store/CommandHandler/DeleteStoreHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\Store\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Store\Command\DeleteStoreCommand;
use PrestaShop\PrestaShop\Core\Domain\Store\CommandHandler\DeleteStoreHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Store\Repository\StoreRepository;
@@ -35,6 +36,7 @@
/**
* Handles command that deletes store
*/
+#[AsCommandHandler]
class DeleteStoreHandler implements DeleteStoreHandlerInterface
{
/**
diff --git a/src/Adapter/Store/CommandHandler/ToggleStoreStatusHandler.php b/src/Adapter/Store/CommandHandler/ToggleStoreStatusHandler.php
index 0121edca93d47..be5a5ee81a9ac 100644
--- a/src/Adapter/Store/CommandHandler/ToggleStoreStatusHandler.php
+++ b/src/Adapter/Store/CommandHandler/ToggleStoreStatusHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\Store\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Store\Command\ToggleStoreStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Store\CommandHandler\ToggleStoreStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Store\Exception\CannotToggleStoreStatusException;
@@ -36,6 +37,7 @@
/**
* Handles command that toggle store status
*/
+#[AsCommandHandler]
class ToggleStoreStatusHandler implements ToggleStoreStatusHandlerInterface
{
/**
diff --git a/src/Adapter/Store/QueryHandler/GetStoreForEditingHandler.php b/src/Adapter/Store/QueryHandler/GetStoreForEditingHandler.php
index 5f53e71622d5f..c9dc4a8d707fe 100644
--- a/src/Adapter/Store/QueryHandler/GetStoreForEditingHandler.php
+++ b/src/Adapter/Store/QueryHandler/GetStoreForEditingHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Store\QueryHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Store\Exception\StoreException;
use PrestaShop\PrestaShop\Core\Domain\Store\Exception\StoreNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Store\Query\GetStoreForEditing;
@@ -34,6 +35,7 @@
use PrestaShop\PrestaShop\Core\Domain\Store\Repository\StoreRepository;
use PrestaShopException;
+#[AsQueryHandler]
class GetStoreForEditingHandler implements GetStoreForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Supplier/CommandHandler/AbstractDeleteSupplierHandler.php b/src/Adapter/Supplier/CommandHandler/AbstractDeleteSupplierHandler.php
index b20c84739ba12..06eb753b81155 100644
--- a/src/Adapter/Supplier/CommandHandler/AbstractDeleteSupplierHandler.php
+++ b/src/Adapter/Supplier/CommandHandler/AbstractDeleteSupplierHandler.php
@@ -30,10 +30,8 @@
use Db;
use PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater;
use PrestaShop\PrestaShop\Adapter\Supplier\SupplierAddressProvider;
-use PrestaShop\PrestaShop\Adapter\Supplier\SupplierOrderValidator;
use PrestaShop\PrestaShop\Core\Domain\Product\ValueObject\ProductId;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\CannotDeleteSupplierAddressException;
-use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\CannotDeleteSupplierException;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\CannotDeleteSupplierProductRelationException;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\SupplierException;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\SupplierNotFoundException;
@@ -47,11 +45,6 @@
*/
abstract class AbstractDeleteSupplierHandler
{
- /**
- * @var SupplierOrderValidator
- */
- private $supplierOrderValidator;
-
/**
* @var string
*/
@@ -68,18 +61,15 @@ abstract class AbstractDeleteSupplierHandler
private $productSupplierUpdater;
/**
- * @param SupplierOrderValidator $supplierOrderValidator
* @param SupplierAddressProvider $supplierAddressProvider
* @param ProductSupplierUpdater $productSupplierUpdater
* @param string $dbPrefix
*/
public function __construct(
- SupplierOrderValidator $supplierOrderValidator,
SupplierAddressProvider $supplierAddressProvider,
ProductSupplierUpdater $productSupplierUpdater,
string $dbPrefix
) {
- $this->supplierOrderValidator = $supplierOrderValidator;
$this->dbPrefix = $dbPrefix;
$this->supplierAddressProvider = $supplierAddressProvider;
$this->productSupplierUpdater = $productSupplierUpdater;
@@ -102,16 +92,6 @@ protected function removeSupplier(SupplierId $supplierId)
throw new SupplierNotFoundException(sprintf('Supplier object with id "%s" was not found for deletion.', $supplierId->getValue()));
}
- if ($this->hasPendingOrders($supplierId)) {
- throw new CannotDeleteSupplierException(
- sprintf(
- 'Supplier with id %d cannot be deleted due to it has pending orders',
- $supplierId->getValue()
- ),
- CannotDeleteSupplierException::HAS_PENDING_ORDERS
- );
- }
-
if (false === $this->deleteProductSupplierRelation($supplierId)) {
throw new CannotDeleteSupplierProductRelationException(
sprintf(
@@ -186,16 +166,4 @@ private function deleteSupplierAddress(SupplierId $supplierId)
return true;
}
-
- /**
- * Checks if the given supplier has pending orders.
- *
- * @param SupplierId $supplierId
- *
- * @return bool
- */
- private function hasPendingOrders(SupplierId $supplierId)
- {
- return $this->supplierOrderValidator->hasPendingOrders($supplierId->getValue());
- }
}
diff --git a/src/Adapter/Supplier/CommandHandler/AddSupplierHandler.php b/src/Adapter/Supplier/CommandHandler/AddSupplierHandler.php
index 9976b04dd7b83..0d486ad3471b5 100644
--- a/src/Adapter/Supplier/CommandHandler/AddSupplierHandler.php
+++ b/src/Adapter/Supplier/CommandHandler/AddSupplierHandler.php
@@ -29,6 +29,7 @@
use Address;
use PrestaShop\PrestaShop\Adapter\Supplier\AbstractSupplierHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Command\AddSupplierCommand;
use PrestaShop\PrestaShop\Core\Domain\Supplier\CommandHandler\AddSupplierHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\SupplierException;
@@ -40,6 +41,7 @@
/**
* Handles command which adds new supplier using legacy object model
*/
+#[AsCommandHandler]
final class AddSupplierHandler extends AbstractSupplierHandler implements AddSupplierHandlerInterface
{
/**
diff --git a/src/Adapter/Supplier/CommandHandler/BulkDeleteSupplierHandler.php b/src/Adapter/Supplier/CommandHandler/BulkDeleteSupplierHandler.php
index ff665f9d53a8b..02ae51ddd211b 100644
--- a/src/Adapter/Supplier/CommandHandler/BulkDeleteSupplierHandler.php
+++ b/src/Adapter/Supplier/CommandHandler/BulkDeleteSupplierHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkDeleteSupplierCommand;
use PrestaShop\PrestaShop\Core\Domain\Supplier\CommandHandler\BulkDeleteSupplierHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\CannotDeleteSupplierException;
@@ -34,6 +35,7 @@
/**
* Class BulkDeleteSupplierHandler is responsible for deleting multiple suppliers.
*/
+#[AsCommandHandler]
final class BulkDeleteSupplierHandler extends AbstractDeleteSupplierHandler implements BulkDeleteSupplierHandlerInterface
{
/**
@@ -47,7 +49,7 @@ public function handle(BulkDeleteSupplierCommand $command)
try {
$this->removeSupplier($supplierId);
} catch (SupplierException $e) {
- if (SupplierException::class === get_class($e)) {
+ if (SupplierException::class === $e::class) {
throw new CannotDeleteSupplierException(sprintf('Cannot delete Supplier object with id "%s".', $supplierId->getValue()), CannotDeleteSupplierException::FAILED_BULK_DELETE);
}
diff --git a/src/Adapter/Supplier/CommandHandler/BulkDisableSupplierHandler.php b/src/Adapter/Supplier/CommandHandler/BulkDisableSupplierHandler.php
index 0cbc86f5ccacd..a68278713cc51 100644
--- a/src/Adapter/Supplier/CommandHandler/BulkDisableSupplierHandler.php
+++ b/src/Adapter/Supplier/CommandHandler/BulkDisableSupplierHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkDisableSupplierCommand;
use PrestaShop\PrestaShop\Core\Domain\Supplier\CommandHandler\BulkDisableSupplierHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\CannotUpdateSupplierStatusException;
@@ -37,6 +38,7 @@
/**
* Class BulkDisableSupplierHandler is responsible for disabling multiple suppliers.
*/
+#[AsCommandHandler]
final class BulkDisableSupplierHandler implements BulkDisableSupplierHandlerInterface
{
/**
diff --git a/src/Adapter/Supplier/CommandHandler/BulkEnableSupplierHandler.php b/src/Adapter/Supplier/CommandHandler/BulkEnableSupplierHandler.php
index 47524f48beb7e..dccc2888be505 100644
--- a/src/Adapter/Supplier/CommandHandler/BulkEnableSupplierHandler.php
+++ b/src/Adapter/Supplier/CommandHandler/BulkEnableSupplierHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkEnableSupplierCommand;
use PrestaShop\PrestaShop\Core\Domain\Supplier\CommandHandler\BulkEnableSupplierHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\CannotUpdateSupplierStatusException;
@@ -37,6 +38,7 @@
/**
* Class BulkEnableSupplierHandler is responsible for enabling multiple suppliers.
*/
+#[AsCommandHandler]
final class BulkEnableSupplierHandler implements BulkEnableSupplierHandlerInterface
{
/**
diff --git a/src/Adapter/Supplier/CommandHandler/DeleteSupplierHandler.php b/src/Adapter/Supplier/CommandHandler/DeleteSupplierHandler.php
index 91f7d9f511769..10d69b807c5bc 100644
--- a/src/Adapter/Supplier/CommandHandler/DeleteSupplierHandler.php
+++ b/src/Adapter/Supplier/CommandHandler/DeleteSupplierHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Command\DeleteSupplierCommand;
use PrestaShop\PrestaShop\Core\Domain\Supplier\CommandHandler\DeleteSupplierHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\CannotDeleteSupplierException;
@@ -34,6 +35,7 @@
/**
* Class DeleteSupplierHandler is responsible for deleting the supplier.
*/
+#[AsCommandHandler]
final class DeleteSupplierHandler extends AbstractDeleteSupplierHandler implements DeleteSupplierHandlerInterface
{
/**
@@ -47,7 +49,7 @@ public function handle(DeleteSupplierCommand $command)
try {
$this->removeSupplier($supplierId);
} catch (SupplierException $e) {
- if (SupplierException::class === get_class($e)) {
+ if (SupplierException::class === $e::class) {
throw new CannotDeleteSupplierException(sprintf('Cannot delete Supplier object with id "%s".', $supplierId->getValue()), CannotDeleteSupplierException::FAILED_DELETE);
}
diff --git a/src/Adapter/Supplier/CommandHandler/DeleteSupplierLogoImageHandler.php b/src/Adapter/Supplier/CommandHandler/DeleteSupplierLogoImageHandler.php
index 1688223de7132..9b6b5427ce5ec 100644
--- a/src/Adapter/Supplier/CommandHandler/DeleteSupplierLogoImageHandler.php
+++ b/src/Adapter/Supplier/CommandHandler/DeleteSupplierLogoImageHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler;
use ImageType;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Command\DeleteSupplierLogoImageCommand;
use PrestaShop\PrestaShop\Core\Domain\Supplier\CommandHandler\DeleteSupplierLogoImageHandlerInterface;
use Symfony\Component\Filesystem\Filesystem;
@@ -36,6 +37,7 @@
/**
* Handles command which deletes supplier cover image using legacy object model
*/
+#[AsCommandHandler]
class DeleteSupplierLogoImageHandler implements DeleteSupplierLogoImageHandlerInterface
{
/**
diff --git a/src/Adapter/Supplier/CommandHandler/EditSupplierHandler.php b/src/Adapter/Supplier/CommandHandler/EditSupplierHandler.php
index 93c051d3b2ae3..8968553d6de74 100644
--- a/src/Adapter/Supplier/CommandHandler/EditSupplierHandler.php
+++ b/src/Adapter/Supplier/CommandHandler/EditSupplierHandler.php
@@ -29,6 +29,7 @@
use Address;
use PrestaShop\PrestaShop\Adapter\Supplier\AbstractSupplierHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Command\EditSupplierCommand;
use PrestaShop\PrestaShop\Core\Domain\Supplier\CommandHandler\EditSupplierHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\SupplierException;
@@ -38,6 +39,7 @@
/**
* Handles command which edits supplier using legacy object model
*/
+#[AsCommandHandler]
final class EditSupplierHandler extends AbstractSupplierHandler implements EditSupplierHandlerInterface
{
/**
diff --git a/src/Adapter/Supplier/CommandHandler/ToggleSupplierStatusHandler.php b/src/Adapter/Supplier/CommandHandler/ToggleSupplierStatusHandler.php
index fc6de9d795160..7c945450e1ba4 100644
--- a/src/Adapter/Supplier/CommandHandler/ToggleSupplierStatusHandler.php
+++ b/src/Adapter/Supplier/CommandHandler/ToggleSupplierStatusHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Command\ToggleSupplierStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Supplier\CommandHandler\ToggleSupplierStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\CannotToggleSupplierStatusException;
@@ -37,6 +38,7 @@
/**
* Class ToggleSupplierStatusHandler is responsible for toggling supplier status.
*/
+#[AsCommandHandler]
final class ToggleSupplierStatusHandler implements ToggleSupplierStatusHandlerInterface
{
/**
diff --git a/src/Adapter/Supplier/QueryHandler/GetSupplierForEditingHandler.php b/src/Adapter/Supplier/QueryHandler/GetSupplierForEditingHandler.php
index 9a90814dc48dd..c6d5afa3be7ed 100644
--- a/src/Adapter/Supplier/QueryHandler/GetSupplierForEditingHandler.php
+++ b/src/Adapter/Supplier/QueryHandler/GetSupplierForEditingHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Supplier\QueryHandler;
use PrestaShop\PrestaShop\Adapter\Supplier\AbstractSupplierHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Query\GetSupplierForEditing;
use PrestaShop\PrestaShop\Core\Domain\Supplier\QueryHandler\GetSupplierForEditingHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Supplier\QueryResult\EditableSupplier;
@@ -35,6 +36,7 @@
/**
* Handles query which gets supplier for editing
*/
+#[AsQueryHandler]
final class GetSupplierForEditingHandler extends AbstractSupplierHandler implements GetSupplierForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Supplier/QueryHandler/GetSupplierForViewingHandler.php b/src/Adapter/Supplier/QueryHandler/GetSupplierForViewingHandler.php
index 386bd7a383e34..bd622951c413f 100644
--- a/src/Adapter/Supplier/QueryHandler/GetSupplierForViewingHandler.php
+++ b/src/Adapter/Supplier/QueryHandler/GetSupplierForViewingHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Supplier\QueryHandler;
use Currency;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\SupplierException;
use PrestaShop\PrestaShop\Core\Domain\Supplier\Exception\SupplierNotFoundException;
@@ -42,6 +43,7 @@
/**
* Handles query which gets supplier for viewing
*/
+#[AsQueryHandler]
final class GetSupplierForViewingHandler implements GetSupplierForViewingHandlerInterface
{
/**
diff --git a/src/Adapter/Supplier/SupplierOrderValidator.php b/src/Adapter/Supplier/SupplierOrderValidator.php
index 2bc4198da0e17..58cc3987503b0 100644
--- a/src/Adapter/Supplier/SupplierOrderValidator.php
+++ b/src/Adapter/Supplier/SupplierOrderValidator.php
@@ -26,10 +26,10 @@
namespace PrestaShop\PrestaShop\Adapter\Supplier;
-use SupplyOrder;
-
/**
* Class SupplierOrderValidator is responsible for handling supplier and its corresponding order validity.
+ *
+ * @deprecated since 9.0 and will be removed in 10.0
*/
class SupplierOrderValidator
{
@@ -42,6 +42,11 @@ class SupplierOrderValidator
*/
public function hasPendingOrders($supplierId)
{
- return SupplyOrder::supplierHasPendingOrders($supplierId);
+ @trigger_error(sprintf(
+ '%s is deprecated since 9.0 and will be removed in 10.0.',
+ __METHOD__
+ ), E_USER_DEPRECATED);
+
+ return false;
}
}
diff --git a/src/Adapter/Tab/CommandHandler/UpdateTabStatusByClassNameHandler.php b/src/Adapter/Tab/CommandHandler/UpdateTabStatusByClassNameHandler.php
index 13950d8f6a87e..c07961a508db6 100644
--- a/src/Adapter/Tab/CommandHandler/UpdateTabStatusByClassNameHandler.php
+++ b/src/Adapter/Tab/CommandHandler/UpdateTabStatusByClassNameHandler.php
@@ -29,11 +29,13 @@
namespace PrestaShop\PrestaShop\Adapter\Tab\CommandHandler;
use Doctrine\ORM\EntityManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Tab\Command\UpdateTabStatusByClassNameCommand;
use PrestaShop\PrestaShop\Core\Domain\Tab\CommandHandler\UpdateTabStatusByClassNameHandlerInterface;
use PrestaShopBundle\Entity\Repository\TabRepository;
use PrestaShopBundle\Entity\Tab;
+#[AsCommandHandler]
class UpdateTabStatusByClassNameHandler implements UpdateTabStatusByClassNameHandlerInterface
{
/**
diff --git a/src/Adapter/Tax/CommandHandler/AddTaxHandler.php b/src/Adapter/Tax/CommandHandler/AddTaxHandler.php
index 4517770641e2a..306cd50527db0 100644
--- a/src/Adapter/Tax/CommandHandler/AddTaxHandler.php
+++ b/src/Adapter/Tax/CommandHandler/AddTaxHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Tax\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Tax\AbstractTaxHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Tax\Command\AddTaxCommand;
use PrestaShop\PrestaShop\Core\Domain\Tax\CommandHandler\AddTaxHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Tax\Exception\TaxException;
@@ -37,6 +38,7 @@
/**
* Handles command which is responsible for tax editing
*/
+#[AsCommandHandler]
final class AddTaxHandler extends AbstractTaxHandler implements AddTaxHandlerInterface
{
/**
diff --git a/src/Adapter/Tax/CommandHandler/BulkDeleteTaxHandler.php b/src/Adapter/Tax/CommandHandler/BulkDeleteTaxHandler.php
index d41f4679c2668..348cf576272cc 100644
--- a/src/Adapter/Tax/CommandHandler/BulkDeleteTaxHandler.php
+++ b/src/Adapter/Tax/CommandHandler/BulkDeleteTaxHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Tax\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Tax\AbstractTaxHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Tax\Command\BulkDeleteTaxCommand;
use PrestaShop\PrestaShop\Core\Domain\Tax\CommandHandler\BulkDeleteTaxHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Tax\Exception\DeleteTaxException;
@@ -36,6 +37,7 @@
/**
* Handles command which deletes Taxes on bulk action using legacy object model
*/
+#[AsCommandHandler]
final class BulkDeleteTaxHandler extends AbstractTaxHandler implements BulkDeleteTaxHandlerInterface
{
/**
diff --git a/src/Adapter/Tax/CommandHandler/BulkToggleTaxStatusHandler.php b/src/Adapter/Tax/CommandHandler/BulkToggleTaxStatusHandler.php
index c4ece4709f128..4ff7e631fb940 100644
--- a/src/Adapter/Tax/CommandHandler/BulkToggleTaxStatusHandler.php
+++ b/src/Adapter/Tax/CommandHandler/BulkToggleTaxStatusHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Tax\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Tax\AbstractTaxHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Tax\Command\BulkToggleTaxStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Tax\CommandHandler\BulkToggleTaxStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Tax\Exception\TaxException;
@@ -36,6 +37,7 @@
/**
* Handles command which toggles taxes status on bulk action using legacy object model
*/
+#[AsCommandHandler]
final class BulkToggleTaxStatusHandler extends AbstractTaxHandler implements BulkToggleTaxStatusHandlerInterface
{
/**
diff --git a/src/Adapter/Tax/CommandHandler/DeleteTaxHandler.php b/src/Adapter/Tax/CommandHandler/DeleteTaxHandler.php
index e67e358a84eea..ce388e52722c1 100644
--- a/src/Adapter/Tax/CommandHandler/DeleteTaxHandler.php
+++ b/src/Adapter/Tax/CommandHandler/DeleteTaxHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Tax\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Tax\AbstractTaxHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Tax\Command\DeleteTaxCommand;
use PrestaShop\PrestaShop\Core\Domain\Tax\CommandHandler\DeleteTaxHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Tax\Exception\DeleteTaxException;
@@ -36,6 +37,7 @@
/**
* Handles command which deletes Tax using legacy object model
*/
+#[AsCommandHandler]
final class DeleteTaxHandler extends AbstractTaxHandler implements DeleteTaxHandlerInterface
{
/**
diff --git a/src/Adapter/Tax/CommandHandler/EditTaxHandler.php b/src/Adapter/Tax/CommandHandler/EditTaxHandler.php
index a55f3dbab6d8b..eed604bf70bf8 100644
--- a/src/Adapter/Tax/CommandHandler/EditTaxHandler.php
+++ b/src/Adapter/Tax/CommandHandler/EditTaxHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Tax\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Tax\AbstractTaxHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Tax\Command\EditTaxCommand;
use PrestaShop\PrestaShop\Core\Domain\Tax\CommandHandler\EditTaxHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Tax\Exception\TaxException;
@@ -36,6 +37,7 @@
/**
* Handles command which is responsible for tax editing
*/
+#[AsCommandHandler]
final class EditTaxHandler extends AbstractTaxHandler implements EditTaxHandlerInterface
{
/**
diff --git a/src/Adapter/Tax/CommandHandler/ToggleTaxStatusHandler.php b/src/Adapter/Tax/CommandHandler/ToggleTaxStatusHandler.php
index 22f94124e589f..49bc09e498e17 100644
--- a/src/Adapter/Tax/CommandHandler/ToggleTaxStatusHandler.php
+++ b/src/Adapter/Tax/CommandHandler/ToggleTaxStatusHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Tax\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Tax\AbstractTaxHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Tax\Command\ToggleTaxStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Tax\CommandHandler\ToggleTaxStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Tax\Exception\TaxException;
@@ -36,6 +37,7 @@
/**
* Handles command which toggles Tax status using legacy object model
*/
+#[AsCommandHandler]
final class ToggleTaxStatusHandler extends AbstractTaxHandler implements ToggleTaxStatusHandlerInterface
{
/**
diff --git a/src/Adapter/Tax/QueryHandler/GetTaxForEditingHandler.php b/src/Adapter/Tax/QueryHandler/GetTaxForEditingHandler.php
index 0e19942fd7221..d312284a41828 100644
--- a/src/Adapter/Tax/QueryHandler/GetTaxForEditingHandler.php
+++ b/src/Adapter/Tax/QueryHandler/GetTaxForEditingHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\Tax\QueryHandler;
use PrestaShop\PrestaShop\Adapter\Tax\AbstractTaxHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Tax\Query\GetTaxForEditing;
use PrestaShop\PrestaShop\Core\Domain\Tax\QueryHandler\GetTaxForEditingHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Tax\QueryResult\EditableTax;
@@ -34,6 +35,7 @@
/**
* Handles query which gets tax for editing
*/
+#[AsQueryHandler]
final class GetTaxForEditingHandler extends AbstractTaxHandler implements GetTaxForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/TaxRulesGroup/CommandHandler/AddTaxRulesGroupHandler.php b/src/Adapter/TaxRulesGroup/CommandHandler/AddTaxRulesGroupHandler.php
index 04b81fdc18d44..d2209710ddc08 100644
--- a/src/Adapter/TaxRulesGroup/CommandHandler/AddTaxRulesGroupHandler.php
+++ b/src/Adapter/TaxRulesGroup/CommandHandler/AddTaxRulesGroupHandler.php
@@ -30,6 +30,7 @@
use PrestaShop\PrestaShop\Adapter\TaxRulesGroup\AbstractTaxRulesGroupHandler;
use PrestaShop\PrestaShop\Adapter\TaxRulesGroup\Repository\TaxRulesGroupRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopId;
use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\AddTaxRulesGroupCommand;
use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\CommandHandler\AddTaxRulesGroupHandlerInterface;
@@ -39,6 +40,7 @@
/**
* Handles tax rules group addition
*/
+#[AsCommandHandler]
class AddTaxRulesGroupHandler extends AbstractTaxRulesGroupHandler implements AddTaxRulesGroupHandlerInterface
{
/**
diff --git a/src/Adapter/TaxRulesGroup/CommandHandler/BulkDeleteTaxRulesGroupHandler.php b/src/Adapter/TaxRulesGroup/CommandHandler/BulkDeleteTaxRulesGroupHandler.php
index 3a13d923026d1..41b4e7cc00ecf 100644
--- a/src/Adapter/TaxRulesGroup/CommandHandler/BulkDeleteTaxRulesGroupHandler.php
+++ b/src/Adapter/TaxRulesGroup/CommandHandler/BulkDeleteTaxRulesGroupHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler;
use PrestaShop\PrestaShop\Adapter\TaxRulesGroup\AbstractTaxRulesGroupHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\BulkDeleteTaxRulesGroupCommand;
use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\CommandHandler\BulkDeleteTaxRulesGroupHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Exception\CannotBulkDeleteTaxRulesGroupException;
@@ -35,6 +36,7 @@
/**
* Handles multiple tax rules group deletion
*/
+#[AsCommandHandler]
final class BulkDeleteTaxRulesGroupHandler extends AbstractTaxRulesGroupHandler implements BulkDeleteTaxRulesGroupHandlerInterface
{
/**
diff --git a/src/Adapter/TaxRulesGroup/CommandHandler/BulkSetTaxRulesGroupStatusHandler.php b/src/Adapter/TaxRulesGroup/CommandHandler/BulkSetTaxRulesGroupStatusHandler.php
index 9a27e22800bad..ae5e57696646d 100644
--- a/src/Adapter/TaxRulesGroup/CommandHandler/BulkSetTaxRulesGroupStatusHandler.php
+++ b/src/Adapter/TaxRulesGroup/CommandHandler/BulkSetTaxRulesGroupStatusHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler;
use PrestaShop\PrestaShop\Adapter\TaxRulesGroup\AbstractTaxRulesGroupHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\BulkSetTaxRulesGroupStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\CommandHandler\BulkToggleTaxRulesGroupStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Exception\CannotBulkUpdateTaxRulesGroupException;
@@ -35,6 +36,7 @@
/**
* Handles toggling of multiple tax rules groups statuses
*/
+#[AsCommandHandler]
final class BulkSetTaxRulesGroupStatusHandler extends AbstractTaxRulesGroupHandler implements BulkToggleTaxRulesGroupStatusHandlerInterface
{
/**
diff --git a/src/Adapter/TaxRulesGroup/CommandHandler/DeleteTaxRulesGroupHandler.php b/src/Adapter/TaxRulesGroup/CommandHandler/DeleteTaxRulesGroupHandler.php
index af80ae7f2bdbf..4b94bb321754d 100644
--- a/src/Adapter/TaxRulesGroup/CommandHandler/DeleteTaxRulesGroupHandler.php
+++ b/src/Adapter/TaxRulesGroup/CommandHandler/DeleteTaxRulesGroupHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler;
use PrestaShop\PrestaShop\Adapter\TaxRulesGroup\AbstractTaxRulesGroupHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\DeleteTaxRulesGroupCommand;
use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\CommandHandler\DeleteTaxRulesGroupHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Exception\CannotDeleteTaxRulesGroupException;
@@ -35,6 +36,7 @@
/**
* Handles deletion of single tax rules group
*/
+#[AsCommandHandler]
final class DeleteTaxRulesGroupHandler extends AbstractTaxRulesGroupHandler implements DeleteTaxRulesGroupHandlerInterface
{
/**
diff --git a/src/Adapter/TaxRulesGroup/CommandHandler/EditTaxRulesGroupHandler.php b/src/Adapter/TaxRulesGroup/CommandHandler/EditTaxRulesGroupHandler.php
index 44ba89e43e599..d23caea67fce9 100644
--- a/src/Adapter/TaxRulesGroup/CommandHandler/EditTaxRulesGroupHandler.php
+++ b/src/Adapter/TaxRulesGroup/CommandHandler/EditTaxRulesGroupHandler.php
@@ -30,6 +30,7 @@
use PrestaShop\PrestaShop\Adapter\TaxRulesGroup\AbstractTaxRulesGroupHandler;
use PrestaShop\PrestaShop\Adapter\TaxRulesGroup\Repository\TaxRulesGroupRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopId;
use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\EditTaxRulesGroupCommand;
use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\CommandHandler\EditTaxRulesGroupHandlerInterface;
@@ -39,6 +40,7 @@
/**
* Handles tax rules group edition
*/
+#[AsCommandHandler]
class EditTaxRulesGroupHandler extends AbstractTaxRulesGroupHandler implements EditTaxRulesGroupHandlerInterface
{
/**
diff --git a/src/Adapter/TaxRulesGroup/CommandHandler/SetTaxRulesGroupStatusHandler.php b/src/Adapter/TaxRulesGroup/CommandHandler/SetTaxRulesGroupStatusHandler.php
index 2fb82ace2edeb..df39cb9e12dbd 100644
--- a/src/Adapter/TaxRulesGroup/CommandHandler/SetTaxRulesGroupStatusHandler.php
+++ b/src/Adapter/TaxRulesGroup/CommandHandler/SetTaxRulesGroupStatusHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler;
use PrestaShop\PrestaShop\Adapter\TaxRulesGroup\AbstractTaxRulesGroupHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\SetTaxRulesGroupStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\CommandHandler\ToggleTaxRulesGroupStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Exception\CannotUpdateTaxRulesGroupException;
@@ -36,6 +37,7 @@
/**
* Handles tax rules group status toggling
*/
+#[AsCommandHandler]
final class SetTaxRulesGroupStatusHandler extends AbstractTaxRulesGroupHandler implements ToggleTaxRulesGroupStatusHandlerInterface
{
/**
diff --git a/src/Adapter/TaxRulesGroup/QueryHandler/GetTaxRulesGroupForEditingHandler.php b/src/Adapter/TaxRulesGroup/QueryHandler/GetTaxRulesGroupForEditingHandler.php
index 71a4e881a67c8..14497e1258355 100644
--- a/src/Adapter/TaxRulesGroup/QueryHandler/GetTaxRulesGroupForEditingHandler.php
+++ b/src/Adapter/TaxRulesGroup/QueryHandler/GetTaxRulesGroupForEditingHandler.php
@@ -27,6 +27,7 @@
namespace PrestaShop\PrestaShop\Adapter\TaxRulesGroup\QueryHandler;
use PrestaShop\PrestaShop\Adapter\TaxRulesGroup\AbstractTaxRulesGroupHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Exception\TaxRulesGroupNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Query\GetTaxRulesGroupForEditing;
use PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\QueryHandler\GetTaxRulesGroupForEditingHandlerInterface;
@@ -35,6 +36,7 @@
/**
* Handles query which gets tax rules group for editing
*/
+#[AsQueryHandler]
final class GetTaxRulesGroupForEditingHandler extends AbstractTaxRulesGroupHandler implements GetTaxRulesGroupForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Title/CommandHandler/AddTitleHandler.php b/src/Adapter/Title/CommandHandler/AddTitleHandler.php
index 0b88a6a2c4410..67944054372eb 100644
--- a/src/Adapter/Title/CommandHandler/AddTitleHandler.php
+++ b/src/Adapter/Title/CommandHandler/AddTitleHandler.php
@@ -30,6 +30,7 @@
use Gender;
use PrestaShop\PrestaShop\Adapter\Title\AbstractTitleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Title\Command\AddTitleCommand;
use PrestaShop\PrestaShop\Core\Domain\Title\CommandHandler\AddTitleHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Title\Exception\TitleException;
@@ -39,6 +40,7 @@
/**
* Handles creation of title
*/
+#[AsCommandHandler]
class AddTitleHandler extends AbstractTitleHandler implements AddTitleHandlerInterface
{
/**
diff --git a/src/Adapter/Title/CommandHandler/BulkDeleteTitleHandler.php b/src/Adapter/Title/CommandHandler/BulkDeleteTitleHandler.php
index b4fe35018b173..99c2246fed28a 100644
--- a/src/Adapter/Title/CommandHandler/BulkDeleteTitleHandler.php
+++ b/src/Adapter/Title/CommandHandler/BulkDeleteTitleHandler.php
@@ -29,12 +29,14 @@
namespace PrestaShop\PrestaShop\Adapter\Title\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Title\AbstractTitleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Title\Command\BulkDeleteTitleCommand;
use PrestaShop\PrestaShop\Core\Domain\Title\CommandHandler\BulkDeleteTitleHandlerInterface;
/**
* Handles command that bulk delete titles
*/
+#[AsCommandHandler]
class BulkDeleteTitleHandler extends AbstractTitleHandler implements BulkDeleteTitleHandlerInterface
{
/**
diff --git a/src/Adapter/Title/CommandHandler/DeleteTitleHandler.php b/src/Adapter/Title/CommandHandler/DeleteTitleHandler.php
index 03e9efd987d4c..fb3a35fac627f 100644
--- a/src/Adapter/Title/CommandHandler/DeleteTitleHandler.php
+++ b/src/Adapter/Title/CommandHandler/DeleteTitleHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Title\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Title\AbstractTitleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Title\Command\DeleteTitleCommand;
use PrestaShop\PrestaShop\Core\Domain\Title\CommandHandler\DeleteTitleHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Title\Exception\CannotDeleteTitleException;
@@ -36,6 +37,7 @@
/**
* Handles command that delete title
*/
+#[AsCommandHandler]
class DeleteTitleHandler extends AbstractTitleHandler implements DeleteTitleHandlerInterface
{
/**
diff --git a/src/Adapter/Title/CommandHandler/EditTitleHandler.php b/src/Adapter/Title/CommandHandler/EditTitleHandler.php
index cc36b7e7b35ac..b6dce216d3da0 100644
--- a/src/Adapter/Title/CommandHandler/EditTitleHandler.php
+++ b/src/Adapter/Title/CommandHandler/EditTitleHandler.php
@@ -30,6 +30,7 @@
use Gender;
use PrestaShop\PrestaShop\Adapter\Title\AbstractTitleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Title\Command\EditTitleCommand;
use PrestaShop\PrestaShop\Core\Domain\Title\CommandHandler\EditTitleHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Title\Exception\CannotUpdateTitleException;
@@ -38,6 +39,7 @@
/**
* Handles edition of title
*/
+#[AsCommandHandler]
class EditTitleHandler extends AbstractTitleHandler implements EditTitleHandlerInterface
{
/**
diff --git a/src/Adapter/Title/QueryHandler/GetTitleForEditingHandler.php b/src/Adapter/Title/QueryHandler/GetTitleForEditingHandler.php
index 22462136e03e8..e79b59101fdab 100644
--- a/src/Adapter/Title/QueryHandler/GetTitleForEditingHandler.php
+++ b/src/Adapter/Title/QueryHandler/GetTitleForEditingHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Title\QueryHandler;
use PrestaShop\PrestaShop\Adapter\Title\AbstractTitleHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Title\Query\GetTitleForEditing;
use PrestaShop\PrestaShop\Core\Domain\Title\QueryHandler\GetTitleForEditingHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Title\QueryResult\EditableTitle;
@@ -38,6 +39,7 @@
*
* @internal
*/
+#[AsQueryHandler]
class GetTitleForEditingHandler extends AbstractTitleHandler implements GetTitleForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Warehouse/WarehouseDataProvider.php b/src/Adapter/Warehouse/WarehouseDataProvider.php
deleted file mode 100644
index 9f3e61abbbadd..0000000000000
--- a/src/Adapter/Warehouse/WarehouseDataProvider.php
+++ /dev/null
@@ -1,81 +0,0 @@
-
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShop\PrestaShop\Adapter\Warehouse;
-
-use Warehouse;
-use WarehouseProductLocation;
-
-/**
- * @deprecated since 8.1 and will be removed in next major.
- *
- * This class will provide data from DB / ORM about Warehouse.
- */
-class WarehouseDataProvider
-{
- /**
- * Get product warehouses.
- *
- * @param int $id_product
- *
- * @return array Warehouses
- */
- public function getWarehouseProductLocations($id_product)
- {
- $collection = WarehouseProductLocation::getCollection($id_product);
-
- return $collection->getResults();
- }
-
- /**
- * Get all warehouses.
- *
- * @param bool $ignore_shop Optional, false by default - Allows to get only the warehouses that are associated to one/some shops (@see $id_shop)
- * @param int $id_shop optional, Context::shop::Id by default - Allows to define a specific shop to filter
- *
- * @return array Warehouses (ID, reference/name concatenated)
- */
- public function getWarehouses($ignore_shop = false, $id_shop = null)
- {
- return Warehouse::getWarehouses($ignore_shop, $id_shop);
- }
-
- /**
- * For a given product and warehouse, gets the product warehouse data.
- *
- * @param int $id_product
- * @param int $id_product_attribute
- * @param int $id_warehouse
- *
- * @return array
- */
- public function getWarehouseProductLocationData($id_product, $id_product_attribute, $id_warehouse)
- {
- $location = WarehouseProductLocation::getProductLocation($id_product, $id_product_attribute, $id_warehouse);
- // for 'activated', we test if $location is ===false or ==="", that's the only difference to know it...
- return ['location' => $location, 'activated' => ($location !== false), 'product_id' => $id_product];
- }
-}
diff --git a/src/Adapter/Webservice/CommandHandler/AddWebserviceKeyHandler.php b/src/Adapter/Webservice/CommandHandler/AddWebserviceKeyHandler.php
index 69dcc28ba5867..b44505f62b373 100644
--- a/src/Adapter/Webservice/CommandHandler/AddWebserviceKeyHandler.php
+++ b/src/Adapter/Webservice/CommandHandler/AddWebserviceKeyHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Webservice\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Webservice\Command\AddWebserviceKeyCommand;
use PrestaShop\PrestaShop\Core\Domain\Webservice\CommandHandler\AddWebserviceKeyHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Webservice\Exception\DuplicateWebserviceKeyException;
@@ -40,6 +41,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class AddWebserviceKeyHandler extends AbstractWebserviceKeyHandler implements AddWebserviceKeyHandlerInterface
{
/**
diff --git a/src/Adapter/Webservice/CommandHandler/EditWebserviceKeyHandler.php b/src/Adapter/Webservice/CommandHandler/EditWebserviceKeyHandler.php
index fc21d49b322ae..0368c2d3a5bf5 100644
--- a/src/Adapter/Webservice/CommandHandler/EditWebserviceKeyHandler.php
+++ b/src/Adapter/Webservice/CommandHandler/EditWebserviceKeyHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Webservice\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Webservice\Command\EditWebserviceKeyCommand;
use PrestaShop\PrestaShop\Core\Domain\Webservice\CommandHandler\EditWebserviceKeyHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Webservice\Exception\WebserviceConstraintException;
@@ -39,6 +40,7 @@
*
* @internal
*/
+#[AsCommandHandler]
final class EditWebserviceKeyHandler extends AbstractWebserviceKeyHandler implements EditWebserviceKeyHandlerInterface
{
/**
diff --git a/src/Adapter/Webservice/QueryHandler/GetWebserviceKeyForEditingHandler.php b/src/Adapter/Webservice/QueryHandler/GetWebserviceKeyForEditingHandler.php
index 4be10847941a8..d7305481f6d75 100644
--- a/src/Adapter/Webservice/QueryHandler/GetWebserviceKeyForEditingHandler.php
+++ b/src/Adapter/Webservice/QueryHandler/GetWebserviceKeyForEditingHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Adapter\Webservice\QueryHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Webservice\Exception\WebserviceKeyNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Webservice\Query\GetWebserviceKeyForEditing;
use PrestaShop\PrestaShop\Core\Domain\Webservice\QueryHandler\GetWebserviceKeyForEditingHandlerInterface;
@@ -38,6 +39,7 @@
*
* @internal
*/
+#[AsQueryHandler]
final class GetWebserviceKeyForEditingHandler implements GetWebserviceKeyForEditingHandlerInterface
{
/**
diff --git a/src/Adapter/Zone/CommandHandler/AddZoneHandler.php b/src/Adapter/Zone/CommandHandler/AddZoneHandler.php
index e7daee988019b..d178b02cc6481 100644
--- a/src/Adapter/Zone/CommandHandler/AddZoneHandler.php
+++ b/src/Adapter/Zone/CommandHandler/AddZoneHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Zone\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Zone\Command\AddZoneCommand;
use PrestaShop\PrestaShop\Core\Domain\Zone\CommandHandler\AddZoneHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Zone\Exception\MissingZoneRequiredFieldsException;
@@ -40,6 +41,7 @@
/**
* Handles command that adds new zone.
*/
+#[AsCommandHandler]
final class AddZoneHandler extends AbstractObjectModelHandler implements AddZoneHandlerInterface
{
/**
diff --git a/src/Adapter/Zone/CommandHandler/BulkDeleteZoneHandler.php b/src/Adapter/Zone/CommandHandler/BulkDeleteZoneHandler.php
index 2b64bdbf62574..c9ff624cf42b7 100644
--- a/src/Adapter/Zone/CommandHandler/BulkDeleteZoneHandler.php
+++ b/src/Adapter/Zone/CommandHandler/BulkDeleteZoneHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\Zone\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Zone\Command\BulkDeleteZoneCommand;
use PrestaShop\PrestaShop\Core\Domain\Zone\CommandHandler\BulkDeleteZoneHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Zone\Exception\DeleteZoneException;
@@ -37,6 +38,7 @@
/**
* Handles command that bulk delete zones
*/
+#[AsCommandHandler]
final class BulkDeleteZoneHandler implements BulkDeleteZoneHandlerInterface
{
/**
diff --git a/src/Adapter/Zone/CommandHandler/BulkToggleZoneStatusHandler.php b/src/Adapter/Zone/CommandHandler/BulkToggleZoneStatusHandler.php
index 9ce9735aed28a..9094049c14a06 100644
--- a/src/Adapter/Zone/CommandHandler/BulkToggleZoneStatusHandler.php
+++ b/src/Adapter/Zone/CommandHandler/BulkToggleZoneStatusHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\Zone\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Zone\Command\BulkToggleZoneStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Zone\CommandHandler\BulkToggleZoneStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Zone\Exception\CannotToggleZoneStatusException;
@@ -39,6 +40,7 @@
/**
* Handles command that toggles zones status in bulk action
*/
+#[AsCommandHandler]
final class BulkToggleZoneStatusHandler implements BulkToggleZoneStatusHandlerInterface
{
/**
diff --git a/src/Adapter/Zone/CommandHandler/DeleteZoneHandler.php b/src/Adapter/Zone/CommandHandler/DeleteZoneHandler.php
index 13de97bc4b57c..b917f13aa84d5 100644
--- a/src/Adapter/Zone/CommandHandler/DeleteZoneHandler.php
+++ b/src/Adapter/Zone/CommandHandler/DeleteZoneHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\Zone\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Zone\Command\DeleteZoneCommand;
use PrestaShop\PrestaShop\Core\Domain\Zone\CommandHandler\DeleteZoneHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Zone\Exception\DeleteZoneException;
@@ -37,6 +38,7 @@
/**
* Handles command that delete zone
*/
+#[AsCommandHandler]
final class DeleteZoneHandler implements DeleteZoneHandlerInterface
{
/**
diff --git a/src/Adapter/Zone/CommandHandler/EditZoneHandler.php b/src/Adapter/Zone/CommandHandler/EditZoneHandler.php
index 978b2ab14a7aa..ead1964056117 100644
--- a/src/Adapter/Zone/CommandHandler/EditZoneHandler.php
+++ b/src/Adapter/Zone/CommandHandler/EditZoneHandler.php
@@ -29,6 +29,7 @@
namespace PrestaShop\PrestaShop\Adapter\Zone\CommandHandler;
use PrestaShop\PrestaShop\Adapter\Domain\AbstractObjectModelHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Zone\Command\EditZoneCommand;
use PrestaShop\PrestaShop\Core\Domain\Zone\CommandHandler\EditZoneHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Zone\Exception\CannotEditZoneException;
@@ -37,6 +38,7 @@
use PrestaShopException;
use Zone;
+#[AsCommandHandler]
final class EditZoneHandler extends AbstractObjectModelHandler implements EditZoneHandlerInterface
{
/**
diff --git a/src/Adapter/Zone/CommandHandler/ToggleZoneStatusHandler.php b/src/Adapter/Zone/CommandHandler/ToggleZoneStatusHandler.php
index 90fec33961e0d..a02a6febb8759 100644
--- a/src/Adapter/Zone/CommandHandler/ToggleZoneStatusHandler.php
+++ b/src/Adapter/Zone/CommandHandler/ToggleZoneStatusHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\Zone\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Zone\Command\ToggleZoneStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Zone\CommandHandler\ToggleZoneStatusHandlerInterface;
use PrestaShop\PrestaShop\Core\Domain\Zone\Exception\CannotToggleZoneStatusException;
@@ -36,6 +37,7 @@
use PrestaShopException;
use Zone;
+#[AsCommandHandler]
final class ToggleZoneStatusHandler implements ToggleZoneStatusHandlerInterface
{
/**
diff --git a/src/Adapter/Zone/QueryHandler/GetZoneForEditingHandler.php b/src/Adapter/Zone/QueryHandler/GetZoneForEditingHandler.php
index c657192b4e095..9960351c5c8e6 100644
--- a/src/Adapter/Zone/QueryHandler/GetZoneForEditingHandler.php
+++ b/src/Adapter/Zone/QueryHandler/GetZoneForEditingHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Adapter\Zone\QueryHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Zone\Exception\ZoneNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\Zone\Query\GetZoneForEditing;
use PrestaShop\PrestaShop\Core\Domain\Zone\QueryHandler\GetZoneForEditingHandlerInterface;
@@ -39,6 +40,7 @@
*
* @internal
*/
+#[AsQueryHandler]
final class GetZoneForEditingHandler implements GetZoneForEditingHandlerInterface
{
/**
diff --git a/src/Core/Addon/Module/ModuleManagerBuilder.php b/src/Core/Addon/Module/ModuleManagerBuilder.php
index ab64ee9753340..2af980c26bc11 100644
--- a/src/Core/Addon/Module/ModuleManagerBuilder.php
+++ b/src/Core/Addon/Module/ModuleManagerBuilder.php
@@ -101,7 +101,7 @@ public function build()
if (null === self::$moduleManager) {
$sfContainer = SymfonyContainer::getInstance();
if (null !== $sfContainer) {
- self::$moduleManager = $sfContainer->get('prestashop.module.manager');
+ self::$moduleManager = $sfContainer->get(ModuleManager::class);
} else {
self::$moduleManager = new ModuleManager(
$this->buildRepository(),
@@ -128,14 +128,15 @@ public function buildRepository()
if (null === self::$modulesRepository) {
$sfContainer = SymfonyContainer::getInstance();
if (null !== $sfContainer) {
- self::$modulesRepository = $sfContainer->get('prestashop.core.admin.module.repository');
+ self::$modulesRepository = $sfContainer->get(ModuleRepository::class);
} else {
self::$modulesRepository = new ModuleRepository(
self::$moduleDataProvider,
self::$adminModuleDataProvider,
self::$cacheProvider,
new HookManager(),
- _PS_MODULE_DIR_
+ _PS_MODULE_DIR_,
+ Context::getContext()->language->id
);
}
}
diff --git a/src/Core/Addon/Theme/ThemeManager.php b/src/Core/Addon/Theme/ThemeManager.php
index fde5deea62a78..50cf5a1f75bdf 100644
--- a/src/Core/Addon/Theme/ThemeManager.php
+++ b/src/Core/Addon/Theme/ThemeManager.php
@@ -459,7 +459,7 @@ private function doApplyImageTypes(array $types): self
private function installFromZip($source)
{
/** @var Finder $finderClass */
- $finderClass = get_class($this->finder);
+ $finderClass = $this->finder::class;
$this->finder = $finderClass::create();
$sandboxPath = $this->getSandboxPath();
diff --git a/src/Core/Addon/Theme/ThemePageLayoutsCustomizer.php b/src/Core/Addon/Theme/ThemePageLayoutsCustomizer.php
index 27f8a0fa71dfd..22bcb9a84cc9b 100644
--- a/src/Core/Addon/Theme/ThemePageLayoutsCustomizer.php
+++ b/src/Core/Addon/Theme/ThemePageLayoutsCustomizer.php
@@ -31,7 +31,7 @@
/**
* Class PagesLayoutCustomizer customizes pages layout for shop's Front Office theme.
*/
-final class ThemePageLayoutsCustomizer implements ThemePageLayoutsCustomizerInterface
+class ThemePageLayoutsCustomizer implements ThemePageLayoutsCustomizerInterface
{
/**
* @var Theme
diff --git a/src/Core/Cache/Clearer/CacheClearerChain.php b/src/Core/Cache/Clearer/CacheClearerChain.php
index fbba8a55872da..0210c6cab7695 100644
--- a/src/Core/Cache/Clearer/CacheClearerChain.php
+++ b/src/Core/Cache/Clearer/CacheClearerChain.php
@@ -52,5 +52,9 @@ public function clear()
foreach ($this->cacheClearers as $cacheClearer) {
$cacheClearer->clear();
}
+
+ if (function_exists('opcache_reset')) {
+ opcache_reset();
+ }
}
}
diff --git a/src/Core/Cart/CartRow.php b/src/Core/Cart/CartRow.php
index 08fb390b86f31..a81dbedf871da 100644
--- a/src/Core/Cart/CartRow.php
+++ b/src/Core/Cart/CartRow.php
@@ -303,7 +303,7 @@ protected function getProductPrice(CartCore $cart, $rowData)
$productId = (int) $rowData['id_product'];
$quantity = (int) $rowData['cart_quantity'];
- $addressId = $cart->getProductAddressId($rowData);
+ $addressId = $cart->getProductAddressId();
if (!$addressId) {
$addressId = $cart->getTaxAddressId();
}
diff --git a/src/Core/CommandBus/Attributes/AsCommandHandler.php b/src/Core/CommandBus/Attributes/AsCommandHandler.php
new file mode 100644
index 0000000000000..894d82549d65d
--- /dev/null
+++ b/src/Core/CommandBus/Attributes/AsCommandHandler.php
@@ -0,0 +1,37 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\CommandBus\Attributes;
+
+#[\Attribute(\Attribute::TARGET_CLASS)]
+class AsCommandHandler
+{
+ public function __construct(public $method = 'handle')
+ {
+ }
+}
diff --git a/src/Core/CommandBus/Attributes/AsQueryHandler.php b/src/Core/CommandBus/Attributes/AsQueryHandler.php
new file mode 100644
index 0000000000000..65d8700bfa8f9
--- /dev/null
+++ b/src/Core/CommandBus/Attributes/AsQueryHandler.php
@@ -0,0 +1,37 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\CommandBus\Attributes;
+
+#[\Attribute(\Attribute::TARGET_CLASS)]
+class AsQueryHandler
+{
+ public function __construct(public $method = 'handle')
+ {
+ }
+}
diff --git a/src/Core/CommandBus/ExecutedCommandRegistry.php b/src/Core/CommandBus/ExecutedCommandRegistry.php
index 7e86d1a843967..066c1413540df 100644
--- a/src/Core/CommandBus/ExecutedCommandRegistry.php
+++ b/src/Core/CommandBus/ExecutedCommandRegistry.php
@@ -35,7 +35,7 @@
*/
final class ExecutedCommandRegistry
{
- private const BACKTRACE_LIMIT = 10;
+ private const BACKTRACE_LIMIT = 15;
/**
* @var array
@@ -64,8 +64,8 @@ public function __construct(CommandTypeParser $commandTypeParser)
*/
public function register($command, $handler): void
{
- $commandClass = get_class($command);
- $handlerClass = get_class($handler);
+ $commandClass = $command::class;
+ $handlerClass = $handler::class;
$type = $this->commandTypeParser->parse($commandClass);
@@ -115,8 +115,8 @@ private function getTrace(): array
$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, self::BACKTRACE_LIMIT);
foreach ($trace as $step) {
- if ($step['class'] === TacticianCommandBusAdapter::class
- && $step['function'] === 'handle'
+ if ($step['function'] === 'handle'
+ && is_a($step['class'], CommandBusInterface::class, true)
) {
return [
'file' => $step['file'],
diff --git a/src/Core/CommandBus/Middleware/CommandRegisterMiddleware.php b/src/Core/CommandBus/Middleware/CommandRegisterMiddleware.php
deleted file mode 100644
index 476af16739f7a..0000000000000
--- a/src/Core/CommandBus/Middleware/CommandRegisterMiddleware.php
+++ /dev/null
@@ -1,81 +0,0 @@
-
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShop\PrestaShop\Core\CommandBus\Middleware;
-
-use League\Tactician\Handler\CommandNameExtractor\CommandNameExtractor;
-use League\Tactician\Handler\Locator\HandlerLocator;
-use League\Tactician\Middleware;
-use PrestaShop\PrestaShop\Core\CommandBus\ExecutedCommandRegistry;
-
-/**
- * Registers every command that was executed in system
- */
-final class CommandRegisterMiddleware implements Middleware
-{
- /**
- * @var HandlerLocator
- */
- private $handlerLocator;
-
- /**
- * @var CommandNameExtractor
- */
- private $commandNameExtractor;
-
- /**
- * @var ExecutedCommandRegistry
- */
- private $executedCommandRegistry;
-
- /**
- * @param HandlerLocator $handlerLocator
- * @param CommandNameExtractor $commandNameExtractor
- * @param ExecutedCommandRegistry $executedCommandRegistry
- */
- public function __construct(
- HandlerLocator $handlerLocator,
- CommandNameExtractor $commandNameExtractor,
- ExecutedCommandRegistry $executedCommandRegistry
- ) {
- $this->handlerLocator = $handlerLocator;
- $this->commandNameExtractor = $commandNameExtractor;
- $this->executedCommandRegistry = $executedCommandRegistry;
- }
-
- /**
- * {@inheritdoc}
- */
- public function execute($command, callable $next)
- {
- $commandName = $this->commandNameExtractor->extract($command);
- $handler = $this->handlerLocator->getHandlerForCommand($commandName);
-
- $this->executedCommandRegistry->register($command, $handler);
-
- return $next($command);
- }
-}
diff --git a/src/Core/Context/EmployeeContext.php b/src/Core/Context/EmployeeContext.php
new file mode 100644
index 0000000000000..cb0db477d4f1b
--- /dev/null
+++ b/src/Core/Context/EmployeeContext.php
@@ -0,0 +1,81 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Context;
+
+use PrestaShop\PrestaShop\Core\Model\EmployeeInterface;
+
+/**
+ * @experimental Depends on ADR https://github.com/PrestaShop/ADR/pull/36
+ */
+class EmployeeContext
+{
+ public const SUPER_ADMIN_PROFILE_ID = 1;
+
+ public function __construct(
+ private readonly ?EmployeeInterface $employee
+ ) {
+ }
+
+ public function getEmployee(): ?EmployeeInterface
+ {
+ return $this->employee;
+ }
+
+ public function hasAuthorizationOnShopGroup(int $shopGroupId): bool
+ {
+ if (!$this->employee) {
+ return false;
+ }
+
+ return $this->isSuperAdmin() || in_array($shopGroupId, $this->employee->getAssociatedShopGroupIds());
+ }
+
+ public function hasAuthorizationOnShop(int $shopId): bool
+ {
+ if (!$this->employee) {
+ return false;
+ }
+
+ return $this->isSuperAdmin() || in_array($shopId, $this->employee->getAssociatedShopIds());
+ }
+
+ public function getDefaultShopId(): int
+ {
+ if (!$this->employee) {
+ return 0;
+ }
+
+ return $this->employee->getDefaultShopId();
+ }
+
+ public function isSuperAdmin(): bool
+ {
+ return $this->employee && $this->employee->getProfileId() === self::SUPER_ADMIN_PROFILE_ID;
+ }
+}
diff --git a/src/Core/Context/EmployeeContextBuilder.php b/src/Core/Context/EmployeeContextBuilder.php
new file mode 100644
index 0000000000000..c3e4216d3bf0a
--- /dev/null
+++ b/src/Core/Context/EmployeeContextBuilder.php
@@ -0,0 +1,71 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Context;
+
+use Employee as LegacyEmployee;
+use PrestaShop\PrestaShop\Core\Model\Employee;
+
+/**
+ * @experimental Depends on ADR https://github.com/PrestaShop/ADR/pull/36
+ */
+class EmployeeContextBuilder
+{
+ private ?int $employeeId = null;
+
+ public function build(): EmployeeContext
+ {
+ $employee = null;
+ if ($this->employeeId) {
+ $legacyEmployee = new LegacyEmployee($this->employeeId);
+ $employee = new Employee(
+ id: $legacyEmployee->getId(),
+ profileId: $legacyEmployee->getProfileId(),
+ languageId: $legacyEmployee->getLanguageId(),
+ firstName: $legacyEmployee->getFirstName(),
+ lastName: $legacyEmployee->getLastName(),
+ email: $legacyEmployee->getEmail(),
+ password: $legacyEmployee->getPassword(),
+ imageUrl: $legacyEmployee->getImageUrl(),
+ defaultTabId: $legacyEmployee->getDefaultTabId(),
+ defaultShopId: $legacyEmployee->getDefaultShopId(),
+ associatedShopIds: $legacyEmployee->getAssociatedShopIds(),
+ associatedShopGroupIds: $legacyEmployee->getAssociatedShopGroupIds()
+ );
+ }
+
+ return new EmployeeContext($employee);
+ }
+
+ public function setEmployeeId(?int $employeeId): self
+ {
+ $this->employeeId = $employeeId;
+
+ return $this;
+ }
+}
diff --git a/src/Core/Context/ShopContext.php b/src/Core/Context/ShopContext.php
new file mode 100644
index 0000000000000..176cc9c38bd56
--- /dev/null
+++ b/src/Core/Context/ShopContext.php
@@ -0,0 +1,54 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Context;
+
+use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
+use PrestaShop\PrestaShop\Core\Model\ShopInterface;
+
+/**
+ * @experimental Depends on ADR https://github.com/PrestaShop/ADR/pull/36
+ */
+class ShopContext
+{
+ public function __construct(
+ private readonly ShopConstraint $shopConstraint,
+ private readonly ShopInterface $shop
+ ) {
+ }
+
+ public function getShopConstraint(): ShopConstraint
+ {
+ return $this->shopConstraint;
+ }
+
+ public function getShop(): ShopInterface
+ {
+ return $this->shop;
+ }
+}
diff --git a/src/Core/Context/ShopContextBuilder.php b/src/Core/Context/ShopContextBuilder.php
new file mode 100644
index 0000000000000..7e3635efc43b3
--- /dev/null
+++ b/src/Core/Context/ShopContextBuilder.php
@@ -0,0 +1,99 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Context;
+
+use PrestaShop\PrestaShop\Adapter\Shop\Repository\ShopRepository;
+use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
+use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopId;
+use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
+use PrestaShop\PrestaShop\Core\Model\Shop;
+
+/**
+ * @experimental Depends on ADR https://github.com/PrestaShop/ADR/pull/36
+ */
+class ShopContextBuilder
+{
+ private ?ShopConstraint $shopConstraint = null;
+ private ?int $shopId = null;
+
+ public function __construct(
+ private readonly ShopRepository $shopRepository
+ ) {
+ }
+
+ public function build(): ShopContext
+ {
+ if (null === $this->shopConstraint) {
+ throw new InvalidArgumentException(sprintf(
+ 'Cannot build shop context as no shopConstraint has been defined you need to call %s::setShopConstraint to define it before building the shop context',
+ self::class
+ ));
+ }
+
+ if (null === $this->shopId) {
+ throw new InvalidArgumentException(sprintf(
+ 'Cannot build shop context as no shopId has been defined you need to call %s::setShopId to define it before building the shop context',
+ self::class
+ ));
+ }
+
+ $shop = $this->shopRepository->get(new ShopId($this->shopId));
+
+ return new ShopContext(
+ $this->shopConstraint,
+ new Shop(
+ id: $shop->getId(),
+ name: $shop->getName(),
+ shopGroupId: $shop->getShopGroupId(),
+ categoryId: $shop->getCategoryId(),
+ themeName: $shop->getThemeName(),
+ color: $shop->getColor(),
+ physicalUri: $shop->getPhysicalUri(),
+ virtualUri: $shop->getVirtualUri(),
+ domain: $shop->getDomain(),
+ domainSSL: $shop->getDomainSSL(),
+ active: $shop->isActive()
+ )
+ );
+ }
+
+ public function setShopId(int $shopId): self
+ {
+ $this->shopId = $shopId;
+
+ return $this;
+ }
+
+ public function setShopConstraint(ShopConstraint $shopConstraint): self
+ {
+ $this->shopConstraint = $shopConstraint;
+
+ return $this;
+ }
+}
diff --git a/src/Core/Data/AbstractTypedCollection.php b/src/Core/Data/AbstractTypedCollection.php
index 5e24e7791a1ec..8897ddf4b3ac5 100644
--- a/src/Core/Data/AbstractTypedCollection.php
+++ b/src/Core/Data/AbstractTypedCollection.php
@@ -161,7 +161,7 @@ private function checkElementType($element)
{
$expectedType = $this->getType();
if (!($element instanceof $expectedType)) {
- throw new TypeException(sprintf('Invalid element type %s, expected %s', is_object($element) ? get_class($element) : gettype($element), $expectedType));
+ throw new TypeException(sprintf('Invalid element type %s, expected %s', is_object($element) ? $element::class : gettype($element), $expectedType));
}
}
}
diff --git a/src/Core/Data/Layer/AbstractDataLayer.php b/src/Core/Data/Layer/AbstractDataLayer.php
index 420f969448696..dbc8165f69fa6 100644
--- a/src/Core/Data/Layer/AbstractDataLayer.php
+++ b/src/Core/Data/Layer/AbstractDataLayer.php
@@ -194,7 +194,7 @@ protected function saveReadPropagationResult($id, $data)
try {
$this->doWrite($id, $data);
} catch (Exception $e) {
- throw new DataLayerException('Unable to write into "' . $id . '"" (data layer : "' . get_class($this) . '")', 0, $e);
+ throw new DataLayerException('Unable to write into "' . $id . '"" (data layer : "' . static::class . '")', 0, $e);
}
}
}
@@ -224,7 +224,7 @@ protected function saveWritePropagationResult($id, $data)
try {
$this->doWrite($id, $data);
} catch (Exception $e) {
- throw new DataLayerException('Unable to write into "' . $id . '" (data layer "' . get_class($this) . '")', 0, $e);
+ throw new DataLayerException('Unable to write into "' . $id . '" (data layer "' . static::class . '")', 0, $e);
}
// If update needed after write
diff --git a/src/Core/Domain/AbstractBulkCommandHandler.php b/src/Core/Domain/AbstractBulkCommandHandler.php
index 9271c8bf6dcb3..9d56c8b49b7a1 100644
--- a/src/Core/Domain/AbstractBulkCommandHandler.php
+++ b/src/Core/Domain/AbstractBulkCommandHandler.php
@@ -71,11 +71,11 @@ protected function handleBulkAction(array $ids, string $exceptionToCatch, mixed
}
/**
- * @param Throwable[] $coughtExceptions
+ * @param Throwable[] $caughtExceptions
*
* @return BulkCommandExceptionInterface
*/
- abstract protected function buildBulkException(array $coughtExceptions): BulkCommandExceptionInterface;
+ abstract protected function buildBulkException(array $caughtExceptions): BulkCommandExceptionInterface;
/**
* @param mixed $id
diff --git a/src/Core/Category/Provider/CategoryImageFinder.php b/src/Core/Domain/Alias/Command/BulkDeleteAliasCommand.php
similarity index 65%
rename from src/Core/Category/Provider/CategoryImageFinder.php
rename to src/Core/Domain/Alias/Command/BulkDeleteAliasCommand.php
index 263c7bb8d9ac3..7707b531d1420 100644
--- a/src/Core/Category/Provider/CategoryImageFinder.php
+++ b/src/Core/Domain/Alias/Command/BulkDeleteAliasCommand.php
@@ -26,36 +26,38 @@
declare(strict_types=1);
-namespace PrestaShop\PrestaShop\Core\Category\Provider;
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\Command;
-use Symfony\Component\Finder\Finder;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
/**
- * Finds used thumb images for specific category id
+ * Deletes multiple aliases
*/
-class CategoryImageFinder extends Finder
+class BulkDeleteAliasCommand
{
/**
- * @var string
+ * @var AliasId[]
*/
- private $categoryImgDir;
+ private array $aliasIds;
/**
- * @param string $categoryImgDir
+ * @param int[] $aliasIds
+ *
+ * @throws AliasConstraintException
*/
- public function __construct(string $categoryImgDir)
+ public function __construct(array $aliasIds)
{
- parent::__construct();
- $this->categoryImgDir = $categoryImgDir;
+ foreach ($aliasIds as $aliasId) {
+ $this->aliasIds[] = new AliasId($aliasId);
+ }
}
/**
- * @param int $categoryId
- *
- * @return Finder
+ * @return AliasId[]
*/
- public function findMenuThumbnails(int $categoryId): Finder
+ public function getAliasIds(): array
{
- return $this->files()->name('/^' . $categoryId . '-([0-9])?_thumb.jpg/i')->in($this->categoryImgDir);
+ return $this->aliasIds;
}
}
diff --git a/src/Core/Domain/Category/CommandHandler/DeleteCategoryMenuThumbnailImageHandlerInterface.php b/src/Core/Domain/Alias/Command/DeleteAliasCommand.php
similarity index 71%
rename from src/Core/Domain/Category/CommandHandler/DeleteCategoryMenuThumbnailImageHandlerInterface.php
rename to src/Core/Domain/Alias/Command/DeleteAliasCommand.php
index 6883ef903ef17..0c1e15ddb312f 100644
--- a/src/Core/Domain/Category/CommandHandler/DeleteCategoryMenuThumbnailImageHandlerInterface.php
+++ b/src/Core/Domain/Alias/Command/DeleteAliasCommand.php
@@ -24,17 +24,29 @@
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/
-namespace PrestaShop\PrestaShop\Core\Domain\Category\CommandHandler;
+declare(strict_types=1);
-use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryMenuThumbnailImageCommand;
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
/**
- * Defines contract for service that handles category menu thumbnail deleting command.
+ * Deletes given alias.
*/
-interface DeleteCategoryMenuThumbnailImageHandlerInterface
+class DeleteAliasCommand
{
+ private AliasId $aliasId;
+
+ public function __construct(int $aliasId)
+ {
+ $this->aliasId = new AliasId($aliasId);
+ }
+
/**
- * @param DeleteCategoryMenuThumbnailImageCommand $command
+ * @return AliasId
*/
- public function handle(DeleteCategoryMenuThumbnailImageCommand $command);
+ public function getAliasId(): AliasId
+ {
+ return $this->aliasId;
+ }
}
diff --git a/src/Core/Domain/Category/ValueObject/MenuThumbnailId.php b/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
similarity index 52%
rename from src/Core/Domain/Category/ValueObject/MenuThumbnailId.php
rename to src/Core/Domain/Alias/Command/UpdateAliasCommand.php
index 1fc28c0d7f37d..01b8d69bb23c3 100644
--- a/src/Core/Domain/Category/ValueObject/MenuThumbnailId.php
+++ b/src/Core/Domain/Alias/Command/UpdateAliasCommand.php
@@ -24,50 +24,64 @@
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/
-namespace PrestaShop\PrestaShop\Core\Domain\Category\ValueObject;
+declare(strict_types=1);
-use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryException;
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\Alias\ValueObject\AliasId;
/**
- * Stores id for category's menu thumbnail image.
+ * Edits alias with given data
*/
-class MenuThumbnailId
+class UpdateAliasCommand
{
+ private AliasId $aliasId;
+
/**
- * @var array category is of having maximum of 3 menu thumbnails with defined Ids
+ * @var string[]
*/
- public const ALLOWED_ID_VALUES = [0, 1, 2];
+ private array $aliases;
+
+ private string $searchTerm;
/**
- * @var int
+ * @param int $aliasId
+ * @param string[] $aliases this input is array of string aliases that are returned from the form input
+ * @param string $searchTerm
*/
- private $menuThumbnailId;
+ public function __construct(
+ int $aliasId,
+ array $aliases,
+ string $searchTerm,
+ ) {
+ $this->aliasId = new AliasId($aliasId);
+ $this->aliases = $aliases;
+ $this->searchTerm = $searchTerm;
+ }
/**
- * @param int $menuThumbnailId
+ * @return AliasId
*/
- public function __construct($menuThumbnailId)
+ public function getAliasId(): AliasId
{
- $this->assertMenuThumbnailIsWithinAllowedValueRange($menuThumbnailId);
-
- $this->menuThumbnailId = $menuThumbnailId;
+ return $this->aliasId;
}
/**
- * @return int
+ * Returns array of string aliases that are used in the alias form input.
+ *
+ * @return string[]
*/
- public function getValue()
+ public function getAliases(): array
{
- return $this->menuThumbnailId;
+ return $this->aliases;
}
/**
- * @param int $menuThumbnailId
+ * @return string
*/
- private function assertMenuThumbnailIsWithinAllowedValueRange($menuThumbnailId)
+ public function getSearchTerm(): string
{
- if (!is_int($menuThumbnailId) || !in_array($menuThumbnailId, self::ALLOWED_ID_VALUES)) {
- throw new CategoryException(sprintf('Category menu thumbnail id "%s" invalid. Available values are: %s', var_export($menuThumbnailId, true), implode(',', self::ALLOWED_ID_VALUES)));
- }
+ return $this->searchTerm;
}
}
diff --git a/src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php b/src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php
index 6c35a408676c1..511672f67408a 100644
--- a/src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php
+++ b/src/Core/Domain/Alias/Command/UpdateAliasStatusCommand.php
@@ -35,13 +35,35 @@
*/
class UpdateAliasStatusCommand
{
+ private AliasId $aliasId;
+
+ private bool $enabled;
+
/**
- * @param AliasId $aliasId
+ * @param int $aliasId
* @param bool $enabled
*/
public function __construct(
- public readonly AliasId $aliasId,
- public readonly bool $enabled
+ int $aliasId,
+ bool $enabled
) {
+ $this->aliasId = new AliasId($aliasId);
+ $this->enabled = $enabled;
+ }
+
+ /**
+ * @return AliasId
+ */
+ public function getAliasId(): AliasId
+ {
+ return $this->aliasId;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isEnabled(): bool
+ {
+ return $this->enabled;
}
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Order/ActionsBarButtonsCollection.php b/src/Core/Domain/Alias/CommandHandler/BulkDeleteAliasHandlerInterface.php
similarity index 74%
rename from src/PrestaShopBundle/Controller/Admin/Sell/Order/ActionsBarButtonsCollection.php
rename to src/Core/Domain/Alias/CommandHandler/BulkDeleteAliasHandlerInterface.php
index 6f4a02acc1ba6..85949c63a10f5 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Order/ActionsBarButtonsCollection.php
+++ b/src/Core/Domain/Alias/CommandHandler/BulkDeleteAliasHandlerInterface.php
@@ -24,13 +24,17 @@
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/
-namespace PrestaShopBundle\Controller\Admin\Sell\Order;
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler;
-use PrestaShop\PrestaShop\Core\Action\ActionsBarButtonsCollection as CoreActionsBarButtonsCollection;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkDeleteAliasCommand;
/**
- * @deprecated since 8.0 and will be removed in next major. Use PrestaShop\PrestaShop\Core\ActionBar\ActionsBarButtonsCollection instead
+ * Defines contract to handle @see BulkDeleteAliasCommand
*/
-class ActionsBarButtonsCollection extends CoreActionsBarButtonsCollection
+interface BulkDeleteAliasHandlerInterface
{
+ /**
+ * @param BulkDeleteAliasCommand $command
+ */
+ public function handle(BulkDeleteAliasCommand $command): void;
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Order/ActionsBarButton.php b/src/Core/Domain/Alias/CommandHandler/DeleteAliasHandlerInterface.php
similarity index 75%
rename from src/PrestaShopBundle/Controller/Admin/Sell/Order/ActionsBarButton.php
rename to src/Core/Domain/Alias/CommandHandler/DeleteAliasHandlerInterface.php
index f2e2c0c1a1c3f..fcba288cc894a 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Order/ActionsBarButton.php
+++ b/src/Core/Domain/Alias/CommandHandler/DeleteAliasHandlerInterface.php
@@ -24,13 +24,17 @@
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/
-namespace PrestaShopBundle\Controller\Admin\Sell\Order;
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler;
-use PrestaShop\PrestaShop\Core\Action\ActionsBarButton as CoreActionsBarButton;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\DeleteAliasCommand;
/**
- * @deprecated since 8.0 and will be removed in next major. Use PrestaShop\PrestaShop\Core\ActionBar\ActionsBarButton instead
+ * Defines contract to handle @see DeleteAliasCommand
*/
-class ActionsBarButton extends CoreActionsBarButton implements ActionsBarButtonInterface
+interface DeleteAliasHandlerInterface
{
+ /**
+ * @param DeleteAliasCommand $command
+ */
+ public function handle(DeleteAliasCommand $command): void;
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Order/ActionsBarButtonInterface.php b/src/Core/Domain/Alias/CommandHandler/UpdateAliasHandlerInterface.php
similarity index 75%
rename from src/PrestaShopBundle/Controller/Admin/Sell/Order/ActionsBarButtonInterface.php
rename to src/Core/Domain/Alias/CommandHandler/UpdateAliasHandlerInterface.php
index 2179c1634e9a5..13d987fcc5f67 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Order/ActionsBarButtonInterface.php
+++ b/src/Core/Domain/Alias/CommandHandler/UpdateAliasHandlerInterface.php
@@ -24,13 +24,17 @@
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/
-namespace PrestaShopBundle\Controller\Admin\Sell\Order;
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\CommandHandler;
-use PrestaShop\PrestaShop\Core\Action\ActionsBarButtonInterface as CoreActionsBarButtonInterface;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasCommand;
/**
- * @deprecated since 8.0 and will be removed in next major. Use PrestaShop\PrestaShop\Core\ActionBar\ActionsBarButtonInterface instead
+ * Defines contract to handle @see UpdateAliasCommand
*/
-interface ActionsBarButtonInterface extends CoreActionsBarButtonInterface
+interface UpdateAliasHandlerInterface
{
+ /**
+ * @param UpdateAliasCommand $command
+ */
+ public function handle(UpdateAliasCommand $command): void;
}
diff --git a/src/Core/Domain/Alias/Exception/BulkAliasException.php b/src/Core/Domain/Alias/Exception/BulkAliasException.php
index f700c941f81c2..a863aad7ea8ee 100644
--- a/src/Core/Domain/Alias/Exception/BulkAliasException.php
+++ b/src/Core/Domain/Alias/Exception/BulkAliasException.php
@@ -37,8 +37,12 @@
*/
class BulkAliasException extends AliasException implements BulkCommandExceptionInterface
{
- public const FAILED_BULK_DELETE = 1;
-
+ /**
+ * @param Throwable[] $exceptions
+ * @param string $message
+ * @param int $code
+ * @param Throwable|null $previous
+ */
public function __construct(
private readonly array $exceptions,
string $message = 'Errors occurred during Alias bulk action',
diff --git a/src/Core/Domain/Employee/Exception/CannotDeleteWarehouseManagerException.php b/src/Core/Domain/Alias/Exception/CannotDeleteAliasException.php
similarity index 85%
rename from src/Core/Domain/Employee/Exception/CannotDeleteWarehouseManagerException.php
rename to src/Core/Domain/Alias/Exception/CannotDeleteAliasException.php
index 1460aaf424b32..45676dce7ac87 100644
--- a/src/Core/Domain/Employee/Exception/CannotDeleteWarehouseManagerException.php
+++ b/src/Core/Domain/Alias/Exception/CannotDeleteAliasException.php
@@ -24,11 +24,13 @@
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/
-namespace PrestaShop\PrestaShop\Core\Domain\Employee\Exception;
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\Exception;
/**
- * Is thrown when warehouse manager cannot be deleted
+ * Thrown when alias deletion fails
*/
-class CannotDeleteWarehouseManagerException extends EmployeeException
+class CannotDeleteAliasException extends AliasException
{
}
diff --git a/src/Core/Domain/Alias/Exception/CannotUpdateAliasException.php b/src/Core/Domain/Alias/Exception/CannotUpdateAliasException.php
index 2e9ea3fc7f535..0ef490bb9309a 100644
--- a/src/Core/Domain/Alias/Exception/CannotUpdateAliasException.php
+++ b/src/Core/Domain/Alias/Exception/CannotUpdateAliasException.php
@@ -28,6 +28,9 @@
namespace PrestaShop\PrestaShop\Core\Domain\Alias\Exception;
+/**
+ * Thrown when new alias update fails
+ */
class CannotUpdateAliasException extends AliasException
{
}
diff --git a/src/Core/Domain/Category/Exception/MenuThumbnailsLimitException.php b/src/Core/Domain/Alias/Exception/InvalidAliasIdException.php
similarity index 82%
rename from src/Core/Domain/Category/Exception/MenuThumbnailsLimitException.php
rename to src/Core/Domain/Alias/Exception/InvalidAliasIdException.php
index 746b18e3dc324..0c85df4788608 100644
--- a/src/Core/Domain/Category/Exception/MenuThumbnailsLimitException.php
+++ b/src/Core/Domain/Alias/Exception/InvalidAliasIdException.php
@@ -24,11 +24,11 @@
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/
-namespace PrestaShop\PrestaShop\Core\Domain\Category\Exception;
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\Exception;
/**
- * Class MenuThumbnailsLimitException is thrown when maximum number of thumbnail images is reached.
+ * Class InvalidAliasIdException is thrown when AliasId with invalid value is being created.
*/
-class MenuThumbnailsLimitException extends CategoryException
+class InvalidAliasIdException extends AliasException
{
}
diff --git a/src/Core/Domain/Alias/Query/SearchForSearchTerm.php b/src/Core/Domain/Alias/Query/SearchForSearchTerm.php
new file mode 100644
index 0000000000000..f28a9572e808d
--- /dev/null
+++ b/src/Core/Domain/Alias/Query/SearchForSearchTerm.php
@@ -0,0 +1,71 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\Query;
+
+use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
+
+/**
+ * Class SearchAliasesForAssociation is responsible for searching aliases with particular search terms.
+ */
+class SearchForSearchTerm
+{
+ public const DEFAULT_LIMIT = 20;
+
+ private string $searchTerm;
+
+ private ?int $limit;
+
+ /**
+ * @throws InvalidArgumentException
+ */
+ public function __construct(string $searchTerm, ?int $limit = null)
+ {
+ if (null !== $limit && $limit <= 0) {
+ throw new InvalidArgumentException('Search limit must be a positive integer or null');
+ }
+ $this->searchTerm = $searchTerm;
+ $this->limit = $limit;
+ }
+
+ /**
+ * @return string
+ */
+ public function getSearchTerm(): string
+ {
+ return $this->searchTerm;
+ }
+
+ /**
+ * @return int|null
+ */
+ public function getLimit(): ?int
+ {
+ return $this->limit;
+ }
+}
diff --git a/src/Core/Domain/Alias/QueryHandler/SearchForSearchTermHandlerInterface.php b/src/Core/Domain/Alias/QueryHandler/SearchForSearchTermHandlerInterface.php
new file mode 100644
index 0000000000000..6fcbdb174069f
--- /dev/null
+++ b/src/Core/Domain/Alias/QueryHandler/SearchForSearchTermHandlerInterface.php
@@ -0,0 +1,42 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\Alias\QueryHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchForSearchTerm;
+
+/**
+ * Interface SearchAliasesForAssociationHandlerInterface defines contract for SearchAliasesForAssociationHandler
+ */
+interface SearchForSearchTermHandlerInterface
+{
+ /**
+ * @param SearchForSearchTerm $query
+ *
+ * @return string[]
+ */
+ public function handle(SearchForSearchTerm $query): array;
+}
diff --git a/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php b/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php
new file mode 100644
index 0000000000000..089029d7caddc
--- /dev/null
+++ b/src/Core/Domain/AttributeGroup/Command/AddAttributeGroupCommand.php
@@ -0,0 +1,133 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\InvalidAttributeGroupTypeException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupType;
+
+/**
+ * Adds new attribute group
+ */
+class AddAttributeGroupCommand
+{
+ /**
+ * @var string[]
+ */
+ private $localizedNames;
+
+ /**
+ * @var int[]
+ */
+ private $shopAssociation;
+
+ /**
+ * @var array
+ */
+ private $localizedPublicNames;
+
+ /**
+ * @var AttributeGroupType
+ */
+ private $type;
+
+ /**
+ * @param string[] $localizedNames
+ * @param array $localizedPublicNames
+ * @param string $type
+ * @param int[] $shopAssociation
+ *
+ * @throws AttributeGroupConstraintException
+ * @throws InvalidAttributeGroupTypeException
+ */
+ public function __construct(array $localizedNames, array $localizedPublicNames, string $type, array $shopAssociation)
+ {
+ $this->assertNamesAreValid(
+ $localizedNames,
+ 'Attribute name cannot be empty',
+ AttributeGroupConstraintException::EMPTY_NAME
+ );
+ $this->assertNamesAreValid(
+ $localizedPublicNames,
+ 'Attribute public name cannot be empty',
+ AttributeGroupConstraintException::EMPTY_PUBLIC_NAME
+ );
+
+ $this->localizedNames = $localizedNames;
+ $this->localizedPublicNames = $localizedPublicNames;
+ $this->type = new AttributeGroupType($type);
+ $this->shopAssociation = $shopAssociation;
+ }
+
+ /**
+ * @return string[]
+ */
+ public function getLocalizedNames(): array
+ {
+ return $this->localizedNames;
+ }
+
+ /**
+ * @return string[]
+ */
+ public function getLocalizedPublicNames(): array
+ {
+ return $this->localizedPublicNames;
+ }
+
+ /**
+ * @return AttributeGroupType
+ */
+ public function getType(): AttributeGroupType
+ {
+ return $this->type;
+ }
+
+ /**
+ * @return int[]
+ */
+ public function getShopAssociation(): array
+ {
+ return $this->shopAssociation;
+ }
+
+ /**
+ * Asserts that attribute group's names are valid.
+ *
+ * @param string[] $names
+ *
+ * @throws AttributeGroupConstraintException
+ */
+ private function assertNamesAreValid(array $names, string $message, int $errorCode): void
+ {
+ if (empty($names)) {
+ throw new AttributeGroupConstraintException($message, $errorCode);
+ }
+ }
+}
diff --git a/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php b/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php
new file mode 100644
index 0000000000000..3d8315eed4c9d
--- /dev/null
+++ b/src/Core/Domain/AttributeGroup/Command/EditAttributeGroupCommand.php
@@ -0,0 +1,153 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\InvalidAttributeGroupTypeException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupType;
+
+/**
+ * Edits existing attribute group
+ */
+class EditAttributeGroupCommand
+{
+ /**
+ * @var AttributeGroupId
+ */
+ private $attributeGroupId;
+
+ /**
+ * @var string[]
+ */
+ private $localizedNames;
+
+ /**
+ * @var int[]
+ */
+ private $shopAssociation;
+
+ /**
+ * @var array
+ */
+ private $localizedPublicNames;
+
+ /**
+ * @var AttributeGroupType
+ */
+ private $type;
+
+ /**
+ * @param int $attributeGroupId
+ * @param string[] $localizedNames
+ * @param array $localizedPublicNames
+ * @param string $type
+ * @param int[] $shopAssociation
+ *
+ * @throws AttributeGroupConstraintException
+ * @throws InvalidAttributeGroupTypeException
+ */
+ public function __construct(
+ int $attributeGroupId,
+ array $localizedNames,
+ array $localizedPublicNames,
+ string $type,
+ array $shopAssociation
+ ) {
+ $this->attributeGroupId = new AttributeGroupId($attributeGroupId);
+ $this->assertNamesAreValid(
+ $localizedNames,
+ 'Attribute name cannot be empty',
+ AttributeGroupConstraintException::EMPTY_NAME
+ );
+ $this->assertNamesAreValid(
+ $localizedPublicNames,
+ 'Attribute public name cannot be empty',
+ AttributeGroupConstraintException::EMPTY_PUBLIC_NAME
+ );
+ $this->localizedNames = $localizedNames;
+ $this->localizedPublicNames = $localizedPublicNames;
+ $this->type = new AttributeGroupType($type);
+ $this->shopAssociation = $shopAssociation;
+ }
+
+ /**
+ * @return AttributeGroupId
+ */
+ public function getAttributeGroupId(): AttributeGroupId
+ {
+ return $this->attributeGroupId;
+ }
+
+ /**
+ * @return string[]
+ */
+ public function getLocalizedNames(): array
+ {
+ return $this->localizedNames;
+ }
+
+ /**
+ * @return string[]
+ */
+ public function getLocalizedPublicNames(): array
+ {
+ return $this->localizedPublicNames;
+ }
+
+ /**
+ * @return AttributeGroupType
+ */
+ public function getType(): AttributeGroupType
+ {
+ return $this->type;
+ }
+
+ /**
+ * @return int[]
+ */
+ public function getShopAssociation(): array
+ {
+ return $this->shopAssociation;
+ }
+
+ /**
+ * Asserts that attribute group's names are valid.
+ *
+ * @param string[] $names
+ *
+ * @throws AttributeGroupConstraintException
+ */
+ private function assertNamesAreValid(array $names, string $message, int $errorCode): void
+ {
+ if (empty($names)) {
+ throw new AttributeGroupConstraintException($message, $errorCode);
+ }
+ }
+}
diff --git a/src/Core/Domain/AttributeGroup/CommandHandler/AddAttributeGroupHandlerInterface.php b/src/Core/Domain/AttributeGroup/CommandHandler/AddAttributeGroupHandlerInterface.php
new file mode 100644
index 0000000000000..03ad7b7125b70
--- /dev/null
+++ b/src/Core/Domain/AttributeGroup/CommandHandler/AddAttributeGroupHandlerInterface.php
@@ -0,0 +1,43 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\AddAttributeGroupCommand;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
+
+/**
+ * Describes add attribute group command handler
+ */
+interface AddAttributeGroupHandlerInterface
+{
+ /**
+ * @param AddAttributeGroupCommand $command
+ *
+ * @return AttributeGroupId
+ */
+ public function handle(AddAttributeGroupCommand $command): AttributeGroupId;
+}
diff --git a/src/Core/Domain/AttributeGroup/CommandHandler/EditAttributeGroupHandlerInterface.php b/src/Core/Domain/AttributeGroup/CommandHandler/EditAttributeGroupHandlerInterface.php
new file mode 100644
index 0000000000000..9f8baea9d077c
--- /dev/null
+++ b/src/Core/Domain/AttributeGroup/CommandHandler/EditAttributeGroupHandlerInterface.php
@@ -0,0 +1,40 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\EditAttributeGroupCommand;
+
+/**
+ * Describes a service that handles attribute group edit command.
+ */
+interface EditAttributeGroupHandlerInterface
+{
+ /**
+ * @param EditAttributeGroupCommand $command
+ */
+ public function handle(EditAttributeGroupCommand $command): void;
+}
diff --git a/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php b/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php
index c8bd80e8e3839..dced969c2f23c 100644
--- a/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php
+++ b/src/Core/Domain/AttributeGroup/Exception/AttributeGroupConstraintException.php
@@ -27,12 +27,27 @@
namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception;
/**
- * Is thrown when attribute group constraints are violated
+ * When attribute group Id contains invalid values
*/
class AttributeGroupConstraintException extends AttributeGroupException
{
/**
- * When attribute group Id contains invalid values
+ * Used when attribute group id is invalid
*/
public const INVALID_ID = 10;
+
+ /**
+ * Code is used when attribute group does not have name.
+ */
+ public const EMPTY_NAME = 20;
+
+ /**
+ * Code is used when attribute group does not have public name.
+ */
+ public const EMPTY_PUBLIC_NAME = 30;
+
+ /**
+ * Used when attribute group name is invalid.
+ */
+ public const INVALID_NAME = 40;
}
diff --git a/src/Core/Domain/AttributeGroup/Exception/CannotAddAttributeGroupException.php b/src/Core/Domain/AttributeGroup/Exception/CannotAddAttributeGroupException.php
new file mode 100644
index 0000000000000..f8a6c6300d636
--- /dev/null
+++ b/src/Core/Domain/AttributeGroup/Exception/CannotAddAttributeGroupException.php
@@ -0,0 +1,31 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception;
+
+class CannotAddAttributeGroupException extends AttributeGroupException
+{
+}
diff --git a/src/Core/Domain/AttributeGroup/Exception/InvalidAttributeGroupTypeException.php b/src/Core/Domain/AttributeGroup/Exception/InvalidAttributeGroupTypeException.php
new file mode 100644
index 0000000000000..f3648d1795f6f
--- /dev/null
+++ b/src/Core/Domain/AttributeGroup/Exception/InvalidAttributeGroupTypeException.php
@@ -0,0 +1,31 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception;
+
+class InvalidAttributeGroupTypeException extends AttributeGroupException
+{
+}
diff --git a/src/Core/Domain/AttributeGroup/Query/GetAttributeGroupForEditing.php b/src/Core/Domain/AttributeGroup/Query/GetAttributeGroupForEditing.php
new file mode 100644
index 0000000000000..82b67e4c95c10
--- /dev/null
+++ b/src/Core/Domain/AttributeGroup/Query/GetAttributeGroupForEditing.php
@@ -0,0 +1,58 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query;
+
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
+
+/**
+ * Retrieves attribute group data for editing
+ */
+class GetAttributeGroupForEditing
+{
+ /**
+ * @var AttributeGroupId
+ */
+ private $attributeGroupId;
+
+ /**
+ * @param int $attributeGroupId
+ */
+ public function __construct(int $attributeGroupId)
+ {
+ $this->attributeGroupId = new AttributeGroupId($attributeGroupId);
+ }
+
+ /**
+ * @return AttributeGroupId
+ */
+ public function getAttributeGroupId(): AttributeGroupId
+ {
+ return $this->attributeGroupId;
+ }
+}
diff --git a/src/Core/Domain/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandlerInterface.php b/src/Core/Domain/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandlerInterface.php
new file mode 100644
index 0000000000000..eec79ac62ff34
--- /dev/null
+++ b/src/Core/Domain/AttributeGroup/QueryHandler/GetAttributeGroupForEditingHandlerInterface.php
@@ -0,0 +1,43 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\EditableAttributeGroup;
+
+/**
+ * Describes attribute group for editing handler.
+ */
+interface GetAttributeGroupForEditingHandlerInterface
+{
+ /**
+ * @param GetAttributeGroupForEditing $query
+ *
+ * @return EditableAttributeGroup
+ */
+ public function handle(GetAttributeGroupForEditing $query): EditableAttributeGroup;
+}
diff --git a/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php b/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php
new file mode 100644
index 0000000000000..446d287a3114d
--- /dev/null
+++ b/src/Core/Domain/AttributeGroup/QueryResult/EditableAttributeGroup.php
@@ -0,0 +1,123 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult;
+
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
+
+/**
+ * Stores attribute groups data that's needed for editing.
+ */
+class EditableAttributeGroup
+{
+ /**
+ * @var AttributeGroupId
+ */
+ private $attributeGroupId;
+
+ /**
+ * @var string[]
+ */
+ private $name;
+
+ /**
+ * @var int[]
+ */
+ private $associatedShopIds;
+
+ /**
+ * @var array
+ */
+ private $publicName;
+
+ /**
+ * @var string
+ */
+ private $type;
+
+ /**
+ * @param int $attributeGroupId
+ * @param string[] $name
+ * @param array $publicName
+ * @param string $type
+ * @param int[] $associatedShopIds
+ */
+ public function __construct(
+ int $attributeGroupId,
+ array $name,
+ array $publicName,
+ string $type,
+ array $associatedShopIds
+ ) {
+ $this->attributeGroupId = new AttributeGroupId($attributeGroupId);
+ $this->name = $name;
+ $this->associatedShopIds = $associatedShopIds;
+ $this->publicName = $publicName;
+ $this->type = $type;
+ }
+
+ /**
+ * @return AttributeGroupId
+ */
+ public function getAttributeGroupId(): AttributeGroupId
+ {
+ return $this->attributeGroupId;
+ }
+
+ /**
+ * @return string[]
+ */
+ public function getName(): array
+ {
+ return $this->name;
+ }
+
+ /**
+ * @return int[]
+ */
+ public function getAssociatedShopIds(): array
+ {
+ return $this->associatedShopIds;
+ }
+
+ /**
+ * @return array
+ */
+ public function getPublicName(): array
+ {
+ return $this->publicName;
+ }
+
+ /**
+ * @return string
+ */
+ public function getType(): string
+ {
+ return $this->type;
+ }
+}
diff --git a/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php b/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php
index 797176b3aff63..8db6d561fcd12 100644
--- a/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php
+++ b/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupId.php
@@ -24,14 +24,16 @@
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/
+declare(strict_types=1);
+
namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
/**
- * Provides attribute group identification data
+ * Defines Attribute group ID with its constraints.
*/
-final class AttributeGroupId
+class AttributeGroupId
{
/**
* @var int
@@ -40,45 +42,34 @@ final class AttributeGroupId
/**
* @param int $attributeGroupId
- *
- * @throws AttributeGroupConstraintException
*/
- public function __construct($attributeGroupId)
+ public function __construct(int $attributeGroupId)
{
- $this->assertIsIntegerGreaterThanZero($attributeGroupId);
- $this->attributeGroupId = $attributeGroupId;
- }
+ $this->assertIntegerIsGreaterThanZero($attributeGroupId);
- /**
- * @deprecated
- * @see getValue()
- *
- * @return int
- */
- public function getAttributeGroupId()
- {
- return $this->attributeGroupId;
+ $this->attributeGroupId = $attributeGroupId;
}
/**
* @return int
*/
- public function getValue()
+ public function getValue(): int
{
return $this->attributeGroupId;
}
/**
- * Validates that the value is integer and is greater than zero
- *
- * @param int $value
+ * @param int $attributeGroupId
*
* @throws AttributeGroupConstraintException
*/
- private function assertIsIntegerGreaterThanZero($value)
+ private function assertIntegerIsGreaterThanZero(int $attributeGroupId): void
{
- if (!is_int($value) || 0 >= $value) {
- throw new AttributeGroupConstraintException(sprintf('Invalid attribute group id "%s".', var_export($value, true)), AttributeGroupConstraintException::INVALID_ID);
+ if (0 >= $attributeGroupId) {
+ throw new AttributeGroupConstraintException(
+ sprintf('Invalid attributeGroup id %s supplied. Attribute group ID must be a positive integer.', $attributeGroupId),
+ AttributeGroupConstraintException::INVALID_ID
+ );
}
}
}
diff --git a/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupType.php b/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupType.php
new file mode 100644
index 0000000000000..fc6833c80928c
--- /dev/null
+++ b/src/Core/Domain/AttributeGroup/ValueObject/AttributeGroupType.php
@@ -0,0 +1,86 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject;
+
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\InvalidAttributeGroupTypeException;
+
+/**
+ * Defines Attribute group type with its constraints.
+ */
+class AttributeGroupType
+{
+ public const ATTRIBUTE_GROUP_TYPE_SELECT = 'select';
+ public const ATTRIBUTE_GROUP_TYPE_RADIO = 'radio';
+ public const ATTRIBUTE_GROUP_TYPE_COLOR = 'color';
+
+ /**
+ * @var string
+ */
+ private $type;
+
+ /**
+ * @param string $type
+ *
+ * @throws InvalidAttributeGroupTypeException
+ */
+ public function __construct(string $type)
+ {
+ $this->assertTypeExists($type);
+
+ $this->type = $type;
+ }
+
+ /**
+ * @return string
+ */
+ public function getValue(): string
+ {
+ return $this->type;
+ }
+
+ /**
+ * @param string $type
+ *
+ * @return void
+ *
+ * @throws InvalidAttributeGroupTypeException
+ */
+ private function assertTypeExists(string $type): void
+ {
+ $types = [static::ATTRIBUTE_GROUP_TYPE_COLOR, static::ATTRIBUTE_GROUP_TYPE_SELECT, static::ATTRIBUTE_GROUP_TYPE_RADIO];
+ if (!in_array($type, $types)) {
+ throw new InvalidAttributeGroupTypeException(
+ sprintf(
+ 'Invalid attributeGroup type %s supplied.',
+ $type
+ )
+ );
+ }
+ }
+}
diff --git a/src/Core/Domain/AuthorizationServer/Command/DeleteApplicationCommand.php b/src/Core/Domain/AuthorizationServer/Command/DeleteApplicationCommand.php
new file mode 100644
index 0000000000000..b55fc839e18e9
--- /dev/null
+++ b/src/Core/Domain/AuthorizationServer/Command/DeleteApplicationCommand.php
@@ -0,0 +1,63 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\ApplicationConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\ValueObject\ApplicationId;
+
+/**
+ * Deletes application
+ *
+ * @experimental
+ */
+class DeleteApplicationCommand
+{
+ /**
+ * @var ApplicationId
+ */
+ private $applicationId;
+
+ /**
+ * @param $applicationId
+ *
+ * @throws ApplicationConstraintException
+ */
+ public function __construct($applicationId)
+ {
+ $this->applicationId = new ApplicationId($applicationId);
+ }
+
+ /**
+ * @return ApplicationId
+ */
+ public function getApplicationId(): ApplicationId
+ {
+ return $this->applicationId;
+ }
+}
diff --git a/src/Core/Domain/AuthorizationServer/CommandHandler/AddApplicationHandler.php b/src/Core/Domain/AuthorizationServer/CommandHandler/AddApplicationHandler.php
index ee37cb20639b0..5e02c0a83e335 100644
--- a/src/Core/Domain/AuthorizationServer/CommandHandler/AddApplicationHandler.php
+++ b/src/Core/Domain/AuthorizationServer/CommandHandler/AddApplicationHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\AddApplicationCommand;
use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\ApplicationConstraintException;
use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\ApplicationNotFoundException;
@@ -37,10 +38,11 @@
use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\ValueObject\ApplicationId;
/**
- * Handles command which adds new manufacturer using legacy object model
+ * Handles command which adds new application
*
* @experimental
*/
+#[AsCommandHandler]
class AddApplicationHandler implements AddApplicationHandlerInterface
{
/**
diff --git a/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandler.php b/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandler.php
new file mode 100644
index 0000000000000..cc75b1d2a0213
--- /dev/null
+++ b/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandler.php
@@ -0,0 +1,98 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\DeleteApplicationCommand;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\DeleteApplicationException;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\ApiAccessRepositoryInterface;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationRepositoryInterface;
+use PrestaShop\PrestaShop\Core\Repository\TransactionManagerInterface;
+use PrestaShopBundle\Entity\AuthorizedApplication;
+
+/**
+ * Handles command which delete application
+ *
+ * @experimental
+ */
+#[AsCommandHandler]
+class DeleteApplicationHandler implements DeleteApplicationHandlerInterface
+{
+ /**
+ * @var AuthorizedApplicationRepositoryInterface
+ */
+ private $applicationRepository;
+
+ /**
+ * @var ApiAccessRepositoryInterface
+ */
+ private $apiAccessRepository;
+
+ /**
+ * @var TransactionManagerInterface
+ */
+ private $transactionManager;
+
+ /**
+ * @param AuthorizedApplicationRepositoryInterface $applicationRepository
+ * @param ApiAccessRepositoryInterface $apiAccessRepository
+ * @param TransactionManagerInterface $transactionManager
+ */
+ public function __construct(
+ AuthorizedApplicationRepositoryInterface $applicationRepository,
+ ApiAccessRepositoryInterface $apiAccessRepository,
+ TransactionManagerInterface $transactionManager)
+ {
+ $this->applicationRepository = $applicationRepository;
+ $this->apiAccessRepository = $apiAccessRepository;
+ $this->transactionManager = $transactionManager;
+ }
+
+ /**
+ * {@inheritdoc}
+ *
+ * @throws DeleteApplicationException
+ */
+ public function handle(DeleteApplicationCommand $command): void
+ {
+ $this->transactionManager->beginTransaction();
+
+ try {
+ /** @var ?AuthorizedApplication $application */
+ $application = $this->applicationRepository->getById($command->getApplicationId());
+ $this->apiAccessRepository->deleteByApplication($application);
+ $this->applicationRepository->delete($application);
+ } catch (\Exception $exception) {
+ $this->transactionManager->rollback();
+ throw new DeleteApplicationException($exception->getMessage());
+ }
+
+ $this->transactionManager->commit();
+ }
+}
diff --git a/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandlerInterface.php b/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandlerInterface.php
new file mode 100644
index 0000000000000..e5a65316da60f
--- /dev/null
+++ b/src/Core/Domain/AuthorizationServer/CommandHandler/DeleteApplicationHandlerInterface.php
@@ -0,0 +1,42 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\DeleteApplicationCommand;
+
+/**
+ * Defines contract for DeleteApplicationHandler
+ *
+ * @experimental
+ */
+interface DeleteApplicationHandlerInterface
+{
+ /**
+ * @param DeleteApplicationCommand $command
+ */
+ public function handle(DeleteApplicationCommand $command);
+}
diff --git a/src/Core/Domain/AuthorizationServer/CommandHandler/EditApplicationHandler.php b/src/Core/Domain/AuthorizationServer/CommandHandler/EditApplicationHandler.php
index 6471f932ecc44..bbffe5c7cbd60 100644
--- a/src/Core/Domain/AuthorizationServer/CommandHandler/EditApplicationHandler.php
+++ b/src/Core/Domain/AuthorizationServer/CommandHandler/EditApplicationHandler.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\EditApplicationCommand;
use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\ApplicationNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\DuplicateApplicationNameException;
@@ -35,10 +36,11 @@
use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationRepositoryInterface;
/**
- * Handles command which adds new manufacturer using legacy object model
+ * Handles command which edit application
*
* @experimental
*/
+#[AsCommandHandler]
class EditApplicationHandler implements EditApplicationHandlerInterface
{
/**
diff --git a/src/Core/Domain/AuthorizationServer/Exception/DeleteApplicationException.php b/src/Core/Domain/AuthorizationServer/Exception/DeleteApplicationException.php
new file mode 100644
index 0000000000000..4bed13cb2e03a
--- /dev/null
+++ b/src/Core/Domain/AuthorizationServer/Exception/DeleteApplicationException.php
@@ -0,0 +1,38 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception;
+
+/**
+ * Is thrown when application deletion failed
+ *
+ * @experimental
+ */
+class DeleteApplicationException extends ApplicationException
+{
+}
diff --git a/src/Core/Domain/AuthorizationServer/Model/ApiAccessRepositoryInterface.php b/src/Core/Domain/AuthorizationServer/Model/ApiAccessRepositoryInterface.php
new file mode 100644
index 0000000000000..14d2e57b34188
--- /dev/null
+++ b/src/Core/Domain/AuthorizationServer/Model/ApiAccessRepositoryInterface.php
@@ -0,0 +1,44 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model;
+
+use PrestaShopBundle\Entity\AuthorizedApplication;
+
+/**
+ * @experimental
+ */
+interface ApiAccessRepositoryInterface
+{
+ /**
+ * @param AuthorizedApplication $application
+ *
+ * @return void
+ */
+ public function deleteByApplication(AuthorizedApplication $application): void;
+}
diff --git a/src/Core/Domain/AuthorizationServer/Model/AuthorizedApplicationRepositoryInterface.php b/src/Core/Domain/AuthorizationServer/Model/AuthorizedApplicationRepositoryInterface.php
index 032530cd0f09f..ed60d4898a94d 100644
--- a/src/Core/Domain/AuthorizationServer/Model/AuthorizedApplicationRepositoryInterface.php
+++ b/src/Core/Domain/AuthorizationServer/Model/AuthorizedApplicationRepositoryInterface.php
@@ -55,16 +55,23 @@ public function update(AuthorizedApplicationInterface $application): void;
*
* @throws ApplicationNotFoundException
*
- * @return AuthorizedApplicationInterface|null
+ * @return AuthorizedApplicationInterface
*/
- public function getById(ApplicationId $applicationId): ?AuthorizedApplicationInterface;
+ public function getById(ApplicationId $applicationId): AuthorizedApplicationInterface;
/**
* @param string $name
*
* @throws ApplicationNotFoundException
*
- * @return AuthorizedApplicationInterface|null
+ * @return AuthorizedApplicationInterface
*/
- public function getByName(string $name): ?AuthorizedApplicationInterface;
+ public function getByName(string $name): AuthorizedApplicationInterface;
+
+ /**
+ * @param AuthorizedApplicationInterface $application
+ *
+ * @return void
+ */
+ public function delete(AuthorizedApplicationInterface $application): void;
}
diff --git a/src/Core/Domain/AuthorizationServer/Query/GetApplicationForViewing.php b/src/Core/Domain/AuthorizationServer/Query/GetApplicationForViewing.php
new file mode 100644
index 0000000000000..a4daaef8c06e5
--- /dev/null
+++ b/src/Core/Domain/AuthorizationServer/Query/GetApplicationForViewing.php
@@ -0,0 +1,61 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query;
+
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\ApplicationConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\ValueObject\ApplicationId;
+
+/**
+ * Gets application for editing in Back Office
+ */
+class GetApplicationForViewing
+{
+ /**
+ * @var ApplicationId
+ */
+ private $applicationId;
+
+ /**
+ * @param int $applicationId
+ *
+ * @throws ApplicationConstraintException
+ */
+ public function __construct(int $applicationId)
+ {
+ $this->applicationId = new ApplicationId($applicationId);
+ }
+
+ /**
+ * @return ApplicationId
+ */
+ public function getApplicationId(): ApplicationId
+ {
+ return $this->applicationId;
+ }
+}
diff --git a/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForEditingHandler.php b/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForEditingHandler.php
index 110a91f10522b..7c97ce45fc68e 100644
--- a/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForEditingHandler.php
+++ b/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForEditingHandler.php
@@ -28,7 +28,7 @@
namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryHandler;
-use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\ApplicationNotFoundException;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationRepositoryInterface;
use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForEditing;
use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryResult\EditableApplication;
@@ -38,6 +38,7 @@
*
* @experimental
*/
+#[AsQueryHandler]
class GetApplicationForEditingHandler implements GetApplicationForEditingHandlerInterface
{
/**
@@ -57,10 +58,6 @@ public function handle(GetApplicationForEditing $query)
{
$application = $this->applicationRepository->getById($query->getApplicationId());
- if ($application === null) {
- throw new ApplicationNotFoundException(sprintf('Application with id "%d" was not found.', $query->getApplicationId()->getValue()));
- }
-
return new EditableApplication($query->getApplicationId(), $application->getName(), $application->getDescription());
}
}
diff --git a/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandler.php b/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandler.php
new file mode 100644
index 0000000000000..d87516f01563d
--- /dev/null
+++ b/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandler.php
@@ -0,0 +1,64 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryHandler;
+
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationRepositoryInterface;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForViewing;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryResult\ViewableApplication;
+
+/**
+ * Handles query which gets application for viewing
+ */
+#[AsQueryHandler]
+class GetApplicationForViewingHandler implements GetApplicationForViewingHandlerInterface
+{
+ /**
+ * @var AuthorizedApplicationRepositoryInterface
+ */
+ private $applicationRepository;
+
+ /**
+ * @param AuthorizedApplicationRepositoryInterface $applicationRepository
+ */
+ public function __construct(AuthorizedApplicationRepositoryInterface $applicationRepository)
+ {
+ $this->applicationRepository = $applicationRepository;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function handle(GetApplicationForViewing $query): ViewableApplication
+ {
+ $application = $this->applicationRepository->getById($query->getApplicationId());
+
+ return new ViewableApplication($query->getApplicationId(), $application->getName(), $application->getDescription());
+ }
+}
diff --git a/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandlerInterface.php b/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandlerInterface.php
new file mode 100644
index 0000000000000..1edd528e11c7d
--- /dev/null
+++ b/src/Core/Domain/AuthorizationServer/QueryHandler/GetApplicationForViewingHandlerInterface.php
@@ -0,0 +1,43 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForViewing;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryResult\ViewableApplication;
+
+/**
+ * Defines contract for GetApplicationForViewing
+ */
+interface GetApplicationForViewingHandlerInterface
+{
+ /**
+ * @param GetApplicationForViewing $query
+ *
+ * @return ViewableApplication
+ */
+ public function handle(GetApplicationForViewing $query);
+}
diff --git a/src/Core/Category/Provider/MenuThumbnailAvailableKeyProvider.php b/src/Core/Domain/AuthorizationServer/QueryResult/ViewableApplication.php
similarity index 51%
rename from src/Core/Category/Provider/MenuThumbnailAvailableKeyProvider.php
rename to src/Core/Domain/AuthorizationServer/QueryResult/ViewableApplication.php
index cf6ea8c1fdc62..0636b84a7405a 100644
--- a/src/Core/Category/Provider/MenuThumbnailAvailableKeyProvider.php
+++ b/src/Core/Domain/AuthorizationServer/QueryResult/ViewableApplication.php
@@ -26,44 +26,66 @@
declare(strict_types=1);
-namespace PrestaShop\PrestaShop\Core\Category\Provider;
+namespace PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryResult;
-use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\MenuThumbnailId;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\ValueObject\ApplicationId;
/**
- * This class is responsible for providing available category menu thumbnail keys.
- * Category can only have 3 thumbnails (0,1,2).
- * We check if thumbnails with those id's exist, if they do they are no longer available.
+ * Transfers application data for editing
*/
-class MenuThumbnailAvailableKeyProvider
+class ViewableApplication
{
/**
- * @var CategoryImageFinder
+ * @var ApplicationId
*/
- private $categoryImageFinder;
+ private $applicationId;
- public function __construct(CategoryImageFinder $categoryImageFinder)
- {
- $this->categoryImageFinder = $categoryImageFinder;
+ /**
+ * @var string
+ */
+ private $name;
+
+ /**
+ * @var string
+ */
+ private $description;
+
+ /**
+ * @param ApplicationId $applicationId
+ * @param string $name
+ * @param string $description
+ */
+ public function __construct(
+ ApplicationId $applicationId,
+ string $name,
+ string $description
+ ) {
+ $this->applicationId = $applicationId;
+ $this->name = $name;
+ $this->description = $description;
}
/**
- * @param int $categoryId
- *
- * @return array
+ * @return ApplicationId
*/
- public function getAvailableKeys(int $categoryId): array
+ public function getApplicationId(): ApplicationId
{
- $usedKeys = [];
-
- foreach ($this->categoryImageFinder->findMenuThumbnails($categoryId) as $file) {
- $matches = [];
+ return $this->applicationId;
+ }
- if (preg_match('/^' . $categoryId . '-([0-9])?_thumb.jpg/i', $file->getFilename(), $matches) === 1) {
- $usedKeys[] = (int) $matches[1];
- }
- }
+ /**
+ * @return string
+ */
+ public function getName(): string
+ {
+ return $this->name;
+ }
- return array_diff(MenuThumbnailId::ALLOWED_ID_VALUES, $usedKeys);
+ /**
+ * @return string
+ */
+ public function getDescription(): string
+ {
+ return $this->description;
}
}
diff --git a/src/Core/Domain/Cart/Command/SendCartToCustomerCommand.php b/src/Core/Domain/Cart/Command/SendCartToCustomerCommand.php
index 071f0cee05a46..bd01d07463546 100644
--- a/src/Core/Domain/Cart/Command/SendCartToCustomerCommand.php
+++ b/src/Core/Domain/Cart/Command/SendCartToCustomerCommand.php
@@ -30,6 +30,8 @@
/**
* Sends email to the customer to process the payment for cart.
+ *
+ * @deprecated Since 9.0 and will be removed in the next major.
*/
class SendCartToCustomerCommand
{
diff --git a/src/Core/Domain/Cart/CommandHandler/SendCartToCustomerHanlderInterface.php b/src/Core/Domain/Cart/CommandHandler/SendCartToCustomerHanlderInterface.php
index a1288fcbfbfe9..1ff4090423b33 100644
--- a/src/Core/Domain/Cart/CommandHandler/SendCartToCustomerHanlderInterface.php
+++ b/src/Core/Domain/Cart/CommandHandler/SendCartToCustomerHanlderInterface.php
@@ -30,6 +30,8 @@
/**
* Interface for service that handles sending cart to customer.
+ *
+ * @deprecated Since 9.0 and will be removed in the next major.
*/
interface SendCartToCustomerHanlderInterface
{
diff --git a/src/Core/Domain/Cart/QueryResult/CartForOrderCreation/CartShipping.php b/src/Core/Domain/Cart/QueryResult/CartForOrderCreation/CartShipping.php
index 44df023d8a544..fb6813028695c 100644
--- a/src/Core/Domain/Cart/QueryResult/CartForOrderCreation/CartShipping.php
+++ b/src/Core/Domain/Cart/QueryResult/CartForOrderCreation/CartShipping.php
@@ -66,6 +66,11 @@ class CartShipping
*/
private $giftMessage;
+ /**
+ * @var bool
+ */
+ private $isVirtual;
+
/**
* @param string $shippingPrice
* @param bool $freeShipping
@@ -74,6 +79,7 @@ class CartShipping
* @param bool $isGift
* @param bool $isRecycledPackaging
* @param string $giftMessage
+ * @param bool $isVirtual
*/
public function __construct(
string $shippingPrice,
@@ -82,7 +88,8 @@ public function __construct(
?int $selectedCarrierId,
bool $isGift,
bool $isRecycledPackaging,
- string $giftMessage
+ string $giftMessage,
+ bool $isVirtual
) {
$this->shippingPrice = $shippingPrice;
$this->freeShipping = $freeShipping;
@@ -91,6 +98,7 @@ public function __construct(
$this->isGift = $isGift;
$this->isRecycledPackaging = $isRecycledPackaging;
$this->giftMessage = $giftMessage;
+ $this->isVirtual = $isVirtual;
}
/**
@@ -148,4 +156,12 @@ public function getGiftMessage(): string
{
return $this->giftMessage;
}
+
+ /**
+ * @return bool
+ */
+ public function isVirtual(): bool
+ {
+ return $this->isVirtual;
+ }
}
diff --git a/src/Core/Domain/CartRule/Command/AddCartRuleCommand.php b/src/Core/Domain/CartRule/Command/AddCartRuleCommand.php
index efc1e40229de4..6b728a623d254 100644
--- a/src/Core/Domain/CartRule/Command/AddCartRuleCommand.php
+++ b/src/Core/Domain/CartRule/Command/AddCartRuleCommand.php
@@ -28,7 +28,7 @@
namespace PrestaShop\PrestaShop\Core\Domain\CartRule\Command;
-use DateTime;
+use DateTimeImmutable;
use PrestaShop\Decimal\DecimalNumber;
use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleAction;
@@ -42,6 +42,16 @@
*/
class AddCartRuleCommand
{
+ /**
+ * @var array
+ */
+ private $localizedNames;
+
+ /**
+ * @var CartRuleAction
+ */
+ private $cartRuleAction;
+
/**
* @var string
*/
@@ -67,143 +77,101 @@ class AddCartRuleCommand
*/
private $customerId;
- /**
- * @var array
- */
- private $localizedNames;
-
/**
* @var bool
*/
- private $highlightInCart;
+ private $highlightInCart = false;
/**
* @var bool
*/
- private $allowPartialUse;
+ private $allowPartialUse = true;
/**
* @var int
*/
- private $priority;
+ private $priority = 1;
/**
* @var bool
*/
- private $isActive;
+ private $active = true;
/**
- * @var DateTime
+ * @var DateTimeImmutable|null
*/
private $validFrom;
/**
- * @var DateTime
+ * @var DateTimeImmutable|null
*/
private $validTo;
/**
* @var int
*/
- private $totalQuantity;
+ private $totalQuantity = 1;
/**
* @var int
*/
- private $quantityPerUser;
+ private $quantityPerUser = 1;
- /**
- * @var CartRuleAction
- */
- private $cartRuleAction;
-
- /**
- * @param array $localizedNames
- * @param bool $highlightInCart
- * @param bool $allowPartialUse
- * @param int $priority
- * @param bool $isActive
- * @param DateTime $validFrom
- * @param DateTime $validTo
- * @param int $totalQuantity
- * @param int $quantityPerUser
- * @param CartRuleAction $cartRuleAction
- *
- * @throws CartRuleConstraintException
- */
public function __construct(
array $localizedNames,
- bool $highlightInCart,
- bool $allowPartialUse,
- int $priority,
- bool $isActive,
- DateTime $validFrom,
- DateTime $validTo,
- int $totalQuantity,
- int $quantityPerUser,
CartRuleAction $cartRuleAction
) {
- $this->assertDateRangeIsValid($validFrom, $validTo);
$this->setLocalizedNames($localizedNames);
- $this->setPriority($priority);
- $this->setTotalQuantity($totalQuantity);
- $this->setQuantityPerUser($quantityPerUser);
- $this->highlightInCart = $highlightInCart;
- $this->allowPartialUse = $allowPartialUse;
- $this->isActive = $isActive;
- $this->validFrom = $validFrom;
- $this->validTo = $validTo;
$this->cartRuleAction = $cartRuleAction;
}
- /**
- * @return string
- */
public function getDescription(): string
{
return $this->description;
}
- /**
- * @return string
- */
public function getCode(): string
{
return $this->code;
}
- /**
- * @return CustomerId|null
- */
public function getCustomerId(): ?CustomerId
{
return $this->customerId;
}
/**
- * @return array
+ * @return array
*/
public function getLocalizedNames(): array
{
return $this->localizedNames;
}
- /**
- * @return bool
- */
public function isHighlightInCart(): bool
{
return $this->highlightInCart;
}
- /**
- * @return bool
- */
- public function isAllowPartialUse(): bool
+ public function setHighlightInCart(bool $highlight): AddCartRuleCommand
+ {
+ $this->highlightInCart = $highlight;
+
+ return $this;
+ }
+
+ public function allowPartialUse(): bool
{
return $this->allowPartialUse;
}
+ public function setAllowPartialUse(bool $allow): AddCartRuleCommand
+ {
+ $this->allowPartialUse = $allow;
+
+ return $this;
+ }
+
/**
* @return int
*/
@@ -213,58 +181,94 @@ public function getPriority(): int
}
/**
- * @return bool
+ * @param int $priority
+ *
+ * @return AddCartRuleCommand
+ *
+ * @throws CartRuleConstraintException
*/
+ public function setPriority(int $priority): AddCartRuleCommand
+ {
+ if (0 >= $priority) {
+ throw new CartRuleConstraintException(
+ sprintf('Invalid cart rule priority "%s". Must be a positive integer.', $priority),
+ CartRuleConstraintException::INVALID_PRIORITY
+ );
+ }
+
+ $this->priority = $priority;
+
+ return $this;
+ }
+
public function isActive(): bool
{
- return $this->isActive;
+ return $this->active;
}
- /**
- * @return DateTime
- */
- public function getValidFrom(): DateTime
+ public function setActive(bool $active): AddCartRuleCommand
+ {
+ $this->active = $active;
+
+ return $this;
+ }
+
+ public function getValidFrom(): ?DateTimeImmutable
{
return $this->validFrom;
}
- /**
- * @return DateTime
- */
- public function getValidTo(): DateTime
+ public function getValidTo(): ?DateTimeImmutable
{
return $this->validTo;
}
- /**
- * @return int
- */
+ public function setValidityDateRange(DateTimeImmutable $from, DateTimeImmutable $to): AddCartRuleCommand
+ {
+ $this->assertDateRangeIsValid($from, $to);
+ $this->validFrom = $from;
+ $this->validTo = $to;
+
+ return $this;
+ }
+
public function getTotalQuantity(): int
{
return $this->totalQuantity;
}
- /**
- * @return int
- */
+ public function setTotalQuantity(int $quantity): AddCartRuleCommand
+ {
+ if (0 > $quantity) {
+ throw new CartRuleConstraintException(sprintf('Quantity cannot be lower than zero, %d given', $quantity), CartRuleConstraintException::INVALID_QUANTITY);
+ }
+
+ $this->totalQuantity = $quantity;
+
+ return $this;
+ }
+
public function getQuantityPerUser(): int
{
return $this->quantityPerUser;
}
- /**
- * @return CartRuleAction
- */
+ public function setQuantityPerUser(int $quantity): AddCartRuleCommand
+ {
+ if (0 > $quantity) {
+ throw new CartRuleConstraintException(sprintf('Quantity per user cannot be lower than zero, %d given', $quantity), CartRuleConstraintException::INVALID_QUANTITY_PER_USER);
+ }
+
+ $this->quantityPerUser = $quantity;
+
+ return $this;
+ }
+
public function getCartRuleAction(): CartRuleAction
{
return $this->cartRuleAction;
}
- /**
- * @param string $description
- *
- * @return AddCartRuleCommand
- */
public function setDescription(string $description): AddCartRuleCommand
{
$this->description = $description;
@@ -272,11 +276,6 @@ public function setDescription(string $description): AddCartRuleCommand
return $this;
}
- /**
- * @param string $code
- *
- * @return AddCartRuleCommand
- */
public function setCode(string $code): AddCartRuleCommand
{
$this->code = $code;
@@ -284,11 +283,6 @@ public function setCode(string $code): AddCartRuleCommand
return $this;
}
- /**
- * @param int $customerId
- *
- * @return AddCartRuleCommand
- */
public function setCustomerId(int $customerId): AddCartRuleCommand
{
$this->customerId = new CustomerId($customerId);
@@ -336,70 +330,7 @@ private function setLocalizedNames(array $localizedNames): AddCartRuleCommand
return $this;
}
- /**
- * @param int $priority
- *
- * @return AddCartRuleCommand
- *
- * @throws CartRuleConstraintException
- */
- private function setPriority(int $priority): AddCartRuleCommand
- {
- if (0 >= $priority) {
- throw new CartRuleConstraintException(
- sprintf('Invalid cart rule priority "%s". Must be a positive integer.', $priority),
- CartRuleConstraintException::INVALID_PRIORITY
- );
- }
-
- $this->priority = $priority;
-
- return $this;
- }
-
- /**
- * @param int $quantity
- *
- * @return AddCartRuleCommand
- *
- * @throws CartRuleConstraintException
- */
- private function setTotalQuantity(int $quantity): AddCartRuleCommand
- {
- if (0 > $quantity) {
- throw new CartRuleConstraintException(sprintf('Quantity cannot be lower than zero, %d given', $quantity), CartRuleConstraintException::INVALID_QUANTITY);
- }
-
- $this->totalQuantity = $quantity;
-
- return $this;
- }
-
- /**
- * @param int $quantity
- *
- * @return AddCartRuleCommand
- *
- * @throws CartRuleConstraintException
- */
- private function setQuantityPerUser(int $quantity): AddCartRuleCommand
- {
- if (0 > $quantity) {
- throw new CartRuleConstraintException(sprintf('Quantity per user cannot be lower than zero, %d given', $quantity), CartRuleConstraintException::INVALID_QUANTITY_PER_USER);
- }
-
- $this->quantityPerUser = $quantity;
-
- return $this;
- }
-
- /**
- * @param DateTime $dateFrom
- * @param DateTime $dateTo
- *
- * @throws CartRuleConstraintException
- */
- private function assertDateRangeIsValid(DateTime $dateFrom, DateTime $dateTo): void
+ private function assertDateRangeIsValid(DateTimeImmutable $dateFrom, DateTimeImmutable $dateTo): void
{
if ($dateFrom > $dateTo) {
throw new CartRuleConstraintException('Date from cannot be greater than date to.', CartRuleConstraintException::DATE_FROM_GREATER_THAN_DATE_TO);
diff --git a/src/Core/Domain/CartRule/Command/EditCartRuleCommand.php b/src/Core/Domain/CartRule/Command/EditCartRuleCommand.php
index 9200558cd0fc8..0407a28734b05 100644
--- a/src/Core/Domain/CartRule/Command/EditCartRuleCommand.php
+++ b/src/Core/Domain/CartRule/Command/EditCartRuleCommand.php
@@ -94,7 +94,7 @@ class EditCartRuleCommand
/**
* @var bool|null
*/
- private $enabled;
+ private $active;
/**
* @var DateTimeImmutable|null
@@ -190,12 +190,12 @@ public function setAllowPartialUse(?bool $allowPartialUse): EditCartRuleCommand
public function isActive(): ?bool
{
- return $this->enabled;
+ return $this->active;
}
- public function setEnabled(bool $enabled): EditCartRuleCommand
+ public function setActive(bool $active): EditCartRuleCommand
{
- $this->enabled = $enabled;
+ $this->active = $active;
return $this;
}
@@ -247,7 +247,7 @@ public function setPriority(int $priority): EditCartRuleCommand
return $this;
}
- public function setDateRange(DateTimeImmutable $validFrom, DateTimeImmutable $validTo): EditCartRuleCommand
+ public function setValidityDateRange(DateTimeImmutable $validFrom, DateTimeImmutable $validTo): EditCartRuleCommand
{
$this->assertDateRangeIsValid($validFrom, $validTo);
$this->validFrom = $validFrom;
diff --git a/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php b/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
new file mode 100644
index 0000000000000..546fdca65a4be
--- /dev/null
+++ b/src/Core/Domain/CartRule/Command/SetCartRuleRestrictionsCommand.php
@@ -0,0 +1,189 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\CartRule\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\Carrier\ValueObject\CarrierId;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
+use PrestaShop\PrestaShop\Core\Domain\Country\ValueObject\CountryId;
+use PrestaShop\PrestaShop\Core\Domain\Customer\Group\ValueObject\GroupId;
+
+/**
+ * Sets cart rule restrictions.
+ * Leaving property as NULL will cause no changes, however having an empty array will clear existing restrictions.
+ */
+class SetCartRuleRestrictionsCommand
+{
+ private readonly CartRuleId $cartRuleId;
+
+ /**
+ * @var CartRuleId[]|null
+ */
+ private ?array $restrictedCartRuleIds = null;
+
+ /**
+ * @var RestrictionRuleGroup[]|null
+ */
+ private ?array $productRestrictionRuleGroups = null;
+
+ /**
+ * @var CarrierId[]|null
+ */
+ private ?array $restrictedCarrierIds = null;
+
+ /**
+ * @var CountryId[]|null
+ */
+ private ?array $restrictedCountryIds = null;
+
+ /**
+ * @var GroupId[]|null
+ */
+ private ?array $restrictedGroupIds = null;
+
+ /**
+ * @param int $cartRuleId
+ */
+ public function __construct(
+ int $cartRuleId,
+ ) {
+ $this->cartRuleId = new CartRuleId($cartRuleId);
+ }
+
+ public function setRestrictedCarrierIds(array $restrictedCarrierIds): self
+ {
+ $this->restrictedCarrierIds = array_map(static function ($carrierId): CarrierId {
+ return new CarrierId($carrierId);
+ }, $restrictedCarrierIds);
+
+ return $this;
+ }
+
+ public function setRestrictedCountryIds(array $restrictedCountryIds): self
+ {
+ $this->restrictedCountryIds = array_map(static function ($countryId): CountryId {
+ return new CountryId($countryId);
+ }, $restrictedCountryIds);
+
+ return $this;
+ }
+
+ public function setRestrictedGroupIds(array $restrictedGroupIds): self
+ {
+ $this->restrictedGroupIds = array_map(static function ($groupId): GroupId {
+ return new GroupId($groupId);
+ }, $restrictedGroupIds);
+
+ return $this;
+ }
+
+ /**
+ * @return CarrierId[]|null
+ */
+ public function getRestrictedCarrierIds(): ?array
+ {
+ return $this->restrictedCarrierIds;
+ }
+
+ /**
+ * @return CountryId[]|null
+ */
+ public function getRestrictedCountryIds(): ?array
+ {
+ return $this->restrictedCountryIds;
+ }
+
+ /**
+ * @return GroupId[]|null
+ */
+ public function getRestrictedGroupIds(): ?array
+ {
+ return $this->restrictedGroupIds;
+ }
+
+ /**
+ * @return CartRuleId
+ */
+ public function getCartRuleId(): CartRuleId
+ {
+ return $this->cartRuleId;
+ }
+
+ /**
+ * @param int[] $restrictedCartRuleIds
+ *
+ * @return self
+ *
+ * @throws CartRuleConstraintException
+ */
+ public function setRestrictedCartRuleIds(array $restrictedCartRuleIds): self
+ {
+ $this->restrictedCartRuleIds = [];
+ foreach ($restrictedCartRuleIds as $restrictedCartRuleId) {
+ if ($restrictedCartRuleId === $this->getCartRuleId()->getValue()) {
+ throw new CartRuleConstraintException(
+ 'Restricted CartRule ids cannot contain id of current cart rule',
+ CartRuleConstraintException::INVALID_CART_RULE_RESTRICTION
+ );
+ }
+ $this->restrictedCartRuleIds[] = new CartRuleId($restrictedCartRuleId);
+ }
+
+ return $this;
+ }
+
+ /**
+ * @return CartRuleId[]|null
+ */
+ public function getRestrictedCartRuleIds(): ?array
+ {
+ return $this->restrictedCartRuleIds;
+ }
+
+ /**
+ * @param RestrictionRuleGroup[] $productRestrictionRuleGroups
+ *
+ * @return self
+ */
+ public function setProductRestrictionRuleGroups(array $productRestrictionRuleGroups): self
+ {
+ $this->productRestrictionRuleGroups = $productRestrictionRuleGroups;
+
+ return $this;
+ }
+
+ /**
+ * @return RestrictionRuleGroup[]|null
+ */
+ public function getProductRestrictionRuleGroups(): ?array
+ {
+ return $this->productRestrictionRuleGroups;
+ }
+}
diff --git a/admin-dev/themes/default/template/controllers/carts/helpers/index.php b/src/Core/Domain/CartRule/CommandHandler/SetCartRuleRestrictionsHandlerInterface.php
similarity index 77%
rename from admin-dev/themes/default/template/controllers/carts/helpers/index.php
rename to src/Core/Domain/CartRule/CommandHandler/SetCartRuleRestrictionsHandlerInterface.php
index b459cc3ae5750..7a8e0fc61394e 100644
--- a/admin-dev/themes/default/template/controllers/carts/helpers/index.php
+++ b/src/Core/Domain/CartRule/CommandHandler/SetCartRuleRestrictionsHandlerInterface.php
@@ -24,12 +24,13 @@
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+declare(strict_types=1);
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
+namespace PrestaShop\PrestaShop\Core\Domain\CartRule\CommandHandler;
-header('Location: ../../../../../../../');
-exit;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\SetCartRuleRestrictionsCommand;
+
+interface SetCartRuleRestrictionsHandlerInterface
+{
+ public function handle(SetCartRuleRestrictionsCommand $command): void;
+}
diff --git a/src/Core/Domain/CartRule/Exception/CartRuleConstraintException.php b/src/Core/Domain/CartRule/Exception/CartRuleConstraintException.php
index f0eca7730738a..275f76fcb065c 100644
--- a/src/Core/Domain/CartRule/Exception/CartRuleConstraintException.php
+++ b/src/Core/Domain/CartRule/Exception/CartRuleConstraintException.php
@@ -72,6 +72,9 @@ class CartRuleConstraintException extends CartRuleException
public const INVALID_HIGHLIGHT = 36;
public const INVALID_ACTIVE = 37;
public const NON_UNIQUE_CODE = 38;
-
public const INVALID_PRICE_DISCOUNT = 39;
+ public const INVALID_RESTRICTION_RULE_TYPE = 40;
+ public const INVALID_RESTRICTION_RULE_ID = 41;
+ public const EMPTY_RESTRICTION_RULE_IDS = 42;
+ public const EMPTY_RESTRICTION_RULES = 43;
}
diff --git a/src/Core/Domain/CartRule/Query/GetCartRuleForEditing.php b/src/Core/Domain/CartRule/Query/GetCartRuleForEditing.php
index 564184c738ee9..0c735d56b6bea 100644
--- a/src/Core/Domain/CartRule/Query/GetCartRuleForEditing.php
+++ b/src/Core/Domain/CartRule/Query/GetCartRuleForEditing.php
@@ -28,7 +28,6 @@
namespace PrestaShop\PrestaShop\Core\Domain\CartRule\Query;
-use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\CartRuleId;
/**
@@ -36,26 +35,10 @@
*/
class GetCartRuleForEditing
{
- /**
- * @var CartRuleId
- */
- private $cartRuleId;
+ public readonly CartRuleId $cartRuleId;
- /**
- * @param int $cartRuleId
- *
- * @throws CartRuleConstraintException
- */
public function __construct(int $cartRuleId)
{
$this->cartRuleId = new CartRuleId($cartRuleId);
}
-
- /**
- * @return CartRuleId $cartRuleId
- */
- public function getCartRuleId(): CartRuleId
- {
- return $this->cartRuleId;
- }
}
diff --git a/src/Core/Domain/CartRule/QueryResult/CartRuleReductionForEditing.php b/src/Core/Domain/CartRule/QueryResult/CartRuleReductionForEditing.php
index b1f109c854435..2640ab55bbc38 100644
--- a/src/Core/Domain/CartRule/QueryResult/CartRuleReductionForEditing.php
+++ b/src/Core/Domain/CartRule/QueryResult/CartRuleReductionForEditing.php
@@ -68,14 +68,14 @@ public function __construct(
bool $tax,
?int $currencyId,
?int $productId,
- bool $excludeSpecial
+ bool $applyToDiscountedProducts
) {
$this->percent = $percent;
$this->amount = $amount;
$this->tax = $tax;
$this->currencyId = $currencyId;
$this->productId = $productId;
- $this->applyToDiscountedProducts = $excludeSpecial;
+ $this->applyToDiscountedProducts = $applyToDiscountedProducts;
}
/**
diff --git a/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php b/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
index 5a85df5284bc1..1e2bfd7acc3aa 100644
--- a/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
+++ b/src/Core/Domain/CartRule/QueryResult/CartRuleRestrictionsForEditing.php
@@ -28,99 +28,63 @@
namespace PrestaShop\PrestaShop\Core\Domain\CartRule\QueryResult;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction\RestrictionRuleGroup;
+
class CartRuleRestrictionsForEditing
{
/**
- * @var bool
- */
- private $countryRestriction;
-
- /**
- * @var bool
- */
- private $carrierRestriction;
-
- /**
- * @var bool
- */
- private $groupRestriction;
-
- /**
- * @var bool
- */
- private $cartRuleRestriction;
-
- /**
- * @var bool
- */
- private $productRestriction;
-
- /**
- * @var bool
+ * @param int[] $restrictedCartRuleIds
+ * @param RestrictionRuleGroup[] $productRestrictionRuleGroups
+ * @param int[] $restrictedCarrierIds
+ * @param int[] $restrictedCountryIds
+ * @param int[] $restrictedGroupIds
*/
- private $shopRestriction;
-
public function __construct(
- bool $countryRestriction,
- bool $carrierRestriction,
- bool $groupRestriction,
- bool $cartRuleRestriction,
- bool $productRestriction,
- bool $shopRestriction
+ private readonly array $restrictedCartRuleIds,
+ private readonly array $productRestrictionRuleGroups,
+ private readonly array $restrictedCarrierIds,
+ private readonly array $restrictedCountryIds,
+ private readonly array $restrictedGroupIds
) {
- $this->countryRestriction = $countryRestriction;
- $this->carrierRestriction = $carrierRestriction;
- $this->groupRestriction = $groupRestriction;
- $this->cartRuleRestriction = $cartRuleRestriction;
- $this->productRestriction = $productRestriction;
- $this->shopRestriction = $shopRestriction;
- }
-
- /**
- * @return bool
- */
- public function isCountryRestriction(): bool
- {
- return $this->countryRestriction;
}
/**
- * @return bool
+ * @return int[]
*/
- public function isCarrierRestriction(): bool
+ public function getRestrictedCartRuleIds(): array
{
- return $this->carrierRestriction;
+ return $this->restrictedCartRuleIds;
}
/**
- * @return bool
+ * @return RestrictionRuleGroup[]
*/
- public function isGroupRestriction(): bool
+ public function getProductRestrictionRuleGroups(): array
{
- return $this->groupRestriction;
+ return $this->productRestrictionRuleGroups;
}
/**
- * @return bool
+ * @return int[]
*/
- public function isCartRuleRestriction(): bool
+ public function getRestrictedCarrierIds(): array
{
- return $this->cartRuleRestriction;
+ return $this->restrictedCarrierIds;
}
/**
- * @return bool
+ * @return int[]
*/
- public function isProductRestriction(): bool
+ public function getRestrictedCountryIds(): array
{
- return $this->productRestriction;
+ return $this->restrictedCountryIds;
}
/**
- * @return bool
+ * @return int[]
*/
- public function isShopRestriction(): bool
+ public function getRestrictedGroupIds(): array
{
- return $this->shopRestriction;
+ return $this->restrictedGroupIds;
}
}
diff --git a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
new file mode 100644
index 0000000000000..414892a4ab040
--- /dev/null
+++ b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRule.php
@@ -0,0 +1,122 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction;
+
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
+
+class RestrictionRule
+{
+ public const TYPE_PRODUCT = 'products';
+ public const TYPE_CATEGORY = 'categories';
+ public const TYPE_ATTRIBUTE = 'attributes';
+ public const TYPE_MANUFACTURERS = 'manufacturers';
+ public const TYPE_SUPPLIER = 'suppliers';
+ public const VALID_TYPES = [
+ self::TYPE_PRODUCT => self::TYPE_PRODUCT,
+ self::TYPE_CATEGORY => self::TYPE_CATEGORY,
+ self::TYPE_ATTRIBUTE => self::TYPE_ATTRIBUTE,
+ self::TYPE_MANUFACTURERS => self::TYPE_MANUFACTURERS,
+ self::TYPE_SUPPLIER => self::TYPE_SUPPLIER,
+ ];
+
+ private readonly string $type;
+
+ /**
+ * @var int[] Ids of product, attributes, categories, manufacturers or suppliers, depending on restriction rule type
+ */
+ private readonly array $entityIds;
+
+ /**
+ * @param string $type
+ * @param int[] $entityIds
+ */
+ public function __construct(
+ string $type,
+ array $entityIds
+ ) {
+ $this->assertType($type);
+ $this->assertIds($entityIds);
+
+ $this->type = $type;
+ $this->entityIds = $entityIds;
+ }
+
+ /**
+ * @return string
+ */
+ public function getType(): string
+ {
+ return $this->type;
+ }
+
+ /**
+ * @return int[]
+ */
+ public function getEntityIds(): array
+ {
+ return $this->entityIds;
+ }
+
+ /**
+ * @param int[] $ids
+ *
+ * @return void
+ *
+ * @throws CartRuleConstraintException
+ */
+ private function assertIds(array $ids): void
+ {
+ if (empty($ids)) {
+ throw new CartRuleConstraintException(
+ sprintf('%s item ids cannot be empty', self::class),
+ CartRuleConstraintException::EMPTY_RESTRICTION_RULE_IDS
+ );
+ }
+ foreach ($ids as $id) {
+ if (!is_int($id) || $id <= 0) {
+ throw new CartRuleConstraintException(
+ sprintf('%s item id must be positive integer', self::class),
+ CartRuleConstraintException::INVALID_RESTRICTION_RULE_ID
+ );
+ }
+ }
+ }
+
+ private function assertType(string $type): void
+ {
+ if (in_array($type, self::VALID_TYPES, true)) {
+ return;
+ }
+
+ throw new CartRuleConstraintException(
+ sprintf('Invalid type provided to %s', self::class),
+ CartRuleConstraintException::INVALID_RESTRICTION_RULE_TYPE
+ );
+ }
+}
diff --git a/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php
new file mode 100644
index 0000000000000..9c4d487c990c8
--- /dev/null
+++ b/src/Core/Domain/CartRule/ValueObject/Restriction/RestrictionRuleGroup.php
@@ -0,0 +1,98 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\CartRule\ValueObject\Restriction;
+
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Exception\CartRuleConstraintException;
+
+class RestrictionRuleGroup
+{
+ private int $requiredQuantityInCart;
+
+ /**
+ * @var RestrictionRule[]
+ */
+ private array $restrictionRules;
+
+ /**
+ * @param int $requiredQuantityInCart
+ * @param RestrictionRule[] $restrictionRules
+ */
+ public function __construct(
+ int $requiredQuantityInCart,
+ array $restrictionRules
+ ) {
+ $this->assertQuantityIsNotNegative($requiredQuantityInCart);
+ $this->assertRestrictionRules($restrictionRules);
+ $this->requiredQuantityInCart = $requiredQuantityInCart;
+ $this->restrictionRules = $restrictionRules;
+ }
+
+ /**
+ * @return int
+ */
+ public function getRequiredQuantityInCart(): int
+ {
+ return $this->requiredQuantityInCart;
+ }
+
+ /**
+ * @return RestrictionRule[]
+ */
+ public function getRestrictionRules(): array
+ {
+ return $this->restrictionRules;
+ }
+
+ private function assertQuantityIsNotNegative(int $quantity): void
+ {
+ if ($quantity < 0) {
+ throw new CartRuleConstraintException(
+ 'Restrictions required quantity in cart cannot be negative',
+ CartRuleConstraintException::INVALID_QUANTITY
+ );
+ }
+ }
+
+ /**
+ * @param RestrictionRule[] $rules
+ *
+ * @return void
+ *
+ * @throws CartRuleConstraintException
+ */
+ private function assertRestrictionRules(array $rules): void
+ {
+ if (empty($rules)) {
+ throw new CartRuleConstraintException(
+ 'Restriction rules list cannot be empty',
+ CartRuleConstraintException::EMPTY_RESTRICTION_RULES
+ );
+ }
+ }
+}
diff --git a/src/Core/Domain/Category/Command/AddCategoryCommand.php b/src/Core/Domain/Category/Command/AddCategoryCommand.php
index be0378d57a496..2583e33c7592d 100644
--- a/src/Core/Domain/Category/Command/AddCategoryCommand.php
+++ b/src/Core/Domain/Category/Command/AddCategoryCommand.php
@@ -99,11 +99,6 @@ class AddCategoryCommand
*/
private $thumbnailImage;
- /**
- * @var array
- */
- private $menuThumbnailImages;
-
/**
* @param string[] $localizedNames
* @param string[] $localizedLinkRewrites
@@ -119,7 +114,6 @@ public function __construct(array $localizedNames, array $localizedLinkRewrites,
->setLocalizedLinkRewrites($localizedLinkRewrites)
->setIsActive($isActive)
->setParentCategoryId($parentCategoryId);
- $this->menuThumbnailImages = [];
}
/**
@@ -397,20 +391,4 @@ public function setThumbnailImage(?UploadedFile $thumbnailImage): void
{
$this->thumbnailImage = $thumbnailImage;
}
-
- /**
- * @return array
- */
- public function getMenuThumbnailImages(): array
- {
- return $this->menuThumbnailImages;
- }
-
- /**
- * @param array $menuThumbnailImages
- */
- public function setMenuThumbnailImages(array $menuThumbnailImages): void
- {
- $this->menuThumbnailImages = $menuThumbnailImages;
- }
}
diff --git a/src/Core/Domain/Category/Command/AddRootCategoryCommand.php b/src/Core/Domain/Category/Command/AddRootCategoryCommand.php
index 53c6279257a0b..fa9147247daf3 100644
--- a/src/Core/Domain/Category/Command/AddRootCategoryCommand.php
+++ b/src/Core/Domain/Category/Command/AddRootCategoryCommand.php
@@ -94,11 +94,6 @@ class AddRootCategoryCommand
*/
private $thumbnailImage;
- /**
- * @var array
- */
- private $menuThumbnailImages;
-
/**
* @param string[] $name
* @param string[] $linkRewrite
@@ -112,7 +107,6 @@ public function __construct(array $name, array $linkRewrite, $isActive)
->setLocalizedNames($name)
->setLocalizedLinkRewrites($linkRewrite)
->setIsActive($isActive);
- $this->menuThumbnailImages = [];
}
/**
@@ -364,20 +358,4 @@ public function setThumbnailImage(?UploadedFile $thumbnailImage): void
{
$this->thumbnailImage = $thumbnailImage;
}
-
- /**
- * @return array
- */
- public function getMenuThumbnailImages(): array
- {
- return $this->menuThumbnailImages;
- }
-
- /**
- * @param array $menuThumbnailImages
- */
- public function setMenuThumbnailImages(array $menuThumbnailImages): void
- {
- $this->menuThumbnailImages = $menuThumbnailImages;
- }
}
diff --git a/src/Core/Domain/Category/Command/EditCategoryCommand.php b/src/Core/Domain/Category/Command/EditCategoryCommand.php
index 4409334e8ce14..ae701ae3a7571 100644
--- a/src/Core/Domain/Category/Command/EditCategoryCommand.php
+++ b/src/Core/Domain/Category/Command/EditCategoryCommand.php
@@ -105,18 +105,12 @@ class EditCategoryCommand
*/
private $thumbnailImage;
- /**
- * @var array
- */
- private $menuThumbnailImages;
-
/**
* @param int $categoryId
*/
public function __construct($categoryId)
{
$this->categoryId = new CategoryId($categoryId);
- $this->menuThumbnailImages = [];
}
/**
@@ -406,20 +400,4 @@ public function setThumbnailImage(?UploadedFile $thumbnailImage): void
{
$this->thumbnailImage = $thumbnailImage;
}
-
- /**
- * @return array
- */
- public function getMenuThumbnailImages(): array
- {
- return $this->menuThumbnailImages;
- }
-
- /**
- * @param array $menuThumbnailImages
- */
- public function setMenuThumbnailImages(array $menuThumbnailImages): void
- {
- $this->menuThumbnailImages = $menuThumbnailImages;
- }
}
diff --git a/src/Core/Domain/Category/Command/EditRootCategoryCommand.php b/src/Core/Domain/Category/Command/EditRootCategoryCommand.php
index 55d31a36af79a..f76fea48b6d14 100644
--- a/src/Core/Domain/Category/Command/EditRootCategoryCommand.php
+++ b/src/Core/Domain/Category/Command/EditRootCategoryCommand.php
@@ -103,18 +103,12 @@ class EditRootCategoryCommand
*/
private $thumbnailImage;
- /**
- * @var array
- */
- private $menuThumbnailImages;
-
/**
* @param int $categoryId
*/
public function __construct($categoryId)
{
$this->categoryId = new CategoryId($categoryId);
- $this->menuThumbnailImages = [];
}
/**
@@ -374,20 +368,4 @@ public function setThumbnailImage(?UploadedFile $thumbnailImage): void
{
$this->thumbnailImage = $thumbnailImage;
}
-
- /**
- * @return array
- */
- public function getMenuThumbnailImages(): array
- {
- return $this->menuThumbnailImages;
- }
-
- /**
- * @param array $menuThumbnailImages
- */
- public function setMenuThumbnailImages(array $menuThumbnailImages): void
- {
- $this->menuThumbnailImages = $menuThumbnailImages;
- }
}
diff --git a/src/Core/Domain/Category/Exception/CannotDeleteImageException.php b/src/Core/Domain/Category/Exception/CannotDeleteImageException.php
index 7ff0f5d936924..e3355a74b22fe 100644
--- a/src/Core/Domain/Category/Exception/CannotDeleteImageException.php
+++ b/src/Core/Domain/Category/Exception/CannotDeleteImageException.php
@@ -36,5 +36,4 @@ class CannotDeleteImageException extends CategoryException
*/
public const COVER_IMAGE = 1;
public const THUMBNAIL_IMAGE = 2;
- public const MENU_THUMBNAIL_IMAGE = 3;
}
diff --git a/src/Core/Domain/Category/Exception/CategoryConstraintException.php b/src/Core/Domain/Category/Exception/CategoryConstraintException.php
index 00b681845d700..626e0e2194a4b 100644
--- a/src/Core/Domain/Category/Exception/CategoryConstraintException.php
+++ b/src/Core/Domain/Category/Exception/CategoryConstraintException.php
@@ -56,11 +56,6 @@ class CategoryConstraintException extends CategoryException
*/
public const INVALID_PARENT_ID = 6;
- /**
- * Code is used when too many menu thumbnails is being set for category.
- */
- public const TOO_MANY_MENU_THUMBNAILS = 8;
-
/**
* Code is used when invalid id is supplied.
*/
diff --git a/src/Core/Domain/Category/QueryResult/EditableCategory.php b/src/Core/Domain/Category/QueryResult/EditableCategory.php
index 3996976e2e1f4..dd4f4fac1eaf2 100644
--- a/src/Core/Domain/Category/QueryResult/EditableCategory.php
+++ b/src/Core/Domain/Category/QueryResult/EditableCategory.php
@@ -27,7 +27,6 @@
namespace PrestaShop\PrestaShop\Core\Domain\Category\QueryResult;
use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\CategoryId;
-use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\MenuThumbnailId;
/**
* Stores category data needed for editing.
@@ -99,11 +98,6 @@ class EditableCategory
*/
private $coverImage;
- /**
- * @var array
- */
- private $menuThumbnailImages;
-
/**
* @var bool
*/
@@ -134,7 +128,6 @@ class EditableCategory
* @param bool $isRootCategory
* @param mixed $coverImage
* @param mixed $thumbnailImage
- * @param array $menuThumbnailImages
* @param array $subCategories
* @param string[] $additionalDescription
*/
@@ -153,7 +146,6 @@ public function __construct(
$isRootCategory,
$coverImage = null,
$thumbnailImage = null,
- array $menuThumbnailImages = [],
array $subCategories = [],
array $additionalDescription = []
) {
@@ -170,7 +162,6 @@ public function __construct(
$this->shopAssociationIds = $shopAssociationIds;
$this->thumbnailImage = $thumbnailImage;
$this->coverImage = $coverImage;
- $this->menuThumbnailImages = $menuThumbnailImages;
$this->isRootCategory = $isRootCategory;
$this->subCategories = $subCategories;
$this->additionalDescription = $additionalDescription;
@@ -288,14 +279,6 @@ public function getThumbnailImage()
return $this->thumbnailImage;
}
- /**
- * @return array
- */
- public function getMenuThumbnailImages()
- {
- return $this->menuThumbnailImages;
- }
-
/**
* @return bool
*/
@@ -304,14 +287,6 @@ public function isRootCategory()
return $this->isRootCategory;
}
- /**
- * @return bool
- */
- public function canContainMoreMenuThumbnails()
- {
- return count($this->getMenuThumbnailImages()) < count(MenuThumbnailId::ALLOWED_ID_VALUES);
- }
-
/**
* @return array
*/
diff --git a/src/Core/Domain/Currency/Command/AbstractAddCurrencyCommand.php b/src/Core/Domain/Currency/Command/AbstractAddCurrencyCommand.php
new file mode 100644
index 0000000000000..0bad74ee4275f
--- /dev/null
+++ b/src/Core/Domain/Currency/Command/AbstractAddCurrencyCommand.php
@@ -0,0 +1,192 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\Currency\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\AlphaIsoCode;
+use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\ExchangeRate;
+use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\Precision;
+
+abstract class AbstractAddCurrencyCommand
+{
+ protected AlphaIsoCode $isoCode;
+
+ protected ExchangeRate $exchangeRate;
+
+ protected ?Precision $precision = null;
+
+ /**
+ * @var string[]
+ */
+ protected array $localizedNames = [];
+
+ /**
+ * @var string[]
+ */
+ protected array $localizedSymbols = [];
+
+ protected bool $isEnabled;
+
+ /**
+ * @var int[]
+ */
+ protected array $shopIds = [];
+
+ /**
+ * @var string[]
+ */
+ protected array $localizedTransformations = [];
+
+ /**
+ * @throws CurrencyConstraintException
+ */
+ public function __construct(
+ string $isoCode,
+ float $exchangeRate,
+ bool $isEnabled
+ ) {
+ $this->isoCode = new AlphaIsoCode($isoCode);
+ $this->exchangeRate = new ExchangeRate($exchangeRate);
+ $this->isEnabled = $isEnabled;
+ }
+
+ public function getIsoCode(): AlphaIsoCode
+ {
+ return $this->isoCode;
+ }
+
+ public function getPrecision(): ?Precision
+ {
+ return $this->precision;
+ }
+
+ /**
+ * @throws CurrencyConstraintException
+ */
+ public function setPrecision(int|string $precision): self
+ {
+ $this->precision = new Precision($precision);
+
+ return $this;
+ }
+
+ public function getExchangeRate(): ExchangeRate
+ {
+ return $this->exchangeRate;
+ }
+
+ /**
+ * @return string[]
+ */
+ public function getLocalizedNames(): array
+ {
+ return $this->localizedNames;
+ }
+
+ /**
+ * @param string[] $localizedNames currency's localized names, indexed by language id
+ *
+ * @throws CurrencyConstraintException
+ */
+ public function setLocalizedNames(array $localizedNames): self
+ {
+ if (empty($localizedNames)) {
+ throw new CurrencyConstraintException('Currency name cannot be empty', CurrencyConstraintException::EMPTY_NAME);
+ }
+
+ $this->localizedNames = $localizedNames;
+
+ return $this;
+ }
+
+ /**
+ * @return string[]
+ */
+ public function getLocalizedSymbols(): array
+ {
+ return $this->localizedSymbols;
+ }
+
+ /**
+ * @param string[] $localizedSymbols currency's localized symbols, indexed by language id
+ *
+ * @throws CurrencyConstraintException
+ */
+ public function setLocalizedSymbols(array $localizedSymbols): self
+ {
+ if (empty($localizedSymbols)) {
+ throw new CurrencyConstraintException('Currency symbol cannot be empty', CurrencyConstraintException::EMPTY_SYMBOL);
+ }
+
+ $this->localizedSymbols = $localizedSymbols;
+
+ return $this;
+ }
+
+ public function isEnabled(): bool
+ {
+ return $this->isEnabled;
+ }
+
+ /**
+ * @return int[]
+ */
+ public function getShopIds(): array
+ {
+ return $this->shopIds;
+ }
+
+ /**
+ * @param int[] $shopIds
+ */
+ public function setShopIds(array $shopIds): self
+ {
+ $this->shopIds = $shopIds;
+
+ return $this;
+ }
+
+ /**
+ * Returns the currency's localized transformations, indexed by language id
+ *
+ * @return string[]
+ */
+ public function getLocalizedTransformations(): array
+ {
+ return $this->localizedTransformations;
+ }
+
+ /**
+ * @param string[] $localizedTransformations currency's localized transformations, indexed by language id
+ */
+ public function setLocalizedTransformations(array $localizedTransformations): self
+ {
+ $this->localizedTransformations = $localizedTransformations;
+
+ return $this;
+ }
+}
diff --git a/src/Core/Domain/Currency/Command/AbstractEditCurrencyCommand.php b/src/Core/Domain/Currency/Command/AbstractEditCurrencyCommand.php
new file mode 100644
index 0000000000000..29deea684751a
--- /dev/null
+++ b/src/Core/Domain/Currency/Command/AbstractEditCurrencyCommand.php
@@ -0,0 +1,205 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\Currency\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyException;
+use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\CurrencyId;
+use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\ExchangeRate;
+use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\Precision;
+
+abstract class AbstractEditCurrencyCommand
+{
+ protected CurrencyId $currencyId;
+
+ protected ?ExchangeRate $exchangeRate = null;
+
+ protected ?Precision $precision = null;
+
+ /**
+ * @var string[]
+ */
+ protected array $localizedNames = [];
+
+ /**
+ * @var string[]
+ */
+ protected array $localizedSymbols = [];
+
+ protected bool $isEnabled = false;
+
+ /**
+ * @var int[]
+ */
+ protected array $shopIds = [];
+
+ /**
+ * @var string[]
+ */
+ protected array $localizedTransformations = [];
+
+ /**
+ * @throws CurrencyException
+ */
+ public function __construct(int $currencyId)
+ {
+ $this->currencyId = new CurrencyId($currencyId);
+ }
+
+ public function getCurrencyId(): CurrencyId
+ {
+ return $this->currencyId;
+ }
+
+ public function getExchangeRate(): ?ExchangeRate
+ {
+ return $this->exchangeRate;
+ }
+
+ /**
+ * @throws CurrencyConstraintException
+ */
+ public function setExchangeRate(float $exchangeRate): self
+ {
+ $this->exchangeRate = new ExchangeRate($exchangeRate);
+
+ return $this;
+ }
+
+ public function getPrecision(): ?Precision
+ {
+ return $this->precision;
+ }
+
+ /**
+ * @throws CurrencyConstraintException
+ */
+ public function setPrecision(int|string $precision): self
+ {
+ $this->precision = new Precision($precision);
+
+ return $this;
+ }
+
+ /**
+ * @return string[]
+ */
+ public function getLocalizedNames(): array
+ {
+ return $this->localizedNames;
+ }
+
+ /**
+ * @param string[] $localizedNames currency's localized names, indexed by language id
+ *
+ * @throws CurrencyConstraintException
+ */
+ public function setLocalizedNames(array $localizedNames): self
+ {
+ if (empty($localizedNames)) {
+ throw new CurrencyConstraintException('Currency name cannot be empty', CurrencyConstraintException::EMPTY_NAME);
+ }
+
+ $this->localizedNames = $localizedNames;
+
+ return $this;
+ }
+
+ /**
+ * @return string[]
+ */
+ public function getLocalizedSymbols(): array
+ {
+ return $this->localizedSymbols;
+ }
+
+ /**
+ * @param string[] $localizedSymbols currency's localized symbols, indexed by language id
+ *
+ * @throws CurrencyConstraintException
+ */
+ public function setLocalizedSymbols(array $localizedSymbols): self
+ {
+ if (empty($localizedSymbols)) {
+ throw new CurrencyConstraintException('Currency symbol cannot be empty', CurrencyConstraintException::EMPTY_SYMBOL);
+ }
+
+ $this->localizedSymbols = $localizedSymbols;
+
+ return $this;
+ }
+
+ public function isEnabled(): bool
+ {
+ return $this->isEnabled;
+ }
+
+ public function setIsEnabled(bool $isEnabled): self
+ {
+ $this->isEnabled = $isEnabled;
+
+ return $this;
+ }
+
+ /**
+ * @return int[]
+ */
+ public function getShopIds(): array
+ {
+ return $this->shopIds;
+ }
+
+ /**
+ * @param int[] $shopIds
+ */
+ public function setShopIds(array $shopIds): self
+ {
+ $this->shopIds = $shopIds;
+
+ return $this;
+ }
+
+ /**
+ * Returns the currency's localized transformations, indexed by language id
+ *
+ * @return string[]
+ */
+ public function getLocalizedTransformations(): array
+ {
+ return $this->localizedTransformations;
+ }
+
+ /**
+ * @param string[] $localizedTransformations currency's localized transformations, indexed by language id
+ */
+ public function setLocalizedTransformations(array $localizedTransformations): self
+ {
+ $this->localizedTransformations = $localizedTransformations;
+
+ return $this;
+ }
+}
diff --git a/src/Core/Domain/Currency/Command/AddCurrencyCommand.php b/src/Core/Domain/Currency/Command/AddCurrencyCommand.php
index c1a1ea7cc475e..922a42ea288bb 100644
--- a/src/Core/Domain/Currency/Command/AddCurrencyCommand.php
+++ b/src/Core/Domain/Currency/Command/AddCurrencyCommand.php
@@ -26,210 +26,9 @@
namespace PrestaShop\PrestaShop\Core\Domain\Currency\Command;
-use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyConstraintException;
-use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\AlphaIsoCode;
-use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\ExchangeRate;
-use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\Precision;
-
/**
* Class AddCurrencyCommand used to add an official currency
*/
-class AddCurrencyCommand
+class AddCurrencyCommand extends AbstractAddCurrencyCommand
{
- /**
- * @var AlphaIsoCode
- */
- protected $isoCode;
-
- /**
- * @var ExchangeRate
- */
- protected $exchangeRate;
-
- /**
- * @var Precision|null
- */
- protected $precision;
-
- /**
- * @var string[]
- */
- protected $localizedNames = [];
-
- /**
- * @var string[]
- */
- protected $localizedSymbols = [];
-
- /**
- * @var bool
- */
- protected $isEnabled;
-
- /**
- * @var int[]
- */
- protected $shopIds = [];
-
- /**
- * @var string[]
- */
- protected $localizedTransformations = [];
-
- /**
- * @param string $isoCode
- * @param float $exchangeRate
- * @param bool $isEnabled
- *
- * @throws CurrencyConstraintException
- */
- public function __construct(
- $isoCode,
- $exchangeRate,
- $isEnabled
- ) {
- $this->isoCode = new AlphaIsoCode($isoCode);
- $this->exchangeRate = new ExchangeRate($exchangeRate);
- $this->isEnabled = $isEnabled;
- }
-
- /**
- * @return AlphaIsoCode
- */
- public function getIsoCode()
- {
- return $this->isoCode;
- }
-
- /**
- * @return Precision|null
- */
- public function getPrecision(): ?Precision
- {
- return $this->precision;
- }
-
- /**
- * @param int|string $precision
- *
- * @return self
- *
- * @throws CurrencyConstraintException
- */
- public function setPrecision($precision): AddCurrencyCommand
- {
- $this->precision = new Precision($precision);
-
- return $this;
- }
-
- /**
- * @return ExchangeRate
- */
- public function getExchangeRate()
- {
- return $this->exchangeRate;
- }
-
- /**
- * @return string[]
- */
- public function getLocalizedNames(): array
- {
- return $this->localizedNames;
- }
-
- /**
- * @param string[] $localizedNames currency's localized names, indexed by language id
- *
- * @return $this
- *
- * @throws CurrencyConstraintException
- */
- public function setLocalizedNames(array $localizedNames): AddCurrencyCommand
- {
- if (empty($localizedNames)) {
- throw new CurrencyConstraintException('Currency name cannot be empty', CurrencyConstraintException::EMPTY_NAME);
- }
-
- $this->localizedNames = $localizedNames;
-
- return $this;
- }
-
- /**
- * @return string[]
- */
- public function getLocalizedSymbols(): array
- {
- return $this->localizedSymbols;
- }
-
- /**
- * @param string[] $localizedSymbols currency's localized symbols, indexed by language id
- *
- * @return $this
- *
- * @throws CurrencyConstraintException
- */
- public function setLocalizedSymbols(array $localizedSymbols): AddCurrencyCommand
- {
- if (empty($localizedSymbols)) {
- throw new CurrencyConstraintException('Currency symbol cannot be empty', CurrencyConstraintException::EMPTY_SYMBOL);
- }
-
- $this->localizedSymbols = $localizedSymbols;
-
- return $this;
- }
-
- /**
- * @return bool
- */
- public function isEnabled()
- {
- return $this->isEnabled;
- }
-
- /**
- * @return int[]
- */
- public function getShopIds()
- {
- return $this->shopIds;
- }
-
- /**
- * @param int[] $shopIds
- *
- * @return self
- */
- public function setShopIds(array $shopIds)
- {
- $this->shopIds = $shopIds;
-
- return $this;
- }
-
- /**
- * Returns the currency's localized transformations, indexed by language id
- *
- * @return string[]
- */
- public function getLocalizedTransformations(): array
- {
- return $this->localizedTransformations;
- }
-
- /**
- * @param string[] $localizedTransformations currency's localized transformations, indexed by language id
- *
- * @return $this
- */
- public function setLocalizedTransformations(array $localizedTransformations): AddCurrencyCommand
- {
- $this->localizedTransformations = $localizedTransformations;
-
- return $this;
- }
}
diff --git a/src/Core/Domain/Currency/Command/AddUnofficialCurrencyCommand.php b/src/Core/Domain/Currency/Command/AddUnofficialCurrencyCommand.php
index 5cca992021caf..ed2e891425ffd 100644
--- a/src/Core/Domain/Currency/Command/AddUnofficialCurrencyCommand.php
+++ b/src/Core/Domain/Currency/Command/AddUnofficialCurrencyCommand.php
@@ -29,6 +29,6 @@
/**
* Class AddUnofficialCurrencyCommand used to add an alternative currency
*/
-class AddUnofficialCurrencyCommand extends AddCurrencyCommand
+class AddUnofficialCurrencyCommand extends AbstractAddCurrencyCommand
{
}
diff --git a/src/Core/Domain/Currency/Command/EditCurrencyCommand.php b/src/Core/Domain/Currency/Command/EditCurrencyCommand.php
index b2b33250a053f..c9c7417a57550 100644
--- a/src/Core/Domain/Currency/Command/EditCurrencyCommand.php
+++ b/src/Core/Domain/Currency/Command/EditCurrencyCommand.php
@@ -26,230 +26,9 @@
namespace PrestaShop\PrestaShop\Core\Domain\Currency\Command;
-use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyConstraintException;
-use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyException;
-use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\CurrencyId;
-use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\ExchangeRate;
-use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\Precision;
-
/**
* Class EditCurrencyCommand
*/
-class EditCurrencyCommand
+class EditCurrencyCommand extends AbstractEditCurrencyCommand
{
- /**
- * @var CurrencyId
- */
- protected $currencyId;
-
- /**
- * @var ExchangeRate|null
- */
- protected $exchangeRate;
-
- /**
- * @var Precision|null
- */
- protected $precision;
-
- /**
- * @var string[]
- */
- protected $localizedNames = [];
-
- /**
- * @var string[]
- */
- protected $localizedSymbols = [];
-
- /**
- * @var bool
- */
- protected $isEnabled;
-
- /**
- * @var int[]
- */
- protected $shopIds = [];
-
- /**
- * @var string[]
- */
- protected $localizedTransformations = [];
-
- /**
- * @param int $currencyId
- *
- * @throws CurrencyException
- */
- public function __construct($currencyId)
- {
- $this->currencyId = new CurrencyId($currencyId);
- }
-
- /**
- * @return CurrencyId
- */
- public function getCurrencyId()
- {
- return $this->currencyId;
- }
-
- /**
- * @return ExchangeRate|null
- */
- public function getExchangeRate()
- {
- return $this->exchangeRate;
- }
-
- /**
- * @param float $exchangeRate
- *
- * @return self
- *
- * @throws CurrencyConstraintException
- */
- public function setExchangeRate($exchangeRate)
- {
- $this->exchangeRate = new ExchangeRate($exchangeRate);
-
- return $this;
- }
-
- /**
- * @return Precision|null
- */
- public function getPrecision(): ?Precision
- {
- return $this->precision;
- }
-
- /**
- * @param int|string $precision
- *
- * @return self
- *
- * @throws CurrencyConstraintException
- */
- public function setPrecision($precision): EditCurrencyCommand
- {
- $this->precision = new Precision($precision);
-
- return $this;
- }
-
- /**
- * @return string[]
- */
- public function getLocalizedNames(): array
- {
- return $this->localizedNames;
- }
-
- /**
- * @param string[] $localizedNames currency's localized names, indexed by language id
- *
- * @return $this
- *
- * @throws CurrencyConstraintException
- */
- public function setLocalizedNames(array $localizedNames): EditCurrencyCommand
- {
- if (empty($localizedNames)) {
- throw new CurrencyConstraintException('Currency name cannot be empty', CurrencyConstraintException::EMPTY_NAME);
- }
-
- $this->localizedNames = $localizedNames;
-
- return $this;
- }
-
- /**
- * @return string[]
- */
- public function getLocalizedSymbols()
- {
- return $this->localizedSymbols;
- }
-
- /**
- * @param string[] $localizedSymbols currency's localized symbols, indexed by language id
- *
- * @return $this
- *
- * @throws CurrencyConstraintException
- */
- public function setLocalizedSymbols(array $localizedSymbols): EditCurrencyCommand
- {
- if (empty($localizedSymbols)) {
- throw new CurrencyConstraintException('Currency symbol cannot be empty', CurrencyConstraintException::EMPTY_SYMBOL);
- }
-
- $this->localizedSymbols = $localizedSymbols;
-
- return $this;
- }
-
- /**
- * @return bool
- */
- public function isEnabled()
- {
- return $this->isEnabled;
- }
-
- /**
- * @param bool $isEnabled
- *
- * @return self
- */
- public function setIsEnabled($isEnabled)
- {
- $this->isEnabled = $isEnabled;
-
- return $this;
- }
-
- /**
- * @return int[]
- */
- public function getShopIds()
- {
- return $this->shopIds;
- }
-
- /**
- * @param int[] $shopIds
- *
- * @return self
- */
- public function setShopIds(array $shopIds)
- {
- $this->shopIds = $shopIds;
-
- return $this;
- }
-
- /**
- * Returns the currency's localized transformations, indexed by language id
- *
- * @return string[]
- */
- public function getLocalizedTransformations(): array
- {
- return $this->localizedTransformations;
- }
-
- /**
- * @param string[] $localizedTransformations currency's localized transformations, indexed by language id
- *
- * @return $this
- */
- public function setLocalizedTransformations(array $localizedTransformations): EditCurrencyCommand
- {
- $this->localizedTransformations = $localizedTransformations;
-
- return $this;
- }
}
diff --git a/src/Core/Domain/Currency/Command/EditUnofficialCurrencyCommand.php b/src/Core/Domain/Currency/Command/EditUnofficialCurrencyCommand.php
index 8b029b81295de..46a370a22c5f1 100644
--- a/src/Core/Domain/Currency/Command/EditUnofficialCurrencyCommand.php
+++ b/src/Core/Domain/Currency/Command/EditUnofficialCurrencyCommand.php
@@ -29,29 +29,19 @@
use PrestaShop\PrestaShop\Core\Domain\Currency\Exception\CurrencyConstraintException;
use PrestaShop\PrestaShop\Core\Domain\Currency\ValueObject\AlphaIsoCode;
-class EditUnofficialCurrencyCommand extends EditCurrencyCommand
+class EditUnofficialCurrencyCommand extends AbstractEditCurrencyCommand
{
- /**
- * @var AlphaIsoCode|null
- */
- private $isoCode;
+ private ?AlphaIsoCode $isoCode = null;
- /**
- * @return AlphaIsoCode|null
- */
- public function getIsoCode()
+ public function getIsoCode(): ?AlphaIsoCode
{
return $this->isoCode;
}
/**
- * @param string $isoCode
- *
- * @return self
- *
* @throws CurrencyConstraintException
*/
- public function setIsoCode($isoCode)
+ public function setIsoCode(string $isoCode): self
{
$this->isoCode = new AlphaIsoCode($isoCode);
diff --git a/src/Core/Domain/CustomerService/CommandHandler/AddOrderCustomerMessageHandler.php b/src/Core/Domain/CustomerService/CommandHandler/AddOrderCustomerMessageHandler.php
index 57a9a6cbab3fb..7dc20423ad448 100644
--- a/src/Core/Domain/CustomerService/CommandHandler/AddOrderCustomerMessageHandler.php
+++ b/src/Core/Domain/CustomerService/CommandHandler/AddOrderCustomerMessageHandler.php
@@ -32,6 +32,7 @@
use CustomerThread;
use Mail;
use Order;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\CleanHtml;
use PrestaShop\PrestaShop\Core\Domain\CustomerMessage\Command\AddOrderCustomerMessageCommand;
use PrestaShop\PrestaShop\Core\Domain\CustomerMessage\CommandHandler\AddOrderCustomerMessageHandlerInterface;
@@ -43,6 +44,7 @@
use Symfony\Contracts\Translation\TranslatorInterface;
use Tools;
+#[AsCommandHandler]
class AddOrderCustomerMessageHandler implements AddOrderCustomerMessageHandlerInterface
{
/**
diff --git a/src/Core/Domain/CustomerService/CommandHandler/BulkDeleteCustomerThreadHandler.php b/src/Core/Domain/CustomerService/CommandHandler/BulkDeleteCustomerThreadHandler.php
index 9113c62420204..47121d8a89ded 100644
--- a/src/Core/Domain/CustomerService/CommandHandler/BulkDeleteCustomerThreadHandler.php
+++ b/src/Core/Domain/CustomerService/CommandHandler/BulkDeleteCustomerThreadHandler.php
@@ -28,12 +28,14 @@
namespace PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\BulkDeleteCustomerThreadCommand;
use PrestaShop\PrestaShop\Core\Domain\CustomerService\Repository\CustomerThreadRepository;
/**
* Handles command for customer thread bulk deletion
*/
+#[AsCommandHandler]
class BulkDeleteCustomerThreadHandler implements BulkDeleteCustomerThreadHandlerInterface
{
/**
diff --git a/src/Core/Domain/CustomerService/CommandHandler/DeleteCustomerThreadHandler.php b/src/Core/Domain/CustomerService/CommandHandler/DeleteCustomerThreadHandler.php
index 7e4d9836ac3c6..adc43fe2a4eb0 100644
--- a/src/Core/Domain/CustomerService/CommandHandler/DeleteCustomerThreadHandler.php
+++ b/src/Core/Domain/CustomerService/CommandHandler/DeleteCustomerThreadHandler.php
@@ -28,12 +28,14 @@
namespace PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\DeleteCustomerThreadCommand;
use PrestaShop\PrestaShop\Core\Domain\CustomerService\Repository\CustomerThreadRepository;
/**
* Handles command for customer thread deletion
*/
+#[AsCommandHandler]
class DeleteCustomerThreadHandler implements DeleteCustomerThreadHandlerInterface
{
/**
diff --git a/src/Core/Domain/CustomerService/CommandHandler/ForwardCustomerThreadHandler.php b/src/Core/Domain/CustomerService/CommandHandler/ForwardCustomerThreadHandler.php
index 77458c46a5b02..2429319010eee 100644
--- a/src/Core/Domain/CustomerService/CommandHandler/ForwardCustomerThreadHandler.php
+++ b/src/Core/Domain/CustomerService/CommandHandler/ForwardCustomerThreadHandler.php
@@ -33,6 +33,7 @@
use Employee;
use Mail;
use Order;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\ConfigurationInterface;
use PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\ForwardCustomerThreadCommand;
use PrestaShop\PrestaShop\Core\Domain\CustomerService\Exception\CustomerServiceException;
@@ -44,6 +45,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
class ForwardCustomerThreadHandler implements ForwardCustomerThreadHandlerInterface
{
/**
diff --git a/src/Core/Domain/CustomerService/CommandHandler/ReplyToCustomerThreadHandler.php b/src/Core/Domain/CustomerService/CommandHandler/ReplyToCustomerThreadHandler.php
index 1727d1e362ca4..23833783a4880 100644
--- a/src/Core/Domain/CustomerService/CommandHandler/ReplyToCustomerThreadHandler.php
+++ b/src/Core/Domain/CustomerService/CommandHandler/ReplyToCustomerThreadHandler.php
@@ -33,6 +33,7 @@
use CustomerThread;
use Language;
use Mail;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\ReplyToCustomerThreadCommand;
use PrestaShop\PrestaShop\Core\Domain\CustomerService\Exception\CustomerServiceException;
use PrestaShop\PrestaShop\Core\Domain\CustomerService\ValueObject\CustomerThreadStatus;
@@ -44,6 +45,7 @@
/**
* @internal
*/
+#[AsCommandHandler]
class ReplyToCustomerThreadHandler implements ReplyToCustomerThreadHandlerInterface
{
/**
diff --git a/src/Core/Domain/CustomerService/CommandHandler/UpdateCustomerThreadStatusHandler.php b/src/Core/Domain/CustomerService/CommandHandler/UpdateCustomerThreadStatusHandler.php
index 39fecc9911562..00040802f5344 100644
--- a/src/Core/Domain/CustomerService/CommandHandler/UpdateCustomerThreadStatusHandler.php
+++ b/src/Core/Domain/CustomerService/CommandHandler/UpdateCustomerThreadStatusHandler.php
@@ -27,12 +27,14 @@
namespace PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler;
use Doctrine\DBAL\Driver\Connection;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\UpdateCustomerThreadStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\CustomerService\Exception\CustomerServiceException;
/**
* @internal
*/
+#[AsCommandHandler]
class UpdateCustomerThreadStatusHandler implements UpdateCustomerThreadStatusHandlerInterface
{
/**
diff --git a/src/Core/Domain/CustomerService/QueryHandler/GetCustomerServiceSignatureHandler.php b/src/Core/Domain/CustomerService/QueryHandler/GetCustomerServiceSignatureHandler.php
index 22107e97497c5..97d07629a00d6 100644
--- a/src/Core/Domain/CustomerService/QueryHandler/GetCustomerServiceSignatureHandler.php
+++ b/src/Core/Domain/CustomerService/QueryHandler/GetCustomerServiceSignatureHandler.php
@@ -26,12 +26,14 @@
namespace PrestaShop\PrestaShop\Core\Domain\CustomerService\QueryHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\ConfigurationInterface;
use PrestaShop\PrestaShop\Core\Domain\CustomerService\Query\GetCustomerServiceSignature;
/**
* @internal
*/
+#[AsQueryHandler]
final class GetCustomerServiceSignatureHandler implements GetCustomerServiceSignatureHandlerInterface
{
/**
diff --git a/src/Core/Domain/CustomerService/QueryHandler/GetCustomerThreadForViewingHandler.php b/src/Core/Domain/CustomerService/QueryHandler/GetCustomerThreadForViewingHandler.php
index 6ba582f2bcf23..51029b5df3af3 100644
--- a/src/Core/Domain/CustomerService/QueryHandler/GetCustomerThreadForViewingHandler.php
+++ b/src/Core/Domain/CustomerService/QueryHandler/GetCustomerThreadForViewingHandler.php
@@ -34,6 +34,7 @@
use DateTime;
use Employee;
use Order;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\CustomerService\Exception\CustomerThreadNotFoundException;
use PrestaShop\PrestaShop\Core\Domain\CustomerService\Query\GetCustomerThreadForViewing;
use PrestaShop\PrestaShop\Core\Domain\CustomerService\QueryResult\CustomerInformation;
@@ -45,6 +46,7 @@
use PrestaShop\PrestaShop\Core\Domain\CustomerService\ValueObject\CustomerThreadMessageType;
use PrestaShop\PrestaShop\Core\Domain\CustomerService\ValueObject\CustomerThreadStatus;
use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
+use PrestaShop\PrestaShop\Core\Localization\Locale;
use Product;
use Symfony\Contracts\Translation\TranslatorInterface;
use Tools;
@@ -53,6 +55,7 @@
/**
* @internal
*/
+#[AsQueryHandler]
class GetCustomerThreadForViewingHandler implements GetCustomerThreadForViewingHandlerInterface
{
/**
@@ -65,13 +68,20 @@ class GetCustomerThreadForViewingHandler implements GetCustomerThreadForViewingH
*/
private $translator;
+ /**
+ * @var Locale
+ */
+ protected $locale;
+
/**
* @param Context $context
+ * @param Locale $locale
*/
- public function __construct(Context $context)
+ public function __construct(Context $context, Locale $locale)
{
$this->context = $context;
$this->translator = $context->getTranslator();
+ $this->locale = $locale;
}
/**
@@ -349,9 +359,9 @@ private function getCustomerInformation(CustomerThread $thread)
}
$orders[$key]['date_add'] = Tools::displayDate($order['date_add']);
- $orders[$key]['total_paid_real'] = Tools::displayPrice(
+ $orders[$key]['total_paid_real'] = $this->locale->formatPrice(
$order['total_paid_real'],
- new Currency((int) $order['id_currency'])
+ (new Currency((int) $order['id_currency']))->iso_code
);
}
}
@@ -362,7 +372,9 @@ private function getCustomerInformation(CustomerThread $thread)
$customer->lastname,
$thread->email,
count($ordersOk),
- $totalOk ? Tools::displayPrice($totalOk, $this->context->currency) : $totalOk,
+ $totalOk
+ ? $this->context->getCurrentLocale()->formatPrice($totalOk, $this->context->currency->iso_code)
+ : $totalOk,
(new DateTime($customer->date_add))->format($this->context->language->date_format_lite)
);
}
diff --git a/src/Core/Domain/Feature/Command/BulkDeleteFeatureValueCommand.php b/src/Core/Domain/Feature/Command/BulkDeleteFeatureValueCommand.php
new file mode 100644
index 0000000000000..21731526d8e97
--- /dev/null
+++ b/src/Core/Domain/Feature/Command/BulkDeleteFeatureValueCommand.php
@@ -0,0 +1,57 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Feature\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureValueId;
+
+class BulkDeleteFeatureValueCommand
+{
+ /**
+ * @var FeatureValueId[]
+ */
+ private readonly array $featureValueIds;
+
+ /**
+ * @param int[] $featureValueIds
+ */
+ public function __construct(array $featureValueIds)
+ {
+ $this->featureValueIds = array_map(static function ($id): FeatureValueId {
+ return new FeatureValueId((int) $id);
+ }, $featureValueIds);
+ }
+
+ /**
+ * @return FeatureValueId[]
+ */
+ public function getFeatureValueIds(): array
+ {
+ return $this->featureValueIds;
+ }
+}
diff --git a/src/Core/Domain/Feature/Command/DeleteFeatureValueCommand.php b/src/Core/Domain/Feature/Command/DeleteFeatureValueCommand.php
new file mode 100644
index 0000000000000..44021a9d15748
--- /dev/null
+++ b/src/Core/Domain/Feature/Command/DeleteFeatureValueCommand.php
@@ -0,0 +1,49 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Feature\Command;
+
+use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureValueId;
+
+class DeleteFeatureValueCommand
+{
+ private readonly FeatureValueId $featureValueId;
+
+ public function __construct(
+ int $featureValueId
+ ) {
+ $this->featureValueId = new FeatureValueId($featureValueId);
+ }
+
+ /**
+ * @return FeatureValueId
+ */
+ public function getFeatureValueId(): FeatureValueId
+ {
+ return $this->featureValueId;
+ }
+}
diff --git a/src/Core/Domain/Feature/CommandHandler/BulkDeleteFeatureValueHandlerInterface.php b/src/Core/Domain/Feature/CommandHandler/BulkDeleteFeatureValueHandlerInterface.php
new file mode 100644
index 0000000000000..b83c58c253ae5
--- /dev/null
+++ b/src/Core/Domain/Feature/CommandHandler/BulkDeleteFeatureValueHandlerInterface.php
@@ -0,0 +1,34 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\Feature\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\Feature\Command\BulkDeleteFeatureValueCommand;
+
+interface BulkDeleteFeatureValueHandlerInterface
+{
+ public function handle(BulkDeleteFeatureValueCommand $command): void;
+}
diff --git a/src/Core/Domain/Feature/CommandHandler/DeleteFeatureValueHandlerInterface.php b/src/Core/Domain/Feature/CommandHandler/DeleteFeatureValueHandlerInterface.php
new file mode 100644
index 0000000000000..90028e3253252
--- /dev/null
+++ b/src/Core/Domain/Feature/CommandHandler/DeleteFeatureValueHandlerInterface.php
@@ -0,0 +1,34 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\Feature\CommandHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\Feature\Command\DeleteFeatureValueCommand;
+
+interface DeleteFeatureValueHandlerInterface
+{
+ public function handle(DeleteFeatureValueCommand $command): void;
+}
diff --git a/src/Core/Domain/Feature/Exception/BulkFeatureValueException.php b/src/Core/Domain/Feature/Exception/BulkFeatureValueException.php
new file mode 100644
index 0000000000000..bc9e4a6633d80
--- /dev/null
+++ b/src/Core/Domain/Feature/Exception/BulkFeatureValueException.php
@@ -0,0 +1,59 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Feature\Exception;
+
+use PrestaShop\PrestaShop\Core\Domain\Exception\BulkCommandExceptionInterface;
+use Throwable;
+
+class BulkFeatureValueException extends FeatureValueException implements BulkCommandExceptionInterface
+{
+ public const FAILED_BULK_DELETE = 1;
+
+ /**
+ * @param Throwable[] $exceptions
+ * @param string $message
+ * @param int $code
+ * @param Throwable|null $previous
+ */
+ public function __construct(
+ private readonly array $exceptions,
+ string $message = 'Errors occurred during Feature value bulk action',
+ int $code = 0,
+ Throwable $previous = null
+ ) {
+ parent::__construct($message, $code, $previous);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function getExceptions(): array
+ {
+ return $this->exceptions;
+ }
+}
diff --git a/src/Core/Domain/Feature/Exception/CannotDeleteFeatureValueException.php b/src/Core/Domain/Feature/Exception/CannotDeleteFeatureValueException.php
new file mode 100644
index 0000000000000..41dbc33843974
--- /dev/null
+++ b/src/Core/Domain/Feature/Exception/CannotDeleteFeatureValueException.php
@@ -0,0 +1,33 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Feature\Exception;
+
+class CannotDeleteFeatureValueException extends FeatureValueException
+{
+}
diff --git a/src/Core/Domain/Feature/FeatureValueSettings.php b/src/Core/Domain/Feature/FeatureValueSettings.php
new file mode 100644
index 0000000000000..5512769aad7c9
--- /dev/null
+++ b/src/Core/Domain/Feature/FeatureValueSettings.php
@@ -0,0 +1,47 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Feature;
+
+/**
+ * Holds constants for FeatureValue when those settings doesn't have its own dedicated Value Objects
+ */
+class FeatureValueSettings
+{
+ /**
+ * Maximum allowed length for feature value "value" property
+ */
+ public const VALUE_MAX_LENGTH = 255;
+
+ /**
+ * This class is not supposed to be initialized
+ */
+ private function __construct()
+ {
+ }
+}
diff --git a/src/Core/Domain/Hook/Command/UpdateHookStatusCommand.php b/src/Core/Domain/Hook/Command/UpdateHookStatusCommand.php
index dc1afbe02eb8f..2c00b47e466ad 100644
--- a/src/Core/Domain/Hook/Command/UpdateHookStatusCommand.php
+++ b/src/Core/Domain/Hook/Command/UpdateHookStatusCommand.php
@@ -35,28 +35,23 @@
*/
class UpdateHookStatusCommand
{
- /**
- * @var hookId
- */
- private $hookId;
+ private HookId $id;
/**
* New hook status
- *
- * @var bool
*/
- private $status;
+ private bool $active;
/**
* UpdateHookStatusCommand constructor.
*
- * @param int $hookId
- * @param bool $status
+ * @param int $id
+ * @param bool $active
*/
- public function __construct(int $hookId, bool $status)
+ public function __construct(int $id, bool $active)
{
- $this->hookId = new HookId($hookId);
- $this->status = $status;
+ $this->id = new HookId($id);
+ $this->active = $active;
}
/**
@@ -64,14 +59,14 @@ public function __construct(int $hookId, bool $status)
*/
public function getHookId(): HookId
{
- return $this->hookId;
+ return $this->id;
}
/**
* @return bool
*/
- public function getStatus(): bool
+ public function isActive(): bool
{
- return $this->status;
+ return $this->active;
}
}
diff --git a/src/Core/Domain/Hook/Query/GetHook.php b/src/Core/Domain/Hook/Query/GetHook.php
new file mode 100644
index 0000000000000..11579dc5d1b18
--- /dev/null
+++ b/src/Core/Domain/Hook/Query/GetHook.php
@@ -0,0 +1,46 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Hook\Query;
+
+use PrestaShop\PrestaShop\Core\Domain\Hook\ValueObject\HookId;
+
+class GetHook
+{
+ private HookId $id;
+
+ public function __construct(int $id)
+ {
+ $this->id = new HookId($id);
+ }
+
+ public function getId(): HookId
+ {
+ return $this->id;
+ }
+}
diff --git a/src/Core/Domain/Hook/Query/GetHookStatus.php b/src/Core/Domain/Hook/Query/GetHookStatus.php
index 9dc867ff15c07..d90c3bfea22e5 100644
--- a/src/Core/Domain/Hook/Query/GetHookStatus.php
+++ b/src/Core/Domain/Hook/Query/GetHookStatus.php
@@ -35,26 +35,23 @@
*/
class GetHookStatus
{
- /**
- * @var HookId
- */
- private $hookId;
+ private HookId $id;
/**
* GetHookStatus constructor.
*
- * @param int $hookId
+ * @param int $id
*/
- public function __construct(int $hookId)
+ public function __construct(int $id)
{
- $this->hookId = new HookId($hookId);
+ $this->id = new HookId($id);
}
/**
* @return HookId
*/
- public function getHookId(): HookId
+ public function getId(): HookId
{
- return $this->hookId;
+ return $this->id;
}
}
diff --git a/src/Core/Domain/Hook/QueryHandler/GetHookHandlerInterface.php b/src/Core/Domain/Hook/QueryHandler/GetHookHandlerInterface.php
new file mode 100644
index 0000000000000..377000313d2a4
--- /dev/null
+++ b/src/Core/Domain/Hook/QueryHandler/GetHookHandlerInterface.php
@@ -0,0 +1,37 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Hook\QueryHandler;
+
+use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHook;
+
+interface GetHookHandlerInterface
+{
+ public function handle(GetHook $query);
+}
diff --git a/src/Core/Domain/Hook/QueryResult/Hook.php b/src/Core/Domain/Hook/QueryResult/Hook.php
new file mode 100644
index 0000000000000..09a0e2174106a
--- /dev/null
+++ b/src/Core/Domain/Hook/QueryResult/Hook.php
@@ -0,0 +1,67 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\Hook\QueryResult;
+
+class Hook
+{
+ public function __construct(
+ public readonly int $id,
+ public readonly bool $active,
+ public readonly string $name,
+ public readonly string $title,
+ public readonly string $description
+ ) {
+ }
+
+ public function getId(): int
+ {
+ return $this->id;
+ }
+
+ public function isActive(): bool
+ {
+ return $this->active;
+ }
+
+ public function getName(): string
+ {
+ return $this->name;
+ }
+
+ public function getTitle(): string
+ {
+ return $this->title;
+ }
+
+ public function getDescription(): string
+ {
+ return $this->description;
+ }
+}
diff --git a/src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesCommandHandler.php b/src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesHandler.php
similarity index 92%
rename from src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesCommandHandler.php
rename to src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesHandler.php
index de117e2c251be..b34cd3a7bcaf1 100644
--- a/src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesCommandHandler.php
+++ b/src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Core\Domain\MailTemplate\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\MailTemplate\Command\GenerateThemeMailTemplatesCommand;
use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
use PrestaShop\PrestaShop\Core\Language\LanguageRepositoryInterface;
@@ -34,11 +35,12 @@
use PrestaShop\PrestaShop\Core\MailTemplate\ThemeInterface;
/**
- * Class GenerateThemeMailTemplatesCommandHandler generates email templates with parameters provided
+ * Class GenerateThemeMailTemplatesHandler generates email templates with parameters provided
* by GenerateThemeMailTemplatesCommand. If no output folders are defined by the command its output
* folders are the default ones.
*/
-class GenerateThemeMailTemplatesCommandHandler implements GenerateThemeMailTemplatesCommandHandlerInterface
+#[AsCommandHandler]
+class GenerateThemeMailTemplatesHandler implements GenerateThemeMailTemplatesHandlerInterface
{
/** @var LanguageRepositoryInterface */
private $languageRepository;
diff --git a/src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesCommandHandlerInterface.php b/src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesHandlerInterface.php
similarity index 92%
rename from src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesCommandHandlerInterface.php
rename to src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesHandlerInterface.php
index 1f3737bff22f0..5e58ee5b611c1 100644
--- a/src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesCommandHandlerInterface.php
+++ b/src/Core/Domain/MailTemplate/CommandHandler/GenerateThemeMailTemplatesHandlerInterface.php
@@ -29,9 +29,9 @@
use PrestaShop\PrestaShop\Core\Domain\MailTemplate\Command\GenerateThemeMailTemplatesCommand;
/**
- * Interface GenerateThemeMailsHandlerInterface
+ * Interface GenerateThemeMailTemplatesHandlerInterface
*/
-interface GenerateThemeMailTemplatesCommandHandlerInterface
+interface GenerateThemeMailTemplatesHandlerInterface
{
/**
* @param GenerateThemeMailTemplatesCommand $command
diff --git a/src/Core/Domain/Order/Command/IssueReturnProductCommand.php b/src/Core/Domain/Order/Command/IssueReturnProductCommand.php
index 2a5fbb6a57b02..3f7d3a6aa0ddf 100644
--- a/src/Core/Domain/Order/Command/IssueReturnProductCommand.php
+++ b/src/Core/Domain/Order/Command/IssueReturnProductCommand.php
@@ -28,12 +28,15 @@
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\InvalidCancelProductException;
use PrestaShop\PrestaShop\Core\Domain\Order\Exception\OrderException;
+use PrestaShop\PrestaShop\Core\Domain\Order\ValueObject\OrderDetailRefund;
/**
* Issues return product for given order.
*/
-class IssueReturnProductCommand extends IssueStandardRefundCommand
+class IssueReturnProductCommand extends AbstractRefundCommand
{
+ protected bool $refundShippingCost;
+
/**
* The expected format for $orderDetailRefunds is an associative array indexed
* by OrderDetail id containing one fields quantity
@@ -67,11 +70,31 @@ public function __construct(
parent::__construct(
$orderId,
$orderDetailRefunds,
- $refundShippingCost,
+ true,
$generateCreditSlip,
$generateVoucher,
$voucherRefundType
);
+ $this->refundShippingCost = $refundShippingCost;
$this->restockRefundedProducts = $restockRefundedProducts;
}
+
+ public function refundShippingCost(): bool
+ {
+ return $this->refundShippingCost;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setOrderDetailRefunds(array $orderDetailRefunds): void
+ {
+ $this->orderDetailRefunds = [];
+ foreach ($orderDetailRefunds as $orderDetailId => $detailRefund) {
+ $this->orderDetailRefunds[] = OrderDetailRefund::createStandardRefund(
+ $orderDetailId,
+ $detailRefund['quantity']
+ );
+ }
+ }
}
diff --git a/src/Core/Domain/OrderReturnState/Command/BulkDeleteOrderReturnStateCommand.php b/src/Core/Domain/OrderReturnState/Command/BulkDeleteOrderReturnStateCommand.php
index df53b46b72a8f..65b05e934af2d 100644
--- a/src/Core/Domain/OrderReturnState/Command/BulkDeleteOrderReturnStateCommand.php
+++ b/src/Core/Domain/OrderReturnState/Command/BulkDeleteOrderReturnStateCommand.php
@@ -38,7 +38,7 @@ class BulkDeleteOrderReturnStateCommand
/**
* @var OrderReturnStateId[]
*/
- private $orderReturnStateIds;
+ private $orderReturnStateIds = [];
/**
* @param int[] $orderReturnStateIds
diff --git a/src/Core/Domain/OrderReturnState/OrderReturnStateSettings.php b/src/Core/Domain/OrderReturnState/OrderReturnStateSettings.php
new file mode 100644
index 0000000000000..490f7b8be9676
--- /dev/null
+++ b/src/Core/Domain/OrderReturnState/OrderReturnStateSettings.php
@@ -0,0 +1,37 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\OrderReturnState;
+
+class OrderReturnStateSettings
+{
+ /**
+ * Order Return State name max length as defined in the ObjectModel
+ */
+ public const NAME_MAX_LENGTH = 64;
+}
diff --git a/src/Core/Domain/OrderState/Command/AddOrderStateCommand.php b/src/Core/Domain/OrderState/Command/AddOrderStateCommand.php
index 008ebf754a2d1..6541517a2b173 100644
--- a/src/Core/Domain/OrderState/Command/AddOrderStateCommand.php
+++ b/src/Core/Domain/OrderState/Command/AddOrderStateCommand.php
@@ -84,6 +84,26 @@ class AddOrderStateCommand
*/
private $localizedTemplates;
+ /**
+ * @var string|null
+ */
+ protected $pathName;
+
+ /**
+ * @var int|null
+ */
+ protected $fileSize;
+
+ /**
+ * @var string|null
+ */
+ protected $mimeType;
+
+ /**
+ * @var string|null
+ */
+ protected $originalName;
+
/**
* @param string[] $localizedNames
* @param string[] $localizedTemplates
@@ -229,4 +249,54 @@ public function getLocalizedTemplates()
{
return $this->localizedTemplates;
}
+
+ /**
+ * @param string $pathName
+ * @param int $fileSize
+ * @param string $mimeType
+ * @param string $originalName
+ */
+ public function setFileInformation(
+ string $pathName,
+ int $fileSize,
+ string $mimeType,
+ string $originalName
+ ): void {
+ $this->pathName = $pathName;
+ $this->fileSize = $fileSize;
+ $this->mimeType = $mimeType;
+ $this->originalName = $originalName;
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getFilePathName(): ?string
+ {
+ return $this->pathName;
+ }
+
+ /**
+ * @return int|null
+ */
+ public function getFileSize(): ?int
+ {
+ return $this->fileSize;
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getMimeType(): ?string
+ {
+ return $this->mimeType;
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getOriginalName(): ?string
+ {
+ return $this->originalName;
+ }
}
diff --git a/src/Core/Domain/OrderState/Command/BulkDeleteOrderStateCommand.php b/src/Core/Domain/OrderState/Command/BulkDeleteOrderStateCommand.php
index 15f63a566a9d7..c0c172d43d144 100644
--- a/src/Core/Domain/OrderState/Command/BulkDeleteOrderStateCommand.php
+++ b/src/Core/Domain/OrderState/Command/BulkDeleteOrderStateCommand.php
@@ -39,7 +39,7 @@ class BulkDeleteOrderStateCommand
/**
* @var OrderStateId[]
*/
- private $orderStateIds;
+ private $orderStateIds = [];
/**
* @param int[] $orderStateIds
diff --git a/src/Core/Domain/OrderState/Command/EditOrderStateCommand.php b/src/Core/Domain/OrderState/Command/EditOrderStateCommand.php
index afdb11ffc8550..bb21a383f5e67 100644
--- a/src/Core/Domain/OrderState/Command/EditOrderStateCommand.php
+++ b/src/Core/Domain/OrderState/Command/EditOrderStateCommand.php
@@ -106,6 +106,26 @@ class EditOrderStateCommand
*/
private $template;
+ /**
+ * @var string|null
+ */
+ protected $pathName;
+
+ /**
+ * @var int|null
+ */
+ protected $fileSize;
+
+ /**
+ * @var string|null
+ */
+ protected $mimeType;
+
+ /**
+ * @var string|null
+ */
+ protected $originalName;
+
/**
* @param int $orderStateId
*/
@@ -339,4 +359,54 @@ public function setTemplate(?array $template)
return $this;
}
+
+ /**
+ * @param string $pathName
+ * @param int $fileSize
+ * @param string $mimeType
+ * @param string $originalName
+ */
+ public function setFileInformation(
+ string $pathName,
+ int $fileSize,
+ string $mimeType,
+ string $originalName
+ ): void {
+ $this->pathName = $pathName;
+ $this->fileSize = $fileSize;
+ $this->mimeType = $mimeType;
+ $this->originalName = $originalName;
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getFilePathName(): ?string
+ {
+ return $this->pathName;
+ }
+
+ /**
+ * @return int|null
+ */
+ public function getFileSize(): ?int
+ {
+ return $this->fileSize;
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getMimeType(): ?string
+ {
+ return $this->mimeType;
+ }
+
+ /**
+ * @return string|null
+ */
+ public function getOriginalName(): ?string
+ {
+ return $this->originalName;
+ }
}
diff --git a/src/Core/Domain/OrderState/Exception/OrderStateConstraintException.php b/src/Core/Domain/OrderState/Exception/OrderStateConstraintException.php
index d3138793d9d42..f3c0fdb3447bb 100644
--- a/src/Core/Domain/OrderState/Exception/OrderStateConstraintException.php
+++ b/src/Core/Domain/OrderState/Exception/OrderStateConstraintException.php
@@ -40,4 +40,8 @@ class OrderStateConstraintException extends OrderStateException
* @var int Code is used when empty name is provided for order state
*/
public const EMPTY_NAME = 2;
+ /**
+ * @var int
+ */
+ public const INVALID_FILE_SIZE = 3;
}
diff --git a/src/Core/Domain/OrderState/Exception/OrderStateUploadFailedException.php b/src/Core/Domain/OrderState/Exception/OrderStateUploadFailedException.php
new file mode 100644
index 0000000000000..ea0b2a8be3848
--- /dev/null
+++ b/src/Core/Domain/OrderState/Exception/OrderStateUploadFailedException.php
@@ -0,0 +1,35 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\OrderState\Exception;
+
+/**
+ * Class OrderStateUploadFailedException
+ */
+class OrderStateUploadFailedException extends OrderStateException
+{
+}
diff --git a/src/Core/Domain/OrderState/OrderStateFileUploaderInterface.php b/src/Core/Domain/OrderState/OrderStateFileUploaderInterface.php
new file mode 100644
index 0000000000000..25965c0d5fb3d
--- /dev/null
+++ b/src/Core/Domain/OrderState/OrderStateFileUploaderInterface.php
@@ -0,0 +1,37 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Domain\OrderState;
+
+interface OrderStateFileUploaderInterface
+{
+ /**
+ * @param string $filePath
+ * @param int $id
+ * @param int $fileSize
+ */
+ public function upload(string $filePath, int $id, int $fileSize): void;
+}
diff --git a/src/Core/Domain/OrderState/OrderStateSettings.php b/src/Core/Domain/OrderState/OrderStateSettings.php
new file mode 100644
index 0000000000000..6bfbe4810c06d
--- /dev/null
+++ b/src/Core/Domain/OrderState/OrderStateSettings.php
@@ -0,0 +1,37 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Domain\OrderState;
+
+class OrderStateSettings
+{
+ /**
+ * Order state name max length as defined in the ObjectModel
+ */
+ public const NAME_MAX_LENGTH = 64;
+}
diff --git a/src/Core/Domain/OrderState/QueryResult/EditableOrderState.php b/src/Core/Domain/OrderState/QueryResult/EditableOrderState.php
index c693340e96409..9b83aa43a9351 100644
--- a/src/Core/Domain/OrderState/QueryResult/EditableOrderState.php
+++ b/src/Core/Domain/OrderState/QueryResult/EditableOrderState.php
@@ -28,6 +28,7 @@
namespace PrestaShop\PrestaShop\Core\Domain\OrderState\QueryResult;
use PrestaShop\PrestaShop\Core\Domain\OrderState\ValueObject\OrderStateId;
+use SplFileInfo;
/**
* Stores editable data for order state
@@ -42,6 +43,10 @@ class EditableOrderState
* @var array
*/
private $localizedNames;
+ /**
+ * @var SplFileInfo|null
+ */
+ protected $icon;
/**
* @var string
*/
@@ -94,6 +99,7 @@ class EditableOrderState
public function __construct(
OrderStateId $orderStateId,
array $name,
+ ?SplFileInfo $icon,
string $color,
bool $loggable,
bool $invoice,
@@ -109,6 +115,7 @@ public function __construct(
) {
$this->orderStateId = $orderStateId;
$this->localizedNames = $name;
+ $this->icon = $icon;
$this->color = $color;
$this->loggable = $loggable;
$this->invoice = $invoice;
@@ -234,4 +241,12 @@ public function getLocalizedTemplates()
{
return $this->localizedTemplates;
}
+
+ /**
+ * @return SplFileInfo|null
+ */
+ public function getIcon(): ?SplFileInfo
+ {
+ return $this->icon;
+ }
}
diff --git a/src/Core/Domain/Product/Combination/QueryHandler/GetCombinationIdsHandler.php b/src/Core/Domain/Product/Combination/QueryHandler/GetCombinationIdsHandler.php
index d617de59c5f9e..e2c98614adf12 100644
--- a/src/Core/Domain/Product/Combination/QueryHandler/GetCombinationIdsHandler.php
+++ b/src/Core/Domain/Product/Combination/QueryHandler/GetCombinationIdsHandler.php
@@ -27,11 +27,13 @@
namespace PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationIds;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\ValueObject\CombinationId;
use PrestaShop\PrestaShop\Core\Grid\Query\ProductCombinationQueryBuilder;
use PrestaShop\PrestaShop\Core\Search\Filters\ProductCombinationFilters;
+#[AsQueryHandler]
class GetCombinationIdsHandler implements GetCombinationIdsHandlerInterface
{
/**
diff --git a/src/Core/Domain/Product/Combination/QueryHandler/SearchProductCombinationsHandler.php b/src/Core/Domain/Product/Combination/QueryHandler/SearchProductCombinationsHandler.php
index 139ad60ba7e00..c547c6878d3a8 100644
--- a/src/Core/Domain/Product/Combination/QueryHandler/SearchProductCombinationsHandler.php
+++ b/src/Core/Domain/Product/Combination/QueryHandler/SearchProductCombinationsHandler.php
@@ -28,11 +28,13 @@
namespace PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryHandler;
use PrestaShop\PrestaShop\Adapter\Product\Combination\Repository\CombinationRepository;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\SearchProductCombinations;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryResult\ProductCombination;
use PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryResult\ProductCombinationsCollection;
use PrestaShop\PrestaShop\Core\Product\Combination\NameBuilder\CombinationNameBuilderInterface;
+#[AsQueryHandler]
class SearchProductCombinationsHandler implements SearchProductCombinationsHandlerInterface
{
/**
diff --git a/src/Core/Domain/Product/Pack/Exception/ProductPackConstraintException.php b/src/Core/Domain/Product/Pack/Exception/ProductPackConstraintException.php
index e223c03f3975e..145460ef2b072 100644
--- a/src/Core/Domain/Product/Pack/Exception/ProductPackConstraintException.php
+++ b/src/Core/Domain/Product/Pack/Exception/ProductPackConstraintException.php
@@ -49,8 +49,7 @@ class ProductPackConstraintException extends ProductPackException
public const INVALID_STOCK_TYPE = 30;
/**
- * Code is used when trying to link a pack stock with its product and one of them
- * has no advanced stock
+ * Code is used when trying to link a pack stock with its product and one of them has no advanced stock
*/
public const INCOMPATIBLE_STOCK_TYPE = 40;
}
diff --git a/src/Core/Domain/ShowcaseCard/CommandHandler/CloseShowcaseCardHandler.php b/src/Core/Domain/ShowcaseCard/CommandHandler/CloseShowcaseCardHandler.php
index 9a5d63784671e..63f57076aae50 100644
--- a/src/Core/Domain/ShowcaseCard/CommandHandler/CloseShowcaseCardHandler.php
+++ b/src/Core/Domain/ShowcaseCard/CommandHandler/CloseShowcaseCardHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\ConfigurationInterface;
use PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Command\CloseShowcaseCardCommand;
use PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\ConfigurationMap;
@@ -33,6 +34,7 @@
/**
* Saves the showcase card status to keep it closed
*/
+#[AsCommandHandler]
final class CloseShowcaseCardHandler implements CloseShowcaseCardHandlerInterface
{
/**
diff --git a/src/Core/Domain/ShowcaseCard/QueryHandler/GetShowcaseCardIsClosedHandler.php b/src/Core/Domain/ShowcaseCard/QueryHandler/GetShowcaseCardIsClosedHandler.php
index d801f51690c79..8d5ffdcae390f 100644
--- a/src/Core/Domain/ShowcaseCard/QueryHandler/GetShowcaseCardIsClosedHandler.php
+++ b/src/Core/Domain/ShowcaseCard/QueryHandler/GetShowcaseCardIsClosedHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\QueryHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\ConfigurationInterface;
use PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\ConfigurationMap;
use PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Exception\ShowcaseCardException;
@@ -34,6 +35,7 @@
/**
* Finds out if a showcase card has been closed
*/
+#[AsQueryHandler]
final class GetShowcaseCardIsClosedHandler implements GetShowcaseCardIsClosedHandlerInterface
{
/**
diff --git a/src/Core/Domain/SqlManagement/CommandHandler/SaveSqlRequestSettingsHandler.php b/src/Core/Domain/SqlManagement/CommandHandler/SaveSqlRequestSettingsHandler.php
index 0e5772567196d..f4c43dc320804 100644
--- a/src/Core/Domain/SqlManagement/CommandHandler/SaveSqlRequestSettingsHandler.php
+++ b/src/Core/Domain/SqlManagement/CommandHandler/SaveSqlRequestSettingsHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Core\Domain\SqlManagement\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\ConfigurationInterface;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\SaveSqlRequestSettingsCommand;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\SqlRequestSettings;
@@ -34,6 +35,7 @@
/**
* Class SaveSqlRequestSettingsHandler handles command to save SqlRequest settings.
*/
+#[AsCommandHandler]
final class SaveSqlRequestSettingsHandler implements SaveSqlRequestSettingsHandlerInterface
{
/**
diff --git a/src/Core/Domain/SqlManagement/QueryHandler/GetSqlRequestSettingsHandler.php b/src/Core/Domain/SqlManagement/QueryHandler/GetSqlRequestSettingsHandler.php
index 608fb05944801..5accb6c88c94a 100644
--- a/src/Core/Domain/SqlManagement/QueryHandler/GetSqlRequestSettingsHandler.php
+++ b/src/Core/Domain/SqlManagement/QueryHandler/GetSqlRequestSettingsHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Core\Domain\SqlManagement\QueryHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
use PrestaShop\PrestaShop\Core\ConfigurationInterface;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestSettings;
use PrestaShop\PrestaShop\Core\Domain\SqlManagement\SqlRequestSettings;
@@ -34,6 +35,7 @@
/**
* Class GetSqlRequestSettingsHandler handles query to get SqlRequest settings.
*/
+#[AsQueryHandler]
final class GetSqlRequestSettingsHandler implements GetSqlRequestSettingsHandlerInterface
{
/**
diff --git a/src/Core/Domain/Theme/CommandHandler/AdaptThemeToRTLLanguagesHandler.php b/src/Core/Domain/Theme/CommandHandler/AdaptThemeToRTLLanguagesHandler.php
index a5036dd73218c..82668f44968c1 100644
--- a/src/Core/Domain/Theme/CommandHandler/AdaptThemeToRTLLanguagesHandler.php
+++ b/src/Core/Domain/Theme/CommandHandler/AdaptThemeToRTLLanguagesHandler.php
@@ -26,6 +26,7 @@
namespace PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Theme\Command\AdaptThemeToRTLLanguagesCommand;
use PrestaShop\PrestaShop\Core\Domain\Theme\Exception\CannotAdaptThemeToRTLLanguagesException;
use PrestaShop\PrestaShop\Core\Localization\RTL\Exception\GenerationException;
@@ -34,6 +35,7 @@
/**
* Class AdaptThemeToRTLLanguagesHandler
*/
+#[AsCommandHandler]
final class AdaptThemeToRTLLanguagesHandler implements AdaptThemeToRTLLanguagesHandlerInterface
{
/**
diff --git a/src/Core/Domain/Theme/CommandHandler/DeleteThemeHandler.php b/src/Core/Domain/Theme/CommandHandler/DeleteThemeHandler.php
index 7bf7a8b02acae..de895a11afd76 100644
--- a/src/Core/Domain/Theme/CommandHandler/DeleteThemeHandler.php
+++ b/src/Core/Domain/Theme/CommandHandler/DeleteThemeHandler.php
@@ -27,12 +27,14 @@
namespace PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler;
use PrestaShop\PrestaShop\Core\Addon\Theme\ThemeManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Theme\Command\DeleteThemeCommand;
use PrestaShop\PrestaShop\Core\Domain\Theme\Exception\CannotDeleteThemeException;
/**
* Class DeleteThemeHandler
*/
+#[AsCommandHandler]
final class DeleteThemeHandler implements DeleteThemeHandlerInterface
{
/**
diff --git a/src/Core/Domain/Theme/CommandHandler/EnableThemeHandler.php b/src/Core/Domain/Theme/CommandHandler/EnableThemeHandler.php
index a01cb1b9f58f9..db56dadec9e8d 100644
--- a/src/Core/Domain/Theme/CommandHandler/EnableThemeHandler.php
+++ b/src/Core/Domain/Theme/CommandHandler/EnableThemeHandler.php
@@ -28,6 +28,7 @@
use PrestaShop\PrestaShop\Core\Addon\Theme\ThemeManager;
use PrestaShop\PrestaShop\Core\Cache\Clearer\CacheClearerInterface;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Theme\Command\EnableThemeCommand;
use PrestaShop\PrestaShop\Core\Domain\Theme\Exception\CannotEnableThemeException;
use PrestaShop\PrestaShop\Core\Domain\Theme\Exception\ThemeConstraintException;
@@ -35,6 +36,7 @@
/**
* Class EnableThemeHandler
*/
+#[AsCommandHandler]
final class EnableThemeHandler implements EnableThemeHandlerInterface
{
/**
diff --git a/src/Core/Domain/Theme/CommandHandler/ImportThemeHandler.php b/src/Core/Domain/Theme/CommandHandler/ImportThemeHandler.php
index c27dbbcbc577c..02800f9124723 100644
--- a/src/Core/Domain/Theme/CommandHandler/ImportThemeHandler.php
+++ b/src/Core/Domain/Theme/CommandHandler/ImportThemeHandler.php
@@ -29,6 +29,7 @@
use PrestaShop\PrestaShop\Core\Addon\Theme\Exception\ThemeAlreadyExistsException;
use PrestaShop\PrestaShop\Core\Addon\Theme\ThemeManager;
use PrestaShop\PrestaShop\Core\Addon\Theme\ThemeUploaderInterface;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\ConfigurationInterface;
use PrestaShop\PrestaShop\Core\Domain\Theme\Command\ImportThemeCommand;
use PrestaShop\PrestaShop\Core\Domain\Theme\Exception\ImportedThemeAlreadyExistsException;
@@ -38,6 +39,7 @@
/**
* Class ImportThemeHandler
*/
+#[AsCommandHandler]
final class ImportThemeHandler implements ImportThemeHandlerInterface
{
/**
diff --git a/src/Core/Domain/Theme/CommandHandler/ResetThemeLayoutsHandler.php b/src/Core/Domain/Theme/CommandHandler/ResetThemeLayoutsHandler.php
index 0d7ba52575134..cacab4b8ca359 100644
--- a/src/Core/Domain/Theme/CommandHandler/ResetThemeLayoutsHandler.php
+++ b/src/Core/Domain/Theme/CommandHandler/ResetThemeLayoutsHandler.php
@@ -27,12 +27,14 @@
namespace PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler;
use PrestaShop\PrestaShop\Core\Addon\Theme\ThemeManager;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
use PrestaShop\PrestaShop\Core\Domain\Theme\Command\ResetThemeLayoutsCommand;
use PrestaShop\PrestaShop\Core\Domain\Theme\Exception\CannotResetThemeLayoutsException;
/**
* Class ResetThemeLayoutsHandler
*/
+#[AsCommandHandler]
final class ResetThemeLayoutsHandler implements ResetThemeLayoutsHandlerInterface
{
/**
diff --git a/src/Core/Email/EmailLister.php b/src/Core/Email/EmailLister.php
index 381c0b9b9bd7b..ed47d8163075e 100644
--- a/src/Core/Email/EmailLister.php
+++ b/src/Core/Email/EmailLister.php
@@ -58,7 +58,7 @@ public function getAvailableMails($dir)
// Remove unwanted .html / .txt / .tpl / .php / . / ..
foreach ($mail_directory as $mail) {
- if (strpos($mail->getFilename(), '.') !== false) {
+ if (str_contains($mail->getFilename(), '.')) {
$tmp = explode('.', $mail->getFilename());
// Check for filename existence (left part) and if extension is html (right part)
@@ -83,7 +83,7 @@ public function getAvailableMails($dir)
*/
public function getCleanedMailName($mail_name)
{
- if (strpos($mail_name, '.') !== false) {
+ if (str_contains($mail_name, '.')) {
$tmp = explode('.', $mail_name);
if (!isset($tmp[0])) {
diff --git a/src/Core/FeatureFlag/FeatureFlagManager.php b/src/Core/FeatureFlag/FeatureFlagManager.php
new file mode 100644
index 0000000000000..8a6aa78afc714
--- /dev/null
+++ b/src/Core/FeatureFlag/FeatureFlagManager.php
@@ -0,0 +1,129 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\FeatureFlag;
+
+use PrestaShop\PrestaShop\Core\FeatureFlag\Layer\DbLayer;
+use PrestaShop\PrestaShop\Core\FeatureFlag\Layer\DotEnvLayer;
+use PrestaShop\PrestaShop\Core\FeatureFlag\Layer\EnvLayer;
+use PrestaShop\PrestaShop\Core\FeatureFlag\Layer\QueryLayer;
+use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
+use Psr\Container\ContainerInterface;
+use Symfony\Contracts\Service\ServiceSubscriberInterface;
+
+class FeatureFlagManager implements ServiceSubscriberInterface, FeatureFlagStateCheckerInterface
+{
+ public function __construct(
+ private readonly ContainerInterface $locator,
+ private readonly FeatureFlagRepository $featureFlagRepository
+ ) {
+ }
+
+ /**
+ * Subscribe all handlers in this service container.
+ *
+ * @return string[]
+ */
+ public static function getSubscribedServices(): array
+ {
+ return [
+ FeatureFlagSettings::TYPE_ENV => EnvLayer::class,
+ FeatureFlagSettings::TYPE_QUERY => QueryLayer::class,
+ FeatureFlagSettings::TYPE_DOTENV => DotEnvLayer::class,
+ FeatureFlagSettings::TYPE_DB => DbLayer::class,
+ ];
+ }
+
+ /**
+ * Get used layer for the feature flag.
+ */
+ private function getLayer(string $featureFlagName): TypeLayerInterface
+ {
+ $featureFlag = $this->featureFlagRepository->getByName($featureFlagName);
+ if (null !== $featureFlag) {
+ foreach ($featureFlag->getOrderedTypes() as $type) {
+ if ($this->locator->has($type)) {
+ $handler = $this->locator->get($type);
+ if ($handler->canBeUsed($featureFlagName)) {
+ return $handler;
+ }
+ }
+ }
+ throw new \RuntimeException(sprintf('No handler can be used for feature flag %s.', $featureFlagName));
+ }
+ throw new \RuntimeException(sprintf('The feature flag %s doesn\'t exist.', $featureFlagName));
+ }
+
+ /**
+ * Get type of handler used by this feature flag.
+ */
+ public function getUsedType(string $featureFlagName): string
+ {
+ return $this->getLayer($featureFlagName)->getTypeName();
+ }
+
+ /**
+ * Is the handler used by this feature flag read only?
+ */
+ public function isReadonly(string $featureFlagName): bool
+ {
+ return $this->getLayer($featureFlagName)->isReadonly();
+ }
+
+ /**
+ * Is this feature flag enable?
+ */
+ public function isEnabled(string $featureFlagName): bool
+ {
+ return $this->getLayer($featureFlagName)->isEnabled($featureFlagName);
+ }
+
+ /**
+ * Is this feature flag disable?
+ */
+ public function isDisabled(string $featureFlagName): bool
+ {
+ return !$this->isEnabled($featureFlagName);
+ }
+
+ /**
+ * Enable the feature flag by his handler.
+ */
+ public function enable(string $featureFlagName): void
+ {
+ $this->getLayer($featureFlagName)->enable($featureFlagName);
+ }
+
+ /**
+ * Disable the feature flag by his handler.
+ */
+ public function disable(string $featureFlagName): void
+ {
+ $this->getLayer($featureFlagName)->disable($featureFlagName);
+ }
+}
diff --git a/src/Core/FeatureFlag/FeatureFlagSettings.php b/src/Core/FeatureFlag/FeatureFlagSettings.php
index b3343aab166fa..f322b817493e1 100644
--- a/src/Core/FeatureFlag/FeatureFlagSettings.php
+++ b/src/Core/FeatureFlag/FeatureFlagSettings.php
@@ -30,9 +30,26 @@
class FeatureFlagSettings
{
+ /**
+ * Stability consts
+ */
public const STABILITY_STABLE = 'stable';
public const STABILITY_BETA = 'beta';
+ /**
+ * Type consts
+ */
+ public const TYPE_DEFAULT = 'env,dotenv,db';
+ public const TYPE_ENV = 'env';
+ public const TYPE_QUERY = 'query';
+ public const TYPE_DOTENV = 'dotenv';
+ public const TYPE_DB = 'db';
+
+ /**
+ * Prefix for DotEnv & Env Layers
+ */
+ public const PREFIX = 'PS_FF_';
+
/**
* @deprecated Deprecated in 8.1 will be removed in next major.
*/
@@ -45,4 +62,6 @@ class FeatureFlagSettings
public const FEATURE_FLAG_AUTHORIZATION_SERVER = 'authorization_server';
public const FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT = 'multiple_image_format';
+ public const FEATURE_FLAG_SYMFONY_LAYOUT = 'symfony_layout';
+ public const FEATURE_FLAG_FRONT_CONTAINER_V2 = 'front_container_v2';
}
diff --git a/src/Core/FeatureFlag/FeatureFlagStateCheckerInterface.php b/src/Core/FeatureFlag/FeatureFlagStateCheckerInterface.php
new file mode 100644
index 0000000000000..ac651363389b2
--- /dev/null
+++ b/src/Core/FeatureFlag/FeatureFlagStateCheckerInterface.php
@@ -0,0 +1,42 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\FeatureFlag;
+
+interface FeatureFlagStateCheckerInterface
+{
+ /**
+ * Retrieve if the feature flag is enabled.
+ */
+ public function isEnabled(string $featureFlagName): bool;
+
+ /**
+ * Retrieve if the feature flag is enabled.
+ */
+ public function isDisabled(string $featureFlagName): bool;
+}
diff --git a/src/Core/FeatureFlag/Layer/DbLayer.php b/src/Core/FeatureFlag/Layer/DbLayer.php
new file mode 100644
index 0000000000000..6fa62dbb00c82
--- /dev/null
+++ b/src/Core/FeatureFlag/Layer/DbLayer.php
@@ -0,0 +1,91 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\FeatureFlag\Layer;
+
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\TypeLayerInterface;
+use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
+
+class DbLayer implements TypeLayerInterface
+{
+ public function __construct(
+ protected readonly FeatureFlagRepository $featureFlagRepository
+ ) {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function isReadonly(): bool
+ {
+ // It's always editable via DB layer!
+ return false;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getTypeName(): string
+ {
+ return FeatureFlagSettings::TYPE_DB;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function canBeUsed(string $featureFlagName): bool
+ {
+ // It's always possible via DB!
+ return true;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function isEnabled(string $featureFlagName): bool
+ {
+ return $this->featureFlagRepository->isEnabled($featureFlagName);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function enable(string $featureFlagName): void
+ {
+ $this->featureFlagRepository->enable($featureFlagName);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function disable(string $featureFlagName): void
+ {
+ $this->featureFlagRepository->disable($featureFlagName);
+ }
+}
diff --git a/src/Core/FeatureFlag/Layer/DotEnvLayer.php b/src/Core/FeatureFlag/Layer/DotEnvLayer.php
new file mode 100644
index 0000000000000..12ddc699a1a76
--- /dev/null
+++ b/src/Core/FeatureFlag/Layer/DotEnvLayer.php
@@ -0,0 +1,148 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\FeatureFlag\Layer;
+
+use PrestaShop\PrestaShop\Core\EnvironmentInterface;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\TypeLayerInterface;
+
+class DotEnvLayer implements TypeLayerInterface
+{
+ public function __construct(
+ private EnvironmentInterface $environment,
+ private string $rootDir,
+ ) {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function isReadonly(): bool
+ {
+ // It's always editable via DotEnv layer!
+ return false;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getTypeName(): string
+ {
+ return FeatureFlagSettings::TYPE_DOTENV;
+ }
+
+ /**
+ * Retrieve the variable name of this feature flag.
+ */
+ public function getVarName(string $featureFlagName): string
+ {
+ return FeatureFlagSettings::PREFIX . strtoupper($featureFlagName);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function canBeUsed(string $featureFlagName): bool
+ {
+ return isset($_ENV['SYMFONY_DOTENV_VARS']) &&
+ str_contains($_ENV['SYMFONY_DOTENV_VARS'], $this->getVarName($featureFlagName));
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function isEnabled(string $featureFlagName): bool
+ {
+ return isset($_ENV[$this->getVarName($featureFlagName)]) &&
+ filter_var($_ENV[$this->getVarName($featureFlagName)], \FILTER_VALIDATE_BOOLEAN);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function enable(string $featureFlagName): void
+ {
+ $this->setStatus($featureFlagName, true);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function disable(string $featureFlagName): void
+ {
+ $this->setStatus($featureFlagName, false);
+ }
+
+ /**
+ * Retrieve dotenv file used with this feature flag set.
+ */
+ private function locateDotEnvFile(string $featureFlagName): string
+ {
+ $env = $this->environment->getName();
+ $filesToCheck = [".env.$env.local", ".env.$env", '.env'];
+
+ foreach ($filesToCheck as $file) {
+ $path = $this->rootDir . '/' . $file;
+ if (file_exists($path) && str_contains(file_get_contents($path), $this->getVarName($featureFlagName))) {
+ return $path;
+ }
+ }
+
+ return '';
+ }
+
+ /**
+ * Set feature flag status in the good dotenv file.
+ */
+ private function setStatus(string $featureFlagName, bool $status): void
+ {
+ if ($pathDotenv = $this->locateDotEnvFile($featureFlagName)) {
+ file_put_contents(
+ $pathDotenv,
+ preg_replace(
+ "/({$this->getVarName($featureFlagName)})=(.*)/",
+ "$1={$this->boolLabel($status)}",
+ file_get_contents($pathDotenv)
+ )
+ );
+
+ return;
+ }
+
+ throw new \RuntimeException(sprintf('Cannot change status of the feature flag %s', $featureFlagName));
+ }
+
+ /**
+ * Get label in function of boolean.
+ */
+ private function boolLabel(bool $status): string
+ {
+ return $status ? 'true' : 'false';
+ }
+}
diff --git a/src/Core/FeatureFlag/Layer/EnvLayer.php b/src/Core/FeatureFlag/Layer/EnvLayer.php
new file mode 100644
index 0000000000000..1fbabb8a8919d
--- /dev/null
+++ b/src/Core/FeatureFlag/Layer/EnvLayer.php
@@ -0,0 +1,94 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\FeatureFlag\Layer;
+
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\TypeLayerInterface;
+
+class EnvLayer implements TypeLayerInterface
+{
+ /**
+ * {@inheritdoc}
+ */
+ public function getTypeName(): string
+ {
+ return FeatureFlagSettings::TYPE_ENV;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function isReadonly(): bool
+ {
+ // It's always NOT editable via Env layer!
+ return true;
+ }
+
+ /**
+ * Retrieve the const name of this feature flag.
+ */
+ public function getConstName(string $featureFlagName): string
+ {
+ return FeatureFlagSettings::PREFIX . strtoupper($featureFlagName);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function canBeUsed(string $featureFlagName): bool
+ {
+ // Check if PS_FF_{featureFlag's name} is on Env variable.
+ return getenv($this->getConstName($featureFlagName)) !== false;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function isEnabled(string $featureFlagName): bool
+ {
+ return $this->canBeUsed($featureFlagName) &&
+ filter_var(getenv($this->getConstName($featureFlagName)), \FILTER_VALIDATE_BOOLEAN);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function enable(string $featureFlagName): void
+ {
+ throw new \InvalidArgumentException(sprintf('We cannot change status of the env feature flag %s.', $featureFlagName));
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function disable(string $featureFlagName): void
+ {
+ throw new \InvalidArgumentException(sprintf('We cannot change status of the env feature flag %s.', $featureFlagName));
+ }
+}
diff --git a/src/Core/FeatureFlag/Layer/QueryLayer.php b/src/Core/FeatureFlag/Layer/QueryLayer.php
new file mode 100644
index 0000000000000..11b8768f8d4fc
--- /dev/null
+++ b/src/Core/FeatureFlag/Layer/QueryLayer.php
@@ -0,0 +1,110 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\FeatureFlag\Layer;
+
+use PrestaShop\PrestaShop\Core\EnvironmentInterface;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\TypeLayerInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+class QueryLayer implements TypeLayerInterface
+{
+ public function __construct(
+ private EnvironmentInterface $environment,
+ private RequestStack $requestStack,
+ ) {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getTypeName(): string
+ {
+ return FeatureFlagSettings::TYPE_QUERY;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function isReadonly(): bool
+ {
+ // It's always NOT editable via Query layer!
+ return true;
+ }
+
+ /**
+ * Retrieve the var name of this feature flag.
+ */
+ public function getVarName(string $featureFlagName): string
+ {
+ return FeatureFlagSettings::PREFIX . strtoupper($featureFlagName);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function canBeUsed(string $featureFlagName): bool
+ {
+ // Only for debug environment.
+ if (!$this->environment->isDebug()) {
+ return false;
+ }
+
+ // Check if PS_FF_{featureFlag's name} is on query variable.
+ return null !== $this->requestStack->getMainRequest()?->query->get($this->getVarName($featureFlagName));
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function isEnabled(string $featureFlagName): bool
+ {
+ return $this->canBeUsed($featureFlagName) &&
+ filter_var(
+ $this->requestStack->getMainRequest()?->query->get($this->getVarName($featureFlagName)),
+ \FILTER_VALIDATE_BOOLEAN
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function enable(string $featureFlagName): void
+ {
+ throw new \InvalidArgumentException(sprintf('We cannot change status of the query feature flag %s.', $featureFlagName));
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function disable(string $featureFlagName): void
+ {
+ throw new \InvalidArgumentException(sprintf('We cannot change status of the query feature flag %s.', $featureFlagName));
+ }
+}
diff --git a/src/Core/FeatureFlag/TypeLayerInterface.php b/src/Core/FeatureFlag/TypeLayerInterface.php
new file mode 100644
index 0000000000000..6104fd7903c20
--- /dev/null
+++ b/src/Core/FeatureFlag/TypeLayerInterface.php
@@ -0,0 +1,62 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\FeatureFlag;
+
+interface TypeLayerInterface
+{
+ /**
+ * Get type name of this handler.
+ */
+ public function getTypeName(): string;
+
+ /**
+ * Define is this handler can change feature flag status.
+ */
+ public function isReadonly(): bool;
+
+ /**
+ * Define is this handler can be used.
+ */
+ public function canBeUsed(string $featureFlagName): bool;
+
+ /**
+ * Retrieve if the feature flag is enabled.
+ */
+ public function isEnabled(string $featureFlagName): bool;
+
+ /**
+ * Enable the feature flag with this handler method.
+ */
+ public function enable(string $featureFlagName): void;
+
+ /**
+ * Disable the feature flag with this handler method.
+ */
+ public function disable(string $featureFlagName): void;
+}
diff --git a/src/Core/Form/ChoiceProvider/LocalizationPackByIsoCodeChoiceProvider.php b/src/Core/Form/ChoiceProvider/LocalizationPackByIsoCodeChoiceProvider.php
index d7d9595979710..0a85d83a73d23 100644
--- a/src/Core/Form/ChoiceProvider/LocalizationPackByIsoCodeChoiceProvider.php
+++ b/src/Core/Form/ChoiceProvider/LocalizationPackByIsoCodeChoiceProvider.php
@@ -104,7 +104,7 @@ public function getChoices()
->name('/^([a-z]{2})\.xml$/');
foreach ($finder as $file) {
- list($iso) = explode('.', $file->getFilename());
+ [$iso] = explode('.', $file->getFilename());
// if localization pack was not loaded yet and it exists locally
// then add it to choices list
diff --git a/src/Core/Form/ChoiceProvider/ProductConditionChoiceProvider.php b/src/Core/Form/ChoiceProvider/ProductConditionChoiceProvider.php
index 00b8b4bf183da..216a7e44709be 100644
--- a/src/Core/Form/ChoiceProvider/ProductConditionChoiceProvider.php
+++ b/src/Core/Form/ChoiceProvider/ProductConditionChoiceProvider.php
@@ -54,9 +54,9 @@ public function __construct(
public function getChoices()
{
return [
- $this->translator->trans('New', [], 'Shop.Theme.Catalog') => ProductCondition::NEW,
- $this->translator->trans('Used', [], 'Shop.Theme.Catalog') => ProductCondition::USED,
- $this->translator->trans('Refurbished', [], 'Shop.Theme.Catalog') => ProductCondition::REFURBISHED,
+ $this->translator->trans('New', [], 'Admin.Catalog.Feature') => ProductCondition::NEW,
+ $this->translator->trans('Used', [], 'Admin.Catalog.Feature') => ProductCondition::USED,
+ $this->translator->trans('Refurbished', [], 'Admin.Catalog.Feature') => ProductCondition::REFURBISHED,
];
}
}
diff --git a/src/Core/Form/IdentifiableObject/Builder/CartRule/CartRuleActionBuilder.php b/src/Core/Form/IdentifiableObject/Builder/CartRule/CartRuleActionBuilder.php
index 685971a68b7dc..4697041934b77 100644
--- a/src/Core/Form/IdentifiableObject/Builder/CartRule/CartRuleActionBuilder.php
+++ b/src/Core/Form/IdentifiableObject/Builder/CartRule/CartRuleActionBuilder.php
@@ -79,7 +79,6 @@ public function supports(array $data): bool
if (
$propertyAccessor->isReadable($data, '[discount][reduction][value]')
&& $propertyAccessor->isReadable($data, '[discount][reduction][type]')
- && $propertyAccessor->isReadable($data, '[discount][discount_application]')
) {
return true;
}
@@ -118,7 +117,7 @@ private function buildDiscount(array $data): ?Discount
}
$discountApplicationType = new DiscountApplicationType(
- $data['discount']['discount_application'],
+ $data['discount']['discount_application'] ?? DiscountApplicationType::ORDER_WITHOUT_SHIPPING,
$specificProductId
);
$reductionData = $data['discount']['reduction'];
diff --git a/src/Core/Form/IdentifiableObject/CommandBuilder/CommandBuilder.php b/src/Core/Form/IdentifiableObject/CommandBuilder/CommandBuilder.php
index 8f1fcebd5f4ee..e7142453cc752 100644
--- a/src/Core/Form/IdentifiableObject/CommandBuilder/CommandBuilder.php
+++ b/src/Core/Form/IdentifiableObject/CommandBuilder/CommandBuilder.php
@@ -195,7 +195,7 @@ private function updateCommand(object $command, CommandField $commandField, arra
if (!method_exists($command, $setterMethod)) {
throw new InvalidArgumentException(
- sprintf('Setter method "%s" not found in command "%s"', $setterMethod, get_class($command))
+ sprintf('Setter method "%s" not found in command "%s"', $setterMethod, $command::class)
);
}
$command->$setterMethod(...$setterArguments);
diff --git a/src/Core/Form/IdentifiableObject/CommandBuilder/CommandField.php b/src/Core/Form/IdentifiableObject/CommandBuilder/CommandField.php
index 99a39d4f623d0..461b4821d7e88 100644
--- a/src/Core/Form/IdentifiableObject/CommandBuilder/CommandField.php
+++ b/src/Core/Form/IdentifiableObject/CommandBuilder/CommandField.php
@@ -58,7 +58,7 @@ protected function __construct(string $commandSetter, array $dataFields, bool $i
if (!$dataField instanceof DataField) {
throw new InvalidArgumentException(sprintf(
'Invalid data field type "%s", expected "%s"',
- is_object($dataField) ? get_class($dataField) : gettype($dataField),
+ is_object($dataField) ? $dataField::class : gettype($dataField),
DataField::class
));
}
diff --git a/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
new file mode 100644
index 0000000000000..133773b12dff6
--- /dev/null
+++ b/src/Core/Form/IdentifiableObject/DataHandler/AttributeGroupFormDataHandler.php
@@ -0,0 +1,84 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler;
+
+use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\AddAttributeGroupCommand;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\EditAttributeGroupCommand;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupId;
+
+/**
+ * Handles data of submitted Attribute Group form.
+ */
+final class AttributeGroupFormDataHandler implements FormDataHandlerInterface
+{
+ /**
+ * @var CommandBusInterface
+ */
+ private $commandBus;
+
+ /**
+ * @param CommandBusInterface $commandBus
+ */
+ public function __construct(CommandBusInterface $commandBus)
+ {
+ $this->commandBus = $commandBus;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function create(array $data)
+ {
+ /** @var AttributeGroupId $attributeGroupId */
+ $attributeGroupId = $this->commandBus->handle(new AddAttributeGroupCommand(
+ $data['name'],
+ $data['public_name'],
+ $data['group_type'],
+ $data['shop_association']
+ ));
+
+ return $attributeGroupId->getValue();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function update($id, array $data)
+ {
+ /* @var AttributeGroupId $attributeGroupId */
+ $this->commandBus->handle(new EditAttributeGroupCommand(
+ (int) $id,
+ $data['name'],
+ $data['public_name'],
+ $data['group_type'],
+ $data['shop_association']
+ ));
+ }
+}
diff --git a/src/Core/Form/IdentifiableObject/DataHandler/CartRuleFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/CartRuleFormDataHandler.php
index 19b6462e577a2..3a081f2b84cd4 100644
--- a/src/Core/Form/IdentifiableObject/DataHandler/CartRuleFormDataHandler.php
+++ b/src/Core/Form/IdentifiableObject/DataHandler/CartRuleFormDataHandler.php
@@ -27,7 +27,7 @@
namespace PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler;
-use DateTime;
+use DateTimeImmutable;
use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\AddCartRuleCommand;
use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\CartRule\CartRuleActionBuilder;
@@ -64,18 +64,22 @@ public function create(array $data)
$command = new AddCartRuleCommand(
$informationData['name'],
- isset($informationData['highlight']) && (bool) $informationData['highlight'],
- (bool) $informationData['partial_use'],
- (int) $informationData['priority'],
- (bool) $informationData['active'],
- DateTime::createFromFormat(DateTimeUtil::DEFAULT_DATETIME_FORMAT, $dateRange['from']),
- DateTime::createFromFormat(DateTimeUtil::DEFAULT_DATETIME_FORMAT, $dateRange['to']),
- (int) $conditionsData['total_available'],
- (int) $conditionsData['available_per_user'],
$this->cartRuleActionBuilder->build($data['actions'])
);
- $command->setCode($informationData['code']);
+ $command
+ ->setCode($informationData['code'])
+ ->setHighlightInCart(isset($informationData['highlight']) && (bool) $informationData['highlight'])
+ ->setAllowPartialUse((bool) $informationData['partial_use'])
+ ->setPriority((int) $informationData['priority'])
+ ->setActive((bool) $informationData['active'])
+ ->setValidityDateRange(
+ DateTimeImmutable::createFromFormat(DateTimeUtil::DEFAULT_DATETIME_FORMAT, $dateRange['from']),
+ DateTimeImmutable::createFromFormat(DateTimeUtil::DEFAULT_DATETIME_FORMAT, $dateRange['to'])
+ )
+ ->setTotalQuantity((int) $conditionsData['total_available'])
+ ->setQuantityPerUser((int) $conditionsData['available_per_user'])
+ ;
if (!empty($conditionsData['minimum_amount']['amount'])) {
$amountData = $conditionsData['minimum_amount'];
diff --git a/src/Core/Form/IdentifiableObject/DataHandler/CategoryFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/CategoryFormDataHandler.php
index 96a75a09666f8..6afce1a02191d 100644
--- a/src/Core/Form/IdentifiableObject/DataHandler/CategoryFormDataHandler.php
+++ b/src/Core/Form/IdentifiableObject/DataHandler/CategoryFormDataHandler.php
@@ -102,10 +102,6 @@ private function createAddCategoryCommand(array $data): AddCategoryCommand
$command->setAssociatedGroupIds($data['group_association']);
$command->setCoverImage($data['cover_image']);
$command->setThumbnailImage($data['thumbnail_image']);
-
- if (isset($data['menu_thumbnail_images'])) {
- $command->setMenuThumbnailImages($data['menu_thumbnail_images']);
- }
if (isset($data['shop_association'])) {
$command->setAssociatedShopIds($data['shop_association']);
}
@@ -139,10 +135,6 @@ private function createEditCategoryCommand(int $categoryId, array $data): EditCa
$command->setCoverImage($data['cover_image']);
$command->setThumbnailImage($data['thumbnail_image']);
-
- if (isset($data['menu_thumbnail_images'])) {
- $command->setMenuThumbnailImages($data['menu_thumbnail_images']);
- }
if (isset($data['shop_association'])) {
$command->setAssociatedShopIds($data['shop_association']);
}
diff --git a/src/Core/Form/IdentifiableObject/DataHandler/FeatureValueFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/FeatureValueFormDataHandler.php
new file mode 100644
index 0000000000000..7367c5536efe6
--- /dev/null
+++ b/src/Core/Form/IdentifiableObject/DataHandler/FeatureValueFormDataHandler.php
@@ -0,0 +1,66 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler;
+
+use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Command\AddFeatureValueCommand;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Command\EditFeatureValueCommand;
+use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureValueId;
+
+class FeatureValueFormDataHandler implements FormDataHandlerInterface
+{
+ public function __construct(
+ protected readonly CommandBusInterface $commandBus
+ ) {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function create(array $data): int
+ {
+ /** @var FeatureValueId $featureValueId */
+ $featureValueId = $this->commandBus->handle(new AddFeatureValueCommand(
+ $data['feature_id'],
+ $data['value']
+ ));
+
+ return $featureValueId->getValue();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function update($id, array $data): void
+ {
+ $command = (new EditFeatureValueCommand($id))
+ ->setLocalizedValues($data['value'])
+ ;
+
+ $this->commandBus->handle($command);
+ }
+}
diff --git a/src/Core/Form/IdentifiableObject/DataHandler/OrderStateFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/OrderStateFormDataHandler.php
index 3e5bf0de2873f..c98c97c5f2b1c 100644
--- a/src/Core/Form/IdentifiableObject/DataHandler/OrderStateFormDataHandler.php
+++ b/src/Core/Form/IdentifiableObject/DataHandler/OrderStateFormDataHandler.php
@@ -31,6 +31,7 @@
use PrestaShop\PrestaShop\Core\Domain\OrderState\Command\AddOrderStateCommand;
use PrestaShop\PrestaShop\Core\Domain\OrderState\Command\EditOrderStateCommand;
use PrestaShop\PrestaShop\Core\Domain\OrderState\ValueObject\OrderStateId;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
/**
* Saves or updates order state data submitted in form
@@ -91,6 +92,18 @@ private function buildOrderStateAddCommandFromFormData(array $data)
$data['template']
);
+ if (isset($data['icon'])) {
+ /** @var UploadedFile $fileObject */
+ $fileObject = $data['icon'];
+
+ $command->setFileInformation(
+ $fileObject->getPathname(),
+ $fileObject->getSize(),
+ $fileObject->getMimeType(),
+ $fileObject->getClientOriginalName()
+ );
+ }
+
return $command;
}
@@ -116,6 +129,18 @@ private function buildOrderStateEditCommand($orderStateId, array $data)
->setTemplate($data['template'])
;
+ /** @var UploadedFile|null $fileObject */
+ $fileObject = $data['icon'];
+
+ if ($fileObject instanceof UploadedFile) {
+ $command->setFileInformation(
+ $fileObject->getPathname(),
+ $fileObject->getSize(),
+ $fileObject->getMimeType(),
+ $fileObject->getClientOriginalName()
+ );
+ }
+
return $command;
}
}
diff --git a/src/Core/Form/IdentifiableObject/DataHandler/RootCategoryFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/RootCategoryFormDataHandler.php
index d7ec500bb16e0..c8f1776aba7ec 100644
--- a/src/Core/Form/IdentifiableObject/DataHandler/RootCategoryFormDataHandler.php
+++ b/src/Core/Form/IdentifiableObject/DataHandler/RootCategoryFormDataHandler.php
@@ -101,10 +101,6 @@ public function createAddRootCategoryCommand(array $data): AddRootCategoryComman
$command->setAssociatedGroupIds($data['group_association']);
$command->setCoverImage($data['cover_image']);
$command->setThumbnailImage($data['thumbnail_image']);
-
- if (isset($data['menu_thumbnail_images'])) {
- $command->setMenuThumbnailImages($data['menu_thumbnail_images']);
- }
if (isset($data['shop_association'])) {
$command->setAssociatedShopIds($data['shop_association']);
}
@@ -135,10 +131,6 @@ private function createEditRootCategoryCommand(int $rootCategoryId, array $data)
$command->setCoverImage($data['cover_image']);
$command->setThumbnailImage($data['thumbnail_image']);
-
- if (isset($data['menu_thumbnail_images'])) {
- $command->setMenuThumbnailImages($data['menu_thumbnail_images']);
- }
if (isset($data['shop_association'])) {
$command->setAssociatedShopIds($data['shop_association']);
}
diff --git a/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php b/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php
new file mode 100644
index 0000000000000..c5707fc010d32
--- /dev/null
+++ b/src/Core/Form/IdentifiableObject/DataProvider/AttributeGroupFormDataProvider.php
@@ -0,0 +1,77 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider;
+
+use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupForEditing;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\QueryResult\EditableAttributeGroup;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupType;
+
+class AttributeGroupFormDataProvider implements FormDataProviderInterface
+{
+ /**
+ * @var CommandBusInterface
+ */
+ private $queryBus;
+
+ /**
+ * @param CommandBusInterface $queryBus
+ */
+ public function __construct(
+ CommandBusInterface $queryBus
+ ) {
+ $this->queryBus = $queryBus;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getData($id)
+ {
+ /** @var EditableAttributeGroup $editableAttributeGroup */
+ $editableAttributeGroup = $this->queryBus->handle(new GetAttributeGroupForEditing((int) $id));
+
+ return [
+ 'name' => $editableAttributeGroup->getName(),
+ 'public_name' => $editableAttributeGroup->getPublicName(),
+ 'group_type' => $editableAttributeGroup->getType(),
+ 'shop_association' => $editableAttributeGroup->getAssociatedShopIds(),
+ ];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getDefaultData()
+ {
+ return [
+ 'group_type' => AttributeGroupType::ATTRIBUTE_GROUP_TYPE_SELECT,
+ ];
+ }
+}
diff --git a/src/Core/Form/IdentifiableObject/DataProvider/CategoryFormDataProvider.php b/src/Core/Form/IdentifiableObject/DataProvider/CategoryFormDataProvider.php
index 2272a44f1dff6..81464e016504c 100644
--- a/src/Core/Form/IdentifiableObject/DataProvider/CategoryFormDataProvider.php
+++ b/src/Core/Form/IdentifiableObject/DataProvider/CategoryFormDataProvider.php
@@ -124,22 +124,6 @@ public function getData($categoryId)
'size' => $thumbnailImage['size'],
];
}
- $menuThumbnailImages = $editableCategory->getMenuThumbnailImages();
- $menuThumbnailImagesEdited = [];
- foreach ($menuThumbnailImages as $menuThumbnailImage) {
- $menuThumbnailImagesEdited[] = [
- 'id' => $menuThumbnailImage['id'],
- 'image_path' => $menuThumbnailImage['path'],
- 'delete_path' => $this->router->generate(
- 'admin_categories_delete_menu_thumbnail',
- [
- 'categoryId' => $categoryId,
- 'menuThumbnailId' => $menuThumbnailImage['id'],
- ]
- ),
- ];
- }
- $disableMenuThumbnailsUpload = !$editableCategory->canContainMoreMenuThumbnails();
return [
'name' => $editableCategory->getName(),
@@ -155,9 +139,7 @@ public function getData($categoryId)
'shop_association' => $editableCategory->getShopAssociationIds(),
'cover_image' => $coverImages,
'thumbnail_image' => $thumbnailImages,
- 'menu_thumbnail_images' => $menuThumbnailImagesEdited,
'seo_preview' => $categoryUrl,
- 'disabled_menu_thumbnail_upload' => $disableMenuThumbnailsUpload,
];
}
diff --git a/src/Core/Form/IdentifiableObject/DataProvider/FeatureFormDataProvider.php b/src/Core/Form/IdentifiableObject/DataProvider/FeatureFormDataProvider.php
index 3c860e8b92a7d..8559b1e06303e 100644
--- a/src/Core/Form/IdentifiableObject/DataProvider/FeatureFormDataProvider.php
+++ b/src/Core/Form/IdentifiableObject/DataProvider/FeatureFormDataProvider.php
@@ -33,7 +33,7 @@
/**
* Provides data for feature forms.
*/
-final class FeatureFormDataProvider implements FormDataProviderInterface
+class FeatureFormDataProvider implements FormDataProviderInterface
{
/**
* @var CommandBusInterface
diff --git a/src/Core/Form/IdentifiableObject/DataProvider/FeatureValueFormDataProvider.php b/src/Core/Form/IdentifiableObject/DataProvider/FeatureValueFormDataProvider.php
new file mode 100644
index 0000000000000..557c30c3b1e32
--- /dev/null
+++ b/src/Core/Form/IdentifiableObject/DataProvider/FeatureValueFormDataProvider.php
@@ -0,0 +1,62 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider;
+
+use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureValueForEditing;
+use PrestaShop\PrestaShop\Core\Domain\Feature\QueryResult\EditableFeatureValue;
+
+class FeatureValueFormDataProvider implements FormDataProviderInterface
+{
+ public function __construct(
+ private readonly CommandBusInterface $queryBus
+ ) {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getData($id): array
+ {
+ /** @var EditableFeatureValue $featureValueForEditing */
+ $featureValueForEditing = $this->queryBus->handle(new GetFeatureValueForEditing($id));
+
+ return [
+ 'feature_id' => $featureValueForEditing->getFeatureId()->getValue(),
+ 'feature_value_id' => $featureValueForEditing->getFeatureValueId()->getValue(),
+ 'value' => $featureValueForEditing->getLocalizedValues(),
+ ];
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getDefaultData(): array
+ {
+ return [];
+ }
+}
diff --git a/src/Core/Form/IdentifiableObject/DataProvider/OrderReturnStateFormDataProvider.php b/src/Core/Form/IdentifiableObject/DataProvider/OrderReturnStateFormDataProvider.php
index 6563c0f93a3b0..803600c1846c6 100644
--- a/src/Core/Form/IdentifiableObject/DataProvider/OrderReturnStateFormDataProvider.php
+++ b/src/Core/Form/IdentifiableObject/DataProvider/OrderReturnStateFormDataProvider.php
@@ -66,10 +66,8 @@ public function getData($orderStateId)
*/
public function getDefaultData()
{
- $data = [
- 'is_enabled' => true,
+ return [
+ 'color' => '#ffffff',
];
-
- return $data;
}
}
diff --git a/src/Core/Form/IdentifiableObject/DataProvider/OrderStateFormDataProvider.php b/src/Core/Form/IdentifiableObject/DataProvider/OrderStateFormDataProvider.php
index 86f9822087b61..496f6400d7aea 100644
--- a/src/Core/Form/IdentifiableObject/DataProvider/OrderStateFormDataProvider.php
+++ b/src/Core/Form/IdentifiableObject/DataProvider/OrderStateFormDataProvider.php
@@ -76,10 +76,8 @@ public function getData($orderStateId)
*/
public function getDefaultData()
{
- $data = [
- 'is_enabled' => true,
+ return [
+ 'color' => '#ffffff',
];
-
- return $data;
}
}
diff --git a/src/Core/Foundation/Database/EntityRepository.php b/src/Core/Foundation/Database/EntityRepository.php
index ed32f50a37c81..39f19d42db760 100644
--- a/src/Core/Foundation/Database/EntityRepository.php
+++ b/src/Core/Foundation/Database/EntityRepository.php
@@ -65,10 +65,10 @@ public function __construct(
public function __call($method, $arguments)
{
- if (0 === strpos($method, 'findOneBy')) {
+ if (str_starts_with($method, 'findOneBy')) {
$one = true;
$by = substr($method, 9);
- } elseif (0 === strpos($method, 'findBy')) {
+ } elseif (str_starts_with($method, 'findBy')) {
$one = false;
$by = substr($method, 6);
} else {
diff --git a/src/Core/Foundation/Version.php b/src/Core/Foundation/Version.php
index dcaf12beb889e..b4c8809641841 100644
--- a/src/Core/Foundation/Version.php
+++ b/src/Core/Foundation/Version.php
@@ -368,7 +368,7 @@ private function versionCompare($version, $operator)
*/
private function removeLegacyPrefix($version, $majorVersionString)
{
- if ('1.' === substr($version, 0, 2) && substr($version, 0, strlen($majorVersionString)) === $majorVersionString) {
+ if (str_starts_with($version, '1.') && str_starts_with($version, $majorVersionString)) {
$version = substr($version, 2);
}
diff --git a/src/Core/Grid/Column/AbstractColumn.php b/src/Core/Grid/Column/AbstractColumn.php
index c98a711025528..38770c66ec4ad 100644
--- a/src/Core/Grid/Column/AbstractColumn.php
+++ b/src/Core/Grid/Column/AbstractColumn.php
@@ -115,7 +115,7 @@ public function getOption(string $name)
return $this->options[$name];
}
- throw new NoSuchOptionException(sprintf('Option "%s" does not exist in "%s"', $name, get_class($this)));
+ throw new NoSuchOptionException(sprintf('Option "%s" does not exist in "%s"', $name, static::class));
}
/**
diff --git a/src/Core/Grid/Data/Factory/ProfileGridDataFactoryDecorator.php b/src/Core/Grid/Data/Factory/ProfileGridDataFactoryDecorator.php
new file mode 100644
index 0000000000000..1dc8773cd28de
--- /dev/null
+++ b/src/Core/Grid/Data/Factory/ProfileGridDataFactoryDecorator.php
@@ -0,0 +1,103 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Grid\Data\Factory;
+
+use PrestaShop\PrestaShop\Core\Grid\Data\GridData;
+use PrestaShop\PrestaShop\Core\Grid\Record\RecordCollection;
+use PrestaShop\PrestaShop\Core\Grid\Record\RecordCollectionInterface;
+use PrestaShop\PrestaShop\Core\Grid\Search\SearchCriteriaInterface;
+use PrestaShopBundle\Security\Admin\Employee;
+use Symfony\Component\Security\Core\Security;
+
+/**
+ * Class ProfileGridDataFactory decorates data from profile doctrine data factory.
+ */
+final class ProfileGridDataFactoryDecorator implements GridDataFactoryInterface
+{
+ /**
+ * @var GridDataFactoryInterface
+ */
+ private $profileGridDataFactory;
+
+ /**
+ * @var Security
+ */
+ private $security;
+
+ public function __construct(
+ GridDataFactoryInterface $profileGridDataFactory,
+ Security $security
+ ) {
+ $this->profileGridDataFactory = $profileGridDataFactory;
+ $this->security = $security;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getData(SearchCriteriaInterface $searchCriteria)
+ {
+ $profileData = $this->profileGridDataFactory->getData($searchCriteria);
+
+ $profileRecords = $this->applyModifications($profileData->getRecords());
+
+ return new GridData(
+ $profileRecords,
+ $profileData->getRecordsTotal(),
+ $profileData->getQuery()
+ );
+ }
+
+ /**
+ * @param RecordCollectionInterface $profiles
+ *
+ * @return RecordCollection
+ */
+ private function applyModifications(RecordCollectionInterface $profiles)
+ {
+ $modifiedProfiles = [];
+
+ /** @var Employee|null $user */
+ $user = $this->security->getUser();
+ if (null === $user) {
+ return new RecordCollection($modifiedProfiles);
+ }
+
+ $currentUserIdProfile = $user->getData()->id_profile;
+ foreach ($profiles as $profile) {
+ if ($profile['id_profile'] === $currentUserIdProfile) {
+ $profile['disableBulkCheckbox'] = true;
+ }
+
+ $modifiedProfiles[] = $profile;
+ }
+
+ return new RecordCollection($modifiedProfiles);
+ }
+}
diff --git a/src/Core/Grid/Definition/Factory/AbstractGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/AbstractGridDefinitionFactory.php
index c23b5b10a736e..eff678818d19e 100644
--- a/src/Core/Grid/Definition/Factory/AbstractGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/AbstractGridDefinitionFactory.php
@@ -63,7 +63,7 @@ public function __construct(HookDispatcherInterface $hookDispatcher)
/**
* {@inheritdoc}
*/
- final public function getDefinition()
+ public function getDefinition()
{
$definition = new GridDefinition(
$this->getId(),
diff --git a/src/Core/Grid/Definition/Factory/ApiAccessGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/ApiAccessGridDefinitionFactory.php
new file mode 100644
index 0000000000000..043c7435a77cd
--- /dev/null
+++ b/src/Core/Grid/Definition/Factory/ApiAccessGridDefinitionFactory.php
@@ -0,0 +1,123 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Grid\Definition\Factory;
+
+use PrestaShop\PrestaShop\Core\Grid\Action\Row\RowActionCollection;
+use PrestaShop\PrestaShop\Core\Grid\Action\Row\Type\LinkRowAction;
+use PrestaShop\PrestaShop\Core\Grid\Column\ColumnCollection;
+use PrestaShop\PrestaShop\Core\Grid\Column\ColumnCollectionInterface;
+use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\ActionColumn;
+use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\IdentifierColumn;
+use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\ToggleColumn;
+
+/**
+ * Class ApiAccessGridDefinitionFactory is responsible for creating new instance of Api Access grid definition.
+ */
+final class ApiAccessGridDefinitionFactory extends AbstractGridDefinitionFactory
+{
+ use DeleteActionTrait;
+
+ public const GRID_ID = 'api_access';
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getId(): string
+ {
+ return self::GRID_ID;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getName(): string
+ {
+ return $this->trans('Api accesses', [], 'Admin.Navigation.Menu');
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getColumns(): ColumnCollectionInterface
+ {
+ return (new ColumnCollection())
+ ->add(
+ (new IdentifierColumn('client_id'))
+ ->setName($this->trans('Name', [], 'Admin.Global'))
+ ->setOptions([
+ 'identifier_field' => 'client_id',
+ 'clickable' => false,
+ ])
+ )
+ ->add(
+ (new ToggleColumn('active'))
+ ->setName($this->trans('Api access state', [], 'Admin.Global'))
+ ->setOptions([
+ 'field' => 'active',
+ 'primary_field' => 'id_api_access',
+ 'route' => 'admin_api_accesses_toggle_active',
+ 'route_param_name' => 'apiAccessId',
+ 'sortable' => false,
+ ])
+ )
+ ->add((new ActionColumn('actions'))
+ ->setName($this->trans('Actions', [], 'Admin.Global'))
+ ->setOptions([
+ 'actions' => $this->getRowActions(),
+ ])
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getRowActions(): RowActionCollection
+ {
+ $rowActions = new RowActionCollection();
+ $rowActions
+ ->add((new LinkRowAction('edit'))
+ ->setName($this->trans('Edit', [], 'Admin.Actions'))
+ ->setIcon('edit')
+ ->setOptions([
+ 'route' => 'admin_api_accesses_edit',
+ 'route_param_name' => 'apiAccessId',
+ 'route_param_field' => 'id_api_access',
+ ])
+ )
+ ->add(
+ $this->buildDeleteAction(
+ 'admin_api_accesses_delete',
+ 'apiAccessId',
+ 'id_api_access'
+ )
+ );
+
+ return $rowActions;
+ }
+}
diff --git a/src/Core/Grid/Definition/Factory/AttributeGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/AttributeGridDefinitionFactory.php
index e2f58a9cfb631..94876eb693b5a 100644
--- a/src/Core/Grid/Definition/Factory/AttributeGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/AttributeGridDefinitionFactory.php
@@ -44,6 +44,7 @@
use PrestaShop\PrestaShop\Core\Grid\Filter\Filter;
use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollection;
use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
+use PrestaShopBundle\Form\Admin\Type\ReorderPositionsButtonType;
use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\HttpFoundation\Request;
@@ -232,13 +233,7 @@ protected function getFilters()
])
->setAssociatedColumn('value')
)
- ->add((new Filter('position', TextType::class))
- ->setTypeOptions([
- 'required' => false,
- 'attr' => [
- 'placeholder' => $this->trans('Search position', [], 'Admin.Actions'),
- ],
- ])
+ ->add((new Filter('position', ReorderPositionsButtonType::class))
->setAssociatedColumn('position')
)
->add((new Filter('actions', SearchAndResetType::class))
diff --git a/src/Core/Grid/Definition/Factory/AttributeGroupGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/AttributeGroupGridDefinitionFactory.php
index 05138fd1ef8c4..f27d9f1e511e2 100644
--- a/src/Core/Grid/Definition/Factory/AttributeGroupGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/AttributeGroupGridDefinitionFactory.php
@@ -39,6 +39,7 @@
use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\PositionColumn;
use PrestaShop\PrestaShop\Core\Grid\Filter\Filter;
use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollection;
+use PrestaShopBundle\Form\Admin\Type\ReorderPositionsButtonType;
use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\HttpFoundation\Request;
@@ -158,6 +159,14 @@ protected function getGridActions()
],
])
)
+ ->add(
+ (new LinkGridAction('export'))
+ ->setName($this->trans('Export', [], 'Admin.Actions'))
+ ->setIcon('cloud_download')
+ ->setOptions([
+ 'route' => 'admin_attribute_groups_export',
+ ])
+ )
->add((new SimpleGridAction('common_refresh_list'))
->setName($this->trans('Refresh list', [], 'Admin.Advparameters.Feature'))
->setIcon('refresh')
@@ -197,13 +206,7 @@ protected function getFilters()
])
->setAssociatedColumn('name')
)
- ->add((new Filter('position', TextType::class))
- ->setTypeOptions([
- 'required' => false,
- 'attr' => [
- 'placeholder' => $this->trans('Search position', [], 'Admin.Actions'),
- ],
- ])
+ ->add((new Filter('position', ReorderPositionsButtonType::class))
->setAssociatedColumn('position')
)
->add((new Filter('actions', SearchAndResetType::class))
diff --git a/src/Core/Grid/Definition/Factory/CarrierGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/CarrierGridDefinitionFactory.php
index a0152540bfdde..774a5d9db2a04 100644
--- a/src/Core/Grid/Definition/Factory/CarrierGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/CarrierGridDefinitionFactory.php
@@ -44,6 +44,7 @@
use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\ToggleColumn;
use PrestaShop\PrestaShop\Core\Grid\Filter\Filter;
use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollection;
+use PrestaShopBundle\Form\Admin\Type\ReorderPositionsButtonType;
use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
use PrestaShopBundle\Form\Admin\Type\YesAndNoChoiceType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -204,11 +205,8 @@ protected function getFilters()
])
)
->add(
- (new Filter('position', TextType::class))
+ (new Filter('position', ReorderPositionsButtonType::class))
->setAssociatedColumn('position')
- ->setTypeOptions([
- 'required' => false,
- ])
)
->add(
(new Filter('actions', SearchAndResetType::class))
diff --git a/src/Core/Grid/Definition/Factory/CmsPageCategoryDefinitionFactory.php b/src/Core/Grid/Definition/Factory/CmsPageCategoryDefinitionFactory.php
index 9dc3bb030d31b..d0a6069fd9924 100644
--- a/src/Core/Grid/Definition/Factory/CmsPageCategoryDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/CmsPageCategoryDefinitionFactory.php
@@ -43,6 +43,7 @@
use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollection;
use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
use PrestaShop\PrestaShop\Core\Multistore\MultistoreContextCheckerInterface;
+use PrestaShopBundle\Form\Admin\Type\ReorderPositionsButtonType;
use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
use PrestaShopBundle\Form\Admin\Type\YesAndNoChoiceType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -266,13 +267,7 @@ protected function getFilters()
if ($this->isAllShopContextOrShopFeatureIsNotUsed()) {
$filterCollection
- ->add((new Filter('position', TextType::class))
- ->setTypeOptions([
- 'required' => false,
- 'attr' => [
- 'placeholder' => $this->trans('Position', [], 'Admin.Global'),
- ],
- ])
+ ->add((new Filter('position', ReorderPositionsButtonType::class))
->setAssociatedColumn('position')
)
;
diff --git a/src/Core/Grid/Definition/Factory/CmsPageDefinitionFactory.php b/src/Core/Grid/Definition/Factory/CmsPageDefinitionFactory.php
index dad9ee51bbfd0..df0107d56b041 100644
--- a/src/Core/Grid/Definition/Factory/CmsPageDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/CmsPageDefinitionFactory.php
@@ -44,6 +44,7 @@
use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollection;
use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
use PrestaShop\PrestaShop\Core\Multistore\MultistoreContextCheckerInterface;
+use PrestaShopBundle\Form\Admin\Type\ReorderPositionsButtonType;
use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
use PrestaShopBundle\Form\Admin\Type\YesAndNoChoiceType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -278,13 +279,7 @@ protected function getFilters()
if ($this->isAllShopContextOrShopFeatureIsNotUsed()) {
$filterCollection
- ->add((new Filter('position', TextType::class))
- ->setTypeOptions([
- 'required' => false,
- 'attr' => [
- 'placeholder' => $this->trans('Position', [], 'Admin.Global'),
- ],
- ])
+ ->add((new Filter('position', ReorderPositionsButtonType::class))
->setAssociatedColumn('position')
)
;
diff --git a/src/Core/Grid/Definition/Factory/FeatureGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/FeatureGridDefinitionFactory.php
index b737dba0c50e7..28d745a375cf6 100644
--- a/src/Core/Grid/Definition/Factory/FeatureGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/FeatureGridDefinitionFactory.php
@@ -101,12 +101,6 @@ protected function getColumns(): ColumnCollectionInterface
'field' => 'values_count',
])
)
- // @todo: position action is not implemented yet
- // Uncomment Position column and delete position DataColumn when its done.
- ->add((new DataColumn('position'))
- ->setName($this->trans('Position', [], 'Admin.Global'))
- ->setOptions(['field' => 'position'])
- )
->add((new PositionColumn('position'))
->setName($this->trans('Position', [], 'Admin.Global'))
->setOptions([
@@ -120,17 +114,15 @@ protected function getColumns(): ColumnCollectionInterface
->setName($this->trans('Actions', [], 'Admin.Global'))
->setOptions([
'actions' => (new RowActionCollection())
- // @todo: view action is not implemented yet
- // ->add((new LinkRowAction('view'))
- // ->setName($this->trans('View', [], 'Admin.Actions'))
- // ->setIcon('zoom_in')
- // ->setOptions([
- // 'route' => 'admin_features_view',
- // 'route_param_name' => 'featureId',
- // 'route_param_field' => 'id_feature',
- // 'clickable_row' => true,
- // ])
- // )
+ ->add((new LinkRowAction('view'))
+ ->setName($this->trans('View', [], 'Admin.Actions'))
+ ->setIcon('zoom_in')
+ ->setOptions([
+ 'route' => 'admin_feature_values_index',
+ 'route_param_name' => 'featureId',
+ 'route_param_field' => 'id_feature',
+ ])
+ )
->add((new LinkRowAction('edit'))
->setName($this->trans('Edit', [], 'Admin.Actions'))
->setIcon('edit')
diff --git a/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
new file mode 100644
index 0000000000000..4d139280f764b
--- /dev/null
+++ b/src/Core/Grid/Definition/Factory/FeatureValueGridDefinitionFactory.php
@@ -0,0 +1,187 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Grid\Definition\Factory;
+
+use PrestaShop\PrestaShop\Core\Grid\Action\Bulk\BulkActionCollection;
+use PrestaShop\PrestaShop\Core\Grid\Action\Bulk\BulkActionCollectionInterface;
+use PrestaShop\PrestaShop\Core\Grid\Action\GridActionCollection;
+use PrestaShop\PrestaShop\Core\Grid\Action\GridActionCollectionInterface;
+use PrestaShop\PrestaShop\Core\Grid\Action\Row\RowActionCollection;
+use PrestaShop\PrestaShop\Core\Grid\Action\Row\Type\LinkRowAction;
+use PrestaShop\PrestaShop\Core\Grid\Column\ColumnCollection;
+use PrestaShop\PrestaShop\Core\Grid\Column\ColumnCollectionInterface;
+use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\ActionColumn;
+use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\BulkActionColumn;
+use PrestaShop\PrestaShop\Core\Grid\Column\Type\Common\DataColumn;
+use PrestaShop\PrestaShop\Core\Grid\Definition\GridDefinition;
+use PrestaShop\PrestaShop\Core\Grid\Definition\GridDefinitionInterface;
+use PrestaShop\PrestaShop\Core\Grid\Factory\FeatureValueGridFactory;
+use PrestaShop\PrestaShop\Core\Grid\Filter\Filter;
+use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollection;
+use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollectionInterface;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * @see FeatureValueGridFactory - it modifies grid definition to adapt values which depends on request filters (like name and some filter columns)
+ */
+class FeatureValueGridDefinitionFactory extends AbstractFilterableGridDefinitionFactory
+{
+ use DeleteActionTrait;
+
+ public const GRID_ID = 'feature_value';
+
+ public function getDefinition(): GridDefinitionInterface
+ {
+ return new GridDefinition(
+ $this->getId(),
+ $this->getName(),
+ $this->getColumns(),
+ $this->getFilters(),
+ $this->getGridActions(),
+ $this->getBulkActions(),
+ $this->getViewOptions()
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getId(): string
+ {
+ return self::GRID_ID;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getName(): string
+ {
+ // the name is overriden in FeatureValueGridFactory to be the dynamic Feature name instead
+ return 'Features';
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getColumns(): ColumnCollectionInterface
+ {
+ return (new ColumnCollection())
+ ->add((new BulkActionColumn('bulk'))
+ ->setOptions([
+ 'bulk_field' => 'id_feature_value',
+ ])
+ )
+ ->add((new DataColumn('id_feature_value'))
+ ->setName($this->trans('ID', [], 'Admin.Global'))
+ ->setOptions([
+ 'field' => 'id_feature_value',
+ ])
+ )
+ ->add((new DataColumn('value'))
+ ->setName($this->trans('Value', [], 'Admin.Global'))
+ ->setOptions([
+ 'field' => 'value',
+ ])
+ )
+ ->add((new ActionColumn('actions'))
+ ->setName($this->trans('Actions', [], 'Admin.Global'))
+ ->setOptions([
+ 'actions' => (new RowActionCollection())
+ ->add(
+ (new LinkRowAction('edit'))
+ ->setName($this->trans('Edit', [], 'Admin.Actions'))
+ ->setIcon('edit')
+ ->setOptions([
+ 'route' => 'admin_feature_values_edit',
+ 'route_param_name' => 'featureValueId',
+ 'route_param_field' => 'id_feature_value',
+ 'extra_route_params' => [
+ 'featureId' => 'id_feature',
+ ],
+ ])
+ )
+ ->add(
+ $this->buildDeleteAction(
+ 'admin_feature_values_delete',
+ 'featureValueId',
+ 'id_feature_value',
+ Request::METHOD_DELETE,
+ ['featureId' => 'id_feature'],
+ )
+ ),
+ ])
+ )
+ ;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getGridActions(): GridActionCollectionInterface
+ {
+ // actions are filled in FeatureValueGridFactory
+ return new GridActionCollection();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getFilters(): FilterCollectionInterface
+ {
+ // some filters (which depends on request filters) are added inside FeatureValueGridFactory
+ return (new FilterCollection())
+ ->add((new Filter('id_feature_value', NumberType::class))
+ ->setTypeOptions([
+ 'required' => false,
+ 'attr' => [
+ 'placeholder' => $this->trans('Search ID', [], 'Admin.Actions'),
+ ],
+ ])
+ ->setAssociatedColumn('id_feature_value')
+ )
+ ->add((new Filter('value', TextType::class))
+ ->setTypeOptions([
+ 'required' => false,
+ 'attr' => [
+ 'placeholder' => $this->trans('Search value', [], 'Admin.Actions'),
+ ],
+ ])
+ ->setAssociatedColumn('value')
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function getBulkActions(): BulkActionCollectionInterface
+ {
+ return new BulkActionCollection();
+ }
+}
diff --git a/src/Core/Grid/Definition/Factory/OrderReturnStatesGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/OrderReturnStatesGridDefinitionFactory.php
index 85a4b0ba1921b..352a233a54185 100644
--- a/src/Core/Grid/Definition/Factory/OrderReturnStatesGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/OrderReturnStatesGridDefinitionFactory.php
@@ -43,7 +43,6 @@
use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollection;
use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
-use Symfony\Component\Form\Extension\Core\Type\NumberType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\HttpFoundation\Request;
@@ -154,7 +153,7 @@ protected function getFilters()
{
return (new FilterCollection())
->add(
- (new Filter('id_order_return_state', NumberType::class))
+ (new Filter('id_order_return_state', TextType::class))
->setTypeOptions([
'attr' => [
'placeholder' => $this->trans('Search ID', [], 'Admin.Actions'),
diff --git a/src/Core/Grid/Definition/Factory/OrderStatesGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/OrderStatesGridDefinitionFactory.php
index af67068fab3f8..c4cb1c0b57554 100644
--- a/src/Core/Grid/Definition/Factory/OrderStatesGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/OrderStatesGridDefinitionFactory.php
@@ -45,7 +45,6 @@
use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
use PrestaShopBundle\Form\Admin\Type\YesAndNoChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\NumberType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\HttpFoundation\Request;
@@ -193,7 +192,7 @@ protected function getFilters()
{
return (new FilterCollection())
->add(
- (new Filter('id_order_state', NumberType::class))
+ (new Filter('id_order_state', TextType::class))
->setTypeOptions([
'attr' => [
'placeholder' => $this->trans('Search ID', [], 'Admin.Actions'),
diff --git a/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php
index ff591db024b16..b2eff8bfb6874 100644
--- a/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php
+++ b/src/Core/Grid/Definition/Factory/ProductGridDefinitionFactory.php
@@ -52,10 +52,12 @@
use PrestaShop\PrestaShop\Core\Grid\Column\Type\Product\ShopListColumn;
use PrestaShop\PrestaShop\Core\Grid\Filter\Filter;
use PrestaShop\PrestaShop\Core\Grid\Filter\FilterCollection;
+use PrestaShop\PrestaShop\Core\Grid\Filter\HiddenFilter;
use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
use PrestaShop\PrestaShop\Core\Shop\ShopConstraintContextInterface;
use PrestaShopBundle\Form\Admin\Type\IntegerMinMaxFilterType;
use PrestaShopBundle\Form\Admin\Type\NumberMinMaxFilterType;
+use PrestaShopBundle\Form\Admin\Type\ReorderPositionsButtonType;
use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
use PrestaShopBundle\Form\Admin\Type\ShopSelectorType;
use PrestaShopBundle\Form\Admin\Type\YesAndNoChoiceType;
@@ -371,6 +373,7 @@ protected function getSingleShopRowActions(): RowActionCollection
'extra_route_params' => [
'shopId' => $shopId,
],
+ 'confirm_message' => $this->trans('Remember to properly edit all information after duplicating - including SEO information and friendly URL.', [], 'Admin.Catalog.Notification'),
'modal_options' => new ModalOptions([
'title' => $this->trans('Duplicate product', [], 'Admin.Actions'),
'confirm_button_label' => $duplicateLabel,
@@ -474,6 +477,7 @@ protected function getSingleMultiShopsRowActions(): RowActionCollection
'route_param_name' => 'productId',
'route_param_field' => 'id_product',
'extra_route_params' => $extraRouteParams,
+ 'confirm_message' => $this->trans('Remember to properly edit all information after duplicating - including SEO information and friendly URL.', [], 'Admin.Catalog.Notification'),
'modal_options' => new ModalOptions([
'title' => $this->trans('Duplicate product', [], 'Admin.Actions'),
'confirm_button_label' => $duplicateLabel,
@@ -524,6 +528,7 @@ protected function getSingleMultiShopsRowActions(): RowActionCollection
protected function getFilters()
{
$filters = (new FilterCollection())
+ ->add(new HiddenFilter('id_category'))
->add(
(new Filter('id_product', IntegerMinMaxFilterType::class))
->setTypeOptions([
@@ -572,14 +577,9 @@ protected function getFilters()
(new Filter('active', YesAndNoChoiceType::class))
->setAssociatedColumn('active')
)
- ->add((new Filter('position', TextType::class))
- ->setAssociatedColumn('position')
- ->setTypeOptions([
- 'required' => false,
- 'attr' => [
- 'placeholder' => $this->trans('Search position', [], 'Admin.Actions'),
- ],
- ])
+ ->add(
+ (new Filter('position', ReorderPositionsButtonType::class))
+ ->setAssociatedColumn('position')
)
->add(
(new Filter('actions', SearchAndResetType::class))
@@ -692,10 +692,10 @@ protected function getBulkActions()
$bulkDuplicateRoute = 'admin_products_bulk_duplicate_all_shops';
$bulkDeleteRoute = 'admin_products_bulk_delete_from_all_shops';
$routeParams = [];
- $bulkEnableLabel = $this->trans('Activate selection for all stores', [], 'Admin.Actions');
- $bulkDisableLabel = $this->trans('Deactivate selection for all stores', [], 'Admin.Actions');
- $bulkDuplicateLabel = $this->trans('Duplicate selection for all stores', [], 'Admin.Actions');
- $bulkDeleteLabel = $this->trans('Delete selection for all stores', [], 'Admin.Actions');
+ $bulkEnableLabel = $this->trans('Activate selection for associated stores', [], 'Admin.Actions');
+ $bulkDisableLabel = $this->trans('Deactivate selection for associated stores', [], 'Admin.Actions');
+ $bulkDuplicateLabel = $this->trans('Duplicate selection for associated stores', [], 'Admin.Actions');
+ $bulkDeleteLabel = $this->trans('Delete selection for associated stores', [], 'Admin.Actions');
}
return (new BulkActionCollection())
diff --git a/src/Core/Grid/Definition/GridDefinition.php b/src/Core/Grid/Definition/GridDefinition.php
index 67825bb408460..35b7e0074a788 100644
--- a/src/Core/Grid/Definition/GridDefinition.php
+++ b/src/Core/Grid/Definition/GridDefinition.php
@@ -176,7 +176,7 @@ public function getFilters()
/**
* @param string $name
*/
- public function setName($name)
+ public function setName(string $name)
{
if (!is_string($name)) {
throw new InvalidDataException('Definition name should be a string.');
diff --git a/src/Core/Grid/Factory/CategoryGridFactoryDecorator.php b/src/Core/Grid/Factory/CategoryGridFactoryDecorator.php
index 0ba9e65c99dfc..4cec822db7f60 100644
--- a/src/Core/Grid/Factory/CategoryGridFactoryDecorator.php
+++ b/src/Core/Grid/Factory/CategoryGridFactoryDecorator.php
@@ -67,7 +67,7 @@ public function __construct(
/**
* {@inheritdoc}
*/
- public function getGrid(SearchCriteriaInterface $searchCriteria)
+ public function getGrid(SearchCriteriaInterface $searchCriteria): GridInterface
{
$categoryGrid = $this->categoryGridFactory->getGrid($searchCriteria);
diff --git a/src/Core/Grid/Factory/FeatureValueGridFactory.php b/src/Core/Grid/Factory/FeatureValueGridFactory.php
new file mode 100644
index 0000000000000..1001679795d40
--- /dev/null
+++ b/src/Core/Grid/Factory/FeatureValueGridFactory.php
@@ -0,0 +1,227 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Grid\Factory;
+
+use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository;
+use PrestaShop\PrestaShop\Core\Domain\Feature\ValueObject\FeatureId;
+use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
+use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
+use PrestaShop\PrestaShop\Core\Grid\Action\Type\LinkGridAction;
+use PrestaShop\PrestaShop\Core\Grid\Action\Type\SimpleGridAction;
+use PrestaShop\PrestaShop\Core\Grid\Data\Factory\GridDataFactoryInterface;
+use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\BulkDeleteActionTrait;
+use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\GridDefinitionFactoryInterface;
+use PrestaShop\PrestaShop\Core\Grid\Definition\GridDefinition;
+use PrestaShop\PrestaShop\Core\Grid\Filter\Filter;
+use PrestaShop\PrestaShop\Core\Grid\Filter\GridFilterFormFactoryInterface;
+use PrestaShop\PrestaShop\Core\Grid\Grid;
+use PrestaShop\PrestaShop\Core\Grid\GridFactory;
+use PrestaShop\PrestaShop\Core\Grid\GridInterface;
+use PrestaShop\PrestaShop\Core\Grid\Search\SearchCriteriaInterface;
+use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
+use PrestaShop\PrestaShop\Core\Search\Filters\FeatureValueFilters;
+use PrestaShopBundle\Form\Admin\Type\SearchAndResetType;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+/**
+ * This class allows adapting the feature value grid definition with dynamic values
+ * which depends on values inside search filters (the name and actions that needs featureId and/or languageId)
+ */
+class FeatureValueGridFactory extends GridFactory
+{
+ use BulkDeleteActionTrait;
+
+ /**
+ * @param GridDefinitionFactoryInterface $definitionFactory
+ * @param GridDataFactoryInterface $dataFactory
+ * @param GridFilterFormFactoryInterface $filterFormFactory
+ * @param HookDispatcherInterface $hookDispatcher
+ * @param FeatureRepository $featureRepository
+ *
+ * @todo: after following ADR https://github.com/PrestaShop/ADR/pull/33,
+ * the Addapter/FeatureRepository usage should be replaced by interface
+ * and FeatureValueGridFactory should be removed from phpstan-disallowed-calls.neon "allowIn" section
+ */
+ public function __construct(
+ GridDefinitionFactoryInterface $definitionFactory,
+ GridDataFactoryInterface $dataFactory,
+ GridFilterFormFactoryInterface $filterFormFactory,
+ HookDispatcherInterface $hookDispatcher,
+ protected readonly FeatureRepository $featureRepository,
+ protected readonly TranslatorInterface $translator
+ ) {
+ parent::__construct($definitionFactory, $dataFactory, $filterFormFactory, $hookDispatcher);
+ }
+
+ public function getGrid(SearchCriteriaInterface $searchCriteria): GridInterface
+ {
+ if (!$searchCriteria instanceof FeatureValueFilters) {
+ throw new InvalidArgumentException(sprintf('Invalid search criteria. Expected "%s"', FeatureValueFilters::class));
+ }
+
+ /** @var GridDefinition $definition */
+ $definition = $this->definitionFactory->getDefinition();
+ $this->modifyDefinition($definition, $searchCriteria);
+
+ $this->hookDispatcher->dispatchWithParameters('action' . Container::camelize($definition->getId()) . 'GridDefinitionModifier', [
+ 'definition' => $definition,
+ ]);
+
+ $data = $this->dataFactory->getData($searchCriteria);
+
+ $this->hookDispatcher->dispatchWithParameters('action' . Container::camelize($definition->getId()) . 'GridDataModifier', [
+ 'data' => &$data,
+ ]);
+
+ $filterForm = $this->filterFormFactory->create($definition);
+ $filterForm->setData($searchCriteria->getFilters());
+
+ return new Grid(
+ $definition,
+ $data,
+ $searchCriteria,
+ $filterForm
+ );
+ }
+
+ /**
+ * Some modifications are needed in order to fill some required dynamic values coming from request (which are in filters like the $featureId)
+ *
+ * @param GridDefinition $definition
+ * @param FeatureValueFilters $featureValueFilters
+ *
+ * @return void
+ */
+ protected function modifyDefinition(GridDefinition $definition, FeatureValueFilters $featureValueFilters): void
+ {
+ $definition->setName($this->featureRepository->getFeatureName(
+ new FeatureId($featureValueFilters->getFeatureId()),
+ new LanguageId($featureValueFilters->getLanguageId())
+ ));
+
+ $this->addFilters($definition, $featureValueFilters);
+ $this->addGridActions($definition, $featureValueFilters);
+ $this->addBulkActions($definition, $featureValueFilters);
+ }
+
+ /**
+ * Add filter rows which requires dynamic values from request such as $featureId.
+ *
+ * @param GridDefinition $definition
+ * @param FeatureValueFilters $featureValueFilters
+ *
+ * @return void
+ */
+ protected function addFilters(GridDefinition $definition, FeatureValueFilters $featureValueFilters): void
+ {
+ $definition->getFilters()->add((new Filter('actions', SearchAndResetType::class))
+ // these action options are added in FeatureValueGridFactory, because they are dynamic and depend on filters
+ ->setAssociatedColumn('actions')
+ ->setTypeOptions([
+ 'reset_route' => 'admin_common_reset_search_by_filter_id',
+ 'reset_route_params' => [
+ 'filterId' => $definition->getId(),
+ ],
+ 'redirect_route' => 'admin_feature_values_index',
+ 'redirect_route_params' => [
+ 'featureId' => $featureValueFilters->getFeatureId(),
+ ],
+ ])
+ );
+ }
+
+ /**
+ * Most of these actions could have been added statically in definition factory, but the export action requires
+ * $featureId which comes from filters, therefore to maintain actions order and avoid complication we fill all of those actions here.
+ *
+ * @param GridDefinition $definition
+ * @param FeatureValueFilters $featureValueFilters
+ *
+ * @return void
+ */
+ protected function addGridActions(GridDefinition $definition, FeatureValueFilters $featureValueFilters): void
+ {
+ $definition->getGridActions()
+ ->add((new LinkGridAction('import'))
+ ->setName($this->translator->trans('Import', [], 'Admin.Actions'))
+ ->setIcon('cloud_upload')
+ ->setOptions([
+ 'route' => 'admin_import',
+ 'route_params' => [
+ 'import_type' => 'features',
+ ],
+ ])
+ )
+ ->add((new LinkGridAction('export'))
+ ->setName($this->translator->trans('Export', [], 'Admin.Actions'))
+ ->setIcon('cloud_download')
+ ->setOptions([
+ 'route' => 'admin_feature_values_export',
+ 'route_params' => [
+ 'featureId' => $featureValueFilters->getFeatureId(),
+ ],
+ ])
+ )
+ ->add((new SimpleGridAction('common_refresh_list'))
+ ->setName($this->translator->trans('Refresh list', [], 'Admin.Advparameters.Feature'))
+ ->setIcon('refresh')
+ )
+ ->add((new SimpleGridAction('common_show_query'))
+ ->setName($this->translator->trans('Show SQL query', [], 'Admin.Actions'))
+ ->setIcon('code')
+ )
+ ->add((new SimpleGridAction('common_export_sql_manager'))
+ ->setName($this->translator->trans('Export to SQL Manager', [], 'Admin.Actions'))
+ ->setIcon('storage')
+ );
+ }
+
+ /**
+ * Adds bulk actions which requires featureId value from filters
+ *
+ * @param GridDefinition $definition
+ * @param FeatureValueFilters $featureValueFilters
+ *
+ * @return void
+ */
+ protected function addBulkActions(GridDefinition $definition, FeatureValueFilters $featureValueFilters): void
+ {
+ $definition->getBulkActions()->add($this->buildBulkDeleteAction('admin_feature_values_bulk_delete', [
+ 'route_params' => [
+ 'featureId' => $featureValueFilters->getFeatureId(),
+ ],
+ ]));
+ }
+
+ protected function trans($id, array $options, $domain): string
+ {
+ return $this->translator->trans($id, $options, $domain);
+ }
+}
diff --git a/src/Core/Grid/Filter/CategoryFilterFormFactory.php b/src/Core/Grid/Filter/CategoryFilterFormFactory.php
index 5d540cbec60ad..86a8119b3e2d9 100644
--- a/src/Core/Grid/Filter/CategoryFilterFormFactory.php
+++ b/src/Core/Grid/Filter/CategoryFilterFormFactory.php
@@ -83,7 +83,7 @@ public function create(GridDefinitionInterface $definition)
foreach ($categoryFilterForm as $categoryFormItem) {
$newCategoryFormBuilder->add(
$categoryFormItem->getName(),
- get_class($categoryFormItem->getConfig()->getType()->getInnerType()),
+ $categoryFormItem->getConfig()->getType()->getInnerType()::class,
$categoryFormItem->getConfig()->getOptions()
);
}
diff --git a/src/Core/Grid/Filter/CmsPageFilterFormFactory.php b/src/Core/Grid/Filter/CmsPageFilterFormFactory.php
index 4a5f98bd077a8..7d2ba72b52f7f 100644
--- a/src/Core/Grid/Filter/CmsPageFilterFormFactory.php
+++ b/src/Core/Grid/Filter/CmsPageFilterFormFactory.php
@@ -83,7 +83,7 @@ public function create(GridDefinitionInterface $definition)
foreach ($cmsPageCategoryFilterForm as $categoryFormItem) {
$newCmsPageCategoryFormBuilder->add(
$categoryFormItem->getName(),
- get_class($categoryFormItem->getConfig()->getType()->getInnerType()),
+ $categoryFormItem->getConfig()->getType()->getInnerType()::class,
$categoryFormItem->getConfig()->getOptions()
);
}
diff --git a/src/Core/Grid/Filter/FilterFormFactoryFormActionDecorator.php b/src/Core/Grid/Filter/FilterFormFactoryFormActionDecorator.php
index 1f3dd3ffa9f8e..f380b49075fd9 100644
--- a/src/Core/Grid/Filter/FilterFormFactoryFormActionDecorator.php
+++ b/src/Core/Grid/Filter/FilterFormFactoryFormActionDecorator.php
@@ -82,7 +82,7 @@ public function create(GridDefinitionInterface $definition)
foreach ($filterForm as $formItem) {
$formBuilder->add(
$formItem->getName(),
- get_class($formItem->getConfig()->getType()->getInnerType()),
+ $formItem->getConfig()->getType()->getInnerType()::class,
$formItem->getConfig()->getOptions()
);
}
diff --git a/src/Core/Grid/GridFactory.php b/src/Core/Grid/GridFactory.php
index bc84beeefeb19..13ae59f3d2277 100644
--- a/src/Core/Grid/GridFactory.php
+++ b/src/Core/Grid/GridFactory.php
@@ -36,28 +36,8 @@
/**
* Class GridFactory is responsible for creating final Grid instance.
*/
-final class GridFactory implements GridFactoryInterface
+class GridFactory implements GridFactoryInterface
{
- /**
- * @var GridDefinitionFactoryInterface
- */
- private $definitionFactory;
-
- /**
- * @var GridDataFactoryInterface
- */
- private $dataFactory;
-
- /**
- * @var GridFilterFormFactoryInterface
- */
- private $filterFormFactory;
-
- /**
- * @var HookDispatcherInterface
- */
- private $hookDispatcher;
-
/**
* @param GridDefinitionFactoryInterface $definitionFactory
* @param GridDataFactoryInterface $dataFactory
@@ -65,21 +45,17 @@ final class GridFactory implements GridFactoryInterface
* @param HookDispatcherInterface $hookDispatcher
*/
public function __construct(
- GridDefinitionFactoryInterface $definitionFactory,
- GridDataFactoryInterface $dataFactory,
- GridFilterFormFactoryInterface $filterFormFactory,
- HookDispatcherInterface $hookDispatcher
+ protected readonly GridDefinitionFactoryInterface $definitionFactory,
+ protected readonly GridDataFactoryInterface $dataFactory,
+ protected readonly GridFilterFormFactoryInterface $filterFormFactory,
+ protected readonly HookDispatcherInterface $hookDispatcher
) {
- $this->definitionFactory = $definitionFactory;
- $this->dataFactory = $dataFactory;
- $this->filterFormFactory = $filterFormFactory;
- $this->hookDispatcher = $hookDispatcher;
}
/**
* {@inheritdoc}
*/
- public function getGrid(SearchCriteriaInterface $searchCriteria)
+ public function getGrid(SearchCriteriaInterface $searchCriteria): GridInterface
{
$definition = $this->definitionFactory->getDefinition();
$data = $this->dataFactory->getData($searchCriteria);
diff --git a/src/Core/Grid/GridFactoryInterface.php b/src/Core/Grid/GridFactoryInterface.php
index 8f45dfb3cc872..45d85bd84340c 100644
--- a/src/Core/Grid/GridFactoryInterface.php
+++ b/src/Core/Grid/GridFactoryInterface.php
@@ -40,5 +40,5 @@ interface GridFactoryInterface
*
* @return GridInterface
*/
- public function getGrid(SearchCriteriaInterface $searchCriteria);
+ public function getGrid(SearchCriteriaInterface $searchCriteria): GridInterface;
}
diff --git a/src/Core/Grid/Query/AbstractDoctrineQueryBuilder.php b/src/Core/Grid/Query/AbstractDoctrineQueryBuilder.php
index 65f3e2d0ad37f..013b263cd54dc 100644
--- a/src/Core/Grid/Query/AbstractDoctrineQueryBuilder.php
+++ b/src/Core/Grid/Query/AbstractDoctrineQueryBuilder.php
@@ -33,24 +33,14 @@
*/
abstract class AbstractDoctrineQueryBuilder implements DoctrineQueryBuilderInterface
{
- /**
- * @var Connection
- */
- protected $connection;
-
- /**
- * @var string
- */
- protected $dbPrefix;
-
/**
* @param Connection $connection
* @param string $dbPrefix
*/
- public function __construct(Connection $connection, $dbPrefix)
- {
- $this->connection = $connection;
- $this->dbPrefix = $dbPrefix;
+ public function __construct(
+ protected readonly Connection $connection,
+ protected readonly string $dbPrefix
+ ) {
}
/**
diff --git a/src/Core/Grid/Query/ApiAccessQueryBuilder.php b/src/Core/Grid/Query/ApiAccessQueryBuilder.php
new file mode 100644
index 0000000000000..be4e0117ba810
--- /dev/null
+++ b/src/Core/Grid/Query/ApiAccessQueryBuilder.php
@@ -0,0 +1,122 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Grid\Query;
+
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Query\QueryBuilder;
+use InvalidArgumentException;
+use PrestaShop\PrestaShop\Core\Grid\Search\SearchCriteriaInterface;
+use PrestaShop\PrestaShop\Core\Search\Filters\ApiAccessesFilters;
+
+/**
+ * Class ApiAccessQueryBuilder builds search & count queries for api access grid.
+ */
+class ApiAccessQueryBuilder extends AbstractDoctrineQueryBuilder
+{
+ /**
+ * @var DoctrineSearchCriteriaApplicator
+ */
+ private $searchCriteriaApplicator;
+
+ /**
+ * @param Connection $connection
+ * @param string $dbPrefix
+ * @param DoctrineSearchCriteriaApplicator $searchCriteriaApplicator
+ */
+ public function __construct(
+ Connection $connection,
+ string $dbPrefix,
+ DoctrineSearchCriteriaApplicator $searchCriteriaApplicator
+ ) {
+ parent::__construct($connection, $dbPrefix);
+
+ $this->searchCriteriaApplicator = $searchCriteriaApplicator;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria): QueryBuilder
+ {
+ if (!$searchCriteria instanceof ApiAccessesFilters) {
+ throw new InvalidArgumentException(
+ sprintf(
+ 'Expected %s, but got %s',
+ ApiAccessesFilters::class, get_class($searchCriteria)
+ )
+ );
+ }
+
+ $applicationId = $searchCriteria->getApplicationId();
+ $queryBuilder = $this->getQueryBuilder()
+ ->select('aa.*')
+ ->from($this->dbPrefix . 'api_access', 'aa')
+ ->where('aa.id_authorized_application = :applicationId')
+ ->setParameter('applicationId', $applicationId);
+
+ $this->searchCriteriaApplicator
+ ->applyPagination($searchCriteria, $queryBuilder)
+ ->applySorting($searchCriteria, $queryBuilder);
+
+ return $queryBuilder;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getCountQueryBuilder(SearchCriteriaInterface $searchCriteria): QueryBuilder
+ {
+ if (!$searchCriteria instanceof ApiAccessesFilters) {
+ throw new InvalidArgumentException(
+ sprintf(
+ 'Expected %s, but got %s',
+ ApiAccessesFilters::class, get_class($searchCriteria)
+ )
+ );
+ }
+
+ $applicationId = $searchCriteria->getApplicationId();
+
+ return $this->getQueryBuilder()
+ ->select('COUNT(aa.id_api_access)')
+ ->from($this->dbPrefix . 'api_access', 'aa')
+ ->where('aa.id_authorized_application = :applicationId')
+ ->setParameter('applicationId', $applicationId);
+ }
+
+ /**
+ * Get generic query builder.
+ *
+ * @return QueryBuilder
+ */
+ private function getQueryBuilder(): QueryBuilder
+ {
+ return $this->connection->createQueryBuilder();
+ }
+}
diff --git a/src/Core/Grid/Query/FeatureQueryBuilder.php b/src/Core/Grid/Query/FeatureQueryBuilder.php
index 6e2f3b7956ce2..7b1f3cef4bce4 100644
--- a/src/Core/Grid/Query/FeatureQueryBuilder.php
+++ b/src/Core/Grid/Query/FeatureQueryBuilder.php
@@ -77,8 +77,7 @@ public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria)
{
$qb = $this->getQueryBuilder($searchCriteria);
$qb
- ->select('f.id_feature, fl.name')
- ->addSelect('(f.position +1) AS position')
+ ->select('f.id_feature, fl.name, f.position')
->addSelect('COUNT(fv.id_feature_value) AS values_count')
->leftJoin(
'f',
diff --git a/src/Core/Grid/Query/FeatureValueQueryBuilder.php b/src/Core/Grid/Query/FeatureValueQueryBuilder.php
new file mode 100644
index 0000000000000..aaa18a9fcb3dd
--- /dev/null
+++ b/src/Core/Grid/Query/FeatureValueQueryBuilder.php
@@ -0,0 +1,120 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Grid\Query;
+
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Query\QueryBuilder;
+use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
+use PrestaShop\PrestaShop\Core\Grid\Search\SearchCriteriaInterface;
+use PrestaShop\PrestaShop\Core\Search\Filters\FeatureValueFilters;
+
+class FeatureValueQueryBuilder extends AbstractDoctrineQueryBuilder
+{
+ public function __construct(
+ Connection $connection,
+ string $dbPrefix,
+ protected readonly DoctrineSearchCriteriaApplicatorInterface $searchCriteriaApplicator
+ ) {
+ parent::__construct($connection, $dbPrefix);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria): QueryBuilder
+ {
+ $qb = $this->getQueryBuilder($searchCriteria)
+ ->select('fv.id_feature, fv.id_feature_value, fvl.value')
+ ->groupBy('fv.id_feature_value')
+ ;
+
+ $this->searchCriteriaApplicator
+ ->applyPagination($searchCriteria, $qb)
+ ->applySorting($searchCriteria, $qb)
+ ;
+
+ return $qb;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getCountQueryBuilder(SearchCriteriaInterface $searchCriteria): QueryBuilder
+ {
+ return $this->getQueryBuilder($searchCriteria)
+ ->select('COUNT(DISTINCT fv.id_feature_value)')
+ ;
+ }
+
+ /**
+ * @param SearchCriteriaInterface $searchCriteria
+ *
+ * @return QueryBuilder
+ *
+ * @throws InvalidArgumentException
+ */
+ private function getQueryBuilder(SearchCriteriaInterface $searchCriteria): QueryBuilder
+ {
+ if (!$searchCriteria instanceof FeatureValueFilters) {
+ throw new InvalidArgumentException(sprintf('Invalid search criteria type. Expected "%s"', FeatureValueFilters::class));
+ }
+
+ $filters = $searchCriteria->getFilters();
+ $allowedFilters = ['id_feature_value', 'value'];
+
+ $qb = $this->connection
+ ->createQueryBuilder()
+ ->from($this->dbPrefix . 'feature_value', 'fv')
+ ->where('fv.id_feature = :featureId')
+ ->setParameter('featureId', $searchCriteria->getFeatureId())
+ ->leftJoin(
+ 'fv',
+ $this->dbPrefix . 'feature_value_lang',
+ 'fvl',
+ 'fv.id_feature_value = fvl.id_feature_value AND fvl.id_lang = :langId'
+ )
+ ->setParameter('langId', $searchCriteria->getLanguageId())
+ ;
+
+ foreach ($filters as $filterName => $value) {
+ if (!in_array($filterName, $allowedFilters, true)) {
+ continue;
+ }
+
+ if ('value' === $filterName) {
+ $qb->andWhere('fvl.value LIKE :' . $filterName)
+ ->setParameter($filterName, '%' . $value . '%');
+ continue;
+ }
+
+ $qb->andWhere('fv.`' . $filterName . '` = :' . $filterName)
+ ->setParameter($filterName, $value);
+ }
+
+ return $qb;
+ }
+}
diff --git a/src/Core/Grid/Query/Monitoring/AbstractProductQueryBuilder.php b/src/Core/Grid/Query/Monitoring/AbstractProductQueryBuilder.php
index a536c66438f77..b740385ad46c9 100644
--- a/src/Core/Grid/Query/Monitoring/AbstractProductQueryBuilder.php
+++ b/src/Core/Grid/Query/Monitoring/AbstractProductQueryBuilder.php
@@ -38,16 +38,6 @@
*/
abstract class AbstractProductQueryBuilder extends AbstractDoctrineQueryBuilder
{
- /**
- * @var Connection
- */
- protected $connection;
-
- /**
- * @var string
- */
- protected $dbPrefix;
-
/**
* @var int
*/
diff --git a/src/Core/Grid/Query/ProductCombinationQueryBuilder.php b/src/Core/Grid/Query/ProductCombinationQueryBuilder.php
index 945b7a675bac3..23a340a1ac3bd 100644
--- a/src/Core/Grid/Query/ProductCombinationQueryBuilder.php
+++ b/src/Core/Grid/Query/ProductCombinationQueryBuilder.php
@@ -67,7 +67,7 @@ public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria)
throw new InvalidArgumentException(
sprintf(
'Expected %s, but got %s',
- ProductCombinationFilters::class, get_class($searchCriteria)
+ ProductCombinationFilters::class, $searchCriteria::class
)
);
}
@@ -99,7 +99,7 @@ public function getCountQueryBuilder(SearchCriteriaInterface $searchCriteria)
throw new InvalidArgumentException(
sprintf(
'Expected %s, but got %s',
- ProductCombinationFilters::class, get_class($searchCriteria)
+ ProductCombinationFilters::class, $searchCriteria::class
)
);
}
diff --git a/src/Core/Grid/Query/WebserviceKeyQueryBuilder.php b/src/Core/Grid/Query/WebserviceKeyQueryBuilder.php
index a82b8fc16e768..038b0bd75a7ef 100644
--- a/src/Core/Grid/Query/WebserviceKeyQueryBuilder.php
+++ b/src/Core/Grid/Query/WebserviceKeyQueryBuilder.php
@@ -71,7 +71,6 @@ public function __construct(
parent::__construct($connection, $dbPrefix);
$this->searchCriteriaApplicator = $searchCriteriaApplicator;
$this->contextShopIds = $contextShopIds;
- $this->connection = $connection;
$this->doctrineFilterApplicator = $doctrineFilterApplicator;
}
diff --git a/src/Core/Hook/Generator/HookDescriptionGenerator.php b/src/Core/Hook/Generator/HookDescriptionGenerator.php
index 0b994e9d9384b..e77f3de5b1c32 100644
--- a/src/Core/Hook/Generator/HookDescriptionGenerator.php
+++ b/src/Core/Hook/Generator/HookDescriptionGenerator.php
@@ -144,7 +144,7 @@ private function getTextWithHookId($description, $hookId)
*/
private function doesHookDescriptionContainsPlaceholder($description)
{
- return false !== strpos($description, '%s');
+ return str_contains($description, '%s');
}
/**
@@ -156,6 +156,6 @@ private function doesHookDescriptionContainsPlaceholder($description)
*/
private function doesPlaceholderIsTheFirstElementOfTheDescription($description)
{
- return 0 === strncmp($description, '%s', 2);
+ return str_starts_with($description, '%s');
}
}
diff --git a/src/Core/Import/EntityField/Provider/CombinationFieldsProvider.php b/src/Core/Import/EntityField/Provider/CombinationFieldsProvider.php
index 9a10b49bc3969..f84ad67f0a2f5 100644
--- a/src/Core/Import/EntityField/Provider/CombinationFieldsProvider.php
+++ b/src/Core/Import/EntityField/Provider/CombinationFieldsProvider.php
@@ -84,21 +84,6 @@ public function getCollection()
$this->trans('ID / Name of the store', 'Admin.Advparameters.Feature'),
$this->trans('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, the default store will be used.', 'Admin.Advparameters.Help')
),
- new EntityField(
- 'advanced_stock_management',
- $this->trans('Advanced stock management', 'Admin.Advparameters.Feature'),
- $this->trans('Enable advanced stock management on product (0 = No, 1 = Yes)', 'Admin.Advparameters.Help')
- ),
- new EntityField(
- 'depends_on_stock',
- $this->trans('Depends on stock', 'Admin.Advparameters.Feature'),
- $this->trans('0 = Use quantity set in product, 1 = Use quantity from warehouse.', 'Admin.Advparameters.Help')
- ),
- new EntityField(
- 'warehouse',
- $this->trans('Warehouse', 'Admin.Advparameters.Feature'),
- $this->trans('ID of the warehouse to set as storage.', 'Admin.Advparameters.Help')
- ),
];
return EntityFieldCollection::createFromArray($fields);
diff --git a/src/Core/Import/EntityField/Provider/ProductFieldsProvider.php b/src/Core/Import/EntityField/Provider/ProductFieldsProvider.php
index 44c950623fbb0..b7384b64f210f 100644
--- a/src/Core/Import/EntityField/Provider/ProductFieldsProvider.php
+++ b/src/Core/Import/EntityField/Provider/ProductFieldsProvider.php
@@ -148,30 +148,6 @@ public function getCollection()
'Admin.Advparameters.Help'
)
),
- new EntityField(
- 'advanced_stock_management',
- $this->trans('Advanced stock management', 'Admin.Advparameters.Feature'),
- $this->trans(
- 'Enable advanced stock management on product (0 = No, 1 = Yes).',
- 'Admin.Advparameters.Help'
- )
- ),
- new EntityField(
- 'depends_on_stock',
- $this->trans('Depends on stock', 'Admin.Advparameters.Feature'),
- $this->trans(
- '0 = Use quantity set in product, 1 = Use quantity from warehouse.',
- 'Admin.Advparameters.Help'
- )
- ),
- new EntityField(
- 'warehouse',
- $this->trans('Warehouse', 'Admin.Advparameters.Feature'),
- $this->trans(
- 'ID of the warehouse to set as storage.',
- 'Admin.Advparameters.Help'
- )
- ),
new EntityField('accessories', $this->trans('Accessories (x,y,z...)', 'Admin.Advparameters.Feature')),
];
diff --git a/src/Core/Import/File/FileRemoval.php b/src/Core/Import/File/FileRemoval.php
index cb2ab2a8bf928..61027d0307830 100644
--- a/src/Core/Import/File/FileRemoval.php
+++ b/src/Core/Import/File/FileRemoval.php
@@ -52,6 +52,7 @@ public function __construct(ImportDirectory $importDirectory)
public function remove($filename)
{
$fs = new Filesystem();
+ $filename = basename($filename);
$filesToRemove = [
$this->importDirectory . $filename,
$this->importDirectory . 'csvfromexcel/' . $filename,
diff --git a/src/Core/Language/ContextLanguageProviderInterface.php b/src/Core/Language/ContextLanguageProviderInterface.php
new file mode 100644
index 0000000000000..89dc36db5eabc
--- /dev/null
+++ b/src/Core/Language/ContextLanguageProviderInterface.php
@@ -0,0 +1,37 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Language;
+
+/**
+ * @experimental This will be refactored once the Context replacement architecture has been decided
+ */
+interface ContextLanguageProviderInterface
+{
+ public function getLanguageId(): int;
+}
diff --git a/src/Core/Localization/Currency/PatternTransformer.php b/src/Core/Localization/Currency/PatternTransformer.php
index 734b81c9403ef..fbc3a40519fe9 100644
--- a/src/Core/Localization/Currency/PatternTransformer.php
+++ b/src/Core/Localization/Currency/PatternTransformer.php
@@ -142,6 +142,6 @@ private function transformPattern(string $basePattern, string $transformationTyp
*/
private function getRtlCharacter(string $currencyPattern): string
{
- return (false !== strpos($currencyPattern, self::RTL_CHARACTER)) ? self::RTL_CHARACTER : '';
+ return (str_contains($currencyPattern, self::RTL_CHARACTER)) ? self::RTL_CHARACTER : '';
}
}
diff --git a/src/Core/Localization/Number/Formatter.php b/src/Core/Localization/Number/Formatter.php
index d00e168d128d9..c2c74fd2aa71e 100644
--- a/src/Core/Localization/Number/Formatter.php
+++ b/src/Core/Localization/Number/Formatter.php
@@ -115,7 +115,7 @@ public function format($number, NumberSpecification $specification)
$isNegative = $decimalNumber->isNegative();
$decimalNumber = $decimalNumber->toPositive();
- list($majorDigits, $minorDigits) = $this->extractMajorMinorDigits($decimalNumber);
+ [$majorDigits, $minorDigits] = $this->extractMajorMinorDigits($decimalNumber);
$majorDigits = $this->splitMajorGroups($majorDigits);
$minorDigits = $this->adjustMinorDigitsZeroes($minorDigits);
diff --git a/src/Core/Localization/RTL/StylesheetGenerator.php b/src/Core/Localization/RTL/StylesheetGenerator.php
index cdc91a4a79095..521c1b82f657e 100644
--- a/src/Core/Localization/RTL/StylesheetGenerator.php
+++ b/src/Core/Localization/RTL/StylesheetGenerator.php
@@ -108,9 +108,9 @@ public function generateInDirectory($directory, $regenerate = false)
private function shouldProcessFile($file, $regenerate)
{
return
- strpos($file, '/node_modules/') === false
+ !str_contains($file, '/node_modules/')
// rtl.css contains RTL override rules
- && strpos($file, 'rtl.css') === false
+ && !str_contains($file, 'rtl.css')
// does not end with .rtlfix
&& substr(rtrim($file, '.' . $this->fileType), -4) !== $this->rtlSuffix
// RTL file does not exist or we are regenerating them
diff --git a/src/Core/Model/Employee.php b/src/Core/Model/Employee.php
new file mode 100644
index 0000000000000..54e7375acdea6
--- /dev/null
+++ b/src/Core/Model/Employee.php
@@ -0,0 +1,113 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Model;
+
+/**
+ * Basic DTO class that implements EmployeeInterface
+ *
+ * @experimental Depends on ADR https://github.com/PrestaShop/ADR/pull/33
+ */
+class Employee implements EmployeeInterface
+{
+ public function __construct(
+ protected int $id,
+ protected int $profileId,
+ protected int $languageId,
+ protected string $firstName,
+ protected string $lastName,
+ protected string $email,
+ protected string $password,
+ protected string $imageUrl,
+ protected int $defaultTabId,
+ protected int $defaultShopId,
+ protected array $associatedShopIds,
+ protected array $associatedShopGroupIds,
+ ) {
+ }
+
+ public function getId(): int
+ {
+ return $this->id;
+ }
+
+ public function getProfileId(): int
+ {
+ return $this->profileId;
+ }
+
+ public function getLanguageId(): int
+ {
+ return $this->languageId;
+ }
+
+ public function getFirstName(): string
+ {
+ return $this->firstName;
+ }
+
+ public function getLastName(): string
+ {
+ return $this->lastName;
+ }
+
+ public function getEmail(): string
+ {
+ return $this->email;
+ }
+
+ public function getPassword(): string
+ {
+ return $this->password;
+ }
+
+ public function getImageUrl(): string
+ {
+ return $this->imageUrl;
+ }
+
+ public function getDefaultTabId(): int
+ {
+ return $this->defaultTabId;
+ }
+
+ public function getAssociatedShopIds(): array
+ {
+ return $this->associatedShopIds;
+ }
+
+ public function getDefaultShopId(): int
+ {
+ return $this->defaultShopId;
+ }
+
+ public function getAssociatedShopGroupIds(): array
+ {
+ return $this->associatedShopGroupIds;
+ }
+}
diff --git a/src/Core/Model/EmployeeInterface.php b/src/Core/Model/EmployeeInterface.php
new file mode 100644
index 0000000000000..489aa6ab0cad9
--- /dev/null
+++ b/src/Core/Model/EmployeeInterface.php
@@ -0,0 +1,59 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Model;
+
+/**
+ * @experimental Depends on ADR https://github.com/PrestaShop/ADR/pull/33
+ */
+interface EmployeeInterface
+{
+ public function getId(): int;
+
+ public function getProfileId(): int;
+
+ public function getLanguageId(): int;
+
+ public function getFirstName(): string;
+
+ public function getLastName(): string;
+
+ public function getEmail(): string;
+
+ public function getPassword(): string;
+
+ public function getImageUrl(): string;
+
+ public function getDefaultTabId(): int;
+
+ public function getDefaultShopId(): int;
+
+ public function getAssociatedShopIds(): array;
+
+ public function getAssociatedShopGroupIds(): array;
+}
diff --git a/src/Core/Model/Shop.php b/src/Core/Model/Shop.php
new file mode 100644
index 0000000000000..18e1638d097c7
--- /dev/null
+++ b/src/Core/Model/Shop.php
@@ -0,0 +1,107 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Model;
+
+/**
+ * Basic DTO class that implements ShopInterface
+ *
+ * @experimental Depends on ADR https://github.com/PrestaShop/ADR/pull/33
+ */
+class Shop implements ShopInterface
+{
+ public function __construct(
+ protected int $id,
+ protected string $name,
+ protected int $shopGroupId,
+ protected int $categoryId,
+ protected string $themeName,
+ protected string $color,
+ protected string $physicalUri,
+ protected string $virtualUri,
+ protected string $domain,
+ protected string $domainSSL,
+ protected bool $active,
+ ) {
+ }
+
+ public function getId(): int
+ {
+ return $this->id;
+ }
+
+ public function getName(): string
+ {
+ return $this->name;
+ }
+
+ public function getShopGroupId(): int
+ {
+ return $this->shopGroupId;
+ }
+
+ public function getCategoryId(): int
+ {
+ return $this->categoryId;
+ }
+
+ public function getThemeName(): string
+ {
+ return $this->themeName;
+ }
+
+ public function getColor(): string
+ {
+ return $this->color;
+ }
+
+ public function isActive(): bool
+ {
+ return $this->active;
+ }
+
+ public function getPhysicalUri(): string
+ {
+ return $this->physicalUri;
+ }
+
+ public function getVirtualUri(): string
+ {
+ return $this->virtualUri;
+ }
+
+ public function getDomain(): string
+ {
+ return $this->domain;
+ }
+
+ public function getDomainSSL(): string
+ {
+ return $this->domainSSL;
+ }
+}
diff --git a/src/Core/Model/ShopInterface.php b/src/Core/Model/ShopInterface.php
new file mode 100644
index 0000000000000..195bee7d1cee2
--- /dev/null
+++ b/src/Core/Model/ShopInterface.php
@@ -0,0 +1,57 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Model;
+
+/**
+ * @experimental Depends on ADR https://github.com/PrestaShop/ADR/pull/33
+ */
+interface ShopInterface
+{
+ public function getId(): int;
+
+ public function getName(): string;
+
+ public function getShopGroupId(): int;
+
+ public function getCategoryId(): int;
+
+ public function getThemeName(): string;
+
+ public function getColor(): string;
+
+ public function isActive(): bool;
+
+ public function getPhysicalUri(): string;
+
+ public function getVirtualUri(): string;
+
+ public function getDomain(): string;
+
+ public function getDomainSSL(): string;
+}
diff --git a/src/Core/Module/Configuration/PaymentRestrictionsConfigurator.php b/src/Core/Module/Configuration/PaymentRestrictionsConfigurator.php
index 2f5b4f92333dc..cbafb97bd63f9 100644
--- a/src/Core/Module/Configuration/PaymentRestrictionsConfigurator.php
+++ b/src/Core/Module/Configuration/PaymentRestrictionsConfigurator.php
@@ -118,7 +118,7 @@ public function configureCarrierRestrictions(array $carrierRestrictions)
*/
private function configureRestrictions($restrictionType, array $restrictions)
{
- list($moduleIds, $newConfiguration) = $this->parseRestrictionData($restrictions);
+ [$moduleIds, $newConfiguration] = $this->parseRestrictionData($restrictions);
$this->clearCurrentConfiguration($restrictionType, $moduleIds);
$this->insertNewConfiguration($restrictionType, $newConfiguration);
diff --git a/src/Core/Module/ModuleCollection.php b/src/Core/Module/ModuleCollection.php
index 87ef97f98c15e..19bcbcab5199e 100644
--- a/src/Core/Module/ModuleCollection.php
+++ b/src/Core/Module/ModuleCollection.php
@@ -43,6 +43,8 @@ class ModuleCollection implements ArrayAccess, Countable, IteratorAggregate
/** @var ModuleInterface[] */
private $modules = [];
+ private $errors = [];
+
public function __construct(array $modules = [])
{
foreach ($modules as $module) {
@@ -112,4 +114,19 @@ public function filter(callable $callable): ModuleCollection
{
return static::createFrom(array_filter($this->modules, $callable));
}
+
+ public function add(ModuleInterface $module): void
+ {
+ $this->modules[] = $module;
+ }
+
+ public function addError(\Throwable $error): void
+ {
+ $this->errors[] = $error;
+ }
+
+ public function getErrors(): array
+ {
+ return $this->errors;
+ }
}
diff --git a/src/Core/Module/ModuleRepository.php b/src/Core/Module/ModuleRepository.php
index f417dd7931848..6a468cd3d907b 100644
--- a/src/Core/Module/ModuleRepository.php
+++ b/src/Core/Module/ModuleRepository.php
@@ -74,23 +74,30 @@ class ModuleRepository implements ModuleRepositoryInterface
/** @var Module[] */
private $modulesFromHook;
+ /**
+ * @var int
+ */
+ private $contextLangId;
+
public function __construct(
ModuleDataProvider $moduleDataProvider,
AdminModuleDataProvider $adminModuleDataProvider,
CacheProvider $cacheProvider,
HookManager $hookManager,
- string $modulePath
+ string $modulePath,
+ int $contextLangId
) {
$this->moduleDataProvider = $moduleDataProvider;
$this->adminModuleDataProvider = $adminModuleDataProvider;
$this->cacheProvider = $cacheProvider;
$this->hookManager = $hookManager;
$this->modulePath = $modulePath;
+ $this->contextLangId = $contextLangId;
}
public function getList(): ModuleCollection
{
- $modules = [];
+ $modules = new ModuleCollection();
$modulesDirsList = (new Finder())->directories()
->in($this->modulePath)
->depth('== 0')
@@ -103,10 +110,10 @@ public function getList(): ModuleCollection
continue;
}
- $modules[] = $this->getModule($moduleName);
+ $modules->add($this->getModule($moduleName));
}
- return ModuleCollection::createFrom($this->addModulesFromHook($modules));
+ return $this->addModulesFromHook($modules);
}
public function getInstalledModules(): ModuleCollection
@@ -227,7 +234,7 @@ protected function getCacheKey(string $moduleName, ?int $shopId = null): string
{
$shop = $shopId ? [$shopId] : Shop::getContextListShopID();
- return $moduleName . implode('-', $shop);
+ return $moduleName . implode('-', $shop) . $this->contextLangId;
}
private function getModuleAttributes(string $moduleName, bool $isValid): array
@@ -280,6 +287,7 @@ private function getModuleDatabaseAttributes(string $moduleName): array
private function getModulesFromHook()
{
if ($this->modulesFromHook === null) {
+ // An array [module_name => module_output] will be returned
$modulesFromHook = $this->hookManager->exec('actionListModules', [], null, true);
$modulesFromHook = array_values($modulesFromHook ?? []);
@@ -292,13 +300,19 @@ private function getModulesFromHook()
}
/**
- * @param Module[] $modules
+ * @param ModuleCollection $modules
*
- * @return Module[]
+ * @return ModuleCollection
*/
- protected function addModulesFromHook(array $modules): array
+ protected function addModulesFromHook(ModuleCollection $modules): ModuleCollection
{
- $externalModules = $this->getModulesFromHook();
+ try {
+ $externalModules = $this->getModulesFromHook();
+ } catch (\Throwable $e) {
+ $modules->addError($e);
+
+ return $modules;
+ }
foreach ($externalModules as $externalModule) {
$merged = false;
@@ -309,7 +323,7 @@ protected function addModulesFromHook(array $modules): array
}
}
if (!$merged) {
- $modules[] = new Module($externalModule);
+ $modules->add(new Module($externalModule));
}
}
@@ -323,7 +337,12 @@ protected function addModulesFromHook(array $modules): array
*/
protected function enrichModuleAttributesFromHook(Module $module): ModuleInterface
{
- $modulesFromHook = $this->getModulesFromHook();
+ try {
+ $modulesFromHook = $this->getModulesFromHook();
+ } catch (\Throwable $e) {
+ return $module;
+ }
+
foreach ($modulesFromHook as $moduleFromHook) {
if ($module->get('name') === $moduleFromHook['name']) {
$module->getAttributes()->add($moduleFromHook);
diff --git a/src/Core/Product/Search/SortOrder.php b/src/Core/Product/Search/SortOrder.php
index fd822e8258d89..f1a9bd2197bfc 100644
--- a/src/Core/Product/Search/SortOrder.php
+++ b/src/Core/Product/Search/SortOrder.php
@@ -127,7 +127,7 @@ public static function newFromString($sortOrderConfiguration)
throw new CoreException('Invalid argument');
}
- list($entity, $field, $direction) = $sortParams;
+ [$entity, $field, $direction] = $sortParams;
return new static($entity, $field, $direction);
}
diff --git a/src/Core/QuickAccess/QuickAccessRepositoryInterface.php b/src/Core/QuickAccess/QuickAccessRepositoryInterface.php
new file mode 100644
index 0000000000000..003dde1977084
--- /dev/null
+++ b/src/Core/QuickAccess/QuickAccessRepositoryInterface.php
@@ -0,0 +1,44 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\QuickAccess;
+
+use PrestaShop\PrestaShop\Core\Domain\Language\ValueObject\LanguageId;
+
+/**
+ * Define the contract to access Quick Accesses.
+ */
+interface QuickAccessRepositoryInterface
+{
+ /**
+ * Returns the complete list of quick accesses.
+ *
+ * @param LanguageId $languageId
+ *
+ * @return array
+ */
+ public function fetchAll(LanguageId $languageId): array;
+}
diff --git a/src/Core/Repository/AbstractMultiShopObjectModelRepository.php b/src/Core/Repository/AbstractMultiShopObjectModelRepository.php
index 5db2a141a6cce..78b8834310e00 100644
--- a/src/Core/Repository/AbstractMultiShopObjectModelRepository.php
+++ b/src/Core/Repository/AbstractMultiShopObjectModelRepository.php
@@ -227,7 +227,7 @@ protected function deleteObjectModelFromShops(ObjectModel $objectModel, array $s
if (!$objectModel->delete()) {
throw new $exceptionClass(
- sprintf('Failed to delete %s #%d', get_class($objectModel), $objectModel->id),
+ sprintf('Failed to delete %s #%d', $objectModel::class, $objectModel->id),
$errorCode
);
}
@@ -235,7 +235,7 @@ protected function deleteObjectModelFromShops(ObjectModel $objectModel, array $s
throw new CoreException(
sprintf(
'Error occurred when trying to delete %s #%d [%s]',
- get_class($objectModel),
+ $objectModel::class,
$objectModel->id,
$e->getMessage()
),
diff --git a/src/Core/Repository/AbstractObjectModelRepository.php b/src/Core/Repository/AbstractObjectModelRepository.php
index 19ba563d6c229..955d7494bab61 100644
--- a/src/Core/Repository/AbstractObjectModelRepository.php
+++ b/src/Core/Repository/AbstractObjectModelRepository.php
@@ -94,7 +94,7 @@ protected function addObjectModel(ObjectModel $objectModel, string $exceptionCla
try {
if (!$objectModel->add()) {
throw new $exceptionClass(
- sprintf('Failed to add %s', get_class($objectModel)),
+ sprintf('Failed to add %s', $objectModel::class),
$errorCode
);
}
@@ -104,7 +104,7 @@ protected function addObjectModel(ObjectModel $objectModel, string $exceptionCla
throw new CoreException(
sprintf(
'Error occurred when trying to add %s [%s]',
- get_class($objectModel),
+ $objectModel::class,
$e->getMessage()
),
0,
@@ -129,7 +129,7 @@ protected function updateObjectModel(ObjectModel $objectModel, string $exception
try {
if (!$objectModel->update()) {
throw new $exceptionClass(
- sprintf('Failed to update %s #%d', get_class($objectModel), $objectModel->id),
+ sprintf('Failed to update %s #%d', $objectModel::class, $objectModel->id),
$errorCode
);
}
@@ -137,7 +137,7 @@ protected function updateObjectModel(ObjectModel $objectModel, string $exception
throw new CoreException(
sprintf(
'Error occurred when trying to update %s #%d [%s]',
- get_class($objectModel),
+ $objectModel::class,
$objectModel->id,
$e->getMessage()
),
@@ -179,7 +179,7 @@ protected function deleteObjectModel(ObjectModel $objectModel, string $exception
try {
if (!$objectModel->delete()) {
throw new $exceptionClass(
- sprintf('Failed to delete %s #%d', get_class($objectModel), $objectModel->id),
+ sprintf('Failed to delete %s #%d', $objectModel::class, $objectModel->id),
$errorCode
);
}
@@ -187,7 +187,7 @@ protected function deleteObjectModel(ObjectModel $objectModel, string $exception
throw new CoreException(
sprintf(
'Error occurred when trying to delete %s #%d [%s]',
- get_class($objectModel),
+ $objectModel::class,
$objectModel->id,
$e->getMessage()
),
@@ -209,7 +209,7 @@ protected function softDeleteObjectModel(ObjectModel $objectModel, string $excep
try {
if (!$objectModel->softDelete()) {
throw new $exceptionClass(
- sprintf('Failed to soft delete %s #%d', get_class($objectModel), $objectModel->id),
+ sprintf('Failed to soft delete %s #%d', $objectModel::class, $objectModel->id),
$errorCode
);
}
@@ -217,7 +217,7 @@ protected function softDeleteObjectModel(ObjectModel $objectModel, string $excep
throw new CoreException(
sprintf(
'Error occurred when trying to soft delete %s #%d [%s]',
- get_class($objectModel),
+ $objectModel::class,
$objectModel->id,
$e->getMessage()
),
diff --git a/admin-dev/themes/default/template/controllers/carts/helpers/view/index.php b/src/Core/Repository/TransactionManagerInterface.php
similarity index 76%
rename from admin-dev/themes/default/template/controllers/carts/helpers/view/index.php
rename to src/Core/Repository/TransactionManagerInterface.php
index 3de54df1f73e7..51c410b1f5e6a 100644
--- a/admin-dev/themes/default/template/controllers/carts/helpers/view/index.php
+++ b/src/Core/Repository/TransactionManagerInterface.php
@@ -24,12 +24,22 @@
* @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
*/
-header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+namespace PrestaShop\PrestaShop\Core\Repository;
-header('Cache-Control: no-store, no-cache, must-revalidate');
-header('Cache-Control: post-check=0, pre-check=0', false);
-header('Pragma: no-cache');
+interface TransactionManagerInterface
+{
+ /**
+ * Initiate a transaction
+ */
+ public function beginTransaction();
-header('Location: ../../../../../../../../');
-exit;
+ /**
+ * Commit a transaction
+ */
+ public function commit();
+
+ /**
+ * Rollback a transaction
+ */
+ public function rollback();
+}
diff --git a/src/Core/Search/Builder/AbstractRepositoryFiltersBuilder.php b/src/Core/Search/Builder/AbstractRepositoryFiltersBuilder.php
index 9bd3f7ec23a74..7577a1cf46675 100644
--- a/src/Core/Search/Builder/AbstractRepositoryFiltersBuilder.php
+++ b/src/Core/Search/Builder/AbstractRepositoryFiltersBuilder.php
@@ -77,7 +77,7 @@ public function setConfig(array $config)
$defaultController = $defaultAction = '';
if (isset($config['request']) && $config['request'] instanceof Request) {
$request = $config['request'];
- list($defaultController, $defaultAction) = ControllerAction::fromString($request->get('_controller'));
+ [$defaultController, $defaultAction] = ControllerAction::fromString($request->get('_controller'));
}
$this->controller = isset($config['controller']) ? $config['controller'] : $defaultController;
diff --git a/src/Core/Search/Builder/TypedBuilder/ApiAccessFiltersBuilder.php b/src/Core/Search/Builder/TypedBuilder/ApiAccessFiltersBuilder.php
new file mode 100644
index 0000000000000..d02334cfe12e7
--- /dev/null
+++ b/src/Core/Search/Builder/TypedBuilder/ApiAccessFiltersBuilder.php
@@ -0,0 +1,80 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder;
+
+use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
+use PrestaShop\PrestaShop\Core\Search\Builder\AbstractFiltersBuilder;
+use PrestaShop\PrestaShop\Core\Search\Filters;
+use PrestaShop\PrestaShop\Core\Search\Filters\ApiAccessesFilters;
+use Symfony\Component\HttpFoundation\Request;
+
+class ApiAccessFiltersBuilder extends AbstractFiltersBuilder implements TypedFiltersBuilderInterface
+{
+ /** @var Request */
+ private $request;
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setConfig(array $config)
+ {
+ $this->request = $config['request'] ?? null;
+
+ return parent::setConfig($config);
+ }
+
+ /**
+ * @throws InvalidArgumentException
+ */
+ public function buildFilters(Filters $filters = null)
+ {
+ $filterParameters = ApiAccessesFilters::getDefaults();
+ if (null !== $filters) {
+ $filterParameters = array_replace($filterParameters, $filters->all());
+ }
+
+ $applicationId = $this->getApplicationId();
+ $filterParameters['filters']['application_id'] = $applicationId;
+
+ return new ApiAccessesFilters($filterParameters);
+ }
+
+ private function getApplicationId()
+ {
+ return $this->request->attributes->getInt('applicationId');
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function supports(string $filterClassName): bool
+ {
+ return $filterClassName === ApiAccessesFilters::class;
+ }
+}
diff --git a/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php b/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php
new file mode 100644
index 0000000000000..461ed3f5197a7
--- /dev/null
+++ b/src/Core/Search/Builder/TypedBuilder/FeatureValueFiltersBuilder.php
@@ -0,0 +1,84 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder;
+
+use PrestaShop\PrestaShop\Core\Language\ContextLanguageProviderInterface;
+use PrestaShop\PrestaShop\Core\Search\Builder\AbstractFiltersBuilder;
+use PrestaShop\PrestaShop\Core\Search\Filters;
+use PrestaShop\PrestaShop\Core\Search\Filters\FeatureValueFilters;
+use Symfony\Component\HttpFoundation\Request;
+
+class FeatureValueFiltersBuilder extends AbstractFiltersBuilder implements TypedFiltersBuilderInterface
+{
+ private Request $request;
+
+ public function __construct(
+ protected readonly ContextLanguageProviderInterface $contextLanguageProvider
+ ) {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setConfig(array $config): FeatureValueFiltersBuilder
+ {
+ $this->request = $config['request'] ?? null;
+
+ return parent::setConfig($config);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function buildFilters(Filters $filters = null)
+ {
+ $filterParameters = FeatureValueFilters::getDefaults();
+ if (null !== $filters) {
+ $filterParameters = array_replace($filterParameters, $filters->all());
+ }
+
+ $filterParameters['filters']['feature_id'] = $this->getFeatureId();
+ $filterParameters['filters']['language_id'] = $this->contextLanguageProvider->getLanguageId();
+
+ return new FeatureValueFilters($filterParameters);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function supports(string $filterClassName): bool
+ {
+ return $filterClassName === FeatureValueFilters::class;
+ }
+
+ private function getFeatureId(): int
+ {
+ return $this->request->attributes->getInt('featureId');
+ }
+}
diff --git a/src/Core/Search/Filters/ApiAccessesFilters.php b/src/Core/Search/Filters/ApiAccessesFilters.php
new file mode 100644
index 0000000000000..04f060501b76d
--- /dev/null
+++ b/src/Core/Search/Filters/ApiAccessesFilters.php
@@ -0,0 +1,83 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Search\Filters;
+
+use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
+use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ApiAccessGridDefinitionFactory;
+use PrestaShop\PrestaShop\Core\Search\Filters;
+
+final class ApiAccessesFilters extends Filters
+{
+ /** @var string */
+ protected $filterId = ApiAccessGridDefinitionFactory::GRID_ID;
+
+ /**
+ * @var int
+ */
+ private $applicationId;
+
+ /**
+ * @param array $filters
+ * @param $filterId
+ *
+ * @throws InvalidArgumentException
+ */
+ public function __construct(array $filters = [], $filterId = '')
+ {
+ if (!isset($filters['filters']['application_id'])) {
+ throw new InvalidArgumentException(sprintf('%s filters expect a application_id filter', static::class));
+ }
+
+ $this->applicationId = (int) $filters['filters']['application_id'];
+
+ parent::__construct($filters, $filterId);
+ }
+
+ /**
+ * @return int
+ */
+ public function getApplicationId(): int
+ {
+ return $this->applicationId;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function getDefaults(): array
+ {
+ return [
+ 'limit' => 10,
+ 'offset' => 0,
+ 'orderBy' => 'id_api_access',
+ 'sortOrder' => 'desc',
+ 'filters' => [],
+ ];
+ }
+}
diff --git a/src/Core/Search/Filters/FeatureValueFilters.php b/src/Core/Search/Filters/FeatureValueFilters.php
new file mode 100644
index 0000000000000..84a9986d62297
--- /dev/null
+++ b/src/Core/Search/Filters/FeatureValueFilters.php
@@ -0,0 +1,87 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShop\PrestaShop\Core\Search\Filters;
+
+use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
+use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureValueGridDefinitionFactory;
+use PrestaShop\PrestaShop\Core\Search\Filters;
+
+class FeatureValueFilters extends Filters
+{
+ /** @var string */
+ protected $filterId = FeatureValueGridDefinitionFactory::GRID_ID;
+
+ /**
+ * @var int
+ */
+ protected $featureId;
+
+ /**
+ * @var int
+ */
+ protected $languageId;
+
+ public function __construct(array $filters = [])
+ {
+ if (!isset($filters['filters']['feature_id'])) {
+ throw new InvalidArgumentException(sprintf('%s filters expect a feature_id filter', static::class));
+ }
+
+ if (!isset($filters['filters']['language_id'])) {
+ throw new InvalidArgumentException(sprintf('%s filters expect a language_id filter', static::class));
+ }
+
+ $this->featureId = (int) $filters['filters']['feature_id'];
+ $this->languageId = (int) $filters['filters']['language_id'];
+
+ parent::__construct($filters, $this->filterId);
+ }
+
+ public function getFeatureId(): int
+ {
+ return $this->featureId;
+ }
+
+ public function getLanguageId(): int
+ {
+ return $this->languageId;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function getDefaults(): array
+ {
+ return [
+ 'limit' => self::LIST_LIMIT,
+ 'offset' => 0,
+ 'orderBy' => 'value',
+ 'sortOrder' => 'asc',
+ 'filters' => [],
+ ];
+ }
+}
diff --git a/src/Core/Search/SearchPanel.php b/src/Core/Search/SearchPanel.php
index 506bc5d10aa6d..0aeaaf223e497 100644
--- a/src/Core/Search/SearchPanel.php
+++ b/src/Core/Search/SearchPanel.php
@@ -49,17 +49,23 @@ class SearchPanel implements SearchPanelInterface
* @var array
*/
protected $queryParams;
+ /**
+ * @var bool|null
+ */
+ private $isExternalLink;
public function __construct(
string $title,
string $buttonLabel,
string $link,
- array $queryParams
+ array $queryParams,
+ ?bool $isExternalLink = true
) {
$this->title = $title;
$this->buttonLabel = $buttonLabel;
$this->link = $link;
$this->queryParams = $queryParams;
+ $this->isExternalLink = $isExternalLink;
}
public function getTitle(): string
@@ -76,4 +82,9 @@ public function getLink(): string
{
return sprintf('%s?%s', $this->link, http_build_query($this->queryParams));
}
+
+ public function isExternalLink(): bool
+ {
+ return $this->isExternalLink;
+ }
}
diff --git a/src/Core/Search/SearchPanelInterface.php b/src/Core/Search/SearchPanelInterface.php
index 7e6f34e269169..3c4bcb27d995b 100644
--- a/src/Core/Search/SearchPanelInterface.php
+++ b/src/Core/Search/SearchPanelInterface.php
@@ -33,4 +33,6 @@ public function getTitle(): string;
public function getButtonLabel(): string;
public function getLink(): string;
+
+ public function isExternalLink(): bool;
}
diff --git a/src/Core/Security/OAuth2/ApiRequestMatcher.php b/src/Core/Security/OAuth2/ApiRequestMatcher.php
new file mode 100644
index 0000000000000..6fb31334b4162
--- /dev/null
+++ b/src/Core/Security/OAuth2/ApiRequestMatcher.php
@@ -0,0 +1,52 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Security\OAuth2;
+
+use ApiPlatform\Action\PlaceholderAction;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestMatcherInterface;
+
+/**
+ * Additional checker for api firewall, the pattern /api is too wide and matches
+ * with existing legacy APIs so we add a more detailed condition that the URI pattern
+ * matches AND it's an API handled by ApiPlatform.
+ *
+ * The legacy APIs should be moved/modified to use another prefix, then this matcher
+ * can be removed as it will be overkill.
+ */
+class ApiRequestMatcher implements RequestMatcherInterface
+{
+ public function matches(Request $request)
+ {
+ return in_array(
+ $request->attributes->get('_controller'),
+ [PlaceholderAction::class, 'api_platform.action.placeholder']
+ );
+ }
+}
diff --git a/src/Core/Security/TokenAuthenticator.php b/src/Core/Security/TokenAuthenticator.php
index 4d057740dee14..d63acea3c9cd2 100644
--- a/src/Core/Security/TokenAuthenticator.php
+++ b/src/Core/Security/TokenAuthenticator.php
@@ -28,6 +28,9 @@
namespace PrestaShop\PrestaShop\Core\Security;
+use Lcobucci\JWT\Encoding\JoseEncoder;
+use Lcobucci\JWT\Token\InvalidTokenStructure;
+use Lcobucci\JWT\Token\Parser;
use PrestaShop\PrestaShop\Core\Security\OAuth2\ResourceServerInterface;
use Psr\Http\Message\ServerRequestInterface;
use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
@@ -69,6 +72,20 @@ public function start(Request $request, AuthenticationException $authException =
public function supports(Request $request): bool
{
+ try {
+ $authorization = $request->headers->get('Authorization') ?? null;
+ if (null === $authorization) {
+ return false;
+ }
+ $explode = explode(' ', $authorization);
+ if (count($explode) >= 2) {
+ $token = $explode[1];
+ (new Parser(new JoseEncoder()))->parse($token);
+ }
+ } catch (InvalidTokenStructure $e) {
+ return false;
+ }
+
// Every request to the API should be handled by this Authenticator
return true;
}
diff --git a/src/Core/Shop/LogoUploader.php b/src/Core/Shop/LogoUploader.php
index bb087ec23d326..fdba87c8dfa38 100644
--- a/src/Core/Shop/LogoUploader.php
+++ b/src/Core/Shop/LogoUploader.php
@@ -31,8 +31,8 @@
use ImageManager;
use PrestaShop\PrestaShop\Core\Domain\Shop\DTO\ShopLogoSettings;
use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
use PrestaShop\PrestaShop\Core\Image\ImageFormatConfigurationInterface;
-use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
use PrestaShopException;
use Shop;
use Tools;
@@ -42,47 +42,23 @@
*/
class LogoUploader
{
- /**
- * @var Shop
- */
- private $shop;
-
/**
* @var array
*/
private $errors = [];
- /**
- * @var ImageFormatConfigurationInterface
- */
- private $imageFormatConfiguration;
-
- /**
- * @var string
- */
- private $imageDirection;
-
- /**
- * @var FeatureFlagRepository
- */
- private $featureFlagRepository;
-
public function __construct(
- Shop $shop,
- ImageFormatConfigurationInterface $imageFormatConfiguration,
- FeatureFlagRepository $featureFlagRepository,
- string $imageDirection
+ private Shop $shop,
+ private ImageFormatConfigurationInterface $imageFormatConfiguration,
+ private FeatureFlagStateCheckerInterface $featureFlagStateChecker,
+ private string $imageDirection
) {
- $this->shop = $shop;
- $this->imageFormatConfiguration = $imageFormatConfiguration;
- $this->imageDirection = $imageDirection;
- $this->featureFlagRepository = $featureFlagRepository;
}
public function updateHeader()
{
if ($this->update('PS_LOGO', 'logo')) {
- list($width, $height) = getimagesize($this->imageDirection . Configuration::get('PS_LOGO'));
+ [$width, $height] = getimagesize($this->imageDirection . Configuration::get('PS_LOGO'));
Configuration::updateValue('SHOP_LOGO_HEIGHT', (int) round($height));
Configuration::updateValue('SHOP_LOGO_WIDTH', (int) round($width));
}
@@ -160,7 +136,7 @@ public function update($fieldName, $logoPrefix, array $files = [])
*
* In case of .jpg images, the actual format inside is decided by ImageManager.
*/
- if ($this->featureFlagRepository->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) {
+ if ($this->featureFlagStateChecker->isEnabled(FeatureFlagSettings::FEATURE_FLAG_MULTIPLE_IMAGE_FORMAT)) {
$configuredImageFormats = $this->imageFormatConfiguration->getGenerationFormats();
} else {
$configuredImageFormats = ['jpg'];
diff --git a/src/Core/Stock/StockManager.php b/src/Core/Stock/StockManager.php
index 816fc9d4d26c1..9b24ff671186e 100644
--- a/src/Core/Stock/StockManager.php
+++ b/src/Core/Stock/StockManager.php
@@ -143,7 +143,7 @@ public function updatePacksQuantityContainingProduct($product, $id_product_attri
* If Product is contained in a Pack, Pack could be decreased or not (only if sub product stocks become not sufficient).
*
* @param Product $product The product to update its stockAvailable
- * @param int $id_product_attribute The declinaison to update (null if not)
+ * @param int|null $id_product_attribute The declinaison to update (null if not)
* @param int $delta_quantity The quantity change (positive or negative)
* @param int|null $id_shop Optional
* @param bool $add_movement Optional
@@ -400,10 +400,6 @@ private function prepareMovement($productId, $productAttributeId, $deltaQuantity
$stockMvt->setIdStockMvtReason((int) $params['id_stock_mvt_reason']);
}
- if (!empty($params['id_supply_order'])) {
- $stockMvt->setIdSupplyOrder((int) $params['id_supply_order']);
- }
-
$stockMvt->setSign($deltaQuantity >= 1 ? 1 : -1);
$stockMvt->setPhysicalQuantity(abs($deltaQuantity));
diff --git a/src/Core/Translation/Builder/Map/Catalogue.php b/src/Core/Translation/Builder/Map/Catalogue.php
index 7306e1fcd4997..bb20370c0ce69 100644
--- a/src/Core/Translation/Builder/Map/Catalogue.php
+++ b/src/Core/Translation/Builder/Map/Catalogue.php
@@ -152,7 +152,7 @@ private function updateCounters(array &$subtree): array
}
// update child and get its counters
- list($count, $missing) = $this->updateCounters($subtree[$key]);
+ [$count, $missing] = $this->updateCounters($subtree[$key]);
// update this tree's counters by adding the child's
$subtree[self::METADATA_KEY_NAME]['count'] += $count;
diff --git a/src/Core/Translation/Builder/Map/Message.php b/src/Core/Translation/Builder/Map/Message.php
index 0c0bd6a62b23c..b232d0bf93d48 100644
--- a/src/Core/Translation/Builder/Map/Message.php
+++ b/src/Core/Translation/Builder/Map/Message.php
@@ -135,9 +135,9 @@ private function containsWord(string $s): bool
$s = strtolower($s);
return
- false !== strpos(strtolower($this->defaultTranslation), $s)
- || (null !== $this->fileTranslation && false !== strpos(strtolower($this->fileTranslation), $s))
- || (null !== $this->userTranslation && false !== strpos(strtolower($this->userTranslation), $s))
+ str_contains(strtolower($this->defaultTranslation), $s)
+ || (null !== $this->fileTranslation && str_contains(strtolower($this->fileTranslation), $s))
+ || (null !== $this->userTranslation && str_contains(strtolower($this->userTranslation), $s))
;
}
}
diff --git a/src/Core/Translation/Storage/Extractor/ThemeExtractor.php b/src/Core/Translation/Storage/Extractor/ThemeExtractor.php
index 2b37b9bcf4b52..5ca6ae39492bd 100644
--- a/src/Core/Translation/Storage/Extractor/ThemeExtractor.php
+++ b/src/Core/Translation/Storage/Extractor/ThemeExtractor.php
@@ -94,7 +94,7 @@ private function normalize(MessageCatalogue $catalogue): MessageCatalogue
foreach ($catalogue->getMetadata('', '') as $domain => $metadata) {
$newDomain = $this->normalizeDomain($domain);
foreach ($metadata as $key => $value) {
- $newCatalogue->setMetadata($key, $value, $newDomain);
+ $newCatalogue->setMetadata((string) $key, $value, $newDomain);
}
}
diff --git a/src/Core/Translation/Storage/Finder/TranslationFinder.php b/src/Core/Translation/Storage/Finder/TranslationFinder.php
index 7502fe8d58609..c5218da2ff934 100644
--- a/src/Core/Translation/Storage/Finder/TranslationFinder.php
+++ b/src/Core/Translation/Storage/Finder/TranslationFinder.php
@@ -149,7 +149,7 @@ private function getDomainFromFile(SplFileInfo $file, string $locale): string
$basename = $file->getBasename('.xlf');
$domain = $basename;
- if (strpos($basename, $locale) === false) {
+ if (!str_contains($basename, $locale)) {
$domain .= '.' . $locale;
}
diff --git a/src/Core/Util/DateTime/NullDateTime.php b/src/Core/Util/DateTime/NullDateTime.php
index b6becedfd2eb8..dacc00e356384 100644
--- a/src/Core/Util/DateTime/NullDateTime.php
+++ b/src/Core/Util/DateTime/NullDateTime.php
@@ -67,7 +67,7 @@ public function format($format): string
}
throw new RuntimeException(
- sprintf('Format "%s" is not supported by %s', $format, get_class($this))
+ sprintf('Format "%s" is not supported by %s', $format, static::class)
);
}
diff --git a/src/Core/Util/String/StringValidator.php b/src/Core/Util/String/StringValidator.php
index b252069e94928..8a6f079e5b64e 100644
--- a/src/Core/Util/String/StringValidator.php
+++ b/src/Core/Util/String/StringValidator.php
@@ -36,7 +36,7 @@ final class StringValidator implements StringValidatorInterface
*/
public function startsWith($string, $prefix)
{
- return strpos($string, $prefix) === 0;
+ return str_starts_with($string, $prefix);
}
/**
diff --git a/src/Core/Webservice/ServerRequirementsChecker.php b/src/Core/Webservice/ServerRequirementsChecker.php
index abef090a31d1e..a01b9f8d3705f 100644
--- a/src/Core/Webservice/ServerRequirementsChecker.php
+++ b/src/Core/Webservice/ServerRequirementsChecker.php
@@ -123,7 +123,7 @@ private function lookForIssues()
$issues[] = self::ISSUE_HTTPS_NOT_AVAILABLE;
}
- if (false === strpos($this->hostingInformation->getServerInformation()['version'], 'Apache')) {
+ if (!str_contains($this->hostingInformation->getServerInformation()['version'], 'Apache')) {
return $issues;
}
diff --git a/src/PrestaShopBundle/Api/Api.php b/src/PrestaShopBundle/Api/Api.php
index 3f36130527b30..83d8c0e499fee 100644
--- a/src/PrestaShopBundle/Api/Api.php
+++ b/src/PrestaShopBundle/Api/Api.php
@@ -33,7 +33,7 @@
*/
final class Api
{
- public const API_BASE_PATH = '/new-api';
+ public const API_BASE_PATH = '/api';
/**
* This class is not meant to be instantiated as it is used to access encoding constants only.
diff --git a/src/PrestaShopBundle/Api/QueryParamsCollection.php b/src/PrestaShopBundle/Api/QueryParamsCollection.php
index bc0ff86e375dc..900e80b13bae2 100644
--- a/src/PrestaShopBundle/Api/QueryParamsCollection.php
+++ b/src/PrestaShopBundle/Api/QueryParamsCollection.php
@@ -316,7 +316,7 @@ public function getSqlOrder()
$implodableOrder = [];
foreach ($this->queryParams['order'] as $order) {
- $descendingOrder = false !== strpos($order, 'desc');
+ $descendingOrder = str_contains($order, 'desc');
$filterColumn = $this->removeDirection($order);
$orderFiltered = '{' . $filterColumn . '}';
@@ -648,7 +648,7 @@ protected function appendSqlAttributesFilterParam($value, $sqlParams)
}
array_map(function ($index, $value) use (&$sqlParams) {
- list($idAttributeGroup, $idAttribute) = explode(':', $value);
+ [$idAttributeGroup, $idAttribute] = explode(':', $value);
$sqlParams['attribute_id_' . $index] = (string) $idAttribute;
$sqlParams['attribute_group_id_' . $index] = (string) $idAttributeGroup;
}, range(0, count($value) - 1), $value);
@@ -704,7 +704,7 @@ protected function appendSqlFeaturesFilterParam($value, $sqlParams)
}
array_map(function ($index, $value) use (&$sqlParams) {
- list($idFeature, $idFeatureValue) = explode(':', $value);
+ [$idFeature, $idFeatureValue] = explode(':', $value);
$sqlParams['feature_id_' . $index] = (string) $idFeature;
$sqlParams['feature_value_id_' . $index] = (string) $idFeatureValue;
}, range(0, count($value) - 1), $value);
diff --git a/src/PrestaShopBundle/ApiPlatform/Decorator/AttributesResourceMetadataCollectionFactoryDecorator.php b/src/PrestaShopBundle/ApiPlatform/Decorator/AttributesResourceMetadataCollectionFactoryDecorator.php
new file mode 100644
index 0000000000000..8c5d14afbdc93
--- /dev/null
+++ b/src/PrestaShopBundle/ApiPlatform/Decorator/AttributesResourceMetadataCollectionFactoryDecorator.php
@@ -0,0 +1,89 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\ApiPlatform\Decorator;
+
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
+use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
+
+/** Decorate Api platform's ResourceMetadataCollectionFactory, so we can alter the results it returns */
+class AttributesResourceMetadataCollectionFactoryDecorator implements ResourceMetadataCollectionFactoryInterface
+{
+ private ResourceMetadataCollectionFactoryInterface $innerFactory;
+
+ public function __construct(ResourceMetadataCollectionFactoryInterface $innerFactory)
+ {
+ $this->innerFactory = $innerFactory;
+ }
+
+ public function create(string $resourceClass): ResourceMetadataCollection
+ {
+ // We call the original method since we only want to alter the result of this method.
+ $resourceMetadataCollection = $this->innerFactory->create($resourceClass);
+
+ /** @var ApiResource $resourceMetadata */
+ foreach ($resourceMetadataCollection as $resourceMetadata) {
+ $operations = $resourceMetadata->getOperations();
+ /** @var Operation $operation */
+ foreach ($operations as $key => $operation) {
+ $extraProperties = $operation->getExtraProperties();
+ if (array_key_exists('scopes', $extraProperties)) {
+ $scopesToAdd = $extraProperties['scopes'];
+ $modifiedOperationWithSecurity = $operation->withSecurity(
+ $this->translateScopeToSecurity($scopesToAdd, $operation->getSecurity())
+ );
+ // We unset the extra property scopes so that the element is not treated again.
+ unset($extraProperties['scopes']);
+ $modifiedOperation = $modifiedOperationWithSecurity->withExtraProperties($extraProperties);
+ // We remove the original element and replace it with our clone.
+ $operations->remove($key);
+ $operations->add($key, $modifiedOperation);
+ }
+ }
+ }
+
+ return $resourceMetadataCollection;
+ }
+
+ private function translateScopeToSecurity(array $scopes, ?string $existingSecurity): string
+ {
+ $security = '';
+ $arrayLength = count($scopes);
+ foreach ($scopes as $key => $scope) {
+ $security .= 'is_granted("ROLE_' . strtoupper($scope) . '")';
+ if ($key !== $arrayLength - 1) {
+ $security .= ' OR ';
+ }
+ }
+
+ return empty($existingSecurity) ? $security : sprintf('(%s) OR (%s)', $existingSecurity, $security);
+ }
+}
diff --git a/src/PrestaShopBundle/ApiPlatform/DomainSerializer.php b/src/PrestaShopBundle/ApiPlatform/DomainSerializer.php
new file mode 100644
index 0000000000000..1e442dbb4ad4e
--- /dev/null
+++ b/src/PrestaShopBundle/ApiPlatform/DomainSerializer.php
@@ -0,0 +1,140 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+declare(strict_types=1);
+
+namespace PrestaShopBundle\ApiPlatform;
+
+use ReflectionException;
+use ReflectionMethod;
+use Symfony\Component\PropertyAccess\PropertyAccess;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Component\Serializer\Serializer as SymfonySerializer;
+use Traversable;
+
+class DomainSerializer implements NormalizerInterface, DenormalizerInterface
+{
+ private SymfonySerializer $serializer;
+
+ /**
+ * @param Traversable $denormalizers
+ */
+ public function __construct(Traversable $denormalizers)
+ {
+ $this->serializer = new SymfonySerializer(iterator_to_array($denormalizers));
+ }
+
+ /**
+ * {@inheritdoc}
+ *
+ * @throws ReflectionException
+ */
+ public function denormalize($data, string $type, string $format = null, array $context = []): mixed
+ {
+ $dataConstruct = [];
+ $reflectionClass = new \ReflectionClass($type);
+ if ($reflectionClass->getConstructor()) {
+ $constructParameters = $reflectionClass->getConstructor()->getParameters();
+ foreach ($constructParameters as $constructParameter) {
+ if (isset($data[$constructParameter->getName()])) {
+ $dataConstruct[$constructParameter->getName()] = $data[$constructParameter->getName()];
+ unset($data[$constructParameter->getName()]);
+ }
+ }
+ }
+
+ $action = $this->serializer->denormalize($dataConstruct, $type, $format, $context);
+
+ $propertyAccessor = PropertyAccess::createPropertyAccessor();
+ //Try to call setters
+ foreach ($data as $param => $value) {
+ $parameters = [];
+ if ($reflectionMethod = $this->findSetterMethod($param, $type)) {
+ $methodParameters = $reflectionMethod->getParameters();
+ foreach ($methodParameters as $methodParameter) {
+ $requestValue = is_array($value) && isset($value[$methodParameter->getName()]) ? $value[$methodParameter->getName()] : $value;
+ if ($methodParameter->getType() instanceof \ReflectionNamedType && $methodParameter->getType()->getName() !== gettype($requestValue)) {
+ $parameters[] = $this->serializer->denormalize($requestValue, $methodParameter->getType()->getName());
+ } else {
+ $parameters[] = $requestValue;
+ }
+ }
+
+ $reflectionMethod->invoke($action, ...$parameters);
+ } elseif ($propertyAccessor->isWritable($action, $param)) {
+ $propertyAccessor->setValue($action, $param, $value);
+ }
+ }
+
+ return $action;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function normalize($object, string $format = null, array $context = [])
+ {
+ return $this->serializer->normalize($object, $format, $context);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function supportsNormalization($data, string $format = null): bool
+ {
+ return $this->serializer->supportsNormalization($data, $format);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function supportsDenormalization($data, string $type, string $format = null): bool
+ {
+ return $this->serializer->supportsDenormalization($data, $type, $format);
+ }
+
+ /**
+ * @param $propertyName
+ * @param $queryClass
+ *
+ * @return false|ReflectionMethod
+ */
+ private function findSetterMethod($propertyName, $queryClass): bool|ReflectionMethod
+ {
+ $reflectionClass = new \ReflectionClass($queryClass);
+
+ foreach ($reflectionClass->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
+ if (str_starts_with($method->getName(), 'set')) {
+ $methodName = lcfirst(substr($method->getName(), 3));
+ if ($methodName === $propertyName) {
+ return $method;
+ }
+ }
+ }
+
+ return false;
+ }
+}
diff --git a/admin-dev/themes/default/template/controllers/statuses/index.php b/src/PrestaShopBundle/ApiPlatform/Exception/NoExtraPropertiesFoundException.php
similarity index 78%
rename from admin-dev/themes/default/template/controllers/statuses/index.php
rename to src/PrestaShopBundle/ApiPlatform/Exception/NoExtraPropertiesFoundException.php
index 6c011614e2845..4041f7d59dc17 100644
--- a/admin-dev/themes/default/template/controllers/statuses/index.php
+++ b/src/PrestaShopBundle/ApiPlatform/Exception/NoExtraPropertiesFoundException.php
@@ -1,4 +1,5 @@
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\ApiPlatform\Normalizer;
+
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+
+class DateTimeImmutableDenormalizer implements DenormalizerInterface
+{
+ public function denormalize($data, string $type, string $format = null, array $context = [])
+ {
+ return new \DateTimeImmutable($data);
+ }
+
+ public function supportsDenormalization($data, string $type, string $format = null)
+ {
+ return \DateTimeImmutable::class === $type;
+ }
+
+ /**
+ * Set higher priority than ObjectDenormalizer.
+ *
+ * @return int
+ */
+ public static function getDefaultPriority(): int
+ {
+ return 10;
+ }
+}
diff --git a/src/PrestaShopBundle/ApiPlatform/Normalizer/DecimalNumberDenormalizer.php b/src/PrestaShopBundle/ApiPlatform/Normalizer/DecimalNumberDenormalizer.php
new file mode 100644
index 0000000000000..b5cf7362836e3
--- /dev/null
+++ b/src/PrestaShopBundle/ApiPlatform/Normalizer/DecimalNumberDenormalizer.php
@@ -0,0 +1,55 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\ApiPlatform\Normalizer;
+
+use PrestaShop\Decimal\DecimalNumber;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+
+class DecimalNumberDenormalizer implements DenormalizerInterface
+{
+ public function denormalize($data, string $type, string $format = null, array $context = [])
+ {
+ return new DecimalNumber((string) $data);
+ }
+
+ public function supportsDenormalization($data, string $type, string $format = null)
+ {
+ return DecimalNumber::class === $type;
+ }
+
+ /**
+ * Set higher priority than ObjectDenormalizer.
+ *
+ * @return int
+ */
+ public static function getDefaultPriority(): int
+ {
+ return 10;
+ }
+}
diff --git a/src/PrestaShopBundle/ApiPlatform/Normalizer/ObjectDenormalizer.php b/src/PrestaShopBundle/ApiPlatform/Normalizer/ObjectDenormalizer.php
new file mode 100644
index 0000000000000..915b99adbf5fb
--- /dev/null
+++ b/src/PrestaShopBundle/ApiPlatform/Normalizer/ObjectDenormalizer.php
@@ -0,0 +1,48 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\ApiPlatform\Normalizer;
+
+use Symfony\Component\Serializer\Normalizer\ObjectNormalizer as SfObjectNormalizer;
+
+/**
+ * Used to be automatic injected in PrestaShopBundle/ApiPlatform/DomainSerializer::normalizers with
+ * prestashop.api.denormalizers tagged services.
+ */
+class ObjectDenormalizer extends SfObjectNormalizer
+{
+ /**
+ * ObjectDenormalizer must be the last denormalizer as a fallback.
+ *
+ * @return int
+ */
+ public static function getDefaultPriority(): int
+ {
+ return -1;
+ }
+}
diff --git a/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php b/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
index 83bc9b2039a3d..37de8b546abb6 100644
--- a/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
+++ b/src/PrestaShopBundle/ApiPlatform/Processor/CommandProcessor.php
@@ -31,32 +31,45 @@
use ApiPlatform\Metadata\Operation;
use ApiPlatform\State\ProcessorInterface;
use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
+use PrestaShopBundle\ApiPlatform\DomainSerializer;
+use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
+use ReflectionException;
+use Symfony\Component\Serializer\Exception\ExceptionInterface;
class CommandProcessor implements ProcessorInterface
{
- /**
- * @var CommandBusInterface
- */
- private $commandBus;
-
/**
* @param CommandBusInterface $commandBus
+ * @param DomainSerializer $apiPlatformSerializer
*/
- public function __construct(CommandBusInterface $commandBus)
- {
- $this->commandBus = $commandBus;
+ public function __construct(
+ private readonly CommandBusInterface $commandBus,
+ private readonly DomainSerializer $apiPlatformSerializer,
+ ) {
}
+ /**
+ * @param $data
+ * @param Operation $operation
+ * @param array $uriVariables
+ * @param array $context
+ *
+ * @return void
+ *
+ * @throws NoExtraPropertiesFoundException
+ * @throws ExceptionInterface|ReflectionException
+ */
public function process($data, Operation $operation, array $uriVariables = [], array $context = [])
{
- $command = $operation->getExtraProperties()['command'];
- $reflectionMethod = new \ReflectionMethod($command, '__construct');
- $constructParameters = $reflectionMethod->getParameters();
- $parameters = [];
- foreach ($constructParameters as $parameter) {
- $parameters[] = $data->{$parameter->name};
+ $commandClass = $operation->getExtraProperties()['command'] ?? null;
+ $commandParameters = array_merge($this->apiPlatformSerializer->normalize($data), $uriVariables);
+
+ if (null === $commandClass || !class_exists($commandClass)) {
+ throw new NoExtraPropertiesFoundException('Extra property "command" not found');
}
- $this->commandBus->handle(new $command(...array_values($parameters)));
+ $command = $this->apiPlatformSerializer->denormalize($commandParameters, $commandClass);
+
+ $this->commandBus->handle($command);
}
}
diff --git a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
index 4e34e03905bec..62a82714bd6cd 100644
--- a/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
+++ b/src/PrestaShopBundle/ApiPlatform/Provider/QueryProvider.php
@@ -28,23 +28,63 @@
namespace PrestaShopBundle\ApiPlatform\Provider;
+use ApiPlatform\Metadata\CollectionOperationInterface;
use ApiPlatform\Metadata\Operation;
use ApiPlatform\State\ProviderInterface;
use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
+use PrestaShopBundle\ApiPlatform\DomainSerializer;
+use PrestaShopBundle\ApiPlatform\Exception\NoExtraPropertiesFoundException;
+use ReflectionException;
+use Symfony\Component\Serializer\Exception\ExceptionInterface;
class QueryProvider implements ProviderInterface
{
- private $queryBus;
-
- public function __construct(CommandBusInterface $queryBus)
- {
- $this->queryBus = $queryBus;
+ /**
+ * @param CommandBusInterface $queryBus
+ * @param DomainSerializer $apiPlatformSerializer
+ */
+ public function __construct(
+ private readonly CommandBusInterface $queryBus,
+ private readonly DomainSerializer $apiPlatformSerializer,
+ ) {
}
- public function provide(Operation $operation, array $uriVariables = [], array $context = [])
+ /**
+ * @param Operation $operation
+ * @param array $uriVariables
+ * @param array $context
+ *
+ * @return mixed
+ *
+ * @throws ExceptionInterface
+ * @throws NoExtraPropertiesFoundException
+ * @throws ReflectionException
+ */
+ public function provide(Operation $operation, array $uriVariables = [], array $context = []): mixed
{
- $query = $operation->getExtraProperties()['query'];
+ $queryClass = $operation->getExtraProperties()['query'] ?? null;
+ $filters = $context['filters'] ?? [];
+ $queryParameters = array_merge($uriVariables, $filters);
+
+ if (null === $queryClass) {
+ throw new NoExtraPropertiesFoundException('Extra property "query" not found');
+ }
+
+ $query = $this->apiPlatformSerializer->denormalize($queryParameters, $queryClass);
+
+ $queryResult = $this->queryBus->handle($query);
+
+ //Handle return type
+ $normalizedQueryResult = $this->apiPlatformSerializer->normalize($queryResult);
+
+ if ($operation instanceof CollectionOperationInterface) {
+ foreach ($normalizedQueryResult as $key => $result) {
+ $normalizedQueryResult[$key] = $this->apiPlatformSerializer->denormalize($result, $operation->getClass());
+ }
+
+ return $normalizedQueryResult;
+ }
- return $this->queryBus->handle(new $query(...$uriVariables));
+ return $this->apiPlatformSerializer->denormalize($normalizedQueryResult, $operation->getClass());
}
}
diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/CartRule.php b/src/PrestaShopBundle/ApiPlatform/Resources/CartRule.php
new file mode 100644
index 0000000000000..3949caeb8dbbe
--- /dev/null
+++ b/src/PrestaShopBundle/ApiPlatform/Resources/CartRule.php
@@ -0,0 +1,76 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\ApiPlatform\Resources;
+
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Put;
+use PrestaShop\PrestaShop\Core\Domain\CartRule\Command\EditCartRuleCommand;
+use PrestaShopBundle\ApiPlatform\Processor\CommandProcessor;
+
+#[ApiResource(
+ operations: [
+ new Put(
+ uriTemplate: '/cartRule',
+ processor: CommandProcessor::class,
+ extraProperties: ['command' => EditCartRuleCommand::class]
+ ),
+ ],
+)]
+class CartRule
+{
+ public int $cartRuleId;
+
+ public string $description;
+
+ public string $code;
+
+ public array $minimumAmount;
+
+ public bool $minimumAmountShippingIncluded;
+
+ public int $customerId;
+
+ public array $localizedNames;
+
+ public bool $highlightInCart;
+
+ public bool $allowPartialUse;
+
+ public int $priority;
+
+ public bool $active;
+
+ public array $validityDateRange;
+
+ public int $totalQuantity;
+
+ public int $quantityPerUser;
+
+ public array $cartRuleAction;
+}
diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/CustomerGroup.php b/src/PrestaShopBundle/ApiPlatform/Resources/CustomerGroup.php
new file mode 100644
index 0000000000000..4ec420ddde876
--- /dev/null
+++ b/src/PrestaShopBundle/ApiPlatform/Resources/CustomerGroup.php
@@ -0,0 +1,59 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\ApiPlatform\Resources;
+
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Post;
+use PrestaShop\PrestaShop\Core\Domain\Customer\Group\Command\AddCustomerGroupCommand;
+use PrestaShopBundle\ApiPlatform\Processor\CommandProcessor;
+
+#[ApiResource(
+ operations: [
+ new Post(
+ uriTemplate: '/customers/group',
+ processor: CommandProcessor::class,
+ extraProperties: [
+ 'command' => AddCustomerGroupCommand::class,
+ ],
+ ),
+ ]
+)]
+class CustomerGroup
+{
+ public array $localizedNames;
+
+ public float $reductionPercent;
+
+ public bool $displayPriceTaxExcluded;
+
+ public bool $showPrice;
+
+ public array $shopIds;
+}
diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/FoundProduct.php b/src/PrestaShopBundle/ApiPlatform/Resources/FoundProduct.php
new file mode 100644
index 0000000000000..a04c925ac971b
--- /dev/null
+++ b/src/PrestaShopBundle/ApiPlatform/Resources/FoundProduct.php
@@ -0,0 +1,108 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\ApiPlatform\Resources;
+
+use ApiPlatform\Core\Annotation\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\GetCollection;
+use PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProducts;
+use PrestaShopBundle\ApiPlatform\Provider\QueryProvider;
+
+#[ApiResource(
+ operations: [
+ new GetCollection(
+ uriTemplate: '/products/search/{phrase}/{resultsLimit}/{isoCode}',
+ openapiContext: [
+ 'parameters' => [
+ [
+ 'name' => 'phrase',
+ 'in' => 'path',
+ 'required' => true,
+ 'schema' => [
+ 'type' => 'string',
+ ],
+ ],
+ [
+ 'name' => 'resultsLimit',
+ 'in' => 'path',
+ 'required' => true,
+ 'schema' => [
+ 'type' => 'int',
+ ],
+ ],
+ [
+ 'name' => 'isoCode',
+ 'in' => 'path',
+ 'required' => true,
+ 'schema' => [
+ 'type' => 'string',
+ ],
+ ],
+ [
+ 'name' => 'orderId',
+ 'in' => 'query',
+ 'required' => false,
+ 'schema' => [
+ 'type' => 'int',
+ ],
+ ],
+ ],
+ ],
+ provider: QueryProvider::class,
+ extraProperties: [
+ 'query' => SearchProducts::class,
+ ]
+ ),
+ ],
+)]
+class FoundProduct
+{
+ #[ApiProperty(identifier: true)]
+ public int $productId;
+
+ public bool $availableOutOfStock;
+
+ public string $name;
+
+ public float $taxRate;
+
+ public string $formattedPrice;
+
+ public float $priceTaxIncl;
+
+ public float $priceTaxExcl;
+
+ public int $stock;
+
+ public string $location;
+
+ public array $combinations;
+
+ public array $customizationFields;
+}
diff --git a/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php b/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php
index ee394bb3bbda7..c1c65a094acad 100644
--- a/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php
+++ b/src/PrestaShopBundle/ApiPlatform/Resources/Hook.php
@@ -34,6 +34,7 @@
use ApiPlatform\Metadata\Put;
use PrestaShop\PrestaShop\Core\Domain\Hook\Command\UpdateHookStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Hook\Exception\HookNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHook;
use PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus;
use PrestaShopBundle\ApiPlatform\Processor\CommandProcessor;
use PrestaShopBundle\ApiPlatform\Provider\QueryProvider;
@@ -41,29 +42,65 @@
#[ApiResource(
operations: [
new Get(
- uriTemplate: '/hook-status/{hookId}',
+ uriTemplate: '/hook-status/{id}',
requirements: ['id' => '\d+'],
+ openapiContext: [
+ 'summary' => 'Get hook status A',
+ 'description' => 'Get hook status B',
+ 'parameters' => [
+ [
+ 'name' => 'id',
+ 'in' => 'path',
+ 'required' => true,
+ 'schema' => [
+ 'type' => 'string',
+ ],
+ 'description' => 'Id of the hook you are requesting the status from',
+ ],
+ [
+ 'name' => 'Authorization',
+ 'in' => 'scopes',
+ 'description' => 'hook_read
hook_write ', + ], + ], + ], exceptionToStatus: [HookNotFoundException::class => 404], provider: QueryProvider::class, - extraProperties: ['query' => GetHookStatus::class] + extraProperties: [ + 'query' => GetHookStatus::class, + 'scopes' => ['hook_read'], + ] ), new Put( uriTemplate: '/hook-status', processor: CommandProcessor::class, - extraProperties: ['command' => UpdateHookStatusCommand::class] + extraProperties: [ + 'command' => UpdateHookStatusCommand::class, + 'scopes' => ['hook_write'], + ] ), - ] + new Get( + uriTemplate: '/hooks/{id}', + requirements: ['id' => '\d+'], + exceptionToStatus: [HookNotFoundException::class => 404], + provider: QueryProvider::class, + extraProperties: [ + 'query' => GetHook::class, + 'scopes' => ['hook_read'], + ] + ), + ], )] class Hook { - /** - * @var int - */ #[ApiProperty(identifier: true)] - public int $hookId; + public int $id; + + public bool $active; + + public string $name; + + public string $title; - /** - * @var bool - */ - public bool $status; + public string $description; } diff --git a/src/PrestaShopBundle/Bridge/AdminController/ControllerConfigurationFactory.php b/src/PrestaShopBundle/Bridge/AdminController/ControllerConfigurationFactory.php index 80e93511354dd..3be1821353bb2 100644 --- a/src/PrestaShopBundle/Bridge/AdminController/ControllerConfigurationFactory.php +++ b/src/PrestaShopBundle/Bridge/AdminController/ControllerConfigurationFactory.php @@ -81,7 +81,7 @@ public function create( sprintf( 'Unexpected user type. Expected "%s", got "%s', Employee::class, - get_class($employee)) + $employee::class) ); } diff --git a/src/PrestaShopBundle/Bridge/AdminController/Listener/InitFrameworkBridgeControllerListener.php b/src/PrestaShopBundle/Bridge/AdminController/Listener/InitFrameworkBridgeControllerListener.php index 559029b13c4b9..bd5c0211c320f 100644 --- a/src/PrestaShopBundle/Bridge/AdminController/Listener/InitFrameworkBridgeControllerListener.php +++ b/src/PrestaShopBundle/Bridge/AdminController/Listener/InitFrameworkBridgeControllerListener.php @@ -88,7 +88,7 @@ public function onKernelController(ControllerEvent $event): void /** @var FrameworkBridgeControllerInterface $controller */ $controller = $event->getController()[0]; - if (!is_string(get_class($controller))) { + if (!is_string($controller::class)) { return; } diff --git a/src/PrestaShopBundle/Bridge/Helper/AddFlashMessage.php b/src/PrestaShopBundle/Bridge/Helper/AddFlashMessage.php new file mode 100644 index 0000000000000..4dfee3d1cc4d2 --- /dev/null +++ b/src/PrestaShopBundle/Bridge/Helper/AddFlashMessage.php @@ -0,0 +1,74 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) + */ +declare(strict_types=1); + +namespace PrestaShopBundle\Bridge\Helper; + +use Symfony\Component\HttpFoundation\Exception\SessionNotFoundException; +use Symfony\Component\HttpFoundation\RequestStack; +use Symfony\Component\HttpFoundation\Session\Session; +use Symfony\Component\HttpFoundation\Session\SessionInterface; + +class AddFlashMessage +{ + private const TYPES = [ + 'errors' => 'error', + 'warnings' => 'warning', + 'informations' => 'info', + 'confirmations' => 'success', + ]; + + public function __construct(private readonly RequestStack $requestStack) + { + } + + public function addMessage(string $type, string $message): void + { + $type = self::TYPES[$type] ?? $type; + + try { + $session = $this->requestStack->getCurrentRequest()->getSession(); + + if (!$session instanceof Session) { + throw new \LogicException(sprintf( + 'You can use the flashbag only with the %s implementation of %s', + Session::class, + SessionInterface::class + )); + } + + $flashBag = $session->getFlashBag(); + + //This condition is to avoid duplicate messages + $messages = $flashBag->peekAll()[$type] ?? []; + if (!in_array($message, $messages, true)) { + $flashBag->add($type, $message); + } + } catch (SessionNotFoundException $e) { + throw new \LogicException('You cannot use the addFlash method if sessions are disabled. Enable them in "config/packages/framework.yaml".', 0, $e); + } + } +} diff --git a/src/PrestaShopBundle/Bridge/Smarty/HeaderConfigurator.php b/src/PrestaShopBundle/Bridge/Smarty/HeaderConfigurator.php index 7454c957c8965..b156ed872731d 100644 --- a/src/PrestaShopBundle/Bridge/Smarty/HeaderConfigurator.php +++ b/src/PrestaShopBundle/Bridge/Smarty/HeaderConfigurator.php @@ -283,7 +283,7 @@ private function getTabs(ControllerConfiguration $controllerConfiguration, $pare foreach ($tabs as $index => $tab) { if (!Tab::checkTabRights($tab['id_tab']) || !$tab['enabled'] - || ($tab['class_name'] == 'AdminStock' && $this->configuration->get('PS_ADVANCED_STOCK_MANAGEMENT') == 0) + || $tab['class_name'] == 'AdminStock' || $tab['class_name'] == 'AdminCarrierWizard') { unset($tabs[$index]); diff --git a/src/PrestaShopBundle/Command/FeatureFlagCommand.php b/src/PrestaShopBundle/Command/FeatureFlagCommand.php index 6f27d88bceb00..2ba2cf2190ef3 100644 --- a/src/PrestaShopBundle/Command/FeatureFlagCommand.php +++ b/src/PrestaShopBundle/Command/FeatureFlagCommand.php @@ -28,6 +28,7 @@ namespace PrestaShopBundle\Command; +use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager; use PrestaShopBundle\Entity\FeatureFlag; use PrestaShopBundle\Entity\Repository\FeatureFlagRepository; use Symfony\Component\Console\Command\Command; @@ -55,16 +56,11 @@ class FeatureFlagCommand extends Command 'list', ]; - /** - * @var FeatureFlagRepository - */ - private $featureFlagRepository; - public function __construct( - FeatureFlagRepository $featureFlagRepository + private readonly FeatureFlagRepository $featureFlagRepository, + private readonly FeatureFlagManager $featureFlagManager ) { parent::__construct(); - $this->featureFlagRepository = $featureFlagRepository; } protected function configure() @@ -99,16 +95,35 @@ private function listFeatureFlags(OutputInterface $output): int { $featureFlags = $this->featureFlagRepository->findAll(); $table = new Table($output); - $table->setHeaders(['Feature flag', 'State']); + $table->setHeaders(['Feature flag', 'Type', 'State']); /** @var FeatureFlag $featureFlag */ foreach ($featureFlags as $featureFlag) { - $table->addRow([$featureFlag->getName(), $featureFlag->isEnabled() ? 'Enabled' : 'Disabled']); + $table->addRow([ + $featureFlag->getName(), + $this->getTypeRow($featureFlag), + $this->featureFlagManager->isEnabled($featureFlag->getName()) ? 'Enabled' : 'Disabled', + ]); } $table->render(); return self::SUCCESS_RETURN_CODE; } + private function getTypeRow(FeatureFlag $featureFlag): string + { + $out = []; + + foreach ($featureFlag->getOrderedTypes() as $type) { + if ($this->featureFlagManager->getUsedType($featureFlag->getName()) === $type) { + $out[] = "[$type]"; + } else { + $out[] = $type; + } + } + + return implode(',', $out); + } + private function toggleFeatureFlag(bool $expectedState, InputInterface $input, OutputInterface $output): int { $featureFlagArgument = $input->getArgument('feature_flag'); @@ -129,13 +144,13 @@ private function toggleFeatureFlag(bool $expectedState, InputInterface $input, O } if ($expectedState) { - $this->featureFlagRepository->enable($featureFlagArgument); + $this->featureFlagManager->enable($featureFlagArgument); $output->writeln(sprintf( 'Feature flag %s was enabled ',
$featureFlagArgument
));
} else {
- $this->featureFlagRepository->disable($featureFlagArgument);
+ $this->featureFlagManager->disable($featureFlagArgument);
$output->writeln(sprintf(
'Feature flag %s was disabled ',
$featureFlagArgument
diff --git a/src/PrestaShopBundle/Command/LegacyLinkLinterCommand.php b/src/PrestaShopBundle/Command/LegacyLinkLinterCommand.php
index c0fe24aebf781..1eb048af045f2 100644
--- a/src/PrestaShopBundle/Command/LegacyLinkLinterCommand.php
+++ b/src/PrestaShopBundle/Command/LegacyLinkLinterCommand.php
@@ -57,6 +57,75 @@ class LegacyLinkLinterCommand extends Command
'admin_common_sidebar',
'admin_common_reset_search',
'admin_common_reset_search_by_filter_id',
+ 'admin_product_new',
+ 'admin_product_form',
+ 'admin_product_virtual_save_action',
+ 'admin_product_virtual_remove_file_action',
+ 'admin_product_virtual_download_file_action',
+ 'admin_product_virtual_remove_action',
+ 'admin_product_attachement_add_action',
+ 'admin_product_image_upload',
+ 'admin_product_image_positions',
+ 'admin_product_image_form',
+ 'admin_product_image_delete',
+ 'admin_get_product_combinations',
+ 'admin_product_catalog',
+ 'admin_product_catalog_filters',
+ 'admin_product_list',
+ 'admin_product_bulk_action',
+ 'admin_product_unit_action',
+ 'admin_product_mass_edit_action',
+ 'admin_product_export_action',
+ 'admin_security_compromised',
+ 'admin_attribute_get_all',
+ 'admin_delete_attribute',
+ 'admin_delete_all_attributes',
+ 'admin_get_form_images_combination',
+ 'admin_category_simple_add_form',
+ 'admin_get_ajax_categories',
+ 'admin_combination_generate_form',
+ 'admin_feature_get_feature_values',
+ 'admin_specific_price_list',
+ 'admin_get_specific_price_update_form',
+ 'admin_specific_price_add',
+ 'admin_specific_price_update',
+ 'admin_delete_specific_price',
+ 'admin_supplier_refresh_product_supplier_combination_form',
+ 'admin_warehouse_refresh_product_warehouse_combination_form',
+ 'admin_products_combinations',
+ 'admin_products_combinations_ids',
+ 'admin_products_combinations_update_combination_from_listing',
+ 'admin_products_combinations_edit_combination',
+ 'admin_products_combinations_bulk_combination_form',
+ 'admin_products_combinations_bulk_edit_combination',
+ 'admin_products_combinations_delete_combination',
+ 'admin_products_combinations_bulk_delete',
+ 'admin_products_attribute_groups',
+ 'admin_all_attribute_groups',
+ 'admin_products_combinations_generate',
+ 'admin_products_specific_prices_list',
+ 'admin_products_specific_prices_create',
+ 'admin_products_specific_prices_edit',
+ 'admin_products_specific_prices_delete',
+ 'admin_products_light_list',
+ 'admin_products_search',
+ 'admin_products_reset_grid_search',
+ 'admin_products_grid_category_filter',
+ 'admin_products_grid_shop_previews',
+ 'admin_products_download_virtual_product_file',
+ 'admin_products_delete_from_shop_group',
+ 'admin_products_delete_from_shop',
+ 'admin_products_enable_for_all_shops',
+ 'admin_products_enable_for_shop_group',
+ 'admin_products_disable_for_all_shops',
+ 'admin_products_disable_for_shop_group',
+ 'admin_products_search_associations',
+ 'admin_products_search_combinations',
+ 'admin_products_search_product_combinations',
+ 'admin_products_quantity',
+ 'admin_categories_get_categories_tree',
+ 'admin_catalog_price_rules_list_for_product',
+ 'admin_features_horizontal_index',
];
public function __construct(LegacyLinkLinter $legacyLinkLinter, AdminRouteProvider $adminRouteProvider)
diff --git a/src/PrestaShopBundle/Command/ListCommandsAndQueriesCommand.php b/src/PrestaShopBundle/Command/ListCommandsAndQueriesCommand.php
index 5bdfb99ceaa5f..620d7fb4bb88d 100644
--- a/src/PrestaShopBundle/Command/ListCommandsAndQueriesCommand.php
+++ b/src/PrestaShopBundle/Command/ListCommandsAndQueriesCommand.php
@@ -26,10 +26,16 @@
namespace PrestaShopBundle\Command;
+use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
+use ApiPlatform\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface;
+use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
+use PrestaShop\PrestaShop\Core\CommandBus\Parser\CommandDefinition;
use PrestaShop\PrestaShop\Core\CommandBus\Parser\CommandDefinitionParser;
+use PrestaShopBundle\Exception\DomainClassNameMalformedException;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Formatter\OutputFormatterStyle;
use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
/**
@@ -37,21 +43,21 @@
*/
class ListCommandsAndQueriesCommand extends Command
{
- /**
- * @var CommandDefinitionParser
- */
- private $commandDefinitionParser;
+ private bool $isFormatSimple;
/**
- * @var array
+ * @var ResourceMetadataCollection[]
*/
- private $commandAndQueries;
+ private array $apiResourcesList;
- public function __construct(CommandDefinitionParser $commandDefinitionParser, array $commandAndQueries)
- {
+ public function __construct(
+ private CommandDefinitionParser $commandDefinitionParser,
+ private array $commandAndQueries,
+ private ResourceNameCollectionFactoryInterface $resourceNameCollectionFactory,
+ private ResourceMetadataCollectionFactoryInterface $resourceMetadataFactory
+ ) {
parent::__construct();
- $this->commandDefinitionParser = $commandDefinitionParser;
- $this->commandAndQueries = $commandAndQueries;
+ $this->isFormatSimple = false;
}
/**
@@ -62,27 +68,135 @@ public function configure()
$this
->setName('prestashop:list:commands-and-queries')
->setDescription('Lists available CQRS commands and queries')
+ ->addOption(
+ 'domain',
+ 'd',
+ InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
+ 'Filter available CQRS by domain.'
+ )
+ ->addOption(
+ 'format',
+ 'f',
+ InputOption::VALUE_REQUIRED,
+ 'Outputs either a regular or simplified format.',
+ 'regular'
+ )
;
}
/**
* {@inheritdoc}
*/
- protected function execute(InputInterface $input, OutputInterface $output)
+ protected function execute(InputInterface $input, OutputInterface $output): int
{
+ $this->apiResourcesList = $this->getResourceList();
+ $this->handleOptions($input);
+
$outputStyle = new OutputFormatterStyle('blue', null);
$output->getFormatter()->setStyle('blue', $outputStyle);
foreach ($this->commandAndQueries as $key => $commandName) {
$commandDefinition = $this->commandDefinitionParser->parseDefinition($commandName);
+ $cqrsEndpointURI = $this->getCQRSEndpointURI($commandDefinition);
- $output->writeln(++$key . '.');
- $output->writeln('Class: ' . $commandDefinition->getClassName() . ' ');
- $output->writeln('Type: ' . $commandDefinition->getCommandType() . ' ');
- $output->writeln('' . $commandDefinition->getDescription() . ' ');
- $output->writeln('');
+ if ($this->isFormatSimple) {
+ $output->writeln('' . $commandDefinition->getClassName() . (!empty($cqrsEndpointURI) ? ' OK' : ' NOT OK') . ' ');
+ } else {
+ $output->writeln(++$key . '.');
+ $output->writeln('Class: ' . $commandDefinition->getClassName() . ' ');
+ $output->writeln('Type: ' . $commandDefinition->getCommandType() . ' ');
+ $output->writeln('API: ' . $cqrsEndpointURI . ' ');
+ $output->writeln('' . $commandDefinition->getDescription() . ' ');
+ $output->writeln('');
+ }
}
return 0;
}
+
+ private function handleOptions(InputInterface $input): void
+ {
+ if ($input->getOption('domain') !== []) {
+ $this->filterCQRS($input->getOption('domain'));
+ }
+
+ if ($input->getOption('format') === 'simple') {
+ $this->isFormatSimple = true;
+ }
+ }
+
+ /**
+ * @param string[] $filters
+ */
+ private function filterCQRS(array $filters): void
+ {
+ $this->commandAndQueries = array_filter($this->commandAndQueries, function (string $currentCQRS) use ($filters) {
+ foreach ($filters as $filter) {
+ // We append a backslash behind the filter to find only exact matches
+ if (str_contains($currentCQRS, $filter . '\\') !== false) {
+ return true;
+ }
+ }
+
+ return false;
+ });
+ }
+
+ /**
+ * This method rebuild the resources from the api platform attributes.
+ *
+ * @return ResourceMetadataCollection[]
+ */
+ private function getResourceList(): array
+ {
+ $resourceMetadataCollection = [];
+ foreach ($this->resourceNameCollectionFactory->create() as $resourceClass) {
+ $resourceMetadataCollection[] = $this->resourceMetadataFactory->create($resourceClass);
+ }
+
+ return $resourceMetadataCollection;
+ }
+
+ /**
+ * This method takes the filtered list of routes, and checks it against the list of CQRS.
+ * The CQRS that have a route with the correct method are implemented, so we return the URI of the endpoint.
+ */
+ private function getCQRSEndpointURI(CommandDefinition $commandDefinition): string
+ {
+ $domainArray = explode('\\', $commandDefinition->getClassName());
+ if (count($domainArray) >= 5) {
+ $domain = $domainArray[4];
+ } else {
+ throw new DomainClassNameMalformedException();
+ }
+
+ foreach ($this->apiResourcesList as $apiResources) {
+ foreach ($apiResources as $resource) {
+ if ($resource->getShortName() !== $domain) {
+ return '';
+ }
+
+ $apiResourceOperations = $resource->getOperations();
+ foreach ($apiResourceOperations as $operation) {
+ if ($this->doesMethodsMatchType($operation->getMethod(), $commandDefinition->getCommandType())) {
+ return $operation->getUriTemplate();
+ }
+ }
+ }
+ }
+
+ return '';
+ }
+
+ private function doesMethodsMatchType(string $method, string $commandType): bool
+ {
+ switch ($commandType) {
+ case 'Command':
+ return $method === 'POST' || $method === 'PUT';
+ case 'Query':
+ return $method === 'GET' || $method === 'DELETE';
+ default:
+ return false;
+ }
+ }
}
diff --git a/src/PrestaShopBundle/Command/UpdateLicensesCommand.php b/src/PrestaShopBundle/Command/UpdateLicensesCommand.php
index 1c8cd5c142ed8..3ecea283381ee 100644
--- a/src/PrestaShopBundle/Command/UpdateLicensesCommand.php
+++ b/src/PrestaShopBundle/Command/UpdateLicensesCommand.php
@@ -248,7 +248,7 @@ private function makeGoodLicense(SplFileInfo $file)
private function isAFLLicense($fileName)
{
foreach ($this->aflLicense as $afl) {
- if (0 === strpos($fileName, $afl)) {
+ if (str_starts_with($fileName, $afl)) {
return true;
}
}
@@ -335,7 +335,7 @@ private function addLicenseToNode($node, SplFileInfo $file)
$comments = $node->getAttribute('comments');
foreach ($comments as $comment) {
if ($comment instanceof \PhpParser\Comment
- && strpos($comment->getText(), 'prestashop') !== false) {
+ && str_contains($comment->getText(), 'prestashop')) {
file_put_contents($file->getRelativePathname(), str_replace($comment->getText(), $this->license, $file->getContents()));
}
}
diff --git a/src/PrestaShopBundle/Command/UpdateSchemaCommand.php b/src/PrestaShopBundle/Command/UpdateSchemaCommand.php
index f0b71a6babc4e..65727db43c60a 100644
--- a/src/PrestaShopBundle/Command/UpdateSchemaCommand.php
+++ b/src/PrestaShopBundle/Command/UpdateSchemaCommand.php
@@ -122,7 +122,7 @@ public function execute(InputInterface $input, OutputInterface $output)
*/
public function dropExistingForeignKeys(Connection $connection, OutputInterface $output): int
{
- // First drop any existing FK
+ // Get foreign key list in all tables with our prefix
$query = $connection->executeQuery(
'SELECT CONSTRAINT_NAME, TABLE_NAME ' .
'FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS ' .
@@ -132,16 +132,16 @@ public function dropExistingForeignKeys(Connection $connection, OutputInterface
);
$results = $query->fetchAllAssociative();
- $nbQueries = 0;
+ $affectedRows = 0;
foreach ($results as $result) {
$drop = 'ALTER TABLE ' . $result['TABLE_NAME'] . ' DROP FOREIGN KEY ' . $result['CONSTRAINT_NAME'];
$output->writeln('Executing: ' . $drop);
- $nbQueries += $connection->executeQuery($drop);
+ $affectedRows += $connection->executeQuery($drop)->rowCount();
}
- return $nbQueries;
+ return $affectedRows;
}
/**
@@ -294,7 +294,7 @@ public function clearQueries(Connection $connection, array &$queries): void
$extra = $results[0]['Extra'];
if ($oldDefaultValue !== null
- && strpos($oldDefaultValue, 'CURRENT_TIMESTAMP') === false) {
+ && !str_contains($oldDefaultValue, 'CURRENT_TIMESTAMP')) {
$oldDefaultValue = "'" . $oldDefaultValue . "'";
}
@@ -305,9 +305,9 @@ public function clearQueries(Connection $connection, array &$queries): void
// set the old default value
if (!($results[0]['Null'] == 'NO' && $results[0]['Default'] === null)
&& !($oldDefaultValue === 'NULL'
- && strpos($matches[0][$matchKey], 'NOT NULL') !== false)
- && (strpos($matches[0][$matchKey], 'BLOB') === false)
- && (strpos($matches[0][$matchKey], 'TEXT') === false)
+ && str_contains($matches[0][$matchKey], 'NOT NULL'))
+ && (!str_contains($matches[0][$matchKey], 'BLOB'))
+ && (!str_contains($matches[0][$matchKey], 'TEXT'))
) {
if (preg_match('/DEFAULT/', $matches[0][$matchKey])) {
$matches[0][$matchKey] = preg_replace(
diff --git a/src/PrestaShopBundle/CommandBus/MessengerCommandBus.php b/src/PrestaShopBundle/CommandBus/MessengerCommandBus.php
new file mode 100644
index 0000000000000..c4fd52c6a3174
--- /dev/null
+++ b/src/PrestaShopBundle/CommandBus/MessengerCommandBus.php
@@ -0,0 +1,60 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShopBundle\CommandBus;
+
+use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
+use Symfony\Component\Messenger\Exception\HandlerFailedException;
+use Symfony\Component\Messenger\HandleTrait;
+use Symfony\Component\Messenger\MessageBusInterface;
+
+/**
+ * Class MessengerCommandBus is the Symfony Messenger CommandsBus implementation for PrestaShop's contract.
+ */
+final class MessengerCommandBus implements CommandBusInterface
+{
+ use HandleTrait {
+ HandleTrait::handle as process;
+ }
+
+ public function __construct(MessageBusInterface $messageBus)
+ {
+ // used in HandleTrait
+ $this->messageBus = $messageBus;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function handle($command)
+ {
+ try {
+ return $this->process($command);
+ } catch (HandlerFailedException $exception) {
+ throw $exception->getPrevious();
+ }
+ }
+}
diff --git a/src/PrestaShopBundle/CommandBus/Middleware/CommandRegisterMiddleware.php b/src/PrestaShopBundle/CommandBus/Middleware/CommandRegisterMiddleware.php
new file mode 100644
index 0000000000000..338d059988388
--- /dev/null
+++ b/src/PrestaShopBundle/CommandBus/Middleware/CommandRegisterMiddleware.php
@@ -0,0 +1,57 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShopBundle\CommandBus\Middleware;
+
+use PrestaShop\PrestaShop\Core\CommandBus\ExecutedCommandRegistry;
+use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\Handler\HandlersLocatorInterface;
+use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
+use Symfony\Component\Messenger\Middleware\StackInterface;
+
+/**
+ * Registers every command that was executed in system
+ */
+final class CommandRegisterMiddleware implements MiddlewareInterface
+{
+ public function __construct(
+ private readonly HandlersLocatorInterface $handlersLocator,
+ private readonly ExecutedCommandRegistry $executedCommandRegistry
+ ) {
+ }
+
+ public function handle(Envelope $envelope, StackInterface $stack): Envelope
+ {
+ $command = $envelope->getMessage();
+ $handlers = $this->handlersLocator->getHandlers($envelope);
+
+ foreach ($handlers as $handler) {
+ $this->executedCommandRegistry->register($command, $handler);
+ }
+
+ return $stack->next()->handle($envelope, $stack);
+ }
+}
diff --git a/src/PrestaShopBundle/Controller/Admin/AttributeController.php b/src/PrestaShopBundle/Controller/Admin/AttributeController.php
index 95226b92005fb..4faa6ea95e522 100644
--- a/src/PrestaShopBundle/Controller/Admin/AttributeController.php
+++ b/src/PrestaShopBundle/Controller/Admin/AttributeController.php
@@ -121,7 +121,7 @@ public function attributesGeneratorAction(Request $request)
foreach ($options as $idGroup => $attributes) {
foreach ($attributes as $attribute) {
//If attribute is a group attribute, replace group data by all attributes group
- if (false !== strpos($attribute, 'group')) {
+ if (str_contains($attribute, 'group')) {
$allGroupAttributes = $this->get('prestashop.adapter.data_provider.attribute')->getAttributeIdsByGroup((int) $idGroup, true);
foreach ($allGroupAttributes as $groupAttribute) {
$newOptions[$idGroup][$groupAttribute] = $groupAttribute;
diff --git a/src/PrestaShopBundle/Controller/Admin/CommonController.php b/src/PrestaShopBundle/Controller/Admin/CommonController.php
index 2218a8e38ff7b..91e24b32cf991 100644
--- a/src/PrestaShopBundle/Controller/Admin/CommonController.php
+++ b/src/PrestaShopBundle/Controller/Admin/CommonController.php
@@ -127,7 +127,7 @@ public function paginationAction(Request $request, $limit = 10, $offset = 0, $to
// urls from route
$callerParameters = $request->attributes->get('caller_parameters', []);
foreach ($callerParameters as $k => $v) {
- if (strpos($k, '_') === 0) {
+ if (str_starts_with($k, '_')) {
unset($callerParameters[$k]);
}
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AdministrationController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AdministrationController.php
index 74bc867c3d7eb..ca647e6403b9a 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AdministrationController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AdministrationController.php
@@ -85,12 +85,12 @@ public function indexAction()
* "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* message="You do not have permission to update this.",
* redirectRoute="admin_administration")
- * @DemoRestricted(redirectRoute="admin_administration")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_administration')]
public function processGeneralFormAction(Request $request)
{
return $this->processForm(
@@ -107,12 +107,12 @@ public function processGeneralFormAction(Request $request)
* "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* message="You do not have permission to update this.",
* redirectRoute="admin_administration")
- * @DemoRestricted(redirectRoute="admin_administration")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_administration')]
public function processUploadQuotaFormAction(Request $request)
{
return $this->processForm(
@@ -130,12 +130,12 @@ public function processUploadQuotaFormAction(Request $request)
* message="You do not have permission to update this.",
* redirectRoute="admin_administration"
* )
- * @DemoRestricted(redirectRoute="admin_administration")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_administration')]
public function processNotificationsFormAction(Request $request)
{
return $this->processForm(
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AuthorizationServer/ApplicationController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AuthorizationServer/ApplicationController.php
index bb6f1e0e297f9..c94ed13e6cec9 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AuthorizationServer/ApplicationController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/AuthorizationServer/ApplicationController.php
@@ -29,15 +29,20 @@
namespace PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters\AuthorizationServer;
use Exception;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\DeleteApplicationCommand;
use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\ApplicationConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\ApplicationException;
use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\ApplicationNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\DeleteApplicationException;
use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Exception\DuplicateApplicationNameException;
use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForEditing;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForViewing;
use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryResult\EditableApplication;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryResult\ViewableApplication;
use PrestaShop\PrestaShop\Core\Domain\Customer\Exception\CustomerConstraintException;
+use PrestaShop\PrestaShop\Core\Search\Filters\ApiAccessesFilters;
use PrestaShop\PrestaShop\Core\Search\Filters\AuthorizedApplicationsFilters;
use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
-use PrestaShopBundle\Exception\NotImplementedException;
use PrestaShopBundle\Security\Annotation\AdminSecurity;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
@@ -73,15 +78,6 @@ public function indexAction(AuthorizedApplicationsFilters $filters): Response
]);
}
- /**
- * @AdminSecurity("is_granted('create', request.get('_legacy_controller')) || is_granted('update', request.get('_legacy_controller')) || is_granted('delete', request.get('_legacy_controller')) || is_granted('read', request.get('_legacy_controller'))")
- */
- public function viewAction(): void
- {
- // TODO: Implement viewAction() method in view PR.
- throw new NotImplementedException();
- }
-
/**
* @AdminSecurity("is_granted('create', request.get('_legacy_controller'))")
*
@@ -163,10 +159,44 @@ public function editAction(Request $request, int $applicationId): Response
/**
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))")
*/
- public function deleteAction(): void
+ public function deleteAction(int $applicationId)
+ {
+ try {
+ $this->getCommandBus()->handle(new DeleteApplicationCommand($applicationId));
+ $this->addFlash(
+ 'success',
+ $this->trans('Successful deletion', 'Admin.Notifications.Success')
+ );
+ } catch (ApplicationException $e) {
+ $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
+ }
+
+ return $this->redirectToRoute('admin_authorized_applications_index');
+ }
+
+ /**
+ * @AdminSecurity("is_granted('create', request.get('_legacy_controller')) || is_granted('update', request.get('_legacy_controller')) || is_granted('delete', request.get('_legacy_controller')) || is_granted('read', request.get('_legacy_controller'))")
+ */
+ public function viewAction(ApiAccessesFilters $filters, int $applicationId): Response
{
- // TODO: Implement deleteAction() method in delete PR.
- throw new NotImplementedException();
+ $gridAuthorizedApplicationFactory = $this->get('prestashop.core.grid.factory.api_access');
+ $grid = $gridAuthorizedApplicationFactory->getGrid($filters);
+
+ try {
+ /** @var ViewableApplication $viewableApplication */
+ $viewableApplication = $this->getQueryBus()->handle(new GetApplicationForViewing($applicationId));
+ } catch (Exception $e) {
+ $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages($e)));
+
+ return $this->redirectToRoute('admin_authorized_applications_index');
+ }
+
+ return $this->render('@PrestaShop/Admin/Configure/AdvancedParameters/AuthorizationServer/Application/view.html.twig', [
+ 'help_link' => $this->generateSidebarLink('AdminAuthorizationServer'),
+ 'enableSidebar' => true,
+ 'viewableApplication' => $viewableApplication,
+ 'grid' => $this->presentGrid($grid),
+ ]);
}
/**
@@ -215,6 +245,11 @@ private function getErrorMessages(Exception $e): array
),
$e instanceof DuplicateApplicationNameException ? $e->getDuplicateActionName() : ''
),
+ DeleteApplicationException::class => $this->trans(
+ 'An error occurred during application deletion: %s',
+ 'Admin.Notifications.Error',
+ [sprintf('"%s"', $e->getMessage())]
+ ),
ApplicationConstraintException::class => [
CustomerConstraintException::INVALID_ID => $this->trans(
'The %s field is invalid.',
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/BackupController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/BackupController.php
index 9fc32483917df..95eb4f2bfe166 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/BackupController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/BackupController.php
@@ -99,13 +99,13 @@ public function indexAction(Request $request, BackupFilters $filters)
* Show file download view.
*
* @AdminSecurity("is_granted('read', request.get('_legacy_controller'))")
- * @DemoRestricted(redirectRoute="admin_backups_index")
*
* @param Request $request
* @param string $downloadFileName
*
* @return Response
*/
+ #[DemoRestricted(redirectRoute: 'admin_backups_index')]
public function downloadViewAction(Request $request, $downloadFileName)
{
$backup = new Backup($downloadFileName);
@@ -125,12 +125,12 @@ public function downloadViewAction(Request $request, $downloadFileName)
* Return a backup content as a download.
*
* @AdminSecurity("is_granted('read', request.get('_legacy_controller'))")
- * @DemoRestricted(redirectRoute="admin_backup")
*
* @param string $downloadFileName
*
* @return BinaryFileResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_backup')]
public function downloadContentAction($downloadFileName)
{
$backup = new Backup($downloadFileName);
@@ -146,12 +146,12 @@ public function downloadContentAction($downloadFileName)
* message="You do not have permission to update this.",
* redirectRoute="admin_backups_index"
* )
- * @DemoRestricted(redirectRoute="admin_backups_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_backups_index')]
public function saveOptionsAction(Request $request)
{
$backupFormHandler = $this->getBackupFormHandler();
@@ -179,10 +179,10 @@ public function saveOptionsAction(Request $request)
* message="You do not have permission to create this.",
* redirectRoute="admin_backups_index"
* )
- * @DemoRestricted(redirectRoute="admin_backups_index")
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_backups_index')]
public function createAction()
{
try {
@@ -220,12 +220,12 @@ public function createAction()
* message="You do not have permission to delete this.",
* redirectRoute="admin_backups_index"
* )
- * @DemoRestricted(redirectRoute="admin_backups_index")
*
* @param string $deleteFileName
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_backups_index')]
public function deleteAction($deleteFileName)
{
$backup = new Backup($deleteFileName);
@@ -256,12 +256,12 @@ public function deleteAction($deleteFileName)
* message="You do not have permission to delete this.",
* redirectRoute="admin_backups_index"
* )
- * @DemoRestricted(redirectRoute="admin_backups_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_backups_index')]
public function bulkDeleteAction(Request $request)
{
$backupsToDelete = $request->request->all('backup_backup_bulk_file_names');
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmailController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmailController.php
index 61386d43a611d..280da21f29ef5 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmailController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmailController.php
@@ -114,7 +114,6 @@ public function searchAction(Request $request)
/**
* Process email configuration saving.
*
- * @DemoRestricted(redirectRoute="admin_emails_index")
* @AdminSecurity(
* "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* message="Access denied."
@@ -124,6 +123,7 @@ public function searchAction(Request $request)
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_emails_index')]
public function saveOptionsAction(Request $request)
{
$formHandler = $this->getEmailConfigurationFormHandler();
@@ -149,13 +149,13 @@ public function saveOptionsAction(Request $request)
/**
* Delete selected email logs.
*
- * @DemoRestricted(redirectRoute="admin_emails_index")
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message="Access denied.")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_emails_index')]
public function deleteBulkAction(Request $request)
{
$mailLogsToDelete = $request->request->get('email_logs_delete_email_logs');
@@ -178,11 +178,11 @@ public function deleteBulkAction(Request $request)
/**
* Delete all email logs.
*
- * @DemoRestricted(redirectRoute="admin_emails_index")
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message="Access denied.")
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_emails_index')]
public function deleteAllAction()
{
$mailLogsEraser = $this->get('prestashop.adapter.email.email_log_eraser');
@@ -197,13 +197,13 @@ public function deleteAllAction()
/**
* Delete single email log.
*
- * @DemoRestricted(redirectRoute="admin_emails_index")
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message="Access denied.")
*
* @param int $mailId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_emails_index')]
public function deleteAction($mailId)
{
$mailLogsEraser = $this->get('prestashop.adapter.email.email_log_eraser');
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmployeeController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmployeeController.php
index 59271cb72e340..c0f19b9b61e87 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmployeeController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/EmployeeController.php
@@ -28,6 +28,7 @@
use Exception;
use ImageManager;
+use PrestaShop\PrestaShop\Adapter\Tab\TabDataProvider;
use PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkDeleteEmployeeCommand;
use PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkUpdateEmployeeStatusCommand;
use PrestaShop\PrestaShop\Core\Domain\Employee\Command\DeleteEmployeeCommand;
@@ -106,7 +107,6 @@ public function indexAction(Request $request, EmployeeFilters $filters)
/**
* Save employee options.
*
- * @DemoRestricted(redirectRoute="admin_employees_index")
* @AdminSecurity(
* "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))"
* )
@@ -115,6 +115,7 @@ public function indexAction(Request $request, EmployeeFilters $filters)
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_employees_index')]
public function saveOptionsAction(Request $request)
{
$employeeOptionsFormHandler = $this->get('prestashop.admin.employee_options.form_handler');
@@ -139,13 +140,13 @@ public function saveOptionsAction(Request $request)
/**
* Toggle given employee status.
*
- * @DemoRestricted(redirectRoute="admin_employees_index")
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_employees_index")
*
* @param int $employeeId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_employees_index')]
public function toggleStatusAction($employeeId)
{
try {
@@ -165,13 +166,13 @@ public function toggleStatusAction($employeeId)
/**
* Bulk enables employee status action.
*
- * @DemoRestricted(redirectRoute="admin_employees_index")
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_employees_index')]
public function bulkStatusEnableAction(Request $request)
{
$employeeIds = $request->request->all('employee_employee_bulk');
@@ -195,13 +196,13 @@ public function bulkStatusEnableAction(Request $request)
/**
* Bulk disables employee status action.
*
- * @DemoRestricted(redirectRoute="admin_employees_index")
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_employees_index')]
public function bulkStatusDisableAction(Request $request)
{
$employeeIds = $request->request->all('employee_employee_bulk');
@@ -225,13 +226,13 @@ public function bulkStatusDisableAction(Request $request)
/**
* Delete employee.
*
- * @DemoRestricted(redirectRoute="admin_employees_index")
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))")
*
* @param int $employeeId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_employees_index')]
public function deleteAction($employeeId)
{
try {
@@ -248,13 +249,13 @@ public function deleteAction($employeeId)
/**
* Delete employees in bulk actions.
*
- * @DemoRestricted(redirectRoute="admin_employees_index")
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_employees_index')]
public function bulkDeleteAction(Request $request)
{
$employeeIds = $request->request->all('employee_employee_bulk');
@@ -276,13 +277,13 @@ public function bulkDeleteAction(Request $request)
/**
* Show employee creation form page and handle it's submit.
*
- * @DemoRestricted(redirectRoute="admin_employees_index")
* @AdminSecurity("is_granted('create', request.get('_legacy_controller'))")
*
* @param Request $request
*
* @return Response
*/
+ #[DemoRestricted(redirectRoute: 'admin_employees_index')]
public function createAction(Request $request)
{
$employeeForm = $this->getEmployeeFormBuilder()->getForm();
@@ -316,13 +317,12 @@ public function createAction(Request $request)
/**
* Show Employee edit page.
*
- * @DemoRestricted(redirectRoute="admin_employees_index")
- *
* @param int $employeeId
* @param Request $request
*
* @return Response
*/
+ #[DemoRestricted(redirectRoute: 'admin_employees_index')]
public function editAction($employeeId, Request $request)
{
$contextEmployeeProvider = $this->get('prestashop.adapter.data_provider.employee');
@@ -467,7 +467,7 @@ public function changeFormLanguageAction(Request $request)
public function getAccessibleTabsAction(Request $request)
{
$profileId = $request->query->get('profileId');
- $tabsDataProvider = $this->get('prestashop.adapter.data_provider.tab');
+ $tabsDataProvider = $this->get(TabDataProvider::class);
$contextEmployeeProvider = $this->get('prestashop.adapter.data_provider.employee');
return $this->json(
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/FeatureFlagController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/FeatureFlagController.php
index 8d37778314c47..f162f2c71ea5b 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/FeatureFlagController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/FeatureFlagController.php
@@ -65,7 +65,7 @@ public function indexAction(Request $request): Response
$this->flashErrors($errors);
}
- $this->redirectToRoute('admin_feature_flags_index');
+ return $this->redirectToRoute('admin_feature_flags_index');
}
$betaFormHandler = $this->get('prestashop.admin.feature_flags.beta_form_handler');
@@ -86,7 +86,7 @@ public function indexAction(Request $request): Response
$this->flashErrors($errors);
}
- $this->redirectToRoute('admin_feature_flags_index');
+ return $this->redirectToRoute('admin_feature_flags_index');
}
return $this->render('@PrestaShop/Admin/Configure/AdvancedParameters/FeatureFlag/index.html.twig', [
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportController.php
index 00877c8bf544c..04c1d71b2c750 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportController.php
@@ -165,12 +165,12 @@ public function uploadAction(Request $request)
* Delete import file.
*
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message="You do not have permission to update this.", redirectRoute="admin_import")
- * @DemoRestricted(redirectRoute="admin_import")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_import')]
public function deleteAction(Request $request)
{
$filename = $request->query->get('filename', $request->query->get('csvfilename'));
@@ -189,12 +189,12 @@ public function deleteAction(Request $request)
* "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* message="You do not have permission to update this.", redirectRoute="admin_import"
* )
- * @DemoRestricted(redirectRoute="admin_import")
*
* @param Request $request
*
* @return Response
*/
+ #[DemoRestricted(redirectRoute: 'admin_import')]
public function downloadAction(Request $request)
{
if ($filename = $request->query->get('filename')) {
@@ -266,12 +266,12 @@ public function getAvailableEntityFieldsAction(Request $request)
* "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* redirectRoute="admin_import"
* )
- * @DemoRestricted(redirectRoute="admin_import")
*
* @param Request $request
*
* @return JsonResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_import')]
public function processImportAction(Request $request)
{
$errors = [];
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportDataConfigurationController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportDataConfigurationController.php
index 9d7463ae43f93..95b29ae0f086a 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportDataConfigurationController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ImportDataConfigurationController.php
@@ -46,12 +46,12 @@ class ImportDataConfigurationController extends FrameworkBundleAdminController
* Shows import data page where the configuration of importable data and the final step of import is handled.
*
* @AdminSecurity("is_granted('read', request.get('_legacy_controller'))")
- * @DemoRestricted(redirectRoute="admin_import")
*
* @param Request $request
*
* @return RedirectResponse|Response
*/
+ #[DemoRestricted(redirectRoute: 'admin_import')]
public function indexAction(Request $request)
{
$importDirectory = $this->get('prestashop.core.import.dir');
@@ -99,12 +99,12 @@ public function indexAction(Request $request)
* Create import data match configuration.
*
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message="You do not have permission to update this.", redirectRoute="admin_import")
- * @DemoRestricted(redirectRoute="admin_import")
*
* @param Request $request
*
* @return JsonResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_import')]
public function createAction(Request $request)
{
$formHandler = $this->get('prestashop.admin.import_data_configuration.form_handler');
@@ -136,12 +136,12 @@ public function createAction(Request $request)
* Delete import data match configuration.
*
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message="You do not have permission to update this.", redirectRoute="admin_import")
- * @DemoRestricted(redirectRoute="admin_import")
*
* @param Request $request
*
* @return JsonResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_import')]
public function deleteAction(Request $request)
{
$importMatchRepository = $this->get('prestashop.core.admin.import_match.repository');
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/LogsController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/LogsController.php
index 7c493e13a4f1c..cd1afdf3f1fc7 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/LogsController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/LogsController.php
@@ -78,12 +78,12 @@ public function indexAction(LogsFilters $filters)
* "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* message="You do not have permission to update this.", redirectRoute="admin_logs_index"
* )
- * @DemoRestricted(redirectRoute="admin_logs_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_logs_index')]
public function searchAction(Request $request)
{
$this->dispatchHook('actionAdminLogsControllerPostProcessBefore', ['controller' => $this]);
@@ -103,12 +103,12 @@ public function searchAction(Request $request)
* "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* message="You do not have permission to update this.", redirectRoute="admin_logs_index"
* )
- * @DemoRestricted(redirectRoute="admin_logs_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_logs_index')]
public function saveSettingsAction(Request $request)
{
$logsByEmailForm = $this->getFormHandler()->getForm();
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/MemcacheServerController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/MemcacheServerController.php
index 045baf8d63fc5..4a5e47e052148 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/MemcacheServerController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/MemcacheServerController.php
@@ -54,12 +54,12 @@ public function listAction()
/**
* @AdminSecurity("is_granted('read', request.get('_legacy_controller'))", message="Access denied.")
- * @DemoRestricted(redirectRoute="admin_servers_test")
*
* @param Request $request
*
* @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_servers_test')]
public function testAction(Request $request)
{
$queryValues = $request->query;
@@ -79,12 +79,12 @@ public function testAction(Request $request)
/**
* @AdminSecurity("is_granted('create', request.get('_legacy_controller'))", message="Access denied.")
- * @DemoRestricted(redirectRoute="admin_servers_test")
*
* @param Request $request
*
* @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_servers_test')]
public function addAction(Request $request)
{
if (!in_array(
@@ -138,12 +138,12 @@ public function addAction(Request $request)
/**
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message="Access denied.")
- * @DemoRestricted(redirectRoute="admin_servers_test")
*
* @param Request $request
*
* @return JsonResponse|\Symfony\Component\HttpFoundation\RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_servers_test')]
public function deleteAction(Request $request)
{
if (!in_array(
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/PerformanceController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/PerformanceController.php
index ff71bddee02bb..37057ed237a6c 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/PerformanceController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/PerformanceController.php
@@ -95,12 +95,12 @@ public function indexAction(): Response
* "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* message="You do not have permission to update this."
* )
- * @DemoRestricted(redirectRoute="admin_performance")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_performance')]
public function processSmartyFormAction(Request $request)
{
return $this->processForm(
@@ -117,12 +117,12 @@ public function processSmartyFormAction(Request $request)
* "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* message="You do not have permission to update this."
* )
- * @DemoRestricted(redirectRoute="admin_performance")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_performance')]
public function processDebugModeFormAction(Request $request)
{
return $this->processForm(
@@ -139,12 +139,12 @@ public function processDebugModeFormAction(Request $request)
* "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* message="You do not have permission to update this."
* )
- * @DemoRestricted(redirectRoute="admin_performance")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_performance')]
public function processOptionalFeaturesFormAction(Request $request)
{
return $this->processForm(
@@ -161,12 +161,12 @@ public function processOptionalFeaturesFormAction(Request $request)
* "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* message="You do not have permission to update this."
* )
- * @DemoRestricted(redirectRoute="admin_performance")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_performance')]
public function processCombineCompressCacheFormAction(Request $request)
{
return $this->processForm(
@@ -183,12 +183,12 @@ public function processCombineCompressCacheFormAction(Request $request)
* "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* message="You do not have permission to update this."
* )
- * @DemoRestricted(redirectRoute="admin_performance")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_performance')]
public function processMediaServersFormAction(Request $request)
{
return $this->processForm(
@@ -205,12 +205,12 @@ public function processMediaServersFormAction(Request $request)
* "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* message="You do not have permission to update this."
* )
- * @DemoRestricted(redirectRoute="admin_performance")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_performance')]
public function processCachingFormAction(Request $request)
{
return $this->processForm(
@@ -257,10 +257,10 @@ protected function processForm(Request $request, FormHandlerInterface $formHandl
/**
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message="Access denied.")
- * @DemoRestricted(redirectRoute="admin_performance")
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_performance')]
public function disableNonBuiltInAction(): RedirectResponse
{
try {
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ProfileController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ProfileController.php
index 4b850474ecf5e..720ce32335666 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ProfileController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ProfileController.php
@@ -120,12 +120,12 @@ public function searchAction(Request $request)
* Show profile's create page
*
* @AdminSecurity("is_granted('create', request.get('_legacy_controller'))")
- * @DemoRestricted(redirectRoute="admin_profiles_index")
*
* @param Request $request
*
* @return Response
*/
+ #[DemoRestricted(redirectRoute: 'admin_profiles_index')]
public function createAction(Request $request)
{
$form = $this->get('prestashop.core.form.identifiable_object.builder.profile_form_builder')->getForm();
@@ -164,13 +164,13 @@ public function createAction(Request $request)
* "is_granted('update', request.get('_legacy_controller'))",
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(redirectRoute="admin_profiles_index")
*
* @param int $profileId
* @param Request $request
*
* @return Response
*/
+ #[DemoRestricted(redirectRoute: 'admin_profiles_index')]
public function editAction($profileId, Request $request)
{
$formHandler = $this->get('prestashop.core.form.identifiable_object.handler.profile_form_handler');
@@ -228,12 +228,12 @@ public function editAction($profileId, Request $request)
* "is_granted('delete', request.get('_legacy_controller'))",
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(redirectRoute="admin_profiles_index")
*
* @param int $profileId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_profiles_index')]
public function deleteAction($profileId)
{
try {
@@ -256,12 +256,12 @@ public function deleteAction($profileId)
* "is_granted('delete', request.get('_legacy_controller'))",
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(redirectRoute="admin_profiles_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_profiles_index')]
public function bulkDeleteAction(Request $request)
{
$profileIds = $request->request->all('profile_bulk');
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ShopController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ShopController.php
index b570153dbe26d..342e41f3ccbd3 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ShopController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/ShopController.php
@@ -70,7 +70,7 @@ public function searchAction(string $searchTerm): JsonResponse
private function getErrorMessage(Exception $e): string
{
return $this->getFallbackErrorMessage(
- get_class($e),
+ $e::class,
$e->getCode(),
$e->getMessage()
);
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SqlManagerController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SqlManagerController.php
index 38584c938d816..9f389599116d6 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SqlManagerController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/SqlManagerController.php
@@ -104,12 +104,12 @@ public function indexAction(Request $request, RequestSqlFilters $filters)
* @deprecated since 1.7.8 and will be removed in next major. Use CommonController:searchGridAction instead
*
* @AdminSecurity("is_granted('read', request.get('_legacy_controller'))", redirectRoute="admin_sql_requests_index")
- * @DemoRestricted(redirectRoute="admin_sql_requests_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_sql_requests_index')]
public function searchAction(Request $request)
{
$definitionFactory = $this->get('prestashop.core.grid.definition.factory.request_sql');
@@ -131,7 +131,6 @@ public function searchAction(Request $request)
/**
* Process Request SQL settings save.
*
- * @DemoRestricted(redirectRoute="admin_sql_requests_index")
* @AdminSecurity(
* "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* redirectRoute="admin_sql_requests_index"
@@ -141,6 +140,7 @@ public function searchAction(Request $request)
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_sql_requests_index')]
public function processFormAction(Request $request)
{
$handler = $this->getSettingsFormHandler();
@@ -207,7 +207,6 @@ public function createAction(Request $request)
/**
* Show Request SQL edit page.
*
- * @DemoRestricted(redirectRoute="admin_sql_requests_index")
* @AdminSecurity(
* "is_granted('update', request.get('_legacy_controller'))",
* message="You do not have permission to edit this.",
@@ -219,6 +218,7 @@ public function createAction(Request $request)
*
* @return Response
*/
+ #[DemoRestricted(redirectRoute: 'admin_sql_requests_index')]
public function editAction(int $sqlRequestId, Request $request)
{
$sqlRequestForm = $this->getSqlRequestFormBuilder()->getFormFor($sqlRequestId);
@@ -260,12 +260,12 @@ public function editAction(int $sqlRequestId, Request $request)
* message="You do not have permission to delete this.",
* redirectRoute="admin_sql_requests_index"
* )
- * @DemoRestricted(redirectRoute="admin_sql_requests_index")
*
* @param int $sqlRequestId ID of selected Request SQL
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_sql_requests_index')]
public function deleteAction(int $sqlRequestId)
{
try {
@@ -291,12 +291,12 @@ public function deleteAction(int $sqlRequestId)
* message="You do not have permission to delete this.",
* redirectRoute="admin_sql_requests_index"
* )
- * @DemoRestricted(redirectRoute="admin_sql_requests_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_sql_requests_index')]
public function deleteBulkAction(Request $request)
{
try {
@@ -358,12 +358,12 @@ public function viewAction(Request $request, int $sqlRequestId)
* "is_granted('read', request.get('_legacy_controller'))",
* redirectRoute="admin_sql_requests_index"
* )
- * @DemoRestricted(redirectRoute="admin_sql_requests_index")
*
* @param int $sqlRequestId Request SQL id
*
* @return RedirectResponse|BinaryFileResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_sql_requests_index')]
public function exportAction(int $sqlRequestId)
{
$requestSqlExporter = $this->get('prestashop.core.sql_manager.exporter.sql_request_exporter');
@@ -483,7 +483,7 @@ protected function getSqlRequestDataFromRequest(Request $request)
protected function handleException(SqlRequestException $e)
{
$code = $e->getCode();
- $type = get_class($e);
+ $type = $e::class;
$exceptionMessages = [
SqlRequestNotFoundException::class => $this->trans('The object cannot be loaded (or found).', 'Admin.Notifications.Error'),
@@ -518,7 +518,7 @@ protected function handleException(SqlRequestException $e)
*/
protected function handleViewException(SqlRequestException $e)
{
- $type = get_class($e);
+ $type = $e::class;
$exceptionMessages = [
SqlRequestNotFoundException::class => $this->trans('The object cannot be loaded (or found).', 'Admin.Notifications.Error'),
@@ -538,7 +538,7 @@ protected function handleViewException(SqlRequestException $e)
*/
protected function handleExportException(Exception $e)
{
- $type = get_class($e);
+ $type = $e::class;
if ($e instanceof FileWritingException) {
return $this->handleApplicationExportException($e);
@@ -568,7 +568,7 @@ protected function handleApplicationExportException(FileWritingException $e)
return $applicationErrors[$code];
}
- return $this->getFallbackErrorMessage(get_class($e), $code);
+ return $this->getFallbackErrorMessage($e::class, $code);
}
/**
@@ -578,7 +578,7 @@ protected function handleApplicationExportException(FileWritingException $e)
*/
protected function handleDomainExportException(SqlRequestException $e)
{
- $type = get_class($e);
+ $type = $e::class;
$domainErrors = [
SqlRequestNotFoundException::class => $this->trans('The object cannot be loaded (or found).', 'Admin.Notifications.Error'),
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/WebserviceController.php b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/WebserviceController.php
index c17f5b15165b9..a2bf6a9cf790d 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/WebserviceController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/AdvancedParameters/WebserviceController.php
@@ -182,13 +182,13 @@ public function searchAction(Request $request)
/**
* Deletes single record.
*
- * @DemoRestricted(redirectRoute="admin_webservice_keys_index")
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message="You do not have permission to delete this.")
*
* @param int $webserviceKeyId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_webservice_keys_index')]
public function deleteAction($webserviceKeyId)
{
$webserviceEraser = $this->get('prestashop.adapter.webservice.webservice_key_eraser');
@@ -209,13 +209,13 @@ public function deleteAction($webserviceKeyId)
/**
* Deletes selected records.
*
- * @DemoRestricted(redirectRoute="admin_webservice_keys_index")
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message="You do not have permission to delete this.")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_webservice_keys_index')]
public function bulkDeleteAction(Request $request)
{
$webserviceToDelete = $request->request->get('webservice_key_bulk_action');
@@ -238,13 +238,13 @@ public function bulkDeleteAction(Request $request)
/**
* Enables status for selected rows.
*
- * @DemoRestricted(redirectRoute="admin_webservice_keys_index")
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message="You do not have permission to edit this.")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_webservice_keys_index')]
public function bulkEnableAction(Request $request)
{
$webserviceToEnable = $request->request->get('webservice_key_bulk_action');
@@ -263,13 +263,13 @@ public function bulkEnableAction(Request $request)
/**
* Disables status for selected rows.
*
- * @DemoRestricted(redirectRoute="admin_webservice_keys_index")
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message="You do not have permission to edit this.")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_webservice_keys_index')]
public function bulkDisableAction(Request $request)
{
$webserviceToDisable = $request->request->get('webservice_key_bulk_action');
@@ -288,13 +288,13 @@ public function bulkDisableAction(Request $request)
/**
* Toggles webservice account status.
*
- * @DemoRestricted(redirectRoute="admin_webservice_keys_index")
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message="You do not have permission to edit this.")
*
* @param int $webserviceKeyId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_webservice_keys_index')]
public function toggleStatusAction($webserviceKeyId)
{
$statusModifier = $this->get('prestashop.adapter.webservice.webservice_key_status_modifier');
@@ -315,7 +315,6 @@ public function toggleStatusAction($webserviceKeyId)
/**
* Process the Webservice configuration form.
*
- * @DemoRestricted(redirectRoute="admin_webservice_keys_index")
* @AdminSecurity(
* "is_granted('create', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* message="You do not have permission to edit this."
@@ -326,6 +325,7 @@ public function toggleStatusAction($webserviceKeyId)
*
* @return Response|RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_webservice_keys_index')]
public function saveSettingsAction(Request $request, WebserviceKeyFilters $filters)
{
$this->dispatchHook('actionAdminAdminWebserviceControllerPostProcessBefore', ['controller' => $this]);
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/ContactsController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/ContactsController.php
index a81f73000f8b2..3d6ee323b7a92 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/ContactsController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/ContactsController.php
@@ -212,12 +212,11 @@ public function editAction($contactId, Request $request)
* message="You do not have permission to delete this."
* )
*
- * @DemoRestricted(redirectRoute="admin_contacts_index")
- *
* @param int $contactId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_contacts_index')]
public function deleteAction($contactId)
{
$contactDeleter = $this->get('prestashop.adapter.contact.deleter');
@@ -243,12 +242,11 @@ public function deleteAction($contactId)
* message="You do not have permission to delete this."
* )
*
- * @DemoRestricted(redirectRoute="admin_contacts_index")
- *
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_contacts_index')]
public function deleteBulkAction(Request $request)
{
$contactIds = $request->request->all('contact_bulk');
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/CustomerPreferencesController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/CustomerPreferencesController.php
index 93af19739d28d..27474f8e26801 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/CustomerPreferencesController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/CustomerPreferencesController.php
@@ -67,12 +67,12 @@ public function indexAction(Request $request)
* "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* message="You do not have permission to update this.", redirectRoute="admin_customer_preferences"
* )
- * @DemoRestricted(redirectRoute="admin_customer_preferences")
*
* @param Request $request
*
* @return Response
*/
+ #[DemoRestricted(redirectRoute: 'admin_customer_preferences')]
public function processAction(Request $request)
{
$formHandler = $this->get('prestashop.admin.customer_preferences.form_handler');
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/MaintenanceController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/MaintenanceController.php
index dc81825e82eca..e40cab048ae51 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/MaintenanceController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/MaintenanceController.php
@@ -74,10 +74,10 @@ public function indexAction(Request $request, FormInterface $form = null)
* "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* message="You do not have permission to edit this.",
* redirectRoute="admin_maintenance")
- * @DemoRestricted(redirectRoute="admin_maintenance")
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_maintenance')]
public function processFormAction(Request $request)
{
$redirectResponse = $this->redirectToRoute('admin_maintenance');
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/MetaController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/MetaController.php
index 476f9f3f3e83a..0cc4724495d34 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/MetaController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/MetaController.php
@@ -83,12 +83,12 @@ public function indexAction(MetaFilters $filters, Request $request)
* Used for applying filtering actions.
*
* @AdminSecurity("is_granted('read', request.get('_legacy_controller'))")
- * @DemoRestricted(redirectRoute="admin_metas_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_metas_index')]
public function searchAction(Request $request)
{
$definitionFactory = $this->get('prestashop.core.grid.definition.factory.meta');
@@ -191,12 +191,12 @@ public function editAction($metaId, Request $request)
* Removes single element from meta list.
*
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message="You do not have permission to delete this.")
- * @DemoRestricted(redirectRoute="admin_metas_index")
*
* @param int $metaId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_metas_index')]
public function deleteAction($metaId)
{
$metaEraser = $this->get('prestashop.adapter.meta.meta_eraser');
@@ -218,12 +218,12 @@ public function deleteAction($metaId)
* Removes multiple records from meta list.
*
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", message="You do not have permission to delete this.")
- * @DemoRestricted(redirectRoute="admin_metas_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_metas_index')]
public function deleteBulkAction(Request $request)
{
$metaToDelete = $request->request->all('meta_bulk');
@@ -245,13 +245,13 @@ public function deleteBulkAction(Request $request)
/**
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message="You do not have permission to edit this.")
- * @DemoRestricted(redirectRoute="admin_metas_index")
*
* @param MetaFilters $filters
* @param Request $request
*
* @return Response|RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_metas_index')]
public function processSetUpUrlsFormAction(MetaFilters $filters, Request $request)
{
$formProcessResult = $this->processForm(
@@ -278,13 +278,13 @@ public function processSetUpUrlsFormAction(MetaFilters $filters, Request $reques
/**
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message="You do not have permission to edit this.")
- * @DemoRestricted(redirectRoute="admin_metas_index")
*
* @param MetaFilters $filters
* @param Request $request
*
* @return Response|RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_metas_index')]
public function processShopUrlsFormAction(MetaFilters $filters, Request $request)
{
$formProcessResult = $this->processForm(
@@ -311,13 +311,13 @@ public function processShopUrlsFormAction(MetaFilters $filters, Request $request
/**
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message="You do not have permission to edit this.")
- * @DemoRestricted(redirectRoute="admin_metas_index")
*
* @param MetaFilters $filters
* @param Request $request
*
* @return Response|RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_metas_index')]
public function processUrlSchemaFormAction(MetaFilters $filters, Request $request)
{
$formProcessResult = $this->processForm(
@@ -339,13 +339,13 @@ public function processUrlSchemaFormAction(MetaFilters $filters, Request $reques
/**
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", message="You do not have permission to edit this.")
- * @DemoRestricted(redirectRoute="admin_metas_index")
*
* @param MetaFilters $filters
* @param Request $request
*
* @return Response|RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_metas_index')]
public function processSeoOptionsFormAction(MetaFilters $filters, Request $request)
{
$formProcessResult = $this->processForm(
@@ -376,10 +376,10 @@ public function processSeoOptionsFormAction(MetaFilters $filters, Request $reque
* @AdminSecurity(
* "is_granted('create', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))"
* )
- * @DemoRestricted(redirectRoute="admin_metas_index")
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_metas_index')]
public function generateRobotsFileAction()
{
$robotsTextFileGenerator = $this->get('prestashop.adapter.file.robots_text_file_generator');
@@ -627,7 +627,7 @@ private function getExceptionByClassAndErrorCode(Exception $exception)
],
];
- $exceptionClass = get_class($exception);
+ $exceptionClass = $exception::class;
$exceptionCode = $exception->getCode();
if (isset($exceptionDictionary[$exceptionClass][$exceptionCode])) {
return $exceptionDictionary[$exceptionClass][$exceptionCode];
@@ -652,7 +652,7 @@ private function getExceptionByType(Exception $exception)
),
];
- $exceptionClass = get_class($exception);
+ $exceptionClass = $exception::class;
if (isset($exceptionDictionary[$exceptionClass])) {
return $exceptionDictionary[$exceptionClass];
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/OrderPreferencesController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/OrderPreferencesController.php
index daa9bf7d2f5e8..30794387d3a46 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/OrderPreferencesController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/OrderPreferencesController.php
@@ -58,7 +58,6 @@ public function indexAction(Request $request)
'help_link' => $this->generateSidebarLink($legacyController),
'generalForm' => $generalForm->createView(),
'giftOptionsForm' => $giftOptionsForm->createView(),
- 'isMultishippingEnabled' => $this->getConfiguration()->getBoolean('PS_ALLOW_MULTISHIPPING'),
'isAtcpShipWrapEnabled' => $this->getConfiguration()->getBoolean('PS_ATCP_SHIPWRAP'),
]);
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/PreferencesController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/PreferencesController.php
index 767830d76b8aa..facc91c11f276 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/PreferencesController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/PreferencesController.php
@@ -66,12 +66,11 @@ public function indexAction(Request $request, FormInterface $form = null)
* message="You do not have permission to update this.",
* redirectRoute="admin_preferences")
*
- * @DemoRestricted(redirectRoute="admin_preferences")
- *
* @return Response
*
* @throws \LogicException
*/
+ #[DemoRestricted(redirectRoute: 'admin_preferences')]
public function processFormAction(Request $request)
{
$this->dispatchHook('actionAdminPreferencesControllerPostProcessBefore', ['controller' => $this]);
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
index d251f9a70f326..8a2699a3f8a4d 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/SearchController.php
@@ -28,9 +28,13 @@
namespace PrestaShopBundle\Controller\Admin\Configure\ShopParameters;
+use Exception;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Exception\AliasConstraintException;
+use PrestaShop\PrestaShop\Core\Domain\Alias\Query\SearchForSearchTerm;
use PrestaShop\PrestaShop\Core\Search\Filters\AliasFilters;
use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
use PrestaShopBundle\Security\Annotation\AdminSecurity;
+use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -65,4 +69,46 @@ public function indexAction(Request $request, AliasFilters $filters): Response
],
]);
}
+
+ /**
+ * @AdminSecurity("is_granted('read', request.get('_legacy_controller'))")
+ *
+ * @param Request $request
+ *
+ * @return JsonResponse
+ */
+ public function searchAliasesForAssociationAction(Request $request): JsonResponse
+ {
+ try {
+ /** @var string[] $searchTerms */
+ $searchTerms = $this->getQueryBus()->handle(new SearchForSearchTerm(
+ $request->get('query', ''),
+ (int) $request->get('limit', SearchForSearchTerm::DEFAULT_LIMIT)
+ ));
+ } catch (AliasConstraintException $e) {
+ return $this->json([
+ 'message' => $this->getErrorMessage($e),
+ ], Response::HTTP_BAD_REQUEST);
+ }
+
+ if (empty($searchTerms)) {
+ return $this->json(['searchTerms' => []], Response::HTTP_NOT_FOUND);
+ }
+
+ return $this->json(['searchTerms' => $searchTerms]);
+ }
+
+ /**
+ * @param Exception $e
+ *
+ * @return string
+ */
+ private function getErrorMessage(Exception $e): string
+ {
+ return $this->getFallbackErrorMessage(
+ get_class($e),
+ $e->getCode(),
+ $e->getMessage()
+ );
+ }
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/TitleController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/TitleController.php
index d992ced64f208..dce263a40e59e 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/TitleController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/TitleController.php
@@ -164,12 +164,12 @@ public function editAction(int $titleId, Request $request): Response
* redirectRoute="admin_title_index",
* message="You need permission to delete this."
* )
- * @DemoRestricted(redirectRoute="admin_title_index")
*
* @param int $titleId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_title_index')]
public function deleteAction(int $titleId): RedirectResponse
{
try {
@@ -189,12 +189,12 @@ public function deleteAction(int $titleId): RedirectResponse
* Deletes titles in bulk action
*
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_title_index")
- * @DemoRestricted(redirectRoute="admin_title_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_title_index')]
public function bulkDeleteAction(Request $request): RedirectResponse
{
$titleIds = $this->getBulkTitlesFromRequest($request);
diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShowcaseCardController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShowcaseCardController.php
index cb43fcb573593..f363561616510 100644
--- a/src/PrestaShopBundle/Controller/Admin/Configure/ShowcaseCardController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShowcaseCardController.php
@@ -53,10 +53,10 @@ class ShowcaseCardController extends FrameworkBundleAdminController
* @AdminSecurity(
* "is_granted('create', 'CONFIGURE') && is_granted('update', 'CONFIGURE')"
* )
- * @DemoRestricted(redirectRoute="admin_metas_index")
*
* @return JsonResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_metas_index')]
public function closeShowcaseCardAction(Request $request)
{
// check prerequisites
diff --git a/src/PrestaShopBundle/Controller/Admin/ErrorController.php b/src/PrestaShopBundle/Controller/Admin/ErrorController.php
index 2bc0e7c90a063..fb156cff4844f 100644
--- a/src/PrestaShopBundle/Controller/Admin/ErrorController.php
+++ b/src/PrestaShopBundle/Controller/Admin/ErrorController.php
@@ -34,7 +34,7 @@
/**
* Manages Error pages (e.g. 500)
*/
-class ErrorController extends FrameworkBundleAdminController
+class ErrorController extends PrestaShopAdminController
{
/**
* Enables debug mode from error page (500 for example)
@@ -47,9 +47,9 @@ class ErrorController extends FrameworkBundleAdminController
*
* @return RedirectResponse
*/
- public function enableDebugModeAction(Request $request)
+ public function enableDebugModeAction(Request $request): RedirectResponse
{
- $this->getCommandBus()->handle(new SwitchDebugModeCommand(true));
+ $this->dispatchCommand(new SwitchDebugModeCommand(true));
return $this->redirect(
$request->request->get('_redirect_url')
diff --git a/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php b/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php
index f3dd109f7121b..19f42abab687b 100644
--- a/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php
+++ b/src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php
@@ -34,7 +34,9 @@
use PrestaShop\PrestaShop\Core\Localization\Locale\Repository as LocaleRepository;
use PrestaShop\PrestaShop\Core\Module\Exception\ModuleErrorInterface;
use PrestaShop\PrestaShop\Core\Security\Permission;
+use Psr\Container\ContainerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\Form\FormError;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\JsonResponse;
@@ -42,11 +44,36 @@
/**
* Extends The Symfony framework bundle controller to add common functions for PrestaShop needs.
+ *
+ * @deprecated since 9.0 to be removed in future versions (10+ at least, when it will not be used anymore),
+ * should stop using it in favor of PrestaShopAdminController.
*/
-class FrameworkBundleAdminController extends AbstractController
+class FrameworkBundleAdminController extends AbstractController implements ContainerAwareInterface
{
+ /**
+ * @deprecated since 9.0
+ */
public const PRESTASHOP_CORE_CONTROLLERS_TAG = 'prestashop.core.controllers';
+ /**
+ * Override to make this compatible with the ContainerAware signature, content should be the same as in the abstract.
+ * Do not override this neither use this, it will be removed in next versions. This overridden method
+ * along with the ContainerAwareInterface was added to skip the error sent by Symfony\Bundle\FrameworkBundle\Controller\ControllerResolver
+ * that forces the controllers extending AbstractController to be defined as service subscriber.
+ *
+ * This method allows us to keep controllers based on FrameworkBundleAdminController from being
+ * adapted. However, the core and the modules should stop using it in favor of PrestaShopAdminController
+ *
+ * @internal
+ */
+ public function setContainer(ContainerInterface $container = null): ?ContainerInterface
+ {
+ $previous = $this->container;
+ $this->container = $container;
+
+ return $previous;
+ }
+
/**
* @var string|null
*/
@@ -496,7 +523,7 @@ protected function getErrorMessageForException(Exception $e, array $messages)
return $e->getMessage();
}
- $exceptionType = get_class($e);
+ $exceptionType = $e::class;
$exceptionCode = $e->getCode();
if (isset($messages[$exceptionType])) {
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/Design/CmsPageController.php b/src/PrestaShopBundle/Controller/Admin/Improve/Design/CmsPageController.php
index c57e14f52ec2a..15d80e798241c 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/Design/CmsPageController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/Design/CmsPageController.php
@@ -453,15 +453,12 @@ public function editCmsCategoryAction($cmsCategoryId, Request $request)
* redirectQueryParamsToKeep={"id_cms_category"},
* message="You do not have permission to delete this."
* )
- * @DemoRestricted(
- * redirectRoute="admin_cms_pages_index",
- * redirectQueryParamsToKeep={"id_cms_category"}
- * )
*
* @param int $cmsCategoryId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
public function deleteCmsCategoryAction($cmsCategoryId)
{
try {
@@ -492,15 +489,12 @@ public function deleteCmsCategoryAction($cmsCategoryId)
* redirectQueryParamsToKeep={"id_cms_category"},
* message="You do not have permission to delete this."
* )
- * @DemoRestricted(
- * redirectRoute="admin_cms_pages_index",
- * redirectQueryParamsToKeep={"id_cms_category"}
- * )
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
public function deleteBulkCmsCategoryAction(Request $request)
{
$cmsCategoriesToDelete = $request->request->all('cms_page_category_bulk');
@@ -535,15 +529,12 @@ public function deleteBulkCmsCategoryAction(Request $request)
* redirectQueryParamsToKeep={"id_cms_category"},
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(
- * redirectRoute="admin_cms_pages_index",
- * redirectQueryParamsToKeep={"id_cms_category"}
- * )
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
public function updateCmsCategoryPositionAction(Request $request)
{
$cmsCategoryParentId = $request->query->getInt('id_cms_category') ?:
@@ -590,13 +581,10 @@ public function updateCmsCategoryPositionAction(Request $request)
* redirectQueryParamsToKeep={"id_cms_category"},
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(
- * redirectRoute="admin_cms_pages_index",
- * redirectQueryParamsToKeep={"id_cms_category"}
- * )
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
public function updateCmsPositionAction(Request $request)
{
$cmsCategoryParentId = $request->query->getInt('id_cms_category') ?:
@@ -642,15 +630,12 @@ public function updateCmsPositionAction(Request $request)
* redirectQueryParamsToKeep={"id_cms_category"},
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(
- * redirectRoute="admin_cms_pages_index",
- * redirectQueryParamsToKeep={"id_cms_category"}
- * )
*
* @param int $cmsCategoryId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
public function toggleCmsCategoryAction($cmsCategoryId)
{
try {
@@ -681,15 +666,12 @@ public function toggleCmsCategoryAction($cmsCategoryId)
* redirectQueryParamsToKeep={"id_cms_category"},
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(
- * redirectRoute="admin_cms_pages_index",
- * redirectQueryParamsToKeep={"id_cms_category"}
- * )
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
public function bulkCmsPageCategoryStatusEnableAction(Request $request)
{
$cmsCategoriesToEnable = $request->request->all('cms_page_category_bulk');
@@ -723,15 +705,12 @@ public function bulkCmsPageCategoryStatusEnableAction(Request $request)
* redirectQueryParamsToKeep={"id_cms_category"},
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(
- * redirectRoute="admin_cms_pages_index",
- * redirectQueryParamsToKeep={"id_cms_category"}
- * )
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
public function bulkCmsPageCategoryStatusDisableAction(Request $request)
{
$cmsCategoriesToDisable = $request->request->all('cms_page_category_bulk');
@@ -769,15 +748,12 @@ function ($item) {
* redirectQueryParamsToKeep={"id_cms_category"},
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(
- * redirectRoute="admin_cms_pages_index",
- * redirectQueryParamsToKeep={"id_cms_category"}
- * )
*
* @param int $cmsId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
public function toggleCmsAction($cmsId)
{
try {
@@ -806,15 +782,12 @@ public function toggleCmsAction($cmsId)
* redirectQueryParamsToKeep={"id_cms_category"},
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(
- * redirectRoute="admin_cms_pages_index",
- * redirectQueryParamsToKeep={"id_cms_category"}
- * )
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
public function bulkDisableCmsPageStatusAction(Request $request)
{
$cmsPagesToDisable = $request->request->all('cms_page_bulk');
@@ -849,15 +822,12 @@ public function bulkDisableCmsPageStatusAction(Request $request)
* redirectQueryParamsToKeep={"id_cms_category"},
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(
- * redirectRoute="admin_cms_pages_index",
- * redirectQueryParamsToKeep={"id_cms_category"}
- * )
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
public function bulkEnableCmsPageStatusAction(Request $request)
{
$cmsPagesToDisable = $request->request->all('cms_page_bulk');
@@ -897,15 +867,12 @@ function ($item) {
* redirectQueryParamsToKeep={"id_cms_category"},
* message="You do not have permission to delete this."
* )
- * @DemoRestricted(
- * redirectRoute="admin_cms_pages_index",
- * redirectQueryParamsToKeep={"id_cms_category"}
- * )
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
public function bulkDeleteCmsPageAction(Request $request)
{
$cmsPagesToDisable = $request->request->all('cms_page_bulk');
@@ -947,15 +914,12 @@ function ($item) {
* redirectQueryParamsToKeep={"id_cms_category"},
* message="You do not have permission to delete this."
* )
- * @DemoRestricted(
- * redirectRoute="admin_cms_pages_index",
- * redirectQueryParamsToKeep={"id_cms_category"}
- * )
*
* @param int $cmsId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_cms_pages_index', redirectQueryParamsToKeep: ['id_cms_category'])]
public function deleteCmsAction($cmsId)
{
$redirectResponse = $this->redirectToParentIndexPageByCmsPageId($cmsId);
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/Design/ThemeController.php b/src/PrestaShopBundle/Controller/Admin/Improve/Design/ThemeController.php
index c723074584580..4bd345ba8b278 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/Design/ThemeController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/Design/ThemeController.php
@@ -112,12 +112,12 @@ public function indexAction(Request $request)
* Upload shop logos.
*
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_themes_index")
- * @DemoRestricted(redirectRoute="admin_themes_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_themes_index')]
public function uploadLogosAction(Request $request)
{
$logosUploadForm = $this->getLogosUploadForm();
@@ -154,10 +154,10 @@ public function uploadLogosAction(Request $request)
* redirectRoute="admin_themes_index",
* message="You do not have permission to view this."
* )
- * @DemoRestricted(redirectRoute="admin_themes_index")
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_themes_index')]
public function exportAction()
{
$themeProvider = $this->get('prestashop.core.addon.theme.theme_provider');
@@ -185,12 +185,12 @@ public function exportAction()
* redirectRoute="admin_themes_index",
* message="You do not have permission to add this."
* )
- * @DemoRestricted(redirectRoute="admin_themes_index")
*
* @param Request $request
*
* @return Response
*/
+ #[DemoRestricted(redirectRoute: 'admin_themes_index')]
public function importAction(Request $request)
{
$importThemeForm = $this->createForm(ImportThemeType::class);
@@ -248,12 +248,12 @@ public function importAction(Request $request)
* redirectRoute="admin_themes_index",
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(redirectRoute="admin_themes_index")
*
* @param string $themeName
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_themes_index')]
public function enableAction($themeName)
{
try {
@@ -282,12 +282,12 @@ public function enableAction($themeName)
* redirectRoute="admin_themes_index",
* message="You do not have permission to delete this."
* )
- * @DemoRestricted(redirectRoute="admin_themes_index")
*
* @param string $themeName
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_themes_index')]
public function deleteAction($themeName)
{
try {
@@ -314,12 +314,12 @@ public function deleteAction($themeName)
* redirectRoute="admin_themes_index",
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(redirectRoute="admin_themes_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_themes_index')]
public function adaptToRTLLanguagesAction(Request $request)
{
$form = $this->getAdaptThemeToRtlLanguageForm();
@@ -359,12 +359,12 @@ public function adaptToRTLLanguagesAction(Request $request)
* redirectRoute="admin_themes_index",
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(redirectRoute="admin_themes_index")
*
* @param string $themeName
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_themes_index')]
public function resetLayoutsAction($themeName)
{
$this->getCommandBus()->handle(new ResetThemeLayoutsCommand(new ThemeName($themeName)));
@@ -531,7 +531,7 @@ private function handleEnableThemeException(ThemeException $e)
*/
private function handleDeleteThemeException(ThemeException $e)
{
- $type = get_class($e);
+ $type = $e::class;
$errorMessages = [
CannotDeleteThemeException::class => $this->trans(
@@ -554,7 +554,7 @@ private function handleDeleteThemeException(ThemeException $e)
*/
private function handleAdaptThemeToRTLLanguagesException(ThemeException $e)
{
- $type = get_class($e);
+ $type = $e::class;
$errorMessages = [
CannotAdaptThemeToRTLLanguagesException::class => $this->trans('Cannot adapt theme to RTL languages.', 'Admin.Design.Notification'),
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/CountryController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/CountryController.php
index 0c40cfcd1ce0f..135dc354a3c15 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/CountryController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/CountryController.php
@@ -173,12 +173,11 @@ public function editAction(int $countryId, Request $request): Response
* message="You need permission to delete this."
* )
*
- * @DemoRestricted(redirectRoute="admin_countries_index")
- *
* @param int $countryId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_countries_index')]
public function deleteAction(int $countryId): RedirectResponse
{
try {
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/CurrencyController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/CurrencyController.php
index c51d8ffa5c3f3..a9a0ba4064c76 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/CurrencyController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/CurrencyController.php
@@ -268,12 +268,12 @@ private function getLanguagesData(string $currencyIsoCode)
* redirectRoute="admin_currencies_index",
* message="You need permission to delete this."
* )
- * @DemoRestricted(redirectRoute="admin_currencies_index")
*
* @param int $currencyId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_currencies_index')]
public function deleteAction($currencyId)
{
try {
@@ -295,10 +295,10 @@ public function deleteAction($currencyId)
* @param string $currencyIsoCode
*
* @AdminSecurity("is_granted('read', request.get('_legacy_controller'))")
- * @DemoRestricted(redirectRoute="admin_currencies_index")
*
* @return JsonResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_currencies_index')]
public function getReferenceDataAction($currencyIsoCode)
{
try {
@@ -346,10 +346,10 @@ public function getReferenceDataAction($currencyIsoCode)
* redirectRoute="admin_currencies_index",
* message="You need permission to edit this."
* )
- * @DemoRestricted(redirectRoute="admin_currencies_index")
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_currencies_index')]
public function toggleStatusAction($currencyId)
{
try {
@@ -376,10 +376,10 @@ public function toggleStatusAction($currencyId)
* redirectRoute="admin_currencies_index",
* message="You need permission to edit this."
* )
- * @DemoRestricted(redirectRoute="admin_currencies_index")
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_currencies_index')]
public function refreshExchangeRatesAction()
{
try {
@@ -485,13 +485,13 @@ private function getSettingsFormHandler()
* Toggles currencies status in bulk action
*
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_currencies_index")
- * @DemoRestricted(redirectRoute="admin_currencies_index")
*
* @param Request $request
* @param string $status
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_currencies_index')]
public function bulkToggleStatusAction(Request $request, $status)
{
$currenciesIds = $this->getBulkCurrenciesFromRequest($request);
@@ -518,12 +518,12 @@ public function bulkToggleStatusAction(Request $request, $status)
* Deletes currencies in bulk action
*
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_currencies_index")
- * @DemoRestricted(redirectRoute="admin_currencies_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_currencies_index')]
public function bulkDeleteAction(Request $request)
{
$currenciesIds = $this->getBulkCurrenciesFromRequest($request);
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/GeolocationController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/GeolocationController.php
index fe9343681df52..6cdd8b1ddb5dc 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/GeolocationController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/GeolocationController.php
@@ -76,12 +76,12 @@ public function indexAction(Request $request)
* message="You do not have permission to edit this.",
* redirectRoute="admin_geolocation_index"
* )
- * @DemoRestricted(redirectRoute="admin_geolocation_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_geolocation_index')]
public function processByIpAddressFormAction(Request $request)
{
return $this->processForm(
@@ -99,12 +99,12 @@ public function processByIpAddressFormAction(Request $request)
* message="You do not have permission to edit this.",
* redirectRoute="admin_geolocation_index"
* )
- * @DemoRestricted(redirectRoute="admin_geolocation_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_geolocation_index')]
public function processWhitelistFormAction(Request $request)
{
return $this->processForm(
@@ -122,12 +122,12 @@ public function processWhitelistFormAction(Request $request)
* message="You do not have permission to edit this.",
* redirectRoute="admin_geolocation_index"
* )
- * @DemoRestricted(redirectRoute="admin_geolocation_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_geolocation_index')]
public function processOptionsFormAction(Request $request)
{
return $this->processForm(
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/LanguageController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/LanguageController.php
index 5cd71cad84d81..82ca51b90c870 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/LanguageController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/LanguageController.php
@@ -216,12 +216,12 @@ public function editAction($languageId, Request $request)
* Deletes language
*
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_languages_index")
- * @DemoRestricted(redirectRoute="admin_languages_index")
*
* @param int $languageId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_languages_index')]
public function deleteAction($languageId)
{
try {
@@ -239,12 +239,12 @@ public function deleteAction($languageId)
* Deletes languages in bulk action
*
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_languages_index")
- * @DemoRestricted(redirectRoute="admin_languages_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_languages_index')]
public function bulkDeleteAction(Request $request)
{
$languageIds = $this->getBulkLanguagesFromRequest($request);
@@ -267,12 +267,12 @@ public function bulkDeleteAction(Request $request)
* Toggles language status
*
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_languages_index")
- * @DemoRestricted(redirectRoute="admin_languages_index")
*
* @param int $languageId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_languages_index')]
public function toggleStatusAction($languageId)
{
try {
@@ -299,13 +299,13 @@ public function toggleStatusAction($languageId)
* Toggles languages status in bulk action
*
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_languages_index")
- * @DemoRestricted(redirectRoute="admin_languages_index")
*
* @param Request $request
* @param string $status
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_languages_index')]
public function bulkToggleStatusAction(Request $request, $status)
{
$languageIds = $this->getBulkLanguagesFromRequest($request);
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/LocalizationController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/LocalizationController.php
index 6c11caffb6d18..1a58b0359a8cb 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/LocalizationController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/LocalizationController.php
@@ -82,12 +82,12 @@ public function indexAction(Request $request)
* "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(redirectRoute="admin_localization_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_localization_index')]
public function processConfigurationFormAction(Request $request)
{
return $this->processForm(
@@ -104,12 +104,12 @@ public function processConfigurationFormAction(Request $request)
* "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(redirectRoute="admin_localization_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_localization_index')]
public function processLocalUnitsFormAction(Request $request)
{
return $this->processForm(
@@ -126,12 +126,12 @@ public function processLocalUnitsFormAction(Request $request)
* "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(redirectRoute="admin_localization_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_localization_index')]
public function processAdvancedFormAction(Request $request)
{
return $this->processForm(
@@ -183,12 +183,12 @@ protected function processForm(Request $request, FormHandlerInterface $formHandl
* "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(redirectRoute="admin_localization_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_localization_index')]
public function importPackAction(Request $request)
{
$localizationPackImportForm = $this->createForm(ImportLocalizationPackType::class);
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/StateController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/StateController.php
index 45f4266ece903..e80df639778de 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/StateController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/StateController.php
@@ -113,12 +113,12 @@ public function indexAction(Request $request, StateFilters $filters): Response
* Deletes state
*
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_states_index")
- * @DemoRestricted(redirectRoute="admin_states_index")
*
* @param int $stateId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_states_index')]
public function deleteAction(int $stateId): RedirectResponse
{
try {
@@ -231,12 +231,12 @@ public function createAction(Request $request): Response
* Toggles state status
*
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_states_index")
- * @DemoRestricted(redirectRoute="admin_states_index")
*
* @param int $stateId
*
* @return JsonResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_states_index')]
public function toggleStatusAction(int $stateId): JsonResponse
{
try {
@@ -294,12 +294,12 @@ public function deleteBulkAction(Request $request): RedirectResponse
* Enables states on bulk action
*
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_states_index")
- * @DemoRestricted(redirectRoute="admin_states_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_states_index')]
public function bulkEnableAction(Request $request): RedirectResponse
{
$stateIds = $this->getBulkStatesFromRequest($request);
@@ -322,12 +322,12 @@ public function bulkEnableAction(Request $request): RedirectResponse
* Disables states on bulk action
*
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_states_index")
- * @DemoRestricted(redirectRoute="admin_states_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_states_index')]
public function bulkDisableAction(Request $request): RedirectResponse
{
$stateIds = $this->getBulkStatesFromRequest($request);
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/TaxController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/TaxController.php
index 6c7b60b230330..1a53fa5306db0 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/TaxController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/TaxController.php
@@ -84,12 +84,12 @@ public function indexAction(Request $request, TaxFilters $filters)
* "is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* redirectRoute="admin_taxes_index"
* )
- * @DemoRestricted(redirectRoute="admin_taxes_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_taxes_index')]
public function saveOptionsAction(Request $request)
{
$taxOptionsFormHandler = $this->getTaxOptionsFormHandler();
@@ -265,12 +265,12 @@ public function editAction(Request $request, $taxId)
* "is_granted('delete', request.get('_legacy_controller'))",
* redirectRoute="admin_taxes_index",
* )
- * @DemoRestricted(redirectRoute="admin_taxes_index")
*
* @param int $taxId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_taxes_index')]
public function deleteAction($taxId)
{
try {
@@ -294,10 +294,10 @@ public function deleteAction($taxId)
* "is_granted('update', request.get('_legacy_controller'))",
* redirectRoute="admin_taxes_index",
* )
- * @DemoRestricted(redirectRoute="admin_taxes_index")
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_taxes_index')]
public function toggleStatusAction($taxId)
{
try {
@@ -324,10 +324,10 @@ public function toggleStatusAction($taxId)
* "is_granted('update', request.get('_legacy_controller'))",
* redirectRoute="admin_taxes_index",
* )
- * @DemoRestricted(redirectRoute="admin_taxes_index")
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_taxes_index')]
public function bulkEnableStatusAction(Request $request)
{
$taxIds = $request->request->all('tax_bulk');
@@ -353,10 +353,10 @@ public function bulkEnableStatusAction(Request $request)
* "is_granted('update', request.get('_legacy_controller'))",
* redirectRoute="admin_taxes_index",
* )
- * @DemoRestricted(redirectRoute="admin_taxes_index")
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_taxes_index')]
public function bulkDisableStatusAction(Request $request)
{
$taxIds = $request->request->all('tax_bulk');
@@ -382,10 +382,10 @@ public function bulkDisableStatusAction(Request $request)
* "is_granted('delete', request.get('_legacy_controller'))",
* redirectRoute="admin_taxes_index",
* )
- * @DemoRestricted(redirectRoute="admin_taxes_index")
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_taxes_index')]
public function bulkDeleteAction(Request $request)
{
$taxIds = $request->request->all('tax_bulk');
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/International/ZoneController.php b/src/PrestaShopBundle/Controller/Admin/Improve/International/ZoneController.php
index dfe97b9917254..fff5ad5122cfb 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/International/ZoneController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/International/ZoneController.php
@@ -209,12 +209,11 @@ public function editAction(int $zoneId, Request $request): Response
* message="You need permission to delete this."
* )
*
- * @DemoRestricted(redirectRoute="admin_zones_index")
- *
* @param int $zoneId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_zones_index')]
public function deleteAction(int $zoneId): RedirectResponse
{
try {
@@ -238,14 +237,11 @@ public function deleteAction(int $zoneId): RedirectResponse
* message="You do not have permission to edit this."
* )
*
- * @DemoRestricted(
- * redirectRoute="admin_zones_index"
- * )
- *
* @param int $zoneId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_zones_index')]
public function toggleStatusAction(int $zoneId): RedirectResponse
{
try {
@@ -265,12 +261,12 @@ public function toggleStatusAction(int $zoneId): RedirectResponse
* Deletes zones in bulk action
*
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_zones_index")
- * @DemoRestricted(redirectRoute="admin_zones_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_zones_index')]
public function bulkDeleteAction(Request $request): RedirectResponse
{
$zoneIds = $this->getBulkZonesFromRequest($request);
@@ -296,13 +292,13 @@ public function bulkDeleteAction(Request $request): RedirectResponse
* "is_granted('update', request.get('_legacy_controller'))",
* redirectRoute="admin_zones_index",
* )
- * @DemoRestricted(redirectRoute="admin_zones_index")
*
* @param string $status
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_zones_index')]
public function bulkToggleStatus(string $status, Request $request): RedirectResponse
{
$status = $status === 'enable';
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php b/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php
index 11a7ad632d0f1..2709d38a135d9 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/ModuleController.php
@@ -30,9 +30,13 @@
use Db;
use Exception;
use PrestaShop\PrestaShop\Adapter\Module\AdminModuleDataProvider;
+use PrestaShop\PrestaShop\Adapter\Module\Module;
use PrestaShop\PrestaShop\Adapter\Module\Module as ModuleAdapter;
use PrestaShop\PrestaShop\Core\Module\ModuleCollection;
+use PrestaShop\PrestaShop\Core\Module\ModuleManager;
+use PrestaShop\PrestaShop\Core\Module\ModuleRepository;
use PrestaShop\PrestaShop\Core\Module\SourceHandler\SourceHandlerNotFoundException;
+use PrestaShop\PrestaShop\Core\Module\SourceHandler\ZipSourceHandler;
use PrestaShop\PrestaShop\Core\Security\Permission;
use PrestaShopBundle\Controller\Admin\Improve\Modules\ModuleAbstractController;
use PrestaShopBundle\Entity\ModuleHistory;
@@ -64,10 +68,15 @@ class ModuleController extends ModuleAbstractController
public function manageAction()
{
$modulesProvider = $this->get('prestashop.core.admin.data_provider.module_interface');
- $moduleRepository = $this->get('prestashop.core.admin.module.repository');
+ $moduleRepository = $this->get(ModuleRepository::class);
$installedProducts = $moduleRepository->getList();
+ $moduleErrors = $installedProducts->getErrors();
+ foreach ($moduleErrors as $moduleError) {
+ $this->addFlash('warning', $moduleError->getMessage());
+ }
+
$categories = $this->getCategories($modulesProvider, $installedProducts);
$bulkActions = [
'bulk-install' => $this->trans('Install', 'Admin.Actions'),
@@ -112,7 +121,7 @@ public function configureModuleAction($module_name)
$legacyUrlGenerator = $this->get('prestashop.core.admin.url_generator_legacy');
$legacyContextProvider = $this->get('prestashop.adapter.legacy.context');
$legacyContext = $legacyContextProvider->getContext();
- $moduleRepository = $this->get('prestashop.core.admin.module.repository');
+ $moduleRepository = $this->get(ModuleRepository::class);
// Get accessed module object
$moduleAccessed = $moduleRepository->getModule($module_name);
@@ -190,33 +199,36 @@ public function moduleAction(Request $request)
return $this->getDisabledFunctionalityResponse($request);
}
- $module = $request->get('module_name');
+ $moduleName = $request->get('module_name');
$source = $request->query->get('source');
- $moduleManager = $this->container->get('prestashop.module.manager');
- $moduleRepository = $this->container->get('prestashop.core.admin.module.repository');
- $modulesProvider = $this->container->get('prestashop.core.admin.data_provider.module_interface');
- $response = [$module => []];
+ $moduleManager = $this->get(ModuleManager::class);
+ $moduleRepository = $this->get(ModuleRepository::class);
+ $modulesProvider = $this->get('prestashop.core.admin.data_provider.module_interface');
+ $response = [$moduleName => []];
if (!method_exists($moduleManager, $action)) {
- $response[$module]['status'] = false;
- $response[$module]['msg'] = $this->trans('Invalid action', 'Admin.Notifications.Error');
+ $response[$moduleName]['status'] = false;
+ $response[$moduleName]['msg'] = $this->trans('Invalid action', 'Admin.Notifications.Error');
return new JsonResponse($response);
}
$actionTitle = AdminModuleDataProvider::ACTIONS_TRANSLATION_LABELS[$action];
-
try {
- $args = [$module];
+ $args = [$moduleName];
if ($source !== null) {
$args[] = $source;
}
if ($action === ModuleAdapter::ACTION_UNINSTALL) {
$args[] = (bool) ($request->request->all('actionParams')['deletion'] ?? false);
- $response[$module]['refresh_needed'] = $this->moduleNeedsReload($moduleRepository->getModule($module));
+ $moduleInstance = $moduleRepository->getModule($moduleName);
+ $response[$moduleName]['refresh_needed'] = $this->moduleNeedsReload($moduleInstance);
+ $response[$moduleName]['has_download_url'] = $moduleInstance->attributes->has('download_url');
}
if ($action === ModuleAdapter::ACTION_DELETE) {
- $response[$module]['refresh_needed'] = false;
+ $moduleInstance = $moduleRepository->getModule($moduleName);
+ $response[$moduleName]['refresh_needed'] = false;
+ $response[$moduleName]['has_download_url'] = $moduleInstance->attributes->has('download_url');
}
$systemCacheClearEnabled = filter_var(
$request->request->all('actionParams')['cacheClearEnabled'] ?? true,
@@ -225,15 +237,15 @@ public function moduleAction(Request $request)
if (!$systemCacheClearEnabled) {
$moduleManager->disableSystemClearCache();
}
- $response[$module]['status'] = call_user_func([$moduleManager, $action], ...$args);
+ $response[$moduleName]['status'] = call_user_func([$moduleManager, $action], ...$args);
} catch (Exception $e) {
- $response[$module]['status'] = false;
- $response[$module]['msg'] = $this->trans(
+ $response[$moduleName]['status'] = false;
+ $response[$moduleName]['msg'] = $this->trans(
'Cannot %action% module %module%. %error_details%',
'Admin.Modules.Notification',
[
'%action%' => $actionTitle,
- '%module%' => $module,
+ '%module%' => $moduleName,
'%error_details%' => $e->getMessage(),
]
);
@@ -241,22 +253,22 @@ public function moduleAction(Request $request)
return new JsonResponse($response);
}
- $moduleInstance = $moduleRepository->getModule($module);
- if ($response[$module]['status'] === true) {
- if (!isset($response[$module]['refresh_needed'])) {
- $response[$module]['refresh_needed'] = $this->moduleNeedsReload($moduleInstance);
+ $moduleInstance = $moduleRepository->getModule($moduleName);
+ if ($response[$moduleName]['status'] === true) {
+ if (!isset($response[$moduleName]['refresh_needed'])) {
+ $response[$moduleName]['refresh_needed'] = $this->moduleNeedsReload($moduleInstance);
}
- $response[$module]['msg'] = $this->trans(
+ $response[$moduleName]['msg'] = $this->trans(
'%action% action on module %module% succeeded.',
'Admin.Modules.Notification',
[
'%action%' => ucfirst($actionTitle),
- '%module%' => $module,
+ '%module%' => $moduleName,
]
);
if ($action !== 'uninstall' && $action !== 'delete') {
- $response[$module]['module_name'] = $module;
- $response[$module]['is_configurable'] = (bool) $moduleInstance->attributes->get('is_configurable');
+ $response[$moduleName]['module_name'] = $moduleName;
+ $response[$moduleName]['is_configurable'] = (bool) $moduleInstance->attributes->get('is_configurable');
}
$collection = ModuleCollection::createFrom([$moduleInstance]);
@@ -264,8 +276,7 @@ public function moduleAction(Request $request)
$modulePresenter = $this->get('prestashop.adapter.presenter.module');
$collectionPresented = $modulePresenter->presentCollection($collectionWithActionUrls);
-
- $response[$module]['action_menu_html'] = $this->container->get('twig')->render(
+ $response[$moduleName]['action_menu_html'] = $this->get('twig')->render(
'@PrestaShop/Admin/Module/Includes/action_menu.html.twig',
[
'module' => $collectionPresented[0],
@@ -273,13 +284,13 @@ public function moduleAction(Request $request)
]
);
} else {
- $response[$module]['msg'] = $this->trans(
+ $response[$moduleName]['msg'] = $this->trans(
'Cannot %action% module %module%. %error_details%',
'Admin.Modules.Notification',
[
'%action%' => $actionTitle,
- '%module%' => $module,
- '%error_details%' => $moduleManager->getError($module),
+ '%module%' => $moduleName,
+ '%error_details%' => $moduleManager->getError($moduleName),
]
);
}
@@ -315,8 +326,8 @@ public function importModuleAction(Request $request)
return $deniedAccess;
}
- $moduleManager = $this->get('prestashop.module.manager');
- $zipSource = $this->get('prestashop.module.sourcehandler.zip');
+ $moduleManager = $this->get(ModuleManager::class);
+ $zipSource = $this->get(ZipSourceHandler::class);
$serverParams = new ServerParams();
$moduleName = '';
@@ -392,7 +403,7 @@ public function importModuleAction(Request $request)
'Admin.Modules.Notification',
['%module%' => $moduleName]
);
- $installationResponse['is_configurable'] = (bool) $this->get('prestashop.core.admin.module.repository')
+ $installationResponse['is_configurable'] = (bool) $this->get(ModuleRepository::class)
->getModule($moduleName)
->attributes
->get('is_configurable');
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/Modules/ModuleAbstractController.php b/src/PrestaShopBundle/Controller/Admin/Improve/Modules/ModuleAbstractController.php
index cb5af8c0ceb6b..2f89a959d1e41 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/Modules/ModuleAbstractController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/Modules/ModuleAbstractController.php
@@ -27,6 +27,7 @@
namespace PrestaShopBundle\Controller\Admin\Improve\Modules;
use PrestaShop\PrestaShop\Core\Module\ModuleCollection;
+use PrestaShop\PrestaShop\Core\Module\ModuleRepository;
use PrestaShop\PrestaShop\Core\Module\ModuleRepositoryInterface;
use PrestaShop\PrestaShop\Core\Security\Permission;
use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
@@ -61,7 +62,7 @@ final protected function getNotificationPageData(ModuleCollection $moduleCollect
protected function getModuleRepository(): ModuleRepositoryInterface
{
- return $this->get('prestashop.core.admin.module.repository');
+ return $this->get(ModuleRepository::class);
}
/**
diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/Shipping/CarriersController.php b/src/PrestaShopBundle/Controller/Admin/Improve/Shipping/CarriersController.php
index 64feeba0852ec..4967cbc2f9c82 100644
--- a/src/PrestaShopBundle/Controller/Admin/Improve/Shipping/CarriersController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Improve/Shipping/CarriersController.php
@@ -134,12 +134,12 @@ public function editAction(int $carrierId): RedirectResponse
* "is_granted('delete', request.get('_legacy_controller'))",
* redirectRoute="admin_carriers_index",
* )
- * @DemoRestricted(redirectRoute="admin_carriers_index")
*
* @param int $carrierId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_carriers_index')]
public function deleteAction(int $carrierId): RedirectResponse
{
try {
@@ -161,12 +161,11 @@ public function deleteAction(int $carrierId): RedirectResponse
* message="You need permission to edit this."
* )
*
- * @DemoRestricted(redirectRoute="admin_carriers_index")
- *
* @param int $carrierId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_carriers_index')]
public function toggleStatusAction(int $carrierId): RedirectResponse
{
try {
@@ -192,12 +191,11 @@ public function toggleStatusAction(int $carrierId): RedirectResponse
* message="You need permission to edit this."
* )
*
- * @DemoRestricted(redirectRoute="admin_carriers_index")
- *
* @param int $carrierId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_carriers_index')]
public function toggleIsFreeAction(int $carrierId): RedirectResponse
{
try {
@@ -223,12 +221,11 @@ public function toggleIsFreeAction(int $carrierId): RedirectResponse
* message="You need permission to edit this."
* )
*
- * @DemoRestricted(redirectRoute="admin_carriers_index")
- *
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_carriers_index')]
public function updatePositionAction(Request $request): RedirectResponse
{
$positionsData = [
@@ -258,12 +255,12 @@ public function updatePositionAction(Request $request): RedirectResponse
* "is_granted('delete', request.get('_legacy_controller'))",
* redirectRoute="admin_carriers_index",
* )
- * @DemoRestricted(redirectRoute="admin_carriers_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_carriers_index')]
public function bulkDeleteAction(Request $request): RedirectResponse
{
$carrierIds = $this->getCarrierIdsFromRequest($request);
@@ -288,12 +285,12 @@ public function bulkDeleteAction(Request $request): RedirectResponse
* "is_granted('update', request.get('_legacy_controller'))",
* redirectRoute="admin_carriers_index",
* )
- * @DemoRestricted(redirectRoute="admin_carriers_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_carriers_index')]
public function bulkEnableStatusAction(Request $request): RedirectResponse
{
$carrierIds = $this->getCarrierIdsFromRequest($request);
@@ -318,12 +315,12 @@ public function bulkEnableStatusAction(Request $request): RedirectResponse
* "is_granted('update', request.get('_legacy_controller'))",
* redirectRoute="admin_carriers_index",
* )
- * @DemoRestricted(redirectRoute="admin_carriers_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_carriers_index')]
public function bulkDisableStatusAction(Request $request): RedirectResponse
{
$carrierIds = $this->getCarrierIdsFromRequest($request);
diff --git a/src/PrestaShopBundle/Controller/Admin/PrestaShopAdminController.php b/src/PrestaShopBundle/Controller/Admin/PrestaShopAdminController.php
new file mode 100644
index 0000000000000..51f9c22d02123
--- /dev/null
+++ b/src/PrestaShopBundle/Controller/Admin/PrestaShopAdminController.php
@@ -0,0 +1,53 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Controller\Admin;
+
+use PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+
+/**
+ * Default controller for PrestaShop admin pages.
+ */
+class PrestaShopAdminController extends AbstractController
+{
+ public static function getSubscribedServices(): array
+ {
+ return parent::getSubscribedServices() + [
+ CommandBusInterface::class => CommandBusInterface::class,
+ ];
+ }
+
+ /**
+ * Get commands bus to execute commands.
+ */
+ protected function dispatchCommand(mixed $command): void
+ {
+ $this->container->get(CommandBusInterface::class)->handle($command);
+ }
+}
diff --git a/src/PrestaShopBundle/Controller/Admin/ProductController.php b/src/PrestaShopBundle/Controller/Admin/ProductController.php
index 2895a97ab8ef6..45c42f4f588ba 100644
--- a/src/PrestaShopBundle/Controller/Admin/ProductController.php
+++ b/src/PrestaShopBundle/Controller/Admin/ProductController.php
@@ -33,7 +33,6 @@
use PrestaShop\PrestaShop\Adapter\Product\FilterCategoriesRequestPurifier;
use PrestaShop\PrestaShop\Adapter\Product\ListParametersUpdater;
use PrestaShop\PrestaShop\Adapter\Tax\TaxRuleDataProvider;
-use PrestaShop\PrestaShop\Adapter\Warehouse\WarehouseDataProvider;
use PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductCommand;
use PrestaShop\PrestaShop\Core\Domain\Product\Exception\CannotUpdateProductException;
use PrestaShop\PrestaShop\Core\Domain\Product\Exception\ProductConstraintException;
@@ -42,6 +41,7 @@
use PrestaShop\PrestaShop\Core\Domain\Product\Query\GetProductForEditing;
use PrestaShop\PrestaShop\Core\Domain\Product\QueryResult\ProductForEditing;
use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
use PrestaShop\PrestaShop\Core\Hook\HookDispatcher;
use PrestaShop\PrestaShop\Core\Product\ProductCsvExporter;
use PrestaShop\PrestaShop\Core\Security\Permission;
@@ -49,7 +49,6 @@
use PrestaShopBundle\Entity\AdminFilter;
use PrestaShopBundle\Entity\Attribute;
use PrestaShopBundle\Entity\Repository\AttributeRepository;
-use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
use PrestaShopBundle\Exception\UpdateProductException;
use PrestaShopBundle\Form\Admin\Product\ProductCategories;
use PrestaShopBundle\Form\Admin\Product\ProductCombination;
@@ -63,7 +62,6 @@
use PrestaShopBundle\Model\Product\AdminModelAdapter;
use PrestaShopBundle\Security\Annotation\AdminSecurity;
use PrestaShopBundle\Service\DataProvider\Admin\ProductInterface as ProductInterfaceProvider;
-use PrestaShopBundle\Service\DataProvider\StockInterface;
use PrestaShopBundle\Service\DataUpdater\Admin\ProductInterface as ProductInterfaceUpdater;
use PrestaShopBundle\Service\Hook\HookFinder;
use Product;
@@ -561,14 +559,7 @@ public function formAction($id, Request $request): Response
$adminProductController->processSpecificPricePriorities();
foreach ($_POST['combinations'] as $combinationValues) {
$adminProductWrapper->processProductAttribute($product, $combinationValues);
- // For now, each attribute set the same value.
- $adminProductWrapper->processDependsOnStock(
- $product,
- ($_POST['depends_on_stock'] == '1'),
- $combinationValues['id_product_attribute']
- );
}
- $adminProductWrapper->processDependsOnStock($product, ($_POST['depends_on_stock'] == '1'));
// If there is no combination, then quantity and location are managed for the whole product (as combination ID 0)
// In all cases, legacy hooks are triggered: actionProductUpdate and actionUpdateQuantity
@@ -585,8 +576,6 @@ public function formAction($id, Request $request): Response
$adminProductWrapper->processAttachments($product, $_POST['attachments']);
- $adminProductController->processWarehouses();
-
$response = new JsonResponse();
$response->setData([
'product' => $product,
@@ -616,12 +605,6 @@ public function formAction($id, Request $request): Response
throw $e;
}
- /** @var StockInterface $stockManager */
- $stockManager = $this->get('prestashop.core.data_provider.stock_interface');
-
- /** @var WarehouseDataProvider $warehouseProvider */
- $warehouseProvider = $this->get('prestashop.adapter.data_provider.warehouse');
-
//If context shop is define to a group shop, disable the form
if ($shopContext->isGroupShopContext()) {
return $this->render('@Product/ProductPage/disabled_form_alert.html.twig', ['showContentHeader' => false]);
@@ -658,8 +641,6 @@ public function formAction($id, Request $request): Response
'ids_product_attribute' => (isset($formData['step3']['id_product_attributes']) ? implode(',', $formData['step3']['id_product_attributes']) : ''),
'has_combinations' => (isset($formData['step3']['id_product_attributes']) && count($formData['step3']['id_product_attributes']) > 0),
'combinations_count' => isset($formData['step3']['id_product_attributes']) ? count($formData['step3']['id_product_attributes']) : 0,
- 'asm_globally_activated' => $stockManager->isAsmGloballyActivated(),
- 'warehouses' => ($stockManager->isAsmGloballyActivated()) ? $warehouseProvider->getWarehouses() : [],
'is_multishop_context' => $isMultiShopContext,
'is_combination_active' => $this->getConfiguration()->getBoolean('PS_COMBINATION_FEATURE_ACTIVE'),
'showContentHeader' => false,
@@ -1306,6 +1287,6 @@ private function getLogDataContext($id_product = null, $error_code = null, $allo
*/
private function shouldRedirectToV2(): bool
{
- return $this->get(FeatureFlagRepository::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_PRODUCT_PAGE_V2);
+ return $this->get(FeatureFlagStateCheckerInterface::class)->isEnabled(FeatureFlagSettings::FEATURE_FLAG_PRODUCT_PAGE_V2);
}
}
diff --git a/src/PrestaShopBundle/Controller/Admin/SecurityController.php b/src/PrestaShopBundle/Controller/Admin/SecurityController.php
index 053affe17ffd6..1426cff45b868 100644
--- a/src/PrestaShopBundle/Controller/Admin/SecurityController.php
+++ b/src/PrestaShopBundle/Controller/Admin/SecurityController.php
@@ -26,38 +26,46 @@
namespace PrestaShopBundle\Controller\Admin;
+use PrestaShopBundle\Service\DataProvider\UserProvider;
use PrestaShopBundle\Service\Routing\Router as PrestaShopRouter;
use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
/**
- * Admin controller to manage security pages.
+ * Security warning controller
*/
-class SecurityController extends FrameworkBundleAdminController
+class SecurityController extends PrestaShopAdminController
{
- public function compromisedAccessAction(Request $request)
+ public function __construct(
+ private readonly UserProvider $userProvider,
+ private readonly CsrfTokenManagerInterface $tokenManager,
+ private readonly ValidatorInterface $validator
+ ) {
+ }
+
+ public function compromisedAccessAction(Request $request): Response
{
$requestUri = urldecode($request->query->get('uri'));
$url = new Assert\Url();
- $violations = $this->get('validator')->validate($requestUri, [$url]);
+ $violations = $this->validator->validate($requestUri, [$url]);
if ($violations->count()) {
return $this->redirect('dashboard');
}
// getToken() actually generate a new token
- $username = $this->get('prestashop.user_provider')->getUsername();
+ $username = $this->userProvider->getUsername();
- $newToken = $this->get('security.csrf.token_manager')
+ $newToken = $this->tokenManager
->getToken($username)
->getValue();
$newUri = PrestaShopRouter::generateTokenizedUrl($requestUri, $newToken);
- return $this->render(
- '@PrestaShop/Admin/Security/compromised.html.twig',
- [
- 'requestUri' => $newUri,
- ]
- );
+ return $this->render('@PrestaShop/Admin/Security/compromised.html.twig', [
+ 'requestUri' => $newUri,
+ ]);
}
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttachmentController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttachmentController.php
index 1d96462da8fc6..b6a3b735793a3 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttachmentController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttachmentController.php
@@ -224,8 +224,8 @@ public function viewAction(int $attachmentId): Response
* Deletes attachment
*
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_attachments_index")
- * @DemoRestricted(redirectRoute="admin_attachments_index")
*/
+ #[DemoRestricted(redirectRoute: 'admin_attachments_index')]
public function deleteAction(int $attachmentId): RedirectResponse
{
try {
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeController.php
index 7e2747118b975..75c44fd77da33 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeController.php
@@ -27,6 +27,7 @@
namespace PrestaShopBundle\Controller\Admin\Sell\Catalog;
use Exception;
+use PrestaShop\PrestaShop\Adapter\AttributeGroup\AttributeGroupViewDataProvider;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\BulkDeleteAttributeCommand;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\DeleteAttributeCommand;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Exception\AttributeNotFoundException;
@@ -72,7 +73,7 @@ public function indexAction(Request $request, $attributeGroupId, AttributeFilter
return $this->redirectToRoute('admin_attribute_groups_index');
}
- $attributeGroupViewDataProvider = $this->get('prestashop.adapter.product.attribute_group.attribute_group_view_data_provider');
+ $attributeGroupViewDataProvider = $this->get(AttributeGroupViewDataProvider::class);
return $this->render('@PrestaShop/Admin/Sell/Catalog/Attribute/index.html.twig', [
'attributeGrid' => $this->presentGrid($attributeGrid),
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
index d77c05baae32e..2cd1f29aec0b7 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/AttributeGroupController.php
@@ -29,7 +29,9 @@
use Exception;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\BulkDeleteAttributeGroupCommand;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\DeleteAttributeGroupCommand;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupConstraintException;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\AttributeGroupNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\CannotAddAttributeGroupException;
use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Exception\DeleteAttributeGroupException;
use PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Query\GetShowcaseCardIsClosed;
use PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\ValueObject\ShowcaseCard;
@@ -37,6 +39,7 @@
use PrestaShop\PrestaShop\Core\Grid\Position\GridPositionUpdaterInterface;
use PrestaShop\PrestaShop\Core\Grid\Position\PositionUpdateFactoryInterface;
use PrestaShop\PrestaShop\Core\Search\Filters\AttributeGroupFilters;
+use PrestaShopBundle\Component\CsvResponse;
use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
use PrestaShopBundle\Security\Annotation\AdminSecurity;
use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -80,12 +83,37 @@ public function indexAction(Request $request, AttributeGroupFilters $attributeGr
* message="You do not have permission to create this."
* )
*
- * @return RedirectResponse
+ * @param Request $request
+ *
+ * @return Response
*/
- public function createAction()
+ public function createAction(Request $request): Response
{
- //@todo: implement in antoher pr
- return $this->redirectToRoute('admin_attribute_groups_index');
+ $attributeGroupFormBuilder = $this->get('PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\AttributeGroupFormBuilder');
+ $attributeFormHandler = $this->get('PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\AttributeGroupFormHandler');
+
+ $attributeGroupForm = $attributeGroupFormBuilder->getForm();
+ $attributeGroupForm->handleRequest($request);
+
+ try {
+ $handlerResult = $attributeFormHandler->handle($attributeGroupForm);
+
+ if (null !== $handlerResult->getIdentifiableObjectId()) {
+ $this->addFlash('success', $this->trans('Successful creation', 'Admin.Notifications.Success'));
+
+ return $this->redirectToRoute('admin_attribute_groups_index');
+ }
+ } catch (Exception $e) {
+ $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
+ }
+
+ return $this->render(
+ '@PrestaShop/Admin/Sell/Catalog/AttributeGroup/create.html.twig',
+ [
+ 'layoutTitle' => $this->trans('New attribute', 'Admin.Navigation.Menu'),
+ 'attributeGroupForm' => $attributeGroupForm->createView(),
+ ]
+ );
}
/**
@@ -96,12 +124,44 @@ public function createAction()
*
* @param int $attributeGroupId
*
- * @return RedirectResponse
+ * @return Response
*/
- public function editAction(int $attributeGroupId)
+ public function editAction(Request $request, int $attributeGroupId): Response
{
- //@todo: implement in antoher pr
- return $this->redirectToRoute('admin_attribute_groups_index');
+ $attributeGroupFormBuilder = $this->get('PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\AttributeGroupFormBuilder');
+ $attributeFormHandler = $this->get('PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\AttributeGroupFormHandler');
+
+ $attributeGroupForm = $attributeGroupFormBuilder->getFormFor($attributeGroupId);
+
+ $attributeGroupForm->handleRequest($request);
+
+ try {
+ $handlerResult = $attributeFormHandler->handleFor($attributeGroupId, $attributeGroupForm);
+
+ if (null !== $handlerResult->getIdentifiableObjectId()) {
+ $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
+
+ return $this->redirectToRoute('admin_attribute_groups_index');
+ }
+ } catch (Exception $e) {
+ $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
+ }
+
+ $formData = $attributeGroupForm->getData();
+ $attributeGroupName = $formData['name'][$this->getContextLangId()] ?? reset($formData['name']);
+
+ return $this->render(
+ '@PrestaShop/Admin/Sell/Catalog/AttributeGroup/edit.html.twig',
+ [
+ 'layoutTitle' => $this->trans(
+ 'Editing attribute %name%',
+ 'Admin.Navigation.Menu',
+ ['%name%' => $attributeGroupName]
+ ),
+ 'attributeGroupForm' => $attributeGroupForm->createView(),
+ 'attributeGroupId' => $attributeGroupId,
+ ]
+ );
}
/**
@@ -111,14 +171,36 @@ public function editAction(int $attributeGroupId)
* )
*
- * @param int $attributeGroupId
+ * @param AttributeGroupFilters $filters
*
- * @return RedirectResponse
+ * @return CsvResponse
*/
- public function exportAction(int $attributeGroupId)
+ public function exportAction(AttributeGroupFilters $filters): CsvResponse
{
- //@todo: implement in antoher pr
- return $this->redirectToRoute('admin_attribute_groups_index');
+ $filters = new AttributeGroupFilters(['limit' => null] + $filters->all());
+ $attributeGroupGridFactory = $this->get('prestashop.core.grid.factory.attribute_group');
+ $attributeGroupGrid = $attributeGroupGridFactory->getGrid($filters);
+
+ $headers = [
+ 'id_attribute_group' => $this->trans('ID', 'Admin.Global'),
+ 'name' => $this->trans('Name', 'Admin.Global'),
+ 'position' => $this->trans('Position', 'Admin.Global'),
+ ];
+
+ $data = [];
+
+ foreach ($attributeGroupGrid->getData()->getRecords()->all() as $record) {
+ $data[] = [
+ 'id_attribute_group' => $record['id_attribute_group'],
+ 'name' => $record['name'],
+ 'position' => $record['position'],
+ ];
+ }
+
+ return (new CsvResponse())
+ ->setData($data)
+ ->setHeadersData($headers)
+ ->setFileName('attribute_group_' . date('Y-m-d_His') . '.csv');
}
/**
@@ -238,6 +320,23 @@ private function getErrorMessages()
'The object cannot be loaded (or found).',
'Admin.Notifications.Error'
),
+ AttributeGroupConstraintException::class => [
+ AttributeGroupConstraintException::EMPTY_NAME => $this->trans(
+ 'The field %field_name% is required at least in your default language.',
+ 'Admin.Notifications.Error',
+ ['%field_name%' => $this->trans('Name', 'Admin.Global')]
+ ),
+ AttributeGroupConstraintException::INVALID_NAME => $this->trans(
+ 'The %s field is invalid.',
+ 'Admin.Notifications.Error',
+ [sprintf('"%s"', $this->trans('Name', 'Admin.Global'))]
+ ),
+ ],
+
+ CannotAddAttributeGroupException::class => $this->trans(
+ 'An error occurred while creating the attribute.',
+ 'Admin.Catalog.Notification'
+ ),
DeleteAttributeGroupException::class => [
DeleteAttributeGroupException::FAILED_DELETE => $this->trans(
'An error occurred while deleting the object.',
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CartRuleController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CartRuleController.php
index 6cbbd90cdd323..77f4fed696eec 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CartRuleController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CartRuleController.php
@@ -111,7 +111,7 @@ public function searchAction(Request $request): JsonResponse
$cartRules = $this->getQueryBus()->handle(new SearchCartRules($searchPhrase));
} catch (Exception $e) {
return $this->json(
- ['message' => $this->getFallbackErrorMessage(get_class($e), $e->getCode())],
+ ['message' => $this->getFallbackErrorMessage($e::class, $e->getCode())],
Response::HTTP_INTERNAL_SERVER_ERROR
);
}
@@ -126,12 +126,12 @@ public function searchAction(Request $request): JsonResponse
* Deletes cart rule
*
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_cart_rules_index")
- * @DemoRestricted(redirectRoute="admin_cart_rules_index")
*
* @param int $cartRuleId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_cart_rules_index')]
public function deleteAction(int $cartRuleId): RedirectResponse
{
try {
@@ -151,12 +151,12 @@ public function deleteAction(int $cartRuleId): RedirectResponse
* Deletes cartRules on bulk action
*
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_cart_rules_index")
- * @DemoRestricted(redirectRoute="admin_cart_rules_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_cart_rules_index')]
public function bulkDeleteAction(Request $request): RedirectResponse
{
$cartRuleIds = $this->getBulkActionIds($request, 'cart_rule_bulk');
@@ -178,12 +178,12 @@ public function bulkDeleteAction(Request $request): RedirectResponse
* Toggles cart rule status
*
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_cart_rules_index")
- * @DemoRestricted(redirectRoute="admin_cart_rules_index")
*
* @param int $cartRuleId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_cart_rules_index')]
public function toggleStatusAction(int $cartRuleId): RedirectResponse
{
try {
@@ -205,10 +205,10 @@ public function toggleStatusAction(int $cartRuleId): RedirectResponse
/**
* @AdminSecurity("is_granted('create', request.get('_legacy_controller'))", redirectRoute="admin_cart_rules_index")
- * @DemoRestricted(redirectRoute="admin_cart_rules_index")
*
* @return Response
*/
+ #[DemoRestricted(redirectRoute: 'admin_cart_rules_index')]
public function createAction(Request $request): Response
{
$form = $this->getFormBuilder()->getForm($this->prefillFormDataForCreation($request));
@@ -237,12 +237,12 @@ public function createAction(Request $request): Response
* Enables cart rules on bulk action
*
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_cart_rules_index")
- * @DemoRestricted(redirectRoute="admin_cart_rules_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_cart_rules_index')]
public function bulkEnableAction(Request $request): RedirectResponse
{
$cartRuleIds = $this->getBulkActionIds($request, 'cart_rule_bulk');
@@ -265,12 +265,12 @@ public function bulkEnableAction(Request $request): RedirectResponse
* Disables cart rules on bulk action
*
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_cart_rules_index")
- * @DemoRestricted(redirectRoute="admin_cart_rules_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_cart_rules_index')]
public function bulkDisableAction(Request $request): RedirectResponse
{
$cartRuleIds = $this->getBulkActionIds($request, 'cart_rule_bulk');
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CatalogPriceRuleController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CatalogPriceRuleController.php
index 5fd9e2066bef4..6e7b07c42850c 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CatalogPriceRuleController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CatalogPriceRuleController.php
@@ -137,12 +137,12 @@ public function searchAction(Request $request)
* Deletes catalog price rule
*
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_catalog_price_rules_index")
- * @DemoRestricted(redirectRoute="admin_catalog_price_rules_index")
*
* @param int|string $catalogPriceRuleId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_catalog_price_rules_index')]
public function deleteAction($catalogPriceRuleId)
{
try {
@@ -162,12 +162,12 @@ public function deleteAction($catalogPriceRuleId)
* Deletes catalogPriceRules on bulk action
*
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_catalog_price_rules_index")
- * @DemoRestricted(redirectRoute="admin_catalog_price_rules_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_catalog_price_rules_index')]
public function bulkDeleteAction(Request $request)
{
$catalogPriceRuleIds = $this->getBulkCatalogPriceRulesFromRequest($request);
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CategoryController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CategoryController.php
index 013d647686c4d..2abc11aaef244 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CategoryController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/CategoryController.php
@@ -35,7 +35,6 @@
use PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkEnableCategoriesCommand;
use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCommand;
use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCoverImageCommand;
-use PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryMenuThumbnailImageCommand;
use PrestaShop\PrestaShop\Core\Domain\Category\Command\SetCategoryIsEnabledCommand;
use PrestaShop\PrestaShop\Core\Domain\Category\Command\UpdateCategoryPositionCommand;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CannotAddCategoryException;
@@ -47,13 +46,11 @@
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryConstraintException;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryException;
use PrestaShop\PrestaShop\Core\Domain\Category\Exception\CategoryNotFoundException;
-use PrestaShop\PrestaShop\Core\Domain\Category\Exception\MenuThumbnailsLimitException;
use PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoriesTree;
use PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryForEditing;
use PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryIsEnabled;
use PrestaShop\PrestaShop\Core\Domain\Category\QueryResult\CategoryForTree;
use PrestaShop\PrestaShop\Core\Domain\Category\QueryResult\EditableCategory;
-use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\MenuThumbnailId;
use PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Query\GetShowcaseCardIsClosed;
use PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\ValueObject\ShowcaseCard;
use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CategoryGridDefinitionFactory;
@@ -209,7 +206,6 @@ public function createAction(Request $request)
[
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
'enableSidebar' => true,
- 'allowMenuThumbnailsUpload' => true,
'categoryForm' => $categoryForm->createView(),
'defaultGroups' => $defaultGroups,
'layoutTitle' => $this->trans('New category', 'Admin.Navigation.Menu'),
@@ -260,7 +256,6 @@ public function createRootAction(Request $request)
[
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
'enableSidebar' => true,
- 'allowMenuThumbnailsUpload' => true,
'rootCategoryForm' => $rootCategoryForm->createView(),
'defaultGroups' => $defaultGroups,
'layoutTitle' => $this->trans('New category', 'Admin.Navigation.Menu'),
@@ -341,7 +336,6 @@ public function editAction($categoryId, Request $request)
'categoryId' => $categoryId,
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
'enableSidebar' => true,
- 'allowMenuThumbnailsUpload' => $editableCategory->canContainMoreMenuThumbnails(),
'contextLangId' => $this->getContextLangId(),
'editCategoryForm' => $categoryForm->createView(),
'editableCategory' => $editableCategory,
@@ -420,7 +414,6 @@ public function editRootAction($categoryId, Request $request)
'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
'enableSidebar' => true,
'categoryId' => $categoryId,
- 'maxMenuThumbnails' => count(MenuThumbnailId::ALLOWED_ID_VALUES),
'contextLangId' => $this->getContextLangId(),
'editRootCategoryForm' => $rootCategoryForm->createView(),
'editableCategory' => $editableCategory,
@@ -477,51 +470,6 @@ public function deleteCoverImageAction(Request $request, $categoryId)
]);
}
- /**
- * Delete given menu thumbnail for category.
- *
- * @AdminSecurity(
- * "is_granted('update', request.get('_legacy_controller'))",
- * message="You do not have permission to edit this.",
- * redirectRoute="admin_categories_edit",
- * redirectQueryParamsToKeep={"categoryId"}
- * )
- *
- * @param Request $request
- * @param int $categoryId
- * @param int $menuThumbnailId
- *
- * @return RedirectResponse
- */
- public function deleteMenuThumbnailAction(Request $request, $categoryId, $menuThumbnailId)
- {
- if (!$this->isCsrfTokenValid('delete-menu-thumbnail', $request->request->get('_csrf_token'))) {
- return $this->redirectToRoute('admin_security_compromised', [
- 'uri' => $this->generateUrl('admin_categories_edit', [
- 'categoryId' => $categoryId,
- ], UrlGeneratorInterface::ABSOLUTE_URL),
- ]);
- }
-
- try {
- $this->getCommandBus()->handle(new DeleteCategoryMenuThumbnailImageCommand(
- (int) $categoryId,
- (int) $menuThumbnailId
- ));
-
- $this->addFlash(
- 'success',
- $this->trans('Image successfully deleted.', 'Admin.Notifications.Success')
- );
- } catch (CategoryException $e) {
- $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
- }
-
- return $this->redirectToRoute('admin_categories_edit', [
- 'categoryId' => $categoryId,
- ]);
- }
-
/**
* Toggle category status.
*
@@ -572,12 +520,12 @@ public function toggleStatusAction($categoryId)
* redirectRoute="admin_categories_index",
* message="You do not have permission to update this."
* )
- * @DemoRestricted(redirectRoute="admin_categories_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_categories_index')]
public function bulkEnableStatusAction(Request $request)
{
try {
@@ -606,12 +554,12 @@ public function bulkEnableStatusAction(Request $request)
* redirectRoute="admin_categories_index",
* message="You do not have permission to update this."
* )
- * @DemoRestricted(redirectRoute="admin_categories_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_categories_index')]
public function bulkDisableStatusAction(Request $request)
{
try {
@@ -640,12 +588,12 @@ public function bulkDisableStatusAction(Request $request)
* redirectRoute="admin_categories_index",
* message="You do not have permission to delete this."
* )
- * @DemoRestricted(redirectRoute="admin_categories_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_categories_index')]
public function bulkDeleteAction(Request $request)
{
$deleteCategoriesForm = $this->createForm(DeleteCategoriesType::class);
@@ -687,12 +635,12 @@ public function bulkDeleteAction(Request $request)
* redirectRoute="admin_categories_index",
* message="You do not have permission to delete this."
* )
- * @DemoRestricted(redirectRoute="admin_categories_index")
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_categories_index')]
public function deleteAction(Request $request)
{
$deleteCategoriesForm = $this->createForm(DeleteCategoriesType::class);
@@ -728,12 +676,12 @@ public function deleteAction(Request $request)
* redirectRoute="admin_categories_index",
* message="You do not have permission to view this."
* )
- * @DemoRestricted(redirectRoute="admin_categories_index")
*
* @param CategoryFilters $filters
*
* @return Response
*/
+ #[DemoRestricted(redirectRoute: 'admin_categories_index')]
public function exportAction(CategoryFilters $filters)
{
$filters = new CategoryFilters(['limit' => null] + $filters->all());
@@ -922,11 +870,6 @@ private function getErrorMessages()
CategoryNotFoundException::class => $this->trans('The object cannot be loaded (or found).', 'Admin.Notifications.Error'),
CategoryConstraintException::class => [
CategoryConstraintException::EMPTY_BULK_DELETE_DATA => $this->trans('You must select at least one element to delete.', 'Admin.Notifications.Error'),
- CategoryConstraintException::TOO_MANY_MENU_THUMBNAILS => sprintf(
- '%s %s',
- $this->trans('An error occurred while uploading the image:', 'Admin.Catalog.Notification'),
- $this->trans('You cannot upload more files', 'Admin.Notifications.Error')
- ),
],
CannotDeleteRootCategoryForShopException::class => $this->trans(
'You cannot remove this category because one of your shops uses it as a root category.',
@@ -948,11 +891,6 @@ private function getErrorMessages()
'An error occurred while updating the status for an object.',
'Admin.Notifications.Error'
),
- MenuThumbnailsLimitException::class => sprintf(
- '%s %s',
- $this->trans('An error occurred while uploading the image:', 'Admin.Catalog.Notification'),
- $this->trans('You cannot upload more files', 'Admin.Notifications.Error')
- ),
UploadedImageConstraintException::class => sprintf(
'%s %s',
$this->trans('An error occurred while uploading the image:', 'Admin.Catalog.Notification'),
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureController.php
index 97ea9239ee251..1875659ee028c 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureController.php
@@ -80,6 +80,11 @@ public function indexAction(Request $request, FeatureFilters $filters): Response
'desc' => $this->trans('Add new feature', 'Admin.Catalog.Feature'),
'icon' => 'add_circle_outline',
],
+ 'add_feature_value' => [
+ 'href' => $this->generateUrl('admin_feature_values_add'),
+ 'desc' => $this->trans('Add new feature value', 'Admin.Catalog.Feature'),
+ 'icon' => 'add_circle_outline',
+ ],
],
]);
}
@@ -165,9 +170,7 @@ public function editAction(int $featureId, Request $request): Response
if ($handlerResult->isSubmitted() && $handlerResult->isValid()) {
$this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
- return $this->redirectToRoute('admin_features_edit', [
- 'featureId' => $featureId,
- ]);
+ return $this->redirectToRoute('admin_features_index');
}
} catch (Exception $e) {
$this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
new file mode 100644
index 0000000000000..b20399564f5a8
--- /dev/null
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/FeatureValueController.php
@@ -0,0 +1,291 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Controller\Admin\Sell\Catalog;
+
+use Exception;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Command\BulkDeleteFeatureValueCommand;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Command\DeleteFeatureValueCommand;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\BulkFeatureValueException;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\CannotDeleteFeatureValueException;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\FeatureNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Exception\FeatureValueNotFoundException;
+use PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureForEditing;
+use PrestaShop\PrestaShop\Core\Domain\Feature\QueryResult\EditableFeature;
+use PrestaShop\PrestaShop\Core\Grid\Factory\FeatureValueGridFactory;
+use PrestaShop\PrestaShop\Core\Search\Filters\FeatureValueFilters;
+use PrestaShopBundle\Component\CsvResponse;
+use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
+use PrestaShopBundle\Controller\BulkActionsTrait;
+use PrestaShopBundle\Security\Annotation\AdminSecurity;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class FeatureValueController extends FrameworkBundleAdminController
+{
+ use BulkActionsTrait;
+
+ /**
+ * Button name which when submitted indicates that after form submission
+ * user wants to be redirected to ADD NEW form to add additional value
+ */
+ private const SAVE_AND_ADD_BUTTON_NAME = 'save-and-add-new';
+
+ /**
+ * @AdminSecurity("is_granted('read', request.get('_legacy_controller'))")
+ */
+ public function indexAction(int $featureId, Request $request, FeatureValueFilters $filters): Response
+ {
+ $featureValueGridFactory = $this->get(FeatureValueGridFactory::class);
+
+ try {
+ /** @var EditableFeature $editableFeature */
+ $editableFeature = $this->getQueryBus()->handle(new GetFeatureForEditing($featureId));
+ } catch (Exception $e) {
+ $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
+
+ return $this->redirectToRoute('admin_features_index');
+ }
+
+ return $this->render('@PrestaShop/Admin/Sell/Catalog/Features/FeatureValue/index.html.twig', [
+ 'enableSidebar' => true,
+ 'help_link' => $this->generateSidebarLink($request->attributes->get('_legacy_controller')),
+ 'featureValueGrid' => $this->presentGrid($featureValueGridFactory->getGrid($filters)),
+ 'layoutTitle' => $editableFeature->getName()[$this->getContextLangId()],
+ 'layoutHeaderToolbarBtn' => [
+ 'add_feature_value' => [
+ 'href' => $this->generateUrl('admin_feature_values_add', ['featureId' => $filters->getFeatureId()]),
+ 'desc' => $this->trans('Add new feature value', 'Admin.Catalog.Feature'),
+ 'icon' => 'add_circle_outline',
+ ],
+ ],
+ ]);
+ }
+
+ /**
+ * @AdminSecurity("is_granted('create', request.get('_legacy_controller'))")
+ *
+ * @param Request $request
+ *
+ * @return Response
+ */
+ public function createAction(Request $request): Response
+ {
+ $featureValueFormBuilder = $this->get('prestashop.core.form.identifiable_object.builder.feature_value_form_builder');
+ $featureValueFormHandler = $this->get('prestashop.core.form.identifiable_object.handler.feature_value_form_handler');
+ $featureId = $request->query->getInt('featureId');
+
+ try {
+ $featureValueForm = $featureValueFormBuilder->getForm(['feature_id' => $featureId]);
+ $featureValueForm->handleRequest($request);
+ $handlerResult = $featureValueFormHandler->handle($featureValueForm);
+
+ if (null !== $handlerResult->getIdentifiableObjectId()) {
+ $this->addFlash('success', $this->trans('Successful creation', 'Admin.Notifications.Success'));
+
+ if ($request->request->has(self::SAVE_AND_ADD_BUTTON_NAME)) {
+ return $this->redirectToRoute('admin_feature_values_add', [
+ 'featureId' => $featureId,
+ ]);
+ }
+
+ if ($featureId) {
+ return $this->redirectToRoute('admin_feature_values_index', [
+ 'featureId' => $featureId,
+ ]);
+ }
+
+ return $this->redirectToRoute('admin_features_index');
+ }
+ } catch (Exception $e) {
+ $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
+
+ return $this->redirectToRoute('admin_features_index');
+ }
+
+ return $this->render('@PrestaShop/Admin/Sell/Catalog/Features/FeatureValue/create.html.twig', [
+ 'featureId' => $featureId,
+ 'featureValueForm' => $featureValueForm->createView(),
+ 'layoutTitle' => $this->trans('New Feature Value', 'Admin.Navigation.Menu'),
+ ]);
+ }
+
+ /**
+ * @AdminSecurity("is_granted('update', request.get('_legacy_controller'))")
+ *
+ * @param int $featureId
+ * @param int $featureValueId
+ * @param Request $request
+ *
+ * @return Response
+ */
+ public function editAction(int $featureId, int $featureValueId, Request $request): Response
+ {
+ $featureValueFormBuilder = $this->get('prestashop.core.form.identifiable_object.builder.feature_value_form_builder');
+ $featureValueFormHandler = $this->get('prestashop.core.form.identifiable_object.handler.feature_value_form_handler');
+
+ try {
+ $featureValueForm = $featureValueFormBuilder->getFormFor($featureValueId);
+ $featureValueForm->handleRequest($request);
+ $handlerResult = $featureValueFormHandler->handleFor((int) $featureValueId, $featureValueForm);
+
+ if ($handlerResult->isSubmitted() && $handlerResult->isValid()) {
+ $this->addFlash('success', $this->trans('Successful update', 'Admin.Notifications.Success'));
+
+ if ($request->request->has(self::SAVE_AND_ADD_BUTTON_NAME)) {
+ return $this->redirectToRoute('admin_feature_values_add', [
+ 'featureId' => $featureId,
+ ]);
+ }
+
+ return $this->redirectToRoute('admin_feature_values_index', [
+ 'featureId' => $featureId,
+ ]);
+ }
+ } catch (Exception $e) {
+ $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
+
+ return $this->redirectToRoute('admin_features_index');
+ }
+
+ return $this->render('@PrestaShop/Admin/Sell/Catalog/Features/FeatureValue/edit.html.twig', [
+ 'featureId' => $featureId,
+ 'featureValueForm' => $featureValueForm->createView(),
+ 'layoutTitle' => $this->trans(
+ 'Feature value',
+ 'Admin.Navigation.Menu',
+ ),
+ ]);
+ }
+
+ /**
+ * @AdminSecurity("is_granted('read', request.get('_legacy_controller'))")
+ *
+ * @param FeatureValueFilters $filters
+ *
+ * @return CsvResponse
+ */
+ public function exportAction(FeatureValueFilters $filters): CsvResponse
+ {
+ $filters = new FeatureValueFilters(['limit' => null] + $filters->all());
+
+ $gridFactory = $this->get(FeatureValueGridFactory::class);
+
+ $headers = [
+ 'id_feature_value' => $this->trans('ID', 'Admin.Global'),
+ 'value' => $this->trans('Value', 'Admin.Global'),
+ ];
+
+ $data = [];
+
+ foreach ($gridFactory->getGrid($filters)->getData()->getRecords()->all() as $record) {
+ $data[] = [
+ 'id_feature_value' => $record['id_feature_value'],
+ 'value' => $record['value'],
+ ];
+ }
+
+ return (new CsvResponse())
+ ->setData($data)
+ ->setHeadersData($headers)
+ ->setFileName('feature_' . $filters->getFeatureId() . '_values_' . date('Y-m-d_His') . '.csv');
+ }
+
+ /**
+ * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))")
+ *
+ * @param int $featureId
+ * @param int $featureValueId
+ *
+ * @return Response
+ */
+ public function deleteAction(int $featureId, int $featureValueId): Response
+ {
+ try {
+ $this->getCommandBus()->handle(new DeleteFeatureValueCommand($featureValueId));
+ } catch (Exception $e) {
+ $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
+ }
+
+ $this->addFlash('success', $this->trans('Successful deletion', 'Admin.Notifications.Success'));
+
+ return $this->redirectToRoute('admin_feature_values_index', [
+ 'featureId' => $featureId,
+ ]);
+ }
+
+ /**
+ * @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))")
+ *
+ * @param int $featureId
+ * @param Request $request
+ *
+ * @return Response
+ */
+ public function bulkDeleteAction(int $featureId, Request $request): Response
+ {
+ try {
+ $this->getCommandBus()->handle(new BulkDeleteFeatureValueCommand($this->getBulkActionIds($request, 'feature_value_bulk')));
+ } catch (Exception $e) {
+ $this->addFlash('error', $this->getErrorMessageForException($e, $this->getErrorMessages()));
+ }
+
+ $this->addFlash('success', $this->trans('Successful deletion', 'Admin.Notifications.Success'));
+
+ return $this->redirectToRoute('admin_feature_values_index', [
+ 'featureId' => $featureId,
+ ]);
+ }
+
+ /**
+ * @return array>
+ */
+ private function getErrorMessages(): array
+ {
+ return [
+ FeatureNotFoundException::class => $this->trans(
+ 'The object cannot be loaded (or found).',
+ 'Admin.Notifications.Error'
+ ),
+ FeatureValueNotFoundException::class => $this->trans(
+ 'The object cannot be loaded (or found).',
+ 'Admin.Notifications.Error'
+ ),
+ BulkFeatureValueException::class => [
+ BulkFeatureValueException::FAILED_BULK_DELETE => $this->trans(
+ 'An error occurred while deleting this selection.',
+ 'Admin.Notifications.Error'
+ ),
+ ],
+ CannotDeleteFeatureValueException::class => $this->trans(
+ 'An error occurred while deleting the object.',
+ 'Admin.Notifications.Error'
+ ),
+ ];
+ }
+}
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/ManufacturerController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/ManufacturerController.php
index 4ef097fc27e29..e6187366a88e5 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/ManufacturerController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/ManufacturerController.php
@@ -264,12 +264,12 @@ public function editAction(Request $request, $manufacturerId)
* Deletes manufacturer
*
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_manufacturers_index")
- * @DemoRestricted(redirectRoute="admin_manufacturers_index")
*
* @param int|string $manufacturerId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_manufacturers_index')]
public function deleteAction($manufacturerId)
{
try {
@@ -289,10 +289,10 @@ public function deleteAction($manufacturerId)
* Deletes manufacturers on bulk action
*
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_manufacturers_index")
- * @DemoRestricted(redirectRoute="admin_manufacturers_index")
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_manufacturers_index')]
public function bulkDeleteAction(Request $request)
{
$manufacturerIds = $this->getBulkManufacturersFromRequest($request);
@@ -314,10 +314,10 @@ public function bulkDeleteAction(Request $request)
* Enables manufacturers on bulk action
*
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_manufacturers_index")
- * @DemoRestricted(redirectRoute="admin_manufacturers_index")
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_manufacturers_index')]
public function bulkEnableAction(Request $request)
{
$manufacturerIds = $this->getBulkManufacturersFromRequest($request);
@@ -340,10 +340,10 @@ public function bulkEnableAction(Request $request)
* Disables manufacturers on bulk action
*
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_manufacturers_index")
- * @DemoRestricted(redirectRoute="admin_manufacturers_index")
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_manufacturers_index')]
public function bulkDisableAction(Request $request)
{
$manufacturerIds = $this->getBulkManufacturersFromRequest($request);
@@ -366,12 +366,12 @@ public function bulkDisableAction(Request $request)
* Toggles manufacturer status
*
* @AdminSecurity("is_granted('update', request.get('_legacy_controller'))", redirectRoute="admin_manufacturers_index")
- * @DemoRestricted(redirectRoute="admin_manufacturers_index")
*
* @param int $manufacturerId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_manufacturers_index')]
public function toggleStatusAction($manufacturerId)
{
try {
@@ -398,10 +398,10 @@ public function toggleStatusAction($manufacturerId)
* "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* redirectRoute="admin_manufacturers_index"
* )
- * @DemoRestricted(redirectRoute="admin_manufacturers_index")
*
* @return Response
*/
+ #[DemoRestricted(redirectRoute: 'admin_manufacturers_index')]
public function exportAction(ManufacturerFilters $filters)
{
$filters = new ManufacturerFilters(['limit' => null] + $filters->all());
@@ -481,12 +481,12 @@ public function deleteLogoImageAction(Request $request, int $manufacturerId): Re
* Deletes address
*
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_manufacturers_index")
- * @DemoRestricted(redirectRoute="admin_manufacturers_index")
*
* @param int $addressId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_manufacturers_index')]
public function deleteAddressAction($addressId)
{
try {
@@ -509,10 +509,10 @@ public function deleteAddressAction($addressId)
* "is_granted('read', request.get('_legacy_controller')) && is_granted('update', request.get('_legacy_controller')) && is_granted('create', request.get('_legacy_controller')) && is_granted('delete', request.get('_legacy_controller'))",
* redirectRoute="admin_manufacturers_index"
* )
- * @DemoRestricted(redirectRoute="admin_manufacturers_index")
*
* @return Response
*/
+ #[DemoRestricted(redirectRoute: 'admin_manufacturers_index')]
public function exportAddressAction(ManufacturerAddressFilters $filters)
{
$addressesGridFactory = $this->get('prestashop.core.grid.grid_factory.manufacturer_address');
@@ -553,10 +553,10 @@ public function exportAddressAction(ManufacturerAddressFilters $filters)
* Deletes adresses in bulk action
*
* @AdminSecurity("is_granted('delete', request.get('_legacy_controller'))", redirectRoute="admin_manufacturers_index")
- * @DemoRestricted(redirectRoute="admin_manufacturers_index")
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_manufacturers_index')]
public function bulkDeleteAddressAction(Request $request)
{
$addressIds = $this->getBulkAddressesFromRequest($request);
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/ProductController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/ProductController.php
index 7c42fd0d4c432..e8a7125961183 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/ProductController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/ProductController.php
@@ -58,6 +58,7 @@
use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopId;
use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilderInterface;
use PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandlerInterface;
use PrestaShop\PrestaShop\Core\Grid\Definition\Factory\GridDefinitionFactoryInterface;
@@ -68,7 +69,6 @@
use PrestaShopBundle\Controller\BulkActionsTrait;
use PrestaShopBundle\Entity\AdminFilter;
use PrestaShopBundle\Entity\ProductDownload;
-use PrestaShopBundle\Entity\Repository\FeatureFlagRepository;
use PrestaShopBundle\Form\Admin\Sell\Product\Category\CategoryFilterType;
use PrestaShopBundle\Form\Admin\Type\ShopSelectorType;
use PrestaShopBundle\Security\Admin\Employee;
@@ -413,6 +413,11 @@ public function createAction(Request $request): Response
$redirectParams['setShopContext'] = 's-' . $createdData['shop_id'];
}
+ // When this configuration is enabled we pre-fill the online status in the redirected form
+ if ((bool) $this->getConfiguration()->get('PS_PRODUCT_ACTIVATION_DEFAULT')) {
+ $redirectParams['forceDefaultActive'] = 1;
+ }
+
return $this->redirectToRoute('admin_products_edit', $redirectParams);
}
} catch (Exception $e) {
@@ -450,10 +455,14 @@ public function editAction(Request $request, int $productId): Response
return $this->renderIncompatibleContext($productId);
}
+ // When query parameter is present we force the initial value in the form, but only in GET method, or you could never manually set false in the form on submit
+ $forceDefaultActive = $request->query->getBoolean('forceDefaultActive') && $request->isMethod(Request::METHOD_GET);
+
try {
$productForm = $this->getEditProductFormBuilder()->getFormFor($productId, [], [
'product_id' => $productId,
'shop_id' => (int) $this->getContextShopId(),
+ 'force_default_active' => $forceDefaultActive,
// @todo: patch/partial update doesn't work good for now (especially multiple empty values) so we use POST for now
// 'method' => Request::METHOD_PATCH,
'method' => Request::METHOD_POST,
@@ -727,15 +736,12 @@ public function disableForAllShopsAction(int $productId): RedirectResponse
* redirectQueryParamsToKeep={"id_category"},
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(
- * redirectRoute="admin_products_index",
- * redirectQueryParamsToKeep={"id_category"}
- * )
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_products_index', redirectQueryParamsToKeep: ['id_category'])]
public function updatePositionAction(Request $request): RedirectResponse
{
try {
@@ -1508,7 +1514,7 @@ private function getGridAdminFilter(): ?AdminFilter
*/
private function shouldRedirectToV1(): bool
{
- return $this->get(FeatureFlagRepository::class)->isDisabled(FeatureFlagSettings::FEATURE_FLAG_PRODUCT_PAGE_V2);
+ return $this->get(FeatureFlagStateCheckerInterface::class)->isDisabled(FeatureFlagSettings::FEATURE_FLAG_PRODUCT_PAGE_V2);
}
/**
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/SupplierController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/SupplierController.php
index 07bedcc54e386..e2797c29e38db 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/SupplierController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/SupplierController.php
@@ -143,14 +143,12 @@ public function createAction(Request $request)
* redirectRoute="admin_suppliers_index",
* message="You do not have permission to delete this."
* )
- * @DemoRestricted(
- * redirectRoute="admin_suppliers_index"
- * )
*
* @param int $supplierId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_suppliers_index')]
public function deleteAction($supplierId)
{
try {
@@ -175,14 +173,12 @@ public function deleteAction($supplierId)
* redirectRoute="admin_suppliers_index",
* message="You do not have permission to delete this."
* )
- * @DemoRestricted(
- * redirectRoute="admin_suppliers_index"
- * )
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_suppliers_index')]
public function bulkDeleteAction(Request $request)
{
$suppliersToDelete = $request->request->all('supplier_bulk');
@@ -215,14 +211,12 @@ function ($item) {
* redirectRoute="admin_suppliers_index",
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(
- * redirectRoute="admin_suppliers_index"
- * )
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_suppliers_index')]
public function bulkDisableAction(Request $request)
{
$suppliersToDisable = $request->request->all('supplier_bulk');
@@ -254,14 +248,12 @@ function ($item) {
* redirectRoute="admin_suppliers_index",
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(
- * redirectRoute="admin_suppliers_index"
- * )
*
* @param Request $request
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_suppliers_index')]
public function bulkEnableAction(Request $request)
{
$suppliersToEnable = $request->request->all('supplier_bulk');
@@ -353,14 +345,12 @@ public function editAction(Request $request, $supplierId)
* redirectRoute="admin_suppliers_index",
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(
- * redirectRoute="admin_suppliers_index"
- * )
*
* @param int $supplierId
*
* @return RedirectResponse
*/
+ #[DemoRestricted(redirectRoute: 'admin_suppliers_index')]
public function toggleStatusAction($supplierId)
{
try {
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Customer/CustomerController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Customer/CustomerController.php
index c1fbd69e61b45..c43f070876d56 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Customer/CustomerController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Customer/CustomerController.php
@@ -285,7 +285,6 @@ public function editAction($customerId, Request $request)
* View customer information.
*
* @AdminSecurity("is_granted('read', request.get('_legacy_controller'))", redirectRoute="admin_customers_index")
- * @DemoRestricted(redirectRoute="admin_customers_index")
*
* @param int $customerId
* @param Request $request
@@ -298,6 +297,7 @@ public function editAction($customerId, Request $request)
*
* @return Response
*/
+ #[DemoRestricted(redirectRoute: 'admin_customers_index')]
public function viewAction(
$customerId,
Request $request,
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Order/CartController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Order/CartController.php
index 76177938a5474..ca288aa2ff9a0 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Order/CartController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Order/CartController.php
@@ -619,7 +619,7 @@ private function getErrorMessages(Exception $e)
*/
private function getErrorCode(Exception $e): int
{
- switch (get_class($e)) {
+ switch ($e::class) {
case ProductOutOfStockException::class:
return Response::HTTP_CONFLICT;
}
diff --git a/src/PrestaShopBundle/Controller/Admin/Sell/Order/OrderController.php b/src/PrestaShopBundle/Controller/Admin/Sell/Order/OrderController.php
index 452922df2320f..59eabbcd103b2 100644
--- a/src/PrestaShopBundle/Controller/Admin/Sell/Order/OrderController.php
+++ b/src/PrestaShopBundle/Controller/Admin/Sell/Order/OrderController.php
@@ -233,7 +233,7 @@ public function placeAction(Request $request)
public function createAction(Request $request)
{
/** @var ShopContext $shopContextChecker */
- $shopContextChecker = $this->container->get('prestashop.adapter.shop.context');
+ $shopContextChecker = $this->get('prestashop.adapter.shop.context');
if (!$shopContextChecker->isSingleShopContext()) {
$this->addFlash('error', $this->trans(
@@ -479,7 +479,7 @@ public function viewAction(int $orderId, Request $request): Response
'order_id' => $orderId,
]);
- $currencyDataProvider = $this->container->get('prestashop.adapter.data_provider.currency');
+ $currencyDataProvider = $this->get('prestashop.adapter.data_provider.currency');
//@todo: Fix me. Should not rely on legacy object model - Currency
$orderCurrency = $currencyDataProvider->getCurrencyById($orderForViewing->getCurrencyId());
@@ -776,7 +776,7 @@ public function addProductAction(int $orderId, Request $request): Response
$formBuilder = $this->get('prestashop.core.form.identifiable_object.builder.cancel_product_form_builder');
$cancelProductForm = $formBuilder->getFormFor($orderId);
- $currencyDataProvider = $this->container->get('prestashop.adapter.data_provider.currency');
+ $currencyDataProvider = $this->get('prestashop.adapter.data_provider.currency');
$orderCurrency = $currencyDataProvider->getCurrencyById($orderForViewing->getCurrencyId());
$addedGridRows = '';
@@ -1044,7 +1044,7 @@ public function updateProductAction(int $orderId, int $orderDetailId, Request $r
$formBuilder = $this->get('prestashop.core.form.identifiable_object.builder.cancel_product_form_builder');
$cancelProductForm = $formBuilder->getFormFor($orderId);
- $currencyDataProvider = $this->container->get('prestashop.adapter.data_provider.currency');
+ $currencyDataProvider = $this->get('prestashop.adapter.data_provider.currency');
$orderCurrency = $currencyDataProvider->getCurrencyById($orderForViewing->getCurrencyId());
return $this->render('@PrestaShop/Admin/Sell/Order/Order/Blocks/View/product.html.twig', [
@@ -1272,16 +1272,13 @@ public function duplicateOrderCartAction(int $orderId)
* redirectQueryParamsToKeep={"orderId"},
* message="You do not have permission to edit this."
* )
- * @DemoRestricted(
- * redirectRoute="admin_orders_view",
- * redirectQueryParamsToKeep={"orderId"}
- * )
*
* @param Request $request
* @param int $orderId
*
* @return Response
*/
+ #[DemoRestricted(redirectRoute: 'admin_orders_view', redirectQueryParamsToKeep: ['orderId'])]
public function sendMessageAction(Request $request, int $orderId): Response
{
$orderMessageForm = $this->createForm(OrderMessageType::class);
@@ -1577,7 +1574,7 @@ public function getProductsListAction(int $orderId): Response
/** @var OrderForViewing $orderForViewing */
$orderForViewing = $this->getQueryBus()->handle(new GetOrderForViewing($orderId, QuerySorting::DESC));
- $currencyDataProvider = $this->container->get('prestashop.adapter.data_provider.currency');
+ $currencyDataProvider = $this->get('prestashop.adapter.data_provider.currency');
$orderCurrency = $currencyDataProvider->getCurrencyById($orderForViewing->getCurrencyId());
$formBuilder = $this->get('prestashop.core.form.identifiable_object.builder.cancel_product_form_builder');
diff --git a/src/PrestaShopBundle/Controller/Admin/SupplierController.php b/src/PrestaShopBundle/Controller/Admin/SupplierController.php
index dbb6a5f2c2933..4b93ee475633c 100644
--- a/src/PrestaShopBundle/Controller/Admin/SupplierController.php
+++ b/src/PrestaShopBundle/Controller/Admin/SupplierController.php
@@ -86,7 +86,6 @@ public function refreshProductSupplierCombinationFormAction($idProduct, $supplie
$this->get(Tools::class),
$this->get('prestashop.adapter.data_provider.product'),
$this->get('prestashop.adapter.data_provider.supplier'),
- $this->get('prestashop.adapter.data_provider.warehouse'),
$this->get('prestashop.adapter.data_provider.feature'),
$this->get('prestashop.adapter.data_provider.pack'),
$this->get('prestashop.adapter.shop.context'),
diff --git a/src/PrestaShopBundle/Controller/Admin/WarehouseController.php b/src/PrestaShopBundle/Controller/Admin/WarehouseController.php
deleted file mode 100644
index 2544ddb199306..0000000000000
--- a/src/PrestaShopBundle/Controller/Admin/WarehouseController.php
+++ /dev/null
@@ -1,104 +0,0 @@
-
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-namespace PrestaShopBundle\Controller\Admin;
-
-use PrestaShop\PrestaShop\Adapter\Product\AdminProductWrapper;
-use PrestaShop\PrestaShop\Adapter\Tools;
-use PrestaShopBundle\Model\Product\AdminModelAdapter as ProductAdminModelAdapter;
-use PrestaShopBundle\Security\Annotation\AdminSecurity;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * @deprecated since 8.1 and will be removed in next major.
- *
- * Admin controller for warehouse on the /product/form page.
- */
-class WarehouseController extends FrameworkBundleAdminController
-{
- /**
- * Refresh the WarehouseCombination data for the given product ID.
- *
- * @AdminSecurity("is_granted('create', request.get('_legacy_controller')) || is_granted('update', request.get('_legacy_controller'))")
- *
- * @param int $idProduct
- *
- * @return string|Response
- */
- public function refreshProductWarehouseCombinationFormAction($idProduct)
- {
- $productAdapter = $this->get('prestashop.adapter.data_provider.product');
- $warehouseAdapter = $this->get('prestashop.adapter.data_provider.warehouse');
- $response = new Response();
-
- //get product and all warehouses
- $product = $productAdapter->getProduct((int) $idProduct);
- if (!is_object($product) || empty($product->id)) {
- $response->setStatusCode(400);
-
- return $response;
- }
- $warehouses = $warehouseAdapter->getWarehouses();
-
- $modelMapper = new ProductAdminModelAdapter(
- $this->get('prestashop.adapter.legacy.context'),
- $this->get(AdminProductWrapper::class),
- $this->get(Tools::class),
- $this->get('prestashop.adapter.data_provider.product'),
- $this->get('prestashop.adapter.data_provider.supplier'),
- $this->get('prestashop.adapter.data_provider.warehouse'),
- $this->get('prestashop.adapter.data_provider.feature'),
- $this->get('prestashop.adapter.data_provider.pack'),
- $this->get('prestashop.adapter.shop.context'),
- $this->get('prestashop.adapter.data_provider.tax'),
- $this->get('prestashop.adapter.legacy.configuration'),
- $this->get('router')
- );
- $allFormData = $modelMapper->getFormData($product);
-
- $form = $this->createFormBuilder($allFormData);
- $simpleSubForm = $form->create('step4', 'form');
-
- foreach ($warehouses as $warehouse) {
- $simpleSubForm->add('warehouse_combination_' . $warehouse['id_warehouse'], 'Symfony\Component\Form\Extension\Core\Type\CollectionType', [
- 'entry_type' => 'PrestaShopBundle\Form\Admin\Product\ProductWarehouseCombination',
- 'entry_options' => [
- 'id_warehouse' => $warehouse['id_warehouse'],
- ],
- 'allow_add' => true,
- 'required' => false,
- 'label' => $warehouse['name'],
- ]);
- }
-
- $form->add($simpleSubForm);
-
- return $this->render('@Product/ProductPage/Forms/form_warehouse_combination.html.twig', [
- 'warehouses' => $warehouses,
- 'form' => $form->getForm()['step4']->createView(),
- ]);
- }
-}
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
index eeab752d8d0ce..82b74cf068c17 100644
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryCollectorPass.php
@@ -26,18 +26,22 @@
namespace PrestaShopBundle\DependencyInjection\Compiler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
+use ReflectionAttribute;
+use ReflectionClass;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
use Symfony\Component\DependencyInjection\ContainerBuilder;
/**
- * Collects all Commands & Queries and puts them into container for later processing.
+ * Aggregates and organizes all Commands & Queries and storing them in a container for future processing
*/
class CommandAndQueryCollectorPass implements CompilerPassInterface
{
/**
* {@inheritdoc}
*/
- public function process(ContainerBuilder $container)
+ public function process(ContainerBuilder $container): void
{
if (!in_array($container->getParameter('kernel.environment'), ['dev', 'test'])) {
return;
@@ -50,21 +54,55 @@ public function process(ContainerBuilder $container)
/**
* Gets command for each provided handler
*
- * @param ContainerBuilder $container
- *
* @return string[]
*/
- private function findCommandsAndQueries(ContainerBuilder $container)
+ private function findCommandsAndQueries(ContainerBuilder $container): array
{
- $handlers = $container->findTaggedServiceIds('tactician.handler');
-
+ $handlers = $container->findTaggedServiceIds('messenger.message_handler');
$commands = [];
- foreach ($handlers as $handler) {
- if (isset(current($handler)['command'])) {
- $commands[] = current($handler)['command'];
+ foreach ($handlers as $key => $value) {
+ if (count(current($value)) == 0) {
+ continue;
}
+
+ $className = $container->getDefinition($key)->getClass();
+ $handlerAttributes = $this->getHandlerAttributes($className);
+ $this->processHandlerAttributes($handlerAttributes, $value, $commands);
}
return $commands;
}
+
+ /**
+ * Get the attributes of a message handler using reflection.
+ *
+ * @return ReflectionAttribute[]
+ */
+ private function getHandlerAttributes(string $handlerClassName): array
+ {
+ $handler = new ReflectionClass($handlerClassName);
+
+ return $handler->getAttributes();
+ }
+
+ /**
+ * Process the handler attributes and add commands and queries to the result.
+ *
+ * @param ReflectionAttribute[] $handlerAttributes
+ * @param array $value
+ * @param string[] $commands
+ *
+ * @return void
+ */
+ private function processHandlerAttributes(array $handlerAttributes, array $value, array &$commands): void
+ {
+ foreach ($handlerAttributes as $handlerAttribute) {
+ $isCommandHandler = $handlerAttribute->getName() === AsCommandHandler::class;
+ $isQueryHandler = $handlerAttribute->getName() === AsQueryHandler::class;
+
+ if (($isCommandHandler || $isQueryHandler) && isset(current($value)['handles'])) {
+ $commands[] = current($value)['handles'];
+ }
+ }
+ }
}
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryRegisterPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryRegisterPass.php
new file mode 100644
index 0000000000000..1defc1aab6ea4
--- /dev/null
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/CommandAndQueryRegisterPass.php
@@ -0,0 +1,114 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+namespace PrestaShopBundle\DependencyInjection\Compiler;
+
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
+use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsQueryHandler;
+use ReflectionClass;
+use ReflectionNamedType;
+use Reflector;
+use RuntimeException;
+use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * This class automatically configures the 'AsCommandHandler' and 'AsQueryHandler' attributes
+ * as tags for auto-detection in Symfony.
+ *
+ * Classes marked with the 'AsCommandHandler' attribute will be registered as command handlers,
+ * while classes marked with 'AsQueryHandler' will be registered as query handlers.
+ *
+ * To make this work, make sure to add the appropriate annotations to the classes that need to
+ * be detected as command or query handlers.
+ *
+ * Usage example:
+ *
+ * #[AsCommandHandler]
+ * class MyCommandHandler
+ * {
+ * // ...
+ * }
+ *
+ * #[AsQueryHandler]
+ * class MyQueryHandler
+ * {
+ * // ...
+ * }
+ *
+ * These classes will be automatically discovered and registered in the Symfony service container
+ * using the `registerAttributeForAutoconfiguration` method.
+ *
+ * @see https://symfony.com/doc/current/service_container/tags.html#autoconfiguring-tags-with-attributes
+ */
+class CommandAndQueryRegisterPass implements CompilerPassInterface
+{
+ /**
+ * {@inheritdoc}
+ */
+ public function process(ContainerBuilder $container): void
+ {
+ $this->registerMessengerTags($container);
+ }
+
+ /**
+ * register messenger tags allowing the recognition of handlers by symfony
+ */
+ private function registerMessengerTags(ContainerBuilder $container): void
+ {
+ $container->registerAttributeForAutoconfiguration(AsCommandHandler::class, static function (ChildDefinition $definition, AsCommandHandler $attribute, Reflector $reflector): void {
+ if (!$reflector instanceof ReflectionClass) {
+ throw new RuntimeException(sprintf('AsCommandHandler must be a class attribute, "%s" given.', $reflector::class));
+ }
+ $definition->addTag('messenger.message_handler', ['method' => $attribute->method, 'handles' => self::guessHandledClasses($reflector, $attribute->method)]);
+ });
+
+ $container->registerAttributeForAutoconfiguration(AsQueryHandler::class, static function (ChildDefinition $definition, AsQueryHandler $attribute, Reflector $reflector): void {
+ if (!$reflector instanceof ReflectionClass) {
+ throw new RuntimeException(sprintf('AsQueryHandler must be a class attribute, "%s" given.', $reflector::class));
+ }
+ $definition->addTag('messenger.message_handler', ['method' => $attribute->method, 'handles' => self::guessHandledClasses($reflector, $attribute->method)]);
+ });
+ }
+
+ private static function guessHandledClasses(ReflectionClass $class, string $method): string
+ {
+ $reflectionMethod = $class->getMethod($method);
+ $parameters = $reflectionMethod->getParameters();
+
+ if (count($parameters) != 1) {
+ throw new RuntimeException(sprintf('Invalid handler service "%s": number of argument "$%s" in method "%s" must be 1 , "%s" given.', $class->getName(), $parameters[0]->getName(), $method, count($parameters)));
+ }
+
+ $firstParameter = $parameters[0]->getType();
+ if (!$firstParameter instanceof ReflectionNamedType) {
+ throw new RuntimeException(sprintf('Invalid parameter type: must be ReflectionNamedType , "%s" given.', $firstParameter::class));
+ }
+
+ return $firstParameter->getName();
+ }
+}
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/ContainerInjectionPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/ContainerInjectionPass.php
deleted file mode 100644
index eb4d6417d6be1..0000000000000
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/ContainerInjectionPass.php
+++ /dev/null
@@ -1,77 +0,0 @@
-
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- */
-
-declare(strict_types=1);
-
-namespace PrestaShopBundle\DependencyInjection\Compiler;
-
-use InvalidArgumentException;
-use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-
-/**
- * As explained in https://github.com/symfony/symfony/issues/36567,
- * Controllers lose the ControllerAwareTrait capabilities when they are decorated.
- *
- * This pass injects the container into PrestaShop tagged controllers to overcome this issue.
- */
-class ContainerInjectionPass implements CompilerPassInterface
-{
- /**
- * {@inheritdoc}
- */
- public function process(ContainerBuilder $container)
- {
- $controllers = $container->findTaggedServiceIds(FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG);
-
- foreach ($controllers as $id => $controller) {
- $definition = $container->findDefinition($id);
- $class = $definition->getClass();
- $reflectedClass = $container->getReflectionClass($class);
-
- if (null === $reflectedClass) {
- throw new InvalidArgumentException(sprintf(
- 'Class "%s" used for service "%s" cannot be found.',
- $class,
- $id
- ));
- }
-
- $isContainerAware = (
- $reflectedClass->implementsInterface(ContainerAwareInterface::class)
- || is_subclass_of($class, AbstractController::class)
- );
-
- if ($isContainerAware) {
- $definition->addMethodCall('setContainer', [new Reference('service_container')]);
- }
- }
- }
-}
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/GridDefinitionServiceIdsCollectorPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/GridDefinitionServiceIdsCollectorPass.php
index 65b315d50ef9f..e736281e6f2ca 100644
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/GridDefinitionServiceIdsCollectorPass.php
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/GridDefinitionServiceIdsCollectorPass.php
@@ -75,7 +75,7 @@ public function process(ContainerBuilder $container)
*/
private function isGridDefinitionService($serviceId, $serviceClass)
{
- $doesServiceStartsWithGridDefinition = strpos($serviceId, self::GRID_DEFINITION_SERVICE_PREFIX) === 0;
+ $doesServiceStartsWithGridDefinition = str_starts_with($serviceId, self::GRID_DEFINITION_SERVICE_PREFIX);
return $doesServiceStartsWithGridDefinition && is_subclass_of($serviceClass, GridDefinitionFactoryInterface::class);
}
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/IdentifiableObjectFormTypesCollectorPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/IdentifiableObjectFormTypesCollectorPass.php
index ace8c807d94cc..dad2a77d8ed23 100644
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/IdentifiableObjectFormTypesCollectorPass.php
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/IdentifiableObjectFormTypesCollectorPass.php
@@ -88,8 +88,8 @@ public function process(ContainerBuilder $container)
private function isIdentifiableObjectFormBuilderService($serviceId, $serviceClass)
{
$isServiceKeyBelongsToIdentifiableObject =
- strpos($serviceId, self::IDENTIFIABLE_OBJECT_SERVICE_NAME_START_WITH) === 0 ||
- strpos($serviceId, self::ALTERNATIVE_IDENTIFIABLE_OBJECT_SERVICE_STARTS_WITH) === 0
+ str_starts_with($serviceId, self::IDENTIFIABLE_OBJECT_SERVICE_NAME_START_WITH) ||
+ str_starts_with($serviceId, self::ALTERNATIVE_IDENTIFIABLE_OBJECT_SERVICE_STARTS_WITH)
;
return $isServiceKeyBelongsToIdentifiableObject &&
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php
index 4d9b66b75377d..4e36b0f47ebcb 100644
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/LoadServicesFromModulesPass.php
@@ -26,7 +26,6 @@
namespace PrestaShopBundle\DependencyInjection\Compiler;
-use PrestaShop\PrestaShop\Adapter\Module\Repository\ModuleRepository;
use Symfony\Component\Config\FileLocator;
use Symfony\Component\Config\Loader\LoaderResolver;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@@ -45,11 +44,6 @@ class LoadServicesFromModulesPass implements CompilerPassInterface
*/
private $configPath;
- /**
- * @var array
- */
- private $activeModulesPaths;
-
/**
* Used to identify which scope of services need to be loaded (front services, admin
* services or generic ones)
@@ -59,7 +53,6 @@ class LoadServicesFromModulesPass implements CompilerPassInterface
public function __construct($containerName = '')
{
$this->configPath = '/config/' . (empty($containerName) ? '' : trim($containerName, '/') . '/');
- $this->activeModulesPaths = (new ModuleRepository(_PS_ROOT_DIR_, _PS_MODULE_DIR_))->getActiveModulesPaths();
}
/**
@@ -67,11 +60,11 @@ public function __construct($containerName = '')
*/
public function process(ContainerBuilder $container)
{
- if (empty($this->activeModulesPaths)) {
- return;
- }
+ $installedModules = $container->getParameter('prestashop.installed_modules');
+ $moduleDir = $container->getParameter('prestashop.module_dir');
- foreach ($this->activeModulesPaths as $modulePath) {
+ foreach ($installedModules as $moduleName) {
+ $modulePath = $moduleDir . $moduleName;
$moduleConfigPath = $modulePath . $this->configPath;
if (file_exists($moduleConfigPath . 'services.yml')) {
$fileLocator = new FileLocator($moduleConfigPath);
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/ModulesDoctrineCompilerPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/ModulesDoctrineCompilerPass.php
index 933d9a2c2de89..68859efedb196 100644
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/ModulesDoctrineCompilerPass.php
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/ModulesDoctrineCompilerPass.php
@@ -47,13 +47,7 @@ class ModulesDoctrineCompilerPass implements CompilerPassInterface
*/
public function process(ContainerBuilder $container)
{
- //We need the list of active modules to load their config, during install the parameter might no be available
- //if the parameters file has not been generated yet, so we skip this part of the build
- if (!$container->hasParameter('kernel.active_modules')) {
- return;
- }
-
- $activeModules = $container->getParameter('kernel.active_modules');
+ $activeModules = $container->getParameter('prestashop.installed_modules');
$compilerPassList = $this->getCompilerPassList($activeModules);
/** @var CompilerPassInterface $compilerPass */
foreach ($compilerPassList as $compilerResourcePath => $compilerPass) {
diff --git a/src/PrestaShopBundle/DependencyInjection/Compiler/OptionsFormHookNameCollectorPass.php b/src/PrestaShopBundle/DependencyInjection/Compiler/OptionsFormHookNameCollectorPass.php
index 22e6dc5ef2483..6551683243495 100644
--- a/src/PrestaShopBundle/DependencyInjection/Compiler/OptionsFormHookNameCollectorPass.php
+++ b/src/PrestaShopBundle/DependencyInjection/Compiler/OptionsFormHookNameCollectorPass.php
@@ -127,7 +127,7 @@ private function stringEndsWith($haystack, $needle)
{
$diff = strlen($haystack) - strlen($needle);
- return $diff >= 0 && strpos($haystack, $needle, $diff) !== false;
+ return $diff >= 0 && str_contains($haystack, $needle);
}
/**
diff --git a/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php b/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
index 23ab79276986b..d04d77b315655 100644
--- a/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
+++ b/src/PrestaShopBundle/DependencyInjection/PrestaShopExtension.php
@@ -28,27 +28,23 @@
use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
/**
* Adds main PrestaShop core services to the Symfony container.
*/
-class PrestaShopExtension extends Extension
+class PrestaShopExtension extends Extension implements PrependExtensionInterface
{
/**
* {@inheritdoc}
*/
public function load(array $configs, ContainerBuilder $container)
{
- $configuration = new AddOnsConfiguration();
- $config = $this->processConfiguration($configuration, $configs);
-
$loader = new YamlFileLoader($container, new FileLocator(dirname(__DIR__) . '/Resources/config'));
$env = $container->getParameter('kernel.environment');
$loader->load('services_' . $env . '.yml');
-
- $container->setParameter('prestashop.addons.categories', $config['addons']['categories']);
}
/**
@@ -66,4 +62,44 @@ public function getAlias()
{
return 'prestashop';
}
+
+ public function prepend(ContainerBuilder $container)
+ {
+ $this->preprendApiConfig($container);
+ }
+
+ public function preprendApiConfig(ContainerBuilder $container)
+ {
+ $paths = [];
+ $installedModules = $container->getParameter('prestashop.installed_modules');
+ $moduleDir = $container->getParameter('prestashop.module_dir');
+
+ foreach ($installedModules as $moduleName) {
+ $modulePath = $moduleDir . $moduleName;
+ // Load YAML definition from the config/api_platform folder in the module
+ $moduleConfigPath = sprintf('%s/config/api_platform', $modulePath);
+ if (file_exists($moduleConfigPath)) {
+ $paths[] = $moduleConfigPath;
+ }
+
+ /**
+ * TODO: Understand why this crashes PrestaShop and redirects to Front Office - no support of entities until then
+ * // Load Doctrine entities that could be used as ApiPlatform DTO resources as well in the src/Entity folder
+ * $entitiesRessourcesPath = sprintf('%s/src/Entity', $modulePath);
+ * if (file_exists($entitiesRessourcesPath)) {
+ * $paths[] = $entitiesRessourcesPath;
+ * }
+ */
+
+ // Load ApiPLatform DTOs from the src/ApiPlatform/Resources folder
+ $moduleRessourcesPath = sprintf('%s/src/ApiPlatform/Resource', $modulePath);
+ if (file_exists($moduleRessourcesPath)) {
+ $paths[] = $moduleRessourcesPath;
+ }
+ }
+
+ if (!empty($paths)) {
+ $container->prependExtensionConfig('api_platform', ['mapping' => ['paths' => $paths]]);
+ }
+ }
}
diff --git a/src/PrestaShopBundle/Entity/AdminFilter.php b/src/PrestaShopBundle/Entity/AdminFilter.php
index 2653d5d129f1e..a39206598b1dc 100644
--- a/src/PrestaShopBundle/Entity/AdminFilter.php
+++ b/src/PrestaShopBundle/Entity/AdminFilter.php
@@ -313,11 +313,11 @@ public static function sanitizeFilterParameters(array $filter)
return function ($subject) use ($filter) {
$operator = null;
- if (false !== strpos($subject, '<=')) {
+ if (str_contains($subject, '<=')) {
$operator = '<=';
}
- if (false !== strpos($subject, '>=')) {
+ if (str_contains($subject, '>=')) {
$operator = '>=';
}
diff --git a/src/PrestaShopBundle/Entity/AuthorizedApplication.php b/src/PrestaShopBundle/Entity/AuthorizedApplication.php
index d5fbace11c854..9d6b2c1906cb9 100644
--- a/src/PrestaShopBundle/Entity/AuthorizedApplication.php
+++ b/src/PrestaShopBundle/Entity/AuthorizedApplication.php
@@ -53,7 +53,7 @@ class AuthorizedApplication implements AuthorizedApplicationInterface
/**
* @var string
*
- * @ORM\Column(name="name", type="string", length=255, unique=true)
+ * @ORM\Column(name="name", type="string", length=50, unique=true)
*/
private $name;
diff --git a/src/PrestaShopBundle/Entity/FeatureFlag.php b/src/PrestaShopBundle/Entity/FeatureFlag.php
index 36043e9e84df3..5ea2b1a60d9c1 100644
--- a/src/PrestaShopBundle/Entity/FeatureFlag.php
+++ b/src/PrestaShopBundle/Entity/FeatureFlag.php
@@ -58,6 +58,13 @@ class FeatureFlag
*/
private $name;
+ /**
+ * @var string
+ *
+ * @ORM\Column(name="type", type="string", length=64, options={"default": FeatureFlagSettings::TYPE_DEFAULT})
+ */
+ private $type;
+
/**
* @var bool
*
@@ -109,6 +116,7 @@ public function __construct(string $name)
throw new InvalidArgumentException('Feature flag name cannot be empty');
}
$this->name = $name;
+ $this->type = FeatureFlagSettings::TYPE_DEFAULT;
$this->state = false;
$this->descriptionWording = '';
$this->descriptionDomain = '';
@@ -260,4 +268,34 @@ public function setStability(string $stability): self
return $this;
}
+
+ /**
+ * @return string
+ */
+ public function getType(): string
+ {
+ return $this->type;
+ }
+
+ /**
+ * Retrieve order of feature flags type
+ *
+ * @return array
+ */
+ public function getOrderedTypes(): array
+ {
+ return explode(',', $this->type);
+ }
+
+ /**
+ * @param string $type
+ *
+ * @return self
+ */
+ public function setType(string $type): self
+ {
+ $this->type = $type;
+
+ return $this;
+ }
}
diff --git a/src/PrestaShopBundle/Entity/Repository/ApiAccessRepository.php b/src/PrestaShopBundle/Entity/Repository/ApiAccessRepository.php
index 4ec3c160a461a..702f5e8cdc5f9 100644
--- a/src/PrestaShopBundle/Entity/Repository/ApiAccessRepository.php
+++ b/src/PrestaShopBundle/Entity/Repository/ApiAccessRepository.php
@@ -29,10 +29,29 @@
namespace PrestaShopBundle\Entity\Repository;
use Doctrine\ORM\EntityRepository;
+use PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\ApiAccessRepositoryInterface;
+use PrestaShopBundle\Entity\AuthorizedApplication;
/**
* @experimental
*/
-class ApiAccessRepository extends EntityRepository
+class ApiAccessRepository extends EntityRepository implements ApiAccessRepositoryInterface
{
+ /**
+ * {@inheritdoc}
+ */
+ public function deleteByApplication(AuthorizedApplication $application): void
+ {
+ $queryBuilder = $this->getEntityManager()->createQueryBuilder();
+
+ $queryBuilder
+ ->delete()
+ ->from($this->getEntityName(), 'e')
+ ->where('e.authorizedApplication = :authorizedApplication')
+ ->setParameter('authorizedApplication', $application);
+
+ $query = $queryBuilder->getQuery();
+
+ $query->execute();
+ }
}
diff --git a/src/PrestaShopBundle/Entity/Repository/AuthorizedApplicationRepository.php b/src/PrestaShopBundle/Entity/Repository/AuthorizedApplicationRepository.php
index 5223f102fa80a..58d6976873c14 100644
--- a/src/PrestaShopBundle/Entity/Repository/AuthorizedApplicationRepository.php
+++ b/src/PrestaShopBundle/Entity/Repository/AuthorizedApplicationRepository.php
@@ -59,7 +59,7 @@ public function update(AuthorizedApplicationInterface $application): void
/**
* {@inheritdoc}
*/
- public function getById(ApplicationId $applicationId): ?AuthorizedApplicationInterface
+ public function getById(ApplicationId $applicationId): AuthorizedApplicationInterface
{
$application = $this->find($applicationId->getValue());
if ($application === null) {
@@ -72,7 +72,7 @@ public function getById(ApplicationId $applicationId): ?AuthorizedApplicationInt
/**
* {@inheritdoc}
*/
- public function getByName(string $name): ?AuthorizedApplicationInterface
+ public function getByName(string $name): AuthorizedApplicationInterface
{
$application = $this->findOneBy(['name' => $name]);
if ($application === null) {
@@ -81,4 +81,13 @@ public function getByName(string $name): ?AuthorizedApplicationInterface
return $application;
}
+
+ /**
+ * {@inheritdoc}
+ */
+ public function delete(AuthorizedApplicationInterface $application): void
+ {
+ $this->getEntityManager()->remove($application);
+ $this->getEntityManager()->flush();
+ }
}
diff --git a/src/PrestaShopBundle/Entity/Repository/FeatureAttributeRepository.php b/src/PrestaShopBundle/Entity/Repository/FeatureAttributeRepository.php
index 0ee59b6952d44..2a82b05e49c6b 100644
--- a/src/PrestaShopBundle/Entity/Repository/FeatureAttributeRepository.php
+++ b/src/PrestaShopBundle/Entity/Repository/FeatureAttributeRepository.php
@@ -210,7 +210,7 @@ private function explodeCollections($rows)
$row['values'] = explode(',', $row['values']);
$row['values'] = array_map(function ($value) {
- if (false === strpos($value, ':')) {
+ if (!str_contains($value, ':')) {
return $value;
}
diff --git a/src/PrestaShopBundle/Entity/Repository/FeatureFlagRepository.php b/src/PrestaShopBundle/Entity/Repository/FeatureFlagRepository.php
index 54911ce327a2f..46ed4b9a2318f 100644
--- a/src/PrestaShopBundle/Entity/Repository/FeatureFlagRepository.php
+++ b/src/PrestaShopBundle/Entity/Repository/FeatureFlagRepository.php
@@ -68,7 +68,7 @@ public function isEnabled(string $featureFlagName): bool
}
/**
- * Check if a feature flag is enabled based on its name (if it doesn't exist false is returned).
+ * Check if a feature flag is disabled based on its name (if it doesn't exist true is returned).
*
* @param string $featureFlagName
*
diff --git a/src/PrestaShopBundle/Entity/Repository/StockManagementRepository.php b/src/PrestaShopBundle/Entity/Repository/StockManagementRepository.php
index d8f843b196c08..86a28b0ea3c06 100644
--- a/src/PrestaShopBundle/Entity/Repository/StockManagementRepository.php
+++ b/src/PrestaShopBundle/Entity/Repository/StockManagementRepository.php
@@ -325,7 +325,7 @@ protected function orderBy(QueryParamsCollection $queryParams)
{
$orderByClause = $queryParams->getSqlOrder();
- $descendingOrder = false !== strpos($orderByClause, ' DESC');
+ $descendingOrder = str_contains($orderByClause, ' DESC');
$productColumns = 'product_id, combination_id';
if ($descendingOrder) {
diff --git a/src/PrestaShopBundle/Entity/Repository/TabRepository.php b/src/PrestaShopBundle/Entity/Repository/TabRepository.php
index e30fb0f2fd208..72d7b9f0a2370 100644
--- a/src/PrestaShopBundle/Entity/Repository/TabRepository.php
+++ b/src/PrestaShopBundle/Entity/Repository/TabRepository.php
@@ -27,10 +27,14 @@
namespace PrestaShopBundle\Entity\Repository;
use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
use PrestaShopBundle\Entity\Tab;
class TabRepository extends EntityRepository
{
+ /** @var array */
+ private $cachedTabIds = [];
+
/**
* @param string $moduleName
*
@@ -61,6 +65,11 @@ public function findOneByClassName($className)
return $this->findOneBy(['className' => $className]);
}
+ public function findOneByRouteName(string $routeName): ?Tab
+ {
+ return $this->findOneBy(['routeName' => $routeName]);
+ }
+
/**
* @param string $className
*
@@ -113,4 +122,70 @@ public function changeEnabledByModuleName($moduleName, $enabled)
}
$this->getEntityManager()->flush();
}
+
+ /**
+ * @param string $className
+ *
+ * @return int
+ *
+ * @throws \Doctrine\ORM\NoResultException
+ * @throws \Doctrine\ORM\NonUniqueResultException
+ */
+ public function getIdByClassName(string $className): int
+ {
+ if (!isset($this->cachedTabIds[$className])) {
+ $result = $this->createQueryBuilder('t')
+ ->select('t.id, t.className')
+ ->where('t.className = :className')
+ ->andWhere('t.id != 0')
+ ->setParameter('className', $className)
+ ->getQuery()
+ ->getSingleResult(Query::HYDRATE_ARRAY)
+ ;
+
+ $this->cachedTabIds[$result['className']] = (int) $result['id'];
+ }
+
+ return $this->cachedTabIds[$className];
+ }
+
+ /**
+ * @param int $tabId
+ *
+ * @return Tab[] breadcrumb to access the Tab, ordered from closest to oldest ancestor
+ *
+ * @throws \Doctrine\ORM\NoResultException
+ * @throws \Doctrine\ORM\NonUniqueResultException
+ */
+ public function getAncestors(int $tabId): array
+ {
+ return $this->getTabParents($tabId);
+ }
+
+ /**
+ * Recursive method is kept as private.
+ *
+ * @param int $tabId
+ *
+ * @return Tab[]
+ *
+ * @throws \Doctrine\ORM\NoResultException
+ * @throws \Doctrine\ORM\NonUniqueResultException
+ */
+ private function getTabParents(int $tabId): array
+ {
+ /** @var Tab $tab */
+ $tab = $this->findOneBy(['id' => $tabId]);
+
+ if (empty($tab->getIdParent())) {
+ return [];
+ }
+
+ $parent = $this->findOneBy(['id' => $tab->getIdParent()]);
+ if (null === $parent) {
+ return [];
+ }
+
+ return array_merge([$parent], $this->getTabParents($parent->getId()));
+ }
}
diff --git a/src/PrestaShopBundle/Entity/StockMvt.php b/src/PrestaShopBundle/Entity/StockMvt.php
index ae0ba3a902c2e..efec851b1a673 100644
--- a/src/PrestaShopBundle/Entity/StockMvt.php
+++ b/src/PrestaShopBundle/Entity/StockMvt.php
@@ -63,9 +63,9 @@ class StockMvt
/**
* @var int
*
- * @ORM\Column(name="id_supply_order", type="integer", nullable=true)
+ * @ORM\Column(name="id_supply_order", type="integer", nullable=true, options={"default":0})
*/
- private $idSupplyOrder;
+ private $idSupplyOrder = 0;
/**
* @var int
diff --git a/src/PrestaShopBundle/Entity/Tab.php b/src/PrestaShopBundle/Entity/Tab.php
index 4df93d7570858..45994c83a7348 100644
--- a/src/PrestaShopBundle/Entity/Tab.php
+++ b/src/PrestaShopBundle/Entity/Tab.php
@@ -26,6 +26,8 @@
namespace PrestaShopBundle\Entity;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\Common\Collections\Selectable;
use Doctrine\ORM\Mapping as ORM;
/**
@@ -155,11 +157,23 @@ public function getIcon()
return $this->icon;
}
- public function getTabLangs()
+ public function getTabLangs(): Collection & Selectable
{
return $this->tabLangs;
}
+ public function getTabLangByLanguageId(int $languageId): ?TabLang
+ {
+ /** @var TabLang $tabLang */
+ foreach ($this->getTabLangs() as $tabLang) {
+ if ($tabLang->getLang()->getId() === $languageId) {
+ return $tabLang;
+ }
+ }
+
+ return null;
+ }
+
/**
* @return string|null
*/
diff --git a/src/PrestaShopBundle/EventListener/ActionDispatcherLegacyHooksSubscriber.php b/src/PrestaShopBundle/EventListener/ActionDispatcherLegacyHooksSubscriber.php
index 8a726720cd6a9..9f910caf78d73 100644
--- a/src/PrestaShopBundle/EventListener/ActionDispatcherLegacyHooksSubscriber.php
+++ b/src/PrestaShopBundle/EventListener/ActionDispatcherLegacyHooksSubscriber.php
@@ -93,7 +93,7 @@ public function callActionDispatcherBeforeHook(ControllerEvent $event)
]);
$requestAttributes->set('controller_type', $controllerType);
- $requestAttributes->set('controller_name', get_class($controller));
+ $requestAttributes->set('controller_name', $controller::class);
}
public function callActionDispatcherAfterHook(ResponseEvent $event)
diff --git a/src/PrestaShopBundle/EventListener/Context/Admin/EmployeeContextListener.php b/src/PrestaShopBundle/EventListener/Context/Admin/EmployeeContextListener.php
new file mode 100644
index 0000000000000..c3c28c6183af3
--- /dev/null
+++ b/src/PrestaShopBundle/EventListener/Context/Admin/EmployeeContextListener.php
@@ -0,0 +1,56 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\EventListener\Context\Admin;
+
+use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use PrestaShop\PrestaShop\Core\Context\EmployeeContextBuilder;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
+
+/**
+ * @experimental Depends on ADR https://github.com/PrestaShop/ADR/pull/36
+ */
+class EmployeeContextListener
+{
+ public function __construct(
+ private readonly EmployeeContextBuilder $employeeContextBuilder,
+ private readonly LegacyContext $legacyContext
+ ) {
+ }
+
+ public function onKernelRequest(RequestEvent $event): void
+ {
+ if (!$event->isMainRequest()) {
+ return;
+ }
+
+ if (!empty($this->legacyContext->getContext()->cookie->id_employee)) {
+ $this->employeeContextBuilder->setEmployeeId((int) $this->legacyContext->getContext()->cookie->id_employee);
+ }
+ }
+}
diff --git a/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php b/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php
new file mode 100644
index 0000000000000..c1ce733230bf7
--- /dev/null
+++ b/src/PrestaShopBundle/EventListener/Context/Admin/ShopContextListener.php
@@ -0,0 +1,119 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\EventListener\Context\Admin;
+
+use PrestaShop\PrestaShop\Adapter\LegacyContext;
+use PrestaShop\PrestaShop\Core\Context\EmployeeContext;
+use PrestaShop\PrestaShop\Core\Context\ShopContextBuilder;
+use PrestaShop\PrestaShop\Core\Domain\Configuration\ShopConfigurationInterface;
+use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
+
+/**
+ * @experimental Depends on ADR https://github.com/PrestaShop/ADR/pull/36
+ */
+class ShopContextListener
+{
+ public function __construct(
+ private readonly ShopContextBuilder $shopContextBuilder,
+ private readonly EmployeeContext $employeeContext,
+ private readonly ShopConfigurationInterface $configuration,
+ private readonly LegacyContext $legacyContext
+ ) {
+ }
+
+ public function onKernelRequest(RequestEvent $event): void
+ {
+ // Once container will be both in FO and BO we'll need to check here that we're in a BO context
+ // either that or the listener itself should be configured in a way so that it only is used in BO context
+ // because in FO we don't handle shop context the same way (there can be only one shop and no shop context
+ // switching is possible)
+ if (!$event->isMainRequest()) {
+ return;
+ }
+
+ $shopConstraint = ShopConstraint::allShops();
+ $cookieShopConstraint = $this->getShopConstraintFromCookie();
+ if ($cookieShopConstraint && $cookieShopConstraint->getShopGroupId()) {
+ // Check if the employee has permission on selected group if not fallback on single shop context with employee's default shop
+ if ($this->employeeContext->hasAuthorizationOnShopGroup($cookieShopConstraint->getShopGroupId()->getValue())) {
+ $shopConstraint = $cookieShopConstraint;
+ } elseif (!empty($this->employeeContext->getDefaultShopId())) {
+ $shopConstraint = ShopConstraint::shop($this->employeeContext->getDefaultShopId());
+ }
+ } elseif ($cookieShopConstraint && $cookieShopConstraint->getShopId()) {
+ // Check if employee has authorization on selected shop if not fallback on single shop context with employee's default shop
+ if ($this->employeeContext->hasAuthorizationOnShop($cookieShopConstraint->getShopId()->getValue())) {
+ $shopConstraint = $cookieShopConstraint;
+ } elseif (!empty($this->employeeContext->getDefaultShopId())) {
+ $shopConstraint = ShopConstraint::shop($this->employeeContext->getDefaultShopId());
+ }
+ }
+ $this->shopContextBuilder->setShopConstraint($shopConstraint);
+
+ // In all cases a shop must be set for the context even if it's the default one
+ if (!$shopConstraint->getShopId()) {
+ $this->shopContextBuilder->setShopId((int) $this->configuration->get('PS_SHOP_DEFAULT', null, ShopConstraint::allShops()));
+ } else {
+ $this->shopContextBuilder->setShopId($shopConstraint->getShopId()->getValue());
+ }
+ }
+
+ /**
+ * Get shop context from the legacy cookie, the value of Cookie::shopContext looks like this:
+ * s-1 -> Single shop with shop ID 1
+ * g-2 -> Shop group with shop group ID 2
+ * empty/other values: All Shops
+ *
+ * @return ShopConstraint|null
+ */
+ private function getShopConstraintFromCookie(): ?ShopConstraint
+ {
+ if (empty($this->legacyContext->getContext()->cookie->shopContext)) {
+ return null;
+ }
+
+ $splitShopContext = explode('-', $this->legacyContext->getContext()->cookie->shopContext);
+ if (count($splitShopContext) == 2) {
+ $splitShopType = $splitShopContext[0];
+ $splitShopValue = (int) $splitShopContext[1];
+ if (empty($splitShopValue)) {
+ return null;
+ }
+
+ if ($splitShopType == 'g') {
+ return ShopConstraint::shopGroup($splitShopValue);
+ } else {
+ return ShopConstraint::shop($splitShopValue);
+ }
+ }
+
+ return null;
+ }
+}
diff --git a/src/PrestaShopBundle/EventListener/DemoModeEnabledListener.php b/src/PrestaShopBundle/EventListener/DemoModeEnabledListener.php
index 59c9334f81bd8..c3774f2adf4c5 100644
--- a/src/PrestaShopBundle/EventListener/DemoModeEnabledListener.php
+++ b/src/PrestaShopBundle/EventListener/DemoModeEnabledListener.php
@@ -26,11 +26,9 @@
namespace PrestaShopBundle\EventListener;
-use Doctrine\Common\Annotations\Reader;
-use Doctrine\Common\Util\ClassUtils;
+use PrestaShop\PrestaShop\Core\Domain\Configuration\ShopConfigurationInterface;
use PrestaShopBundle\Security\Annotation\DemoRestricted;
-use ReflectionClass;
-use ReflectionObject;
+use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Session\Session;
@@ -38,67 +36,23 @@
use Symfony\Component\Routing\RouterInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
-/**
- * Allow a redirection to the right url when using BetterSecurity annotation.
- */
+#[AsEventListener(
+ event: ControllerEvent::class,
+ method: 'onKernelController',
+)]
class DemoModeEnabledListener
{
- /**
- * @var RouterInterface
- */
- private $router;
-
- /**
- * @var TranslatorInterface
- */
- private $translator;
-
- /**
- * @var Session
- */
- private $session;
-
- /**
- * @var Reader
- */
- private $annotationReader;
-
- /**
- * @var bool
- */
- private $isDemoModeEnabled;
-
- /**
- * DemoModeEnabledListener constructor.
- *
- * @param RouterInterface $router
- * @param TranslatorInterface $translator
- * @param Session $session
- * @param Reader $annotationReader
- * @param bool $isDemoModeEnabled
- */
public function __construct(
- RouterInterface $router,
- TranslatorInterface $translator,
- Session $session,
- Reader $annotationReader,
- $isDemoModeEnabled
+ private readonly ShopConfigurationInterface $shopConfiguration,
+ private readonly RouterInterface $router,
+ private readonly TranslatorInterface $translator,
+ private readonly Session $session,
) {
- $this->router = $router;
- $this->translator = $translator;
- $this->session = $session;
- $this->annotationReader = $annotationReader;
- $this->isDemoModeEnabled = $isDemoModeEnabled;
}
- /**
- * @param ControllerEvent $event
- */
- public function onKernelController(ControllerEvent $event)
+ public function onKernelController(ControllerEvent $event): void
{
- if (!$this->isDemoModeEnabled
- || !$event->isMainRequest()
- ) {
+ if (!$this->shopConfiguration->getBoolean('_PS_MODE_DEMO_') || !$event->isMainRequest()) {
return;
}
@@ -108,13 +62,20 @@ public function onKernelController(ControllerEvent $event)
return;
}
- list($controllerObject, $methodName) = $controller;
- $demoRestricted = $this->getAnnotation($controllerObject, $methodName);
+ [$controllerObject, $methodName] = $controller;
- if (!$demoRestricted instanceof DemoRestricted) {
+ $method = new \ReflectionMethod($controllerObject, $methodName);
+ $attributes = $method->getAttributes(DemoRestricted::class);
+
+ if ([] === $attributes) {
return;
}
+ $attribute = $attributes[0];
+
+ /** @var DemoRestricted $demoRestricted */
+ $demoRestricted = $attribute->newInstance();
+
$this->showNotificationMessage($demoRestricted);
$routeParametersToKeep = $this->getQueryParamsFromRequestQuery(
@@ -146,33 +107,6 @@ private function showNotificationMessage(DemoRestricted $demoRestricted)
);
}
- /**
- * Retrieve DemoRestricted Annotation.
- *
- * @param object $controllerObject
- * @param string $methodName
- *
- * @return DemoRestricted|null
- */
- private function getAnnotation($controllerObject, $methodName)
- {
- $tokenAnnotation = DemoRestricted::class;
-
- $classAnnotation = $this->annotationReader->getClassAnnotation(
- new ReflectionClass(ClassUtils::getClass($controllerObject)),
- $tokenAnnotation
- );
-
- if ($classAnnotation) {
- return null;
- }
-
- $controllerReflectionObject = new ReflectionObject($controllerObject);
- $reflectionMethod = $controllerReflectionObject->getMethod($methodName);
-
- return $this->annotationReader->getMethodAnnotation($reflectionMethod, $tokenAnnotation);
- }
-
/**
* Gets query parameters by comparing them to the current request attributes.
*
diff --git a/src/PrestaShopBundle/EventListener/FilterCmsPageCategorySearchCriteriaListener.php b/src/PrestaShopBundle/EventListener/FilterCmsPageCategorySearchCriteriaListener.php
index afe1300bc61a9..abcd0cce276ca 100644
--- a/src/PrestaShopBundle/EventListener/FilterCmsPageCategorySearchCriteriaListener.php
+++ b/src/PrestaShopBundle/EventListener/FilterCmsPageCategorySearchCriteriaListener.php
@@ -64,7 +64,7 @@ public function onFilterSearchCriteria(FilterSearchCriteriaEvent $event)
return;
}
- $searchCriteriaClass = get_class($event->getSearchCriteria());
+ $searchCriteriaClass = $event->getSearchCriteria()::class;
$searchCriteria = $event->getSearchCriteria();
diff --git a/src/PrestaShopBundle/EventListener/ModuleActivatedListener.php b/src/PrestaShopBundle/EventListener/ModuleActivatedListener.php
index 9c701eb25f6f8..ccc6f2fe824d0 100644
--- a/src/PrestaShopBundle/EventListener/ModuleActivatedListener.php
+++ b/src/PrestaShopBundle/EventListener/ModuleActivatedListener.php
@@ -110,7 +110,7 @@ public function onKernelController(ControllerEvent $event)
return;
}
- list($controllerObject, $methodName) = $controller;
+ [$controllerObject, $methodName] = $controller;
$moduleActivated = $this->getAnnotation($controllerObject, $methodName);
if (null === $moduleActivated) {
diff --git a/src/PrestaShopBundle/Exception/DomainClassNameMalformedException.php b/src/PrestaShopBundle/Exception/DomainClassNameMalformedException.php
new file mode 100644
index 0000000000000..7adc9ed335dcb
--- /dev/null
+++ b/src/PrestaShopBundle/Exception/DomainClassNameMalformedException.php
@@ -0,0 +1,39 @@
+
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShopBundle\Exception;
+
+use PrestaShop\PrestaShop\Core\Domain\Exception\DomainException;
+
+/**
+ * Is thrown if the class name of the CQRS list is not a correct class name
+ */
+class DomainClassNameMalformedException extends DomainException
+{
+}
diff --git a/src/PrestaShopBundle/Form/Admin/AdvancedParameters/Performance/DebugModeType.php b/src/PrestaShopBundle/Form/Admin/AdvancedParameters/Performance/DebugModeType.php
index a5037d6c211b1..fbb2667155d51 100644
--- a/src/PrestaShopBundle/Form/Admin/AdvancedParameters/Performance/DebugModeType.php
+++ b/src/PrestaShopBundle/Form/Admin/AdvancedParameters/Performance/DebugModeType.php
@@ -26,6 +26,7 @@
namespace PrestaShopBundle\Form\Admin\AdvancedParameters\Performance;
+use PrestaShopBundle\Form\Admin\Type\GeneratableTextType;
use PrestaShopBundle\Form\Admin\Type\SwitchType;
use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
use Symfony\Component\Form\FormBuilderInterface;
@@ -51,6 +52,24 @@ public function buildForm(FormBuilderInterface $builder, array $options)
'label' => $this->trans('Debug mode', 'Admin.Advparameters.Feature'),
'help' => $this->trans('Enable or disable debug mode. Debug mode will enable extended error reporting, display the Symfony debug bar, and other features.', 'Admin.Advparameters.Help'),
])
+ ->add('debug_cookie_name', GeneratableTextType::class, [
+ 'required' => false,
+ 'generated_value_length' => 16,
+ 'label' => $this->trans('Debug cookie name', 'Admin.Advparameters.Feature'),
+ 'help' => $this->trans('(Optional) Insert a cookie name to enable the debug mode only when this cookie is set.', 'Admin.Advparameters.Help'),
+ 'row_attr' => [
+ 'class' => 'debug-mode-option',
+ ],
+ ])
+ ->add('debug_cookie_value', GeneratableTextType::class, [
+ 'required' => false,
+ 'generated_value_length' => 16,
+ 'label' => $this->trans('Debug cookie value', 'Admin.Advparameters.Feature'),
+ 'help' => $this->trans('(Optional) Insert a value to enable the debug mode only when the cookie configured above is set to this value.', 'Admin.Advparameters.Help'),
+ 'row_attr' => [
+ 'class' => 'debug-mode-option',
+ ],
+ ])
->add('debug_profiling', SwitchType::class, [
'required' => false,
'label' => $this->trans('Debug profiler', 'Admin.Advparameters.Feature'),
diff --git a/src/PrestaShopBundle/Form/Admin/Catalog/Category/AbstractCategoryType.php b/src/PrestaShopBundle/Form/Admin/Catalog/Category/AbstractCategoryType.php
index 9258c1ca92969..ccc2694d2e9b8 100644
--- a/src/PrestaShopBundle/Form/Admin/Catalog/Category/AbstractCategoryType.php
+++ b/src/PrestaShopBundle/Form/Admin/Catalog/Category/AbstractCategoryType.php
@@ -32,9 +32,7 @@
use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex;
use PrestaShop\PrestaShop\Core\ConstraintValidator\TypedRegexValidator;
use PrestaShop\PrestaShop\Core\Domain\Category\CategorySettings;
-use PrestaShop\PrestaShop\Core\Domain\Category\QueryResult\EditableCategory;
use PrestaShop\PrestaShop\Core\Domain\Category\SeoSettings;
-use PrestaShop\PrestaShop\Core\Domain\Category\ValueObject\MenuThumbnailId;
use PrestaShop\PrestaShop\Core\Feature\FeatureInterface;
use PrestaShopBundle\Form\Admin\Type\CategorySeoPreviewType;
use PrestaShopBundle\Form\Admin\Type\FormattedTextareaType;
@@ -47,7 +45,6 @@
use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Component\Validator\Constraints\Length;
use Symfony\Component\Validator\Constraints\NotBlank;
@@ -191,21 +188,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
'can_be_deleted' => false,
'show_size' => true,
])
- ->add('menu_thumbnail_images', ImageWithPreviewType::class, [
- 'label' => $this->trans('Menu thumbnails', 'Admin.Catalog.Feature'),
- 'help' => $this->trans('It will display a thumbnail representing the category in the menu, if the theme allows it.', 'Admin.Catalog.Help'),
- 'multiple' => true,
- 'required' => false,
- 'can_be_deleted' => true,
- 'warning_message' => $this->trans(
- 'You have reached the limit (%limit%) of files to upload, please remove files to continue uploading',
- 'Admin.Catalog.Notification',
- [
- '%limit%' => count(MenuThumbnailId::ALLOWED_ID_VALUES),
- ]
- ),
- 'csrf_delete_token_id' => 'delete-menu-thumbnail',
- ])
->add('seo_preview', CategorySeoPreviewType::class,
[
'label' => $this->trans('SEO preview', 'Admin.Global'),
@@ -352,16 +334,4 @@ public function buildForm(FormBuilderInterface $builder, array $options)
]);
}
}
-
- /**
- * {@inheritdoc}
- */
- public function configureOptions(OptionsResolver $resolver)
- {
- $resolver
- ->setDefaults([
- 'disable_menu_thumbnails_upload' => null,
- ])
- ->setAllowedTypes('disable_menu_thumbnails_upload', ['bool', 'null']);
- }
}
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagType.php b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagType.php
index 47eef80a0745f..12711b15b623e 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagType.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagType.php
@@ -28,7 +28,7 @@
namespace PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\FeatureFlag;
-use PrestaShopBundle\Form\Admin\Type\SwitchType;
+use PrestaShopBundle\Form\Admin\Type\FeatureFlagSwitchType;
use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
use PrestaShopBundle\Form\FormCloner;
use Symfony\Component\Form\Event\PreSetDataEvent;
@@ -56,7 +56,7 @@ public function __construct(
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
- ->add('enabled', SwitchType::class, [
+ ->add('enabled', FeatureFlagSwitchType::class, [
'choices' => [
$this->trans('Disabled', 'Admin.Global') => false,
$this->trans('Enabled', 'Admin.Global') => true,
@@ -75,6 +75,9 @@ public function adaptSwitchOption(PreSetDataEvent $event): void
'label' => $this->trans($featureFlagData['label'], $featureFlagData['label_domain']),
'help' => $this->trans($featureFlagData['description'], $featureFlagData['description_domain']),
'attr' => ['disabled' => $featureFlagData['disabled']],
+ 'types' => $featureFlagData['type'],
+ 'used_type' => $featureFlagData['type_used'],
+ 'forced_by_env' => $featureFlagData['forced_by_env'],
]));
}
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagsFormDataProvider.php b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagsFormDataProvider.php
index 8dbea0942c508..595ae53bc440c 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagsFormDataProvider.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/FeatureFlag/FeatureFlagsFormDataProvider.php
@@ -30,6 +30,8 @@
use Doctrine\ORM\EntityManagerInterface;
use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager;
+use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
use PrestaShop\PrestaShop\Core\Form\FormDataProviderInterface;
use PrestaShopBundle\Entity\FeatureFlag;
use PrestaShopBundle\Routing\Converter\CacheCleanerInterface;
@@ -40,30 +42,17 @@
*/
class FeatureFlagsFormDataProvider implements FormDataProviderInterface
{
- /** @var EntityManagerInterface */
- protected $doctrineEntityManager;
-
- /** @var string */
- protected $stability;
-
- /**
- * @var CacheCleanerInterface
- */
- private $cacheCleaner;
-
/**
* @param EntityManagerInterface $doctrineEntityManager
* @param string $stability
* @param CacheCleanerInterface $cacheCleaner
*/
public function __construct(
- EntityManagerInterface $doctrineEntityManager,
- string $stability,
- CacheCleanerInterface $cacheCleaner
+ protected EntityManagerInterface $doctrineEntityManager,
+ protected readonly string $stability,
+ private CacheCleanerInterface $cacheCleaner,
+ private FeatureFlagManager $featureFlagManager
) {
- $this->doctrineEntityManager = $doctrineEntityManager;
- $this->stability = $stability;
- $this->cacheCleaner = $cacheCleaner;
}
public function getData()
@@ -72,16 +61,18 @@ public function getData()
$featureFlagsData = [];
foreach ($featureFlags as $featureFlag) {
- $featureFlagsData[$featureFlag->getName()] = [
- 'enabled' => $featureFlag->isEnabled(),
+ $flagName = $featureFlag->getName();
+ $featureFlagsData[$flagName] = [
+ 'enabled' => $this->featureFlagManager->isEnabled($flagName),
'name' => $featureFlag->getName(),
'label' => $featureFlag->getLabelWording(),
'label_domain' => $featureFlag->getLabelDomain(),
'description' => $featureFlag->getDescriptionWording(),
'description_domain' => $featureFlag->getDescriptionDomain(),
- // You can handle specific rules here to indicate if the feature flag should be editable or not, currently
- // no more specific rule but it can evolve in the future
- 'disabled' => false,
+ 'type' => $featureFlag->getOrderedTypes(),
+ 'type_used' => $this->featureFlagManager->getUsedType($flagName),
+ 'disabled' => $this->featureFlagManager->isReadOnly($flagName),
+ 'forced_by_env' => $this->featureFlagManager->getUsedType($flagName) === FeatureFlagSettings::TYPE_ENV,
];
}
@@ -102,15 +93,18 @@ public function setData(array $flagsData)
throw new InvalidArgumentException(sprintf('Invalid feature flag configuration submitted, flag %s does not exist', $flagName));
}
+ if ($this->featureFlagManager->isReadonly($flagName)) {
+ continue;
+ }
+
$flagState = $flagData['enabled'] ?? false;
if ($flagState) {
- $featureFlag->enable();
+ $this->featureFlagManager->enable($flagName);
} else {
- $featureFlag->disable();
+ $this->featureFlagManager->disable($flagName);
}
}
- $this->doctrineEntityManager->flush();
// Clear cache of legacy routes since they can depend on an associated feature flag
// when the attribute _legacy_feature_flag is used
$this->cacheCleaner->clearCache();
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/General/PreferencesType.php b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/General/PreferencesType.php
index 56c1d94c7353c..5cff0699e45e0 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/General/PreferencesType.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/General/PreferencesType.php
@@ -214,35 +214,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
'The multistore feature allows you to manage several front offices from a single back office. If this feature is enabled, a Multistore page is available in the Advanced Parameters menu.',
'Admin.Shopparameters.Help'
),
- ])
- ->add('shop_activity', ChoiceType::class, [
- 'required' => false,
- 'placeholder' => $this->trans('-- Please choose your main activity --', 'Install'),
- 'choices' => [
- 'Animals and Pets' => 2,
- 'Art and Culture' => 3,
- 'Babies' => 4,
- 'Beauty and Personal Care' => 5,
- 'Cars' => 6,
- 'Computer Hardware and Software' => 7,
- 'Download' => 8,
- 'Fashion and accessories' => 9,
- 'Flowers, Gifts and Crafts' => 10,
- 'Food and beverage' => 11,
- 'HiFi, Photo and Video' => 12,
- 'Home and Garden' => 13,
- 'Home Appliances' => 14,
- 'Jewelry' => 15,
- 'Lingerie and Adult' => 1,
- 'Mobile and Telecom' => 16,
- 'Services' => 17,
- 'Shoes and accessories' => 18,
- 'Sport and Entertainment' => 19,
- 'Travel' => 20,
- ],
- 'label' => $this->trans('Main Shop Activity', 'Admin.Shopparameters.Feature'),
- 'choice_translation_domain' => 'Install',
- 'autocomplete' => true,
]);
}
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderPreferences/GeneralType.php b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderPreferences/GeneralType.php
index 41428d41dab24..31996a17f25da 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderPreferences/GeneralType.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderPreferences/GeneralType.php
@@ -78,7 +78,6 @@ public function __construct(
public function buildForm(FormBuilderInterface $builder, array $options)
{
$configuration = $this->configuration;
- $isMultishippingEnabled = (bool) $configuration->get('PS_ALLOW_MULTISHIPPING');
$currencyIsoCode = $this->currencyDataProvider->getDefaultCurrencyIsoCode();
$builder
@@ -115,15 +114,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
'multistore_configuration_key' => 'PS_ORDER_RECALCULATE_SHIPPING',
]);
- if ($isMultishippingEnabled) {
- $builder->add('allow_multishipping', SwitchType::class, [
- 'required' => false,
- 'label' => $this->trans('Allow multishipping', 'Admin.Shopparameters.Feature'),
- 'help' => $this->trans('Allow the customer to ship orders to multiple addresses. This option will convert the customer\'s cart into one or more orders.', 'Admin.Shopparameters.Help'),
- 'multistore_configuration_key' => 'PS_ALLOW_MULTISHIPPING',
- ]);
- }
-
$builder
->add('allow_delayed_shipping', SwitchType::class, [
'required' => false,
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderReturnStates/OrderReturnStateType.php b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderReturnStates/OrderReturnStateType.php
index 0767ce866688c..bab7612a8ec1c 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderReturnStates/OrderReturnStateType.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderReturnStates/OrderReturnStateType.php
@@ -29,18 +29,22 @@
use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\DefaultLanguage;
use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex;
+use PrestaShop\PrestaShop\Core\Domain\OrderReturnState\OrderReturnStateSettings;
use PrestaShopBundle\Form\Admin\Type\ColorPickerType;
use PrestaShopBundle\Form\Admin\Type\TranslatableType;
use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Validator\Constraints\Length;
/**
* Type is used to created form for order return state add/edit actions
*/
class OrderReturnStateType extends TranslatorAwareType
{
+ protected const NAME_CHARS = '!<>,;?=+()@#"{}_$%:';
+
/**
* {@inheritdoc}
*/
@@ -48,6 +52,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
->add('name', TranslatableType::class, [
+ 'label' => $this->trans('Status name', 'Admin.Shopparameters.Feature'),
+ 'help' => sprintf(
+ '%s %s %s',
+ $this->trans('Status name', 'Admin.Shopparameters.Feature'),
+ $this->trans('Invalid characters: numbers and', 'Admin.Shopparameters.Feature'),
+ static::NAME_CHARS
+ ),
'type' => TextType::class,
'constraints' => [
new DefaultLanguage(),
@@ -55,13 +66,25 @@ public function buildForm(FormBuilderInterface $builder, array $options)
'options' => [
'constraints' => [
new TypedRegex([
- 'type' => 'generic_name',
+ 'type' => TypedRegex::TYPE_GENERIC_NAME,
+ ]),
+ new Length([
+ 'max' => OrderReturnStateSettings::NAME_MAX_LENGTH,
+ 'maxMessage' => $this->trans(
+ 'This field cannot be longer than %limit% characters',
+ 'Admin.Notifications.Error',
+ [
+ '%limit%' => OrderReturnStateSettings::NAME_MAX_LENGTH,
+ ]
+ ),
]),
],
],
])
->add('color', ColorPickerType::class, [
- 'required' => true,
+ 'label' => $this->trans('Color', 'Admin.Shopparameters.Feature'),
+ 'help' => $this->trans('Status will be highlighted in this color. HTML colors only.', 'Admin.Shopparameters.Help'),
+ 'required' => false,
])
;
}
diff --git a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php
index 1445048e9e085..f3c8fddcac6a4 100644
--- a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php
+++ b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/OrderStates/OrderStateType.php
@@ -30,6 +30,8 @@
use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\DefaultLanguage;
use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex;
use PrestaShop\PrestaShop\Core\Domain\Configuration\ShopConfigurationInterface;
+use PrestaShop\PrestaShop\Core\Domain\OrderState\OrderStateSettings;
+use PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException;
use PrestaShop\PrestaShop\Core\MailTemplate\Layout\Layout;
use PrestaShop\PrestaShop\Core\MailTemplate\ThemeCatalogInterface;
use PrestaShopBundle\Form\Admin\Type\ColorPickerType;
@@ -37,10 +39,12 @@
use PrestaShopBundle\Form\Admin\Type\TranslatableType;
use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\FileType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\Validator\Constraints\Length;
use Symfony\Contracts\Translation\TranslatorInterface;
/**
@@ -48,6 +52,8 @@
*/
class OrderStateType extends TranslatorAwareType
{
+ protected const NAME_CHARS = '!<>,;?=+()@#"{}_$%:';
+
/**
* @var array
*/
@@ -65,7 +71,7 @@ class OrderStateType extends TranslatorAwareType
* @param UrlGeneratorInterface $routing
* @param ShopConfigurationInterface $configuration
*
- * @throws \PrestaShop\PrestaShop\Core\Exception\InvalidArgumentException
+ * @throws InvalidArgumentException
*/
public function __construct(
TranslatorInterface $translator,
@@ -111,20 +117,48 @@ public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
->add('name', TranslatableType::class, [
+ 'label' => $this->trans('Status name', 'Admin.Shopparameters.Feature'),
+ 'help' => sprintf(
+ '%s %s %s',
+ $this->trans('Order status (e.g. \'Pending\').', 'Admin.Shopparameters.Help'),
+ $this->trans('Invalid characters: numbers and', 'Admin.Shopparameters.Help'),
+ static::NAME_CHARS
+ ),
'type' => TextType::class,
'constraints' => [
new DefaultLanguage(),
],
'options' => [
+ 'attr' => [
+ 'autocomplete' => 'off',
+ 'maxlength' => OrderStateSettings::NAME_MAX_LENGTH,
+ ],
'constraints' => [
new TypedRegex([
- 'type' => 'generic_name',
+ 'type' => TypedRegex::TYPE_GENERIC_NAME,
+ ]),
+ new Length([
+ 'max' => OrderStateSettings::NAME_MAX_LENGTH,
+ 'maxMessage' => $this->trans(
+ 'This field cannot be longer than %limit% characters',
+ 'Admin.Notifications.Error',
+ [
+ '%limit%' => OrderStateSettings::NAME_MAX_LENGTH,
+ ]
+ ),
]),
],
],
])
+ ->add('icon', FileType::class, [
+ 'required' => false,
+ 'label' => $this->trans('Icon', 'Admin.Shopparameters.Feature'),
+ 'help' => $this->trans('Upload an icon from your computer (File type: .gif, suggested size: 16x16).', 'Admin.Shopparameters.Help'),
+ ])
->add('color', ColorPickerType::class, [
- 'required' => true,
+ 'required' => false,
+ 'label' => $this->trans('Color', 'Admin.Shopparameters.Feature'),
+ 'help' => $this->trans('Status will be highlighted in this color. HTML colors only.', 'Admin.Shopparameters.Help'),
])
->add('loggable', CheckboxType::class, [
'required' => false,
@@ -190,6 +224,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
],
])
->add('template', TranslatableChoiceType::class, [
+ 'label' => $this->trans('Template', 'Admin.Shopparameters.Feature'),
'hint' => sprintf(
'%s
%s', $this->trans('Only letters, numbers and underscores ("_") are allowed.', 'Admin.Shopparameters.Help'), @@ -197,7 +232,15 @@ public function buildForm(FormBuilderInterface $builder, array $options) ), 'required' => false, 'choices' => $this->templates, - 'row_attr' => $this->templateAttributes, + 'row_attr' => $this->templateAttributes + [ + 'class' => 'order_state_template_select', + ], + 'button' => [ + 'label' => $this->trans('Preview', 'Admin.Actions'), + 'icon' => 'visibility', + 'class' => 'btn btn-primary', + 'id' => 'order_state_template_preview', + ], ]) ; } diff --git a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/ProductPreferences/GeneralType.php b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/ProductPreferences/GeneralType.php index 63cf6f6a4bc9b..96d462216e1af 100644 --- a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/ProductPreferences/GeneralType.php +++ b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/ProductPreferences/GeneralType.php @@ -135,7 +135,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'Admin.Shopparameters.Feature' ), 'help' => $this->trans( - 'When active, friendly URL will be updated on every save.', + 'When enabled, friendly URL will be updated on every name change for offline products only.', 'Admin.Shopparameters.Help' ), 'required' => false, diff --git a/src/PrestaShopBundle/Form/Admin/Improve/Design/Pages/CmsPageType.php b/src/PrestaShopBundle/Form/Admin/Improve/Design/Pages/CmsPageType.php index c0a174a2595db..afe5b8add6776 100644 --- a/src/PrestaShopBundle/Form/Admin/Improve/Design/Pages/CmsPageType.php +++ b/src/PrestaShopBundle/Form/Admin/Improve/Design/Pages/CmsPageType.php @@ -268,6 +268,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'type' => FormattedTextareaType::class, 'required' => false, 'options' => [ + 'limit' => FormattedTextareaType::LIMIT_LONGTEXT_UTF8, 'constraints' => [ new CleanHtml([ 'message' => $this->trans( diff --git a/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/ShopLogosType.php b/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/ShopLogosType.php index 3a23d5d3138a4..fdba689b69692 100644 --- a/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/ShopLogosType.php +++ b/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/ShopLogosType.php @@ -228,7 +228,7 @@ private function disableAllShopContextFields(FormBuilderInterface $builder, $suf $formType = $formField->getConfig()->getType()->getInnerType(); $options = $formField->getConfig()->getOptions(); $options['attr']['disabled'] = true; - $form->add($originalFieldName, get_class($formType), $options); + $form->add($originalFieldName, $formType::class, $options); } }); } @@ -258,7 +258,7 @@ private function setShopRestrictionSource(FormBuilderInterface $builder, $suffix $options = $formField->getConfig()->getOptions(); $options['attr']['data-shop-restriction-source'] = $fieldName; - $form->add($fieldName, get_class($formType), $options); + $form->add($fieldName, $formType::class, $options); } }); } @@ -296,7 +296,7 @@ private function stringEndsWith($haystack, $needle) { $diff = \strlen($haystack) - \strlen($needle); - return $diff >= 0 && strpos($haystack, $needle, $diff) !== false; + return $diff >= 0 && str_contains($haystack, $needle); } /** diff --git a/src/PrestaShopBundle/Form/Admin/Product/ProductOptions.php b/src/PrestaShopBundle/Form/Admin/Product/ProductOptions.php index 2d0c43d7f6792..e1066532698cc 100644 --- a/src/PrestaShopBundle/Form/Admin/Product/ProductOptions.php +++ b/src/PrestaShopBundle/Form/Admin/Product/ProductOptions.php @@ -200,9 +200,9 @@ public function buildForm(FormBuilderInterface $builder, array $options) ]) ->add('condition', FormType\ChoiceType::class, [ 'choices' => [ - $this->translator->trans('New', [], 'Admin.Global') => 'new', - $this->translator->trans('Used', [], 'Shop.Theme.Catalog') => 'used', - $this->translator->trans('Refurbished', [], 'Shop.Theme.Catalog') => 'refurbished', + $this->translator->trans('New', [], 'Admin.Catalog.Feature') => 'new', + $this->translator->trans('Used', [], 'Admin.Catalog.Feature') => 'used', + $this->translator->trans('Refurbished', [], 'Admin.Catalog.Feature') => 'refurbished', ], 'attr' => [ 'class' => 'custom-select', diff --git a/src/PrestaShopBundle/Form/Admin/Product/ProductQuantity.php b/src/PrestaShopBundle/Form/Admin/Product/ProductQuantity.php index ec79161227180..8562ef3f3c616 100644 --- a/src/PrestaShopBundle/Form/Admin/Product/ProductQuantity.php +++ b/src/PrestaShopBundle/Form/Admin/Product/ProductQuantity.php @@ -119,42 +119,9 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'empty_data' => '', ] ) - ->add( - 'advanced_stock_management', - FormType\CheckboxType::class, - [ - 'required' => false, - 'label' => $this->translator->trans( - 'I want to use the advanced stock management system for this product.', - [], - 'Admin.Catalog.Feature' - ), - ] - ) ->add( 'pack_stock_type', FormType\ChoiceType::class - )//see eventListener for details - ->add( - 'depends_on_stock', - FormType\ChoiceType::class, - [ - 'choices' => [ - $this->translator->trans( - 'The available quantities for the current product and its combinations are based on the stock in your warehouse (using the advanced stock management system). ', - [], - 'Admin.Catalog.Feature' - ) => 1, - $this->translator->trans( - 'I want to specify available quantities manually.', - [], - 'Admin.Catalog.Feature' - ) => 0, - ], - 'expanded' => true, - 'required' => true, - 'multiple' => false, - ] ); if ($is_stock_management) { diff --git a/src/PrestaShopBundle/Form/Admin/Product/ProductShipping.php b/src/PrestaShopBundle/Form/Admin/Product/ProductShipping.php index 9ea5c55bd579c..546c6b6d5c323 100644 --- a/src/PrestaShopBundle/Form/Admin/Product/ProductShipping.php +++ b/src/PrestaShopBundle/Form/Admin/Product/ProductShipping.php @@ -29,12 +29,10 @@ use Currency; use PrestaShop\PrestaShop\Adapter\Carrier\CarrierDataProvider; use PrestaShop\PrestaShop\Adapter\LegacyContext; -use PrestaShop\PrestaShop\Adapter\Warehouse\WarehouseDataProvider; use PrestaShopBundle\Form\Admin\Type\CommonAbstractType; use PrestaShopBundle\Form\Admin\Type\TranslateType; use PrestaShopBundle\Form\FormHelper; use Symfony\Component\Form\Extension\Core\Type as FormType; -use Symfony\Component\Form\Extension\Core\Type\CollectionType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Validator\Constraints as Assert; use Symfony\Contracts\Translation\TranslatorInterface; @@ -66,10 +64,6 @@ class ProductShipping extends CommonAbstractType * @var TranslatorInterface */ public $translator; - /** - * @var array - */ - private $warehouses; /** * @var string */ @@ -84,7 +78,6 @@ class ProductShipping extends CommonAbstractType * * @param TranslatorInterface $translator * @param LegacyContext $legacyContext - * @param WarehouseDataProvider $warehouseDataProvider * @param CarrierDataProvider $carrierDataProvider * @param string $dimensionUnit * @param string $weightUnit @@ -92,7 +85,6 @@ class ProductShipping extends CommonAbstractType public function __construct( TranslatorInterface $translator, LegacyContext $legacyContext, - WarehouseDataProvider $warehouseDataProvider, CarrierDataProvider $carrierDataProvider, string $dimensionUnit, string $weightUnit @@ -101,7 +93,6 @@ public function __construct( $this->legacyContext = $legacyContext; $this->currency = $legacyContext->getContext()->currency; $this->locales = $this->legacyContext->getLanguages(); - $this->warehouses = $warehouseDataProvider->getWarehouses(); $carriers = $carrierDataProvider->getCarriers( $this->locales[0]['id_lang'], @@ -261,23 +252,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'label' => $this->translator->trans('Delivery time of in-stock products:', [], 'Admin.Catalog.Feature'), ] ); - - foreach ($this->warehouses as $warehouse) { - $builder->add( - 'warehouse_combination_' . $warehouse['id_warehouse'], - CollectionType::class, - [ - 'entry_type' => 'PrestaShopBundle\Form\Admin\Product\ProductWarehouseCombination', - 'entry_options' => [ - 'id_warehouse' => $warehouse['id_warehouse'], - ], - 'prototype' => true, - 'allow_add' => true, - 'required' => false, - 'label' => $warehouse['name'], - ] - ); - } } /** diff --git a/src/PrestaShopBundle/Form/Admin/Product/ProductWarehouseCombination.php b/src/PrestaShopBundle/Form/Admin/Product/ProductWarehouseCombination.php deleted file mode 100644 index a39f45a31cc55..0000000000000 --- a/src/PrestaShopBundle/Form/Admin/Product/ProductWarehouseCombination.php +++ /dev/null @@ -1,102 +0,0 @@ - - * @copyright Since 2007 PrestaShop SA and Contributors - * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) - */ - -namespace PrestaShopBundle\Form\Admin\Product; - -use PrestaShopBundle\Form\Admin\Type\CommonAbstractType; -use Symfony\Component\Form\Extension\Core\Type\CheckboxType; -use Symfony\Component\Form\Extension\Core\Type\HiddenType; -use Symfony\Component\Form\Extension\Core\Type\TextType; -use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Contracts\Translation\TranslatorInterface; - -/** - * @deprecated since 8.1 and will be removed in next major. - * - * This form class is responsible to generate the basic product Warehouse combinations form. - */ -class ProductWarehouseCombination extends CommonAbstractType -{ - private $translator; - - /** - * Constructor. - * - * @param TranslatorInterface $translator - */ - public function __construct(TranslatorInterface $translator) - { - $this->translator = $translator; - } - - /** - * {@inheritdoc} - * - * Builds form - */ - public function buildForm(FormBuilderInterface $builder, array $options) - { - $builder->add('activated', CheckboxType::class, [ - 'required' => false, - 'label' => $this->translator->trans('Stored', [], 'Admin.Catalog.Feature'), - ]) - ->add('id_product_attribute', HiddenType::class) - ->add('product_id', HiddenType::class) - ->add('warehouse_id', HiddenType::class) - ->add('location', TextType::class, [ - 'required' => false, - 'label' => $this->translator->trans('Location (optional)', [], 'Admin.Catalog.Feature'), - 'empty_data' => '', - ]); - - //set default minimal values for collection prototype - $builder->setData([ - 'warehouse_id' => $options['id_warehouse'], - 'warehouse_activated' => false, - ]); - } - - /** - * {@inheritdoc} - */ - public function configureOptions(OptionsResolver $resolver) - { - $resolver->setDefaults([ - 'id_warehouse' => null, - ]); - } - - /** - * Returns the block prefix of this type. - * - * @return string The prefix name - */ - public function getBlockPrefix() - { - return 'product_warehouse_combination'; - } -} diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php new file mode 100644 index 0000000000000..4a10f9e2488ea --- /dev/null +++ b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php @@ -0,0 +1,121 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) + */ + +declare(strict_types=1); + +namespace PrestaShopBundle\Form\Admin\Sell\Catalog; + +use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex; +use PrestaShop\PrestaShop\Core\ConstraintValidator\TypedRegexValidator; +use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupType as GroupType; +use PrestaShopBundle\Form\Admin\Type\ShopChoiceTreeType; +use PrestaShopBundle\Form\Admin\Type\TranslatableType; +use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; +use Symfony\Component\Form\Extension\Core\Type\TextType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; +use Symfony\Component\Validator\Constraints\NotBlank; +use Symfony\Contracts\Translation\TranslatorInterface; + +/** + * Form type for attribute add/edit + */ +class AttributeGroupType extends TranslatorAwareType +{ + /** + * @param TranslatorInterface $translator + * @param array $locales + */ + public function __construct( + TranslatorInterface $translator, + array $locales + ) { + parent::__construct($translator, $locales); + } + + /** + * {@inheritdoc} + */ + public function buildForm(FormBuilderInterface $builder, array $options) + { + $builder + ->add('name', TranslatableType::class, [ + 'type' => TextType::class, + 'label' => $this->trans('Name', 'Admin.Global'), + 'options' => [ + 'constraints' => [ + new TypedRegex([ + 'type' => TypedRegex::TYPE_CATALOG_NAME, + ]), + ], + ], + 'help' => $this->trans('Your internal name for this attribute.', 'Admin.Catalog.Help') + . ' ' . $this->trans('Invalid characters:', 'Admin.Notifications.Info') + . ' ' . TypedRegexValidator::CATALOG_CHARS, + ]) + ->add('public_name', TranslatableType::class, [ + 'type' => TextType::class, + 'label' => $this->trans('Public name', 'Admin.Catalog.Feature'), + 'options' => [ + 'constraints' => [ + new TypedRegex([ + 'type' => TypedRegex::TYPE_CATALOG_NAME, + ]), + ], + ], + 'help' => $this->trans('Your internal name for this attribute.', 'Admin.Catalog.Help') + . ' ' . $this->trans('Invalid characters:', 'Admin.Notifications.Info') + . ' ' . TypedRegexValidator::CATALOG_CHARS, + ]) + ->add('group_type', ChoiceType::class, [ + 'label' => $this->trans('Attribute type', 'Admin.Catalog.Feature'), + 'help' => $this->trans('The way the attribute\'s values will be presented to the customers in the product\'s page.', 'Admin.Catalog.Help'), + 'choices' => [ + $this->trans('Drop-down list', 'Admin.Global') => GroupType::ATTRIBUTE_GROUP_TYPE_SELECT, + $this->trans('Radio buttons', 'Admin.Global') => GroupType::ATTRIBUTE_GROUP_TYPE_RADIO, + $this->trans('Color or texture', 'Admin.Catalog.Feature') => GroupType::ATTRIBUTE_GROUP_TYPE_COLOR, + ], + ])->add('shop_association', ShopChoiceTreeType::class, [ + 'label' => $this->trans('Shop association', 'Admin.Global'), + 'required' => false, + 'constraints' => [ + new NotBlank([ + 'message' => $this->trans( + 'This field cannot be empty.', 'Admin.Notifications.Error' + ), + ]), + ], + ]); + } + + public function configureOptions(OptionsResolver $resolver): void + { + $resolver->setDefaults([ + 'requiredFields' => [], + ]); + } +} diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php new file mode 100644 index 0000000000000..88af6c4048f18 --- /dev/null +++ b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php @@ -0,0 +1,81 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) + */ + +declare(strict_types=1); + +namespace PrestaShopBundle\Form\Admin\Sell\Catalog; + +use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\DefaultLanguage; +use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex; +use PrestaShop\PrestaShop\Core\Domain\Feature\FeatureValueSettings; +use PrestaShopBundle\Form\Admin\Type\FeatureChoiceType; +use PrestaShopBundle\Form\Admin\Type\TranslatableType; +use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; +use Symfony\Component\Validator\Constraints\Length; + +class FeatureValueType extends TranslatorAwareType +{ + /** + * {@inheritdoc} + */ + public function buildForm(FormBuilderInterface $builder, array $options) + { + $builder + ->add('feature_value_id', HiddenType::class) + ->add('feature_id', FeatureChoiceType::class, [ + 'attr' => [ + // disable feature id choices when editing feature value and only allow changing them when creating new one + 'disabled' => !empty($builder->getData()['feature_value_id']), + ], + ]) + ->add('value', TranslatableType::class, [ + 'label' => $this->trans('Value', 'Admin.Global'), + 'constraints' => [ + new DefaultLanguage(), + ], + 'options' => [ + 'constraints' => [ + new TypedRegex([ + 'type' => 'generic_name', + ]), + new Length(['max' => FeatureValueSettings::VALUE_MAX_LENGTH]), + ], + ], + 'help' => $this->trans('Invalid characters: %chars%', 'Admin.Notifications.Info', ['%chars%' => '<>={}']), + ]) + ; + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'form_theme' => '@PrestaShop/Admin/TwigTemplateForm/prestashop_ui_kit.html.twig', + ]); + } +} diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Order/Delivery/SlipOptionsType.php b/src/PrestaShopBundle/Form/Admin/Sell/Order/Delivery/SlipOptionsType.php index 5f623ab910e53..c02dc6364f82c 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Order/Delivery/SlipOptionsType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Order/Delivery/SlipOptionsType.php @@ -50,7 +50,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) [ 'type' => TextType::class, 'label' => $this->trans('Delivery prefix', 'Admin.Orderscustomers.Feature'), - 'help' => $this->trans('Prefix used for delivery slips.', 'Admin.Orderscustomers.Help'), + 'label_help_box' => $this->trans('Prefix used for delivery slips.', 'Admin.Orderscustomers.Help'), ] ) ->add( @@ -58,7 +58,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) NumberType::class, [ 'label' => $this->trans('Delivery number', 'Admin.Orderscustomers.Feature'), - 'help' => $this->trans( + 'label_help_box' => $this->trans( 'The next delivery slip will begin with this number and then increase with each additional slip.', 'Admin.Orderscustomers.Help' ), @@ -69,7 +69,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) SwitchType::class, [ 'label' => $this->trans('Enable product image', 'Admin.Orderscustomers.Feature'), - 'help' => $this->trans( + 'label_help_box' => $this->trans( 'Add an image before the product name on delivery slips.', 'Admin.Orderscustomers.Help' ), diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Combination/CombinationImagesChoiceType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Combination/CombinationImagesChoiceType.php index 590627c22423a..faae3e458d9c2 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Product/Combination/CombinationImagesChoiceType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/Combination/CombinationImagesChoiceType.php @@ -67,6 +67,7 @@ public function configureOptions(OptionsResolver $resolver) ->setAllowedTypes('product_id', 'int') ->setDefaults([ 'label' => $this->trans('Images', 'Admin.Global'), + 'label_subtitle' => $this->trans('You can specify which images should be displayed when customer selects this combination. If you don\'t select any image, all will be displayed. The default image of the combination will be the first one selected from the list.', 'Admin.Catalog.Feature'), 'choice_attr' => function (string $choice, string $key): array { return ['data-image-url' => $key]; }, diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Details/FeatureValueType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Details/FeatureValueType.php index 99eb1b910ce5d..feba2a53fac12 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Product/Details/FeatureValueType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/Details/FeatureValueType.php @@ -28,7 +28,7 @@ namespace PrestaShopBundle\Form\Admin\Sell\Product\Details; -use PrestaShop\PrestaShop\Core\Form\FormChoiceProviderInterface; +use PrestaShopBundle\Form\Admin\Type\FeatureChoiceType; use PrestaShopBundle\Form\Admin\Type\IconButtonType; use PrestaShopBundle\Form\Admin\Type\TranslatableType; use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType; @@ -42,25 +42,12 @@ class FeatureValueType extends TranslatorAwareType { - /** - * @var FormChoiceProviderInterface - */ - private $featuresChoiceProvider; - - /** - * @var EventSubscriberInterface - */ - private $featureValueListener; - public function __construct( TranslatorInterface $translator, array $locales, - FormChoiceProviderInterface $featuresChoiceProvider, - EventSubscriberInterface $featureValueListener + protected readonly EventSubscriberInterface $featureValueListener ) { parent::__construct($translator, $locales); - $this->featuresChoiceProvider = $featuresChoiceProvider; - $this->featureValueListener = $featureValueListener; } /** @@ -68,19 +55,11 @@ public function __construct( */ public function buildForm(FormBuilderInterface $builder, array $options) { - $features = $this->featuresChoiceProvider->getChoices(); - $builder - ->add('feature_id', ChoiceType::class, [ + ->add('feature_id', FeatureChoiceType::class, [ 'empty_data' => null, - 'choices' => $features, 'required' => false, 'placeholder' => $this->trans('Choose a feature', 'Admin.Catalog.Feature'), - 'label' => $this->trans('Feature', 'Admin.Catalog.Feature'), - 'attr' => [ - 'data-toggle' => 'select2', - 'class' => 'feature-selector', - ], 'constraints' => [ new NotBlank([ 'message' => $this->trans('Choose a feature', 'Admin.Catalog.Feature'), diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/EditProductFormType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/EditProductFormType.php index b613f8563d4a2..c7758b6e3be67 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Product/EditProductFormType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/EditProductFormType.php @@ -90,6 +90,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add('header', HeaderType::class, [ 'active' => $options['active'], + 'force_default_active' => $options['force_default_active'], 'product_id' => $productId, ]) ->add('description', DescriptionType::class, [ @@ -111,6 +112,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ]) ->add('seo', SEOType::class, [ 'product_id' => $productId, + 'active' => $options['active'], ]) ->add('options', OptionsType::class) ->add('extra_modules', ExtraModulesType::class, [ @@ -138,6 +140,7 @@ public function buildView(FormView $view, FormInterface $form, array $options) 'product_type' => $options['product_type'], 'product_id' => $options['product_id'], 'shop_id' => $options['shop_id'], + 'force_default_active' => $options['force_default_active'] ? 1 : 0, ]; $view->vars = array_replace($view->vars, $formVars); @@ -155,6 +158,7 @@ public function configureOptions(OptionsResolver $resolver) ->setDefaults([ 'virtual_product_file_id' => null, 'active' => false, + 'force_default_active' => false, 'allow_extra_fields' => true, 'form_theme' => '@PrestaShop/Admin/Sell/Catalog/Product/FormTheme/product.html.twig', 'use_default_themes' => false, diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/HeaderType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/HeaderType.php index b4d06f778afb3..909e3f84ed141 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Product/HeaderType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/HeaderType.php @@ -141,6 +141,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $this->trans('Online', 'Admin.Global') => true, ], 'modify_all_shops' => true, + 'default_empty_data' => $options['force_default_active'], ]) ->add('mobile_toolbar', ButtonCollectionType::class, [ 'buttons' => $this->toolbarButtonsProvider->getToolbarButtonsOptions(['productId' => $options['product_id']]), @@ -163,6 +164,7 @@ public function configureOptions(OptionsResolver $resolver) $resolver ->setDefaults([ 'active' => false, + 'force_default_active' => false, 'required' => false, 'label' => false, 'form_theme' => '@PrestaShop/Admin/Sell/Catalog/Product/FormTheme/header.html.twig', diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Options/CustomizationFieldType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Options/CustomizationFieldType.php index c055b9a43a973..ea3b9c0b2f5a0 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Product/Options/CustomizationFieldType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/Options/CustomizationFieldType.php @@ -81,6 +81,10 @@ public function buildForm(FormBuilderInterface $builder, array $options) ]) ->add('required', SwitchType::class, [ 'label' => $this->trans('Required', 'Admin.Global'), + 'choices' => [ + $this->trans('Not Required', 'Admin.Global') => false, + $this->trans('Required', 'Admin.Global') => true, + ], 'default_empty_data' => false, ]) ->add('remove', IconButtonType::class, [ diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/RetailPriceType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/RetailPriceType.php index a1628bc022335..dd6aba85dd6ee 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/RetailPriceType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/RetailPriceType.php @@ -167,6 +167,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ]) ->add('tax_rules_group_id', ChoiceType::class, [ 'choices' => $this->taxRuleGroupChoicesProvider->getChoices(), + 'disabled' => !$this->isTaxEnabled, 'required' => false, // placeholder false is important to avoid empty option in select input despite required being false 'placeholder' => false, @@ -188,11 +189,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'data-place-holder-with-state' => $taxRateHelpPlaceholderWithState, 'data-is-tax-enabled' => $this->isTaxEnabled, ], - 'external_link' => [ - 'text' => $this->trans('[1]Manage tax rules[/1]', 'Admin.Catalog.Feature'), - 'href' => $this->router->generate('admin_taxes_index'), - 'align' => 'right', - ], 'modify_all_shops' => true, ]); @@ -231,6 +227,11 @@ public function buildForm(FormBuilderInterface $builder, array $options) new Type(['type' => 'float']), new PositiveOrZero(), ], + 'external_link' => [ + 'text' => $this->trans('[1]Manage tax rules[/1]', 'Admin.Catalog.Feature'), + 'href' => $this->router->generate('admin_taxes_index'), + 'align' => 'right', + ], 'default_empty_data' => 0.0, 'modify_all_shops' => true, ]); diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/SpecificPriceImpactType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/SpecificPriceImpactType.php index 944ddd5c50e56..ca0c3905ba452 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/SpecificPriceImpactType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/SpecificPriceImpactType.php @@ -71,7 +71,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add('reduction', PriceReductionType::class, [ 'label' => $this->trans('Apply a discount to the initial price', 'Admin.Catalog.Feature'), - 'label_subtitle' => $this->trans('For customers meeting the conditions, the initial price will be crossed out and the discount will be highlighted.', 'Admin.Catalog.Feature'), + 'alert_message' => $this->trans('For customers meeting the conditions, the initial price will be crossed out and the discount will be highlighted.', 'Admin.Catalog.Feature'), 'required' => false, 'constraints' => [ new Reduction([ diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/RedirectOptionType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/RedirectOptionType.php index 5d12a1f05fbb7..6d66bcebf41f5 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/RedirectOptionType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/RedirectOptionType.php @@ -189,8 +189,9 @@ public function configureOptions(OptionsResolver $resolver) 'label_help_box' => $this->trans('When your product is disabled, choose to which page you’d like to redirect the customers visiting its page by typing the product or category name.', 'Admin.Catalog.Help'), 'columns_number' => 2, 'row_attr' => [ - 'class' => 'redirect-option-widget', + 'class' => 'redirect-option-widget typeahead-product-collection-type', ], + 'alert_title' => $this->trans('Default behavior is specified in the Shop Parameters > Product settings page.', 'Admin.Catalog.Help'), 'alert_message' => $this->getRedirectionAlertMessages(), ]) ->setRequired([ @@ -205,15 +206,20 @@ public function configureOptions(OptionsResolver $resolver) */ private function getRedirectionAlertMessages(): array { + $formatParameters = [ + '[1]' => '', + '[/1]' => '', + '[2]' => '
', + ]; + return [ - $this->trans('Default behavior is specified in the Shop Parameters > Product settings page.', 'Admin.Catalog.Help'), - $this->trans('No redirection (200), display product = Do not redirect anywhere, display product as discontinued and return normal 200 response.', 'Admin.Catalog.Help'), - $this->trans('No redirection (404), display product = Do not redirect anywhere, display product as discontinued and return 404 "Not Found" response.', 'Admin.Catalog.Help'), - $this->trans('No redirection (410), display product = Do not redirect anywhere, display product as discontinued and return 410 "Gone" response.', 'Admin.Catalog.Help'), - $this->trans('No redirection (404), display error page = Do not redirect anywhere and display a 404 "Not Found" page.', 'Admin.Catalog.Help'), - $this->trans('No redirection (410), display error page = Do not redirect anywhere and display a 410 "Gone" page.', 'Admin.Catalog.Help'), - $this->trans('Permanent redirection (301) = Permanently display another product or category instead.', 'Admin.Catalog.Help'), - $this->trans('Temporary redirection (302) = Temporarily display another product or category instead.', 'Admin.Catalog.Help'), + $this->trans('[1]No redirection (200), display product[/1] [2] Do not redirect anywhere, display product as discontinued and return normal 200 response.', 'Admin.Catalog.Help', $formatParameters), + $this->trans('[1]No redirection (404), display product[/1] [2] Do not redirect anywhere, display product as discontinued and return 404 "Not Found" response.', 'Admin.Catalog.Help', $formatParameters), + $this->trans('[1]No redirection (410), display product[/1] [2] Do not redirect anywhere, display product as discontinued and return 410 "Gone" response.', 'Admin.Catalog.Help', $formatParameters), + $this->trans('[1]No redirection (404), display error page[/1] [2] Do not redirect anywhere and display a 404 "Not Found" page.', 'Admin.Catalog.Help', $formatParameters), + $this->trans('[1]No redirection (410), display error page[/1] [2] Do not redirect anywhere and display a 410 "Gone" page.', 'Admin.Catalog.Help', $formatParameters), + $this->trans('[1]Permanent redirection (301)[/1] [2] Permanently display another product or category instead.', 'Admin.Catalog.Help', $formatParameters), + $this->trans('[1]Temporary redirection (302)[/1] [2] Temporarily display another product or category instead.', 'Admin.Catalog.Help', $formatParameters), ]; } } diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/SEOType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/SEOType.php index b5930261c992f..4f3bd4322e30f 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/SEOType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/SEOType.php @@ -29,6 +29,7 @@ namespace PrestaShopBundle\Form\Admin\Sell\Product\SEO; use PrestaShop\PrestaShop\Adapter\LegacyContext; +use PrestaShop\PrestaShop\Core\ConfigurationInterface; use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex; use PrestaShop\PrestaShop\Core\ConstraintValidator\TypedRegexValidator; use PrestaShop\PrestaShop\Core\Domain\Product\ProductSettings; @@ -64,6 +65,11 @@ class SEOType extends TranslatorAwareType */ private $legacyContext; + /** + * @var ConfigurationInterface + */ + private $configuration; + /** * @param TranslatorInterface $translator * @param array $locales @@ -78,13 +84,15 @@ public function __construct( RouterInterface $router, bool $friendlyUrlEnabled, bool $forceFriendlyUrl, - LegacyContext $legacyContext + LegacyContext $legacyContext, + ConfigurationInterface $configuration ) { parent::__construct($translator, $locales); $this->router = $router; $this->friendlyUrlEnabled = $friendlyUrlEnabled; $this->forceFriendlyUrl = $forceFriendlyUrl; $this->legacyContext = $legacyContext; + $this->configuration = $configuration; } /** @@ -92,6 +100,12 @@ public function __construct( */ public function buildForm(FormBuilderInterface $builder, array $options) { + // Automatic update is only enabled when product is offline and the configuration is enabled + $automaticUrlUpdate = false; + if (!$options['active'] && (bool) $this->configuration->get('PS_FORCE_FRIENDLY_PRODUCT')) { + $automaticUrlUpdate = true; + } + $builder ->add('serp', SerpType::class) ->add('meta_title', TranslatableType::class, [ @@ -169,6 +183,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ], 'attr' => [ 'class' => 'serp-watched-url', + 'data-automatic-update' => (int) $automaticUrlUpdate, ], ], 'modify_all_shops' => true, @@ -259,11 +274,13 @@ public function configureOptions(OptionsResolver $resolver) 'label_subtitle' => $this->trans('Improve your ranking and how your product page will appear in search engines results.', 'Admin.Catalog.Feature'), 'required' => false, 'form_theme' => '@PrestaShop/Admin/Sell/Catalog/Product/FormTheme/product_seo.html.twig', + 'active' => false, ]) ->setRequired([ 'product_id', ]) ->setAllowedTypes('product_id', 'int') + ->setAllowedTypes('active', ['bool']) ; } } diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Stock/StockOptionsType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Stock/StockOptionsType.php index b2eef5eac6738..858c7b3c2f84b 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Product/Stock/StockOptionsType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/Stock/StockOptionsType.php @@ -96,7 +96,9 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'modify_all_shops' => true, // @todo: need to trigger opening allShopscheckbox on "disabling_switch" change too. 'disabling_switch' => true, + 'html5' => true, 'attr' => [ + 'placeholder' => $this->trans('Enter threshold value', 'Admin.Catalog.Feature'), 'class' => 'small-input', ], ]) diff --git a/src/PrestaShopBundle/Form/Admin/Type/FeatureChoiceType.php b/src/PrestaShopBundle/Form/Admin/Type/FeatureChoiceType.php new file mode 100644 index 0000000000000..a81b51ba01afe --- /dev/null +++ b/src/PrestaShopBundle/Form/Admin/Type/FeatureChoiceType.php @@ -0,0 +1,62 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) + */ + +declare(strict_types=1); + +namespace PrestaShopBundle\Form\Admin\Type; + +use PrestaShop\PrestaShop\Core\Form\FormChoiceProviderInterface; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; +use Symfony\Component\OptionsResolver\OptionsResolver; +use Symfony\Contracts\Translation\TranslatorInterface; + +class FeatureChoiceType extends TranslatorAwareType +{ + public function __construct( + TranslatorInterface $translator, + array $locales, + protected readonly FormChoiceProviderInterface $featureChoiceProvider + ) { + parent::__construct($translator, $locales); + } + + public function configureOptions(OptionsResolver $resolver): void + { + $resolver->setDefaults([ + 'choices' => $this->featureChoiceProvider->getChoices(), + 'label' => $this->trans('Feature', 'Admin.Catalog.Feature'), + 'autocomplete' => true, + 'attr' => [ + 'class' => 'feature-selector', + ], + ]); + } + + public function getParent(): string + { + return ChoiceType::class; + } +} diff --git a/src/PrestaShopBundle/Form/Admin/Type/FeatureFlagSwitchType.php b/src/PrestaShopBundle/Form/Admin/Type/FeatureFlagSwitchType.php new file mode 100644 index 0000000000000..0ff690389276a --- /dev/null +++ b/src/PrestaShopBundle/Form/Admin/Type/FeatureFlagSwitchType.php @@ -0,0 +1,77 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) + */ + +declare(strict_types=1); + +namespace PrestaShopBundle\Form\Admin\Type; + +use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\FormInterface; +use Symfony\Component\Form\FormView; +use Symfony\Component\OptionsResolver\OptionsResolver; + +/** + * Displays a switch (ON / OFF by default) for feature flags. + */ +class FeatureFlagSwitchType extends AbstractType +{ + public const TRANS_DOMAIN = 'Admin.Global'; + + /** + * {@inheritdoc} + */ + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'block_prefix' => 'feature_flag', + 'form_theme' => '@PrestaShop/Admin/Configure/AdvancedParameters/FeatureFlag/FormTheme/feature_flag_form.html.twig', + 'types' => [], + 'used_type' => null, + 'forced_by_env' => false, + ]); + $resolver->setAllowedTypes('types', 'array'); + $resolver->setAllowedTypes('used_type', ['null', 'string']); + $resolver->setAllowedTypes('forced_by_env', 'bool'); + } + + /** + * {@inheritdoc} + */ + public function buildView(FormView $view, FormInterface $form, array $options) + { + $view->vars['types'] = $options['types']; + $view->vars['used_type'] = $options['used_type']; + $view->vars['forced_by_env'] = $options['forced_by_env']; + } + + /** + * {@inheritdoc} + */ + public function getParent() + { + return SwitchType::class; + } +} diff --git a/src/PrestaShopBundle/Form/Admin/Type/FormattedTextareaType.php b/src/PrestaShopBundle/Form/Admin/Type/FormattedTextareaType.php index 782df42d42771..43cdc36d0d94e 100644 --- a/src/PrestaShopBundle/Form/Admin/Type/FormattedTextareaType.php +++ b/src/PrestaShopBundle/Form/Admin/Type/FormattedTextareaType.php @@ -39,9 +39,12 @@ class FormattedTextareaType extends TranslatorAwareType { /** - * Max size of UTF-8 content in MySQL text column + * Max size of UTF-8 content in MySQL text columns */ + public const LIMIT_TINYTEXT_UTF8 = 84; public const LIMIT_TEXT_UTF8 = 21844; + public const LIMIT_MEDIUMTEXT_UTF8 = 5592414; + public const LIMIT_LONGTEXT_UTF8 = 1431655764; /** * {@inheritdoc} diff --git a/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php b/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php new file mode 100644 index 0000000000000..2f4cde44efcf0 --- /dev/null +++ b/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php @@ -0,0 +1,98 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) + */ +declare(strict_types=1); + +namespace PrestaShopBundle\Form\Admin\Type; + +use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\NumberType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; +use Symfony\Contracts\Translation\TranslatorInterface; + +/** + * This form class is responsible to create a geolocation latitude/longitude coordinates field. + */ +class GeoCoordinatesType extends AbstractType +{ + /** + * @param TranslatorInterface $translator + */ + public function __construct( + private readonly TranslatorInterface $translator + ) { + } + + /** + * {@inheritdoc} + */ + public function buildForm(FormBuilderInterface $builder, array $options): void + { + $builder + ->add('latitude', NumberType::class, [ + 'required' => false, + 'label' => $options['label_latitude'], + 'attr' => [ + 'placeholder' => $this->translator->trans('-0.12345', [], 'Admin.Global'), + 'class' => 'latitude', + ], + ]) + ->add('longitude', NumberType::class, [ + 'required' => false, + 'label' => $options['label_longitude'], + 'attr' => [ + 'placeholder' => $this->translator->trans('-0.12345', [], 'Admin.Global'), + 'class' => 'longitude', + ], + ]) + ; + } + + /** + * {@inheritdoc} + */ + public function configureOptions(OptionsResolver $resolver): void + { + $resolver->setDefaults([ + 'label_latitude' => $this->translator->trans('Latitude', [], 'Admin.Global'), + 'label_longitude' => $this->translator->trans('Longitude', [], 'Admin.Global'), + 'compound' => true, + 'inherit_data' => true, + ]); + $resolver + ->setAllowedTypes('label_latitude', 'string') + ->setAllowedTypes('label_longitude', 'string') + ; + } + + /** + * {@inheritdoc} + */ + public function getBlockPrefix(): string + { + return 'geo_coordinates'; + } +} diff --git a/src/PrestaShopBundle/Form/Admin/Type/ProductSearchType.php b/src/PrestaShopBundle/Form/Admin/Type/ProductSearchType.php index 279749544f42e..a2605ef7c7e5a 100644 --- a/src/PrestaShopBundle/Form/Admin/Type/ProductSearchType.php +++ b/src/PrestaShopBundle/Form/Admin/Type/ProductSearchType.php @@ -98,7 +98,7 @@ public function configureOptions(OptionsResolver $resolver): void 'filters' => $options['filters'], ]); } else { - return $router->generate('admin_products_v2_search_associations', [ + return $router->generate('admin_products_search_products_for_association', [ 'languageCode' => $languageIsoCode, 'query' => '__QUERY__', ]); diff --git a/src/PrestaShopBundle/Form/Admin/Type/ReorderPositionsButtonType.php b/src/PrestaShopBundle/Form/Admin/Type/ReorderPositionsButtonType.php new file mode 100644 index 0000000000000..37c3dbd8627d9 --- /dev/null +++ b/src/PrestaShopBundle/Form/Admin/Type/ReorderPositionsButtonType.php @@ -0,0 +1,52 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) + */ + +namespace PrestaShopBundle\Form\Admin\Type; + +use Symfony\Component\Form\Extension\Core\Type\ButtonType; +use Symfony\Component\Form\FormBuilderInterface; + +/** + * Class ReorderPositionsButtonType. + */ +class ReorderPositionsButtonType extends TranslatorAwareType +{ + /** + * {@inheritdoc} + */ + public function buildForm(FormBuilderInterface $builder, array $options) + { + $builder->add('position', ButtonType::class, [ + 'label' => $this->trans('Rearrange', 'Admin.Actions'), + 'row_attr' => ['class' => 'mb-0'], + 'attr' => [ + 'class' => 'btn-default js-btn-reorder-positions', + 'data-label-reorder' => $this->trans('Rearrange', 'Admin.Actions'), + 'data-label-save' => $this->trans('Done', 'Admin.Actions'), + ], + ]); + } +} diff --git a/src/PrestaShopBundle/Form/Admin/Type/TranslatableChoiceType.php b/src/PrestaShopBundle/Form/Admin/Type/TranslatableChoiceType.php index 793cf3e50e355..127f04f16dff3 100644 --- a/src/PrestaShopBundle/Form/Admin/Type/TranslatableChoiceType.php +++ b/src/PrestaShopBundle/Form/Admin/Type/TranslatableChoiceType.php @@ -42,6 +42,7 @@ public function buildView(FormView $view, FormInterface $form, array $options) $view->vars['default_locale'] = reset($options['locales'])['iso_code']; $view->vars['choices'] = $options['choices']; + $view->vars['button'] = $options['button']; } /** @@ -50,11 +51,13 @@ public function buildView(FormView $view, FormInterface $form, array $options) public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ + 'button' => [], 'choices' => [], 'choice_translation_domain' => false, 'allow_extra_fields' => true, ]); + $resolver->setAllowedTypes('button', 'array'); $resolver->setAllowedTypes('choices', 'array'); parent::configureOptions($resolver); diff --git a/src/PrestaShopBundle/Form/Validator/Constraints/TinyMceMaxLength.php b/src/PrestaShopBundle/Form/Validator/Constraints/TinyMceMaxLength.php index af8c033e22140..44af4f7ef7a48 100644 --- a/src/PrestaShopBundle/Form/Validator/Constraints/TinyMceMaxLength.php +++ b/src/PrestaShopBundle/Form/Validator/Constraints/TinyMceMaxLength.php @@ -58,6 +58,6 @@ public function __construct($options = null) public function validatedBy(): string { - return get_class($this) . 'Validator'; + return static::class . 'Validator'; } } diff --git a/src/PrestaShopBundle/Install/Install.php b/src/PrestaShopBundle/Install/Install.php index 2c64b718984da..c15f133afb49f 100644 --- a/src/PrestaShopBundle/Install/Install.php +++ b/src/PrestaShopBundle/Install/Install.php @@ -751,7 +751,6 @@ public function configureShop(array $data = []) $default_data = [ 'shop_name' => 'My Shop', - 'shop_activity' => '', 'shop_country' => 'us', 'shop_timezone' => 'US/Eastern', // TODO : this timezone is deprecated 'use_smtp' => false, @@ -778,7 +777,6 @@ public function configureShop(array $data = []) Configuration::updateGlobalValue('PS_INSTALL_VERSION', _PS_INSTALL_VERSION_); Configuration::updateGlobalValue('PS_LOCALE_LANGUAGE', $this->language->getLanguageIso()); Configuration::updateGlobalValue('PS_SHOP_NAME', $data['shop_name']); - Configuration::updateGlobalValue('PS_SHOP_ACTIVITY', $data['shop_activity']); Configuration::updateGlobalValue('PS_COUNTRY_DEFAULT', $id_country); Configuration::updateGlobalValue('PS_LOCALE_COUNTRY', $data['shop_country']); Configuration::updateGlobalValue('PS_TIMEZONE', $data['shop_timezone']); @@ -835,7 +833,7 @@ public function configureShop(array $data = []) // Set logo configuration if (file_exists(_PS_IMG_DIR_ . 'logo.png')) { - list($width, $height) = getimagesize(_PS_IMG_DIR_ . 'logo.png'); + [$width, $height] = getimagesize(_PS_IMG_DIR_ . 'logo.png'); Configuration::updateGlobalValue('SHOP_LOGO_WIDTH', round($width)); Configuration::updateGlobalValue('SHOP_LOGO_HEIGHT', round($height)); } diff --git a/src/PrestaShopBundle/Install/XmlLoader.php b/src/PrestaShopBundle/Install/XmlLoader.php index 8dc1f9ee7b733..656ea2ec6bae7 100644 --- a/src/PrestaShopBundle/Install/XmlLoader.php +++ b/src/PrestaShopBundle/Install/XmlLoader.php @@ -266,7 +266,7 @@ public function populateEntity($entity) return; } - if (substr($entity, 0, 1) == '.' || substr($entity, 0, 1) == '_') { + if (str_starts_with($entity, '.') || str_starts_with($entity, '_')) { return; } @@ -537,7 +537,7 @@ public function createEntity($entity, $identifier, $classname, array $data, arra $entity_id = 0; if (!$xml->fields['primary']) { $primary = 'id_' . $entity; - } elseif (strpos((string) $xml->fields['primary'], ',') === false) { + } elseif (!str_contains((string) $xml->fields['primary'], ',')) { $primary = (string) $xml->fields['primary']; } unset($xml); @@ -662,7 +662,7 @@ public function createEntityTab($identifier, array $data, array $data_lang) // Generate primary key manually if (!$xml->fields['primary']) { $primary = 'id_' . $entity; - } elseif (strpos((string) $xml->fields['primary'], ',') === false) { + } elseif (!str_contains((string) $xml->fields['primary'], ',')) { $primary = (string) $xml->fields['primary']; } else { $primary = ''; @@ -1210,7 +1210,7 @@ public function getEntityContents($entity) // Check if current table is an association table (if multiple primary keys) $is_association = false; - if (strpos($primary, ',') !== false) { + if (str_contains($primary, ',')) { $is_association = true; $primary = array_map('trim', explode(',', $primary)); } diff --git a/src/PrestaShopBundle/Model/Product/AdminModelAdapter.php b/src/PrestaShopBundle/Model/Product/AdminModelAdapter.php index 6f1b14a5ab906..8b374c8300e7b 100644 --- a/src/PrestaShopBundle/Model/Product/AdminModelAdapter.php +++ b/src/PrestaShopBundle/Model/Product/AdminModelAdapter.php @@ -37,7 +37,6 @@ use PrestaShop\PrestaShop\Adapter\Supplier\SupplierDataProvider; use PrestaShop\PrestaShop\Adapter\Tax\TaxRuleDataProvider; use PrestaShop\PrestaShop\Adapter\Tools; -use PrestaShop\PrestaShop\Adapter\Warehouse\WarehouseDataProvider; use PrestaShop\PrestaShop\Core\Domain\Product\ValueObject\RedirectType; use PrestaShopBundle\Utils\FloatParser; use Product; @@ -75,8 +74,6 @@ class AdminModelAdapter extends \PrestaShopBundle\Model\AdminModelAdapter private $taxRuleDataProvider; /** @var array */ private $productPricePriority; - /** @var WarehouseDataProvider */ - private $warehouseAdapter; /** @var Configuration */ private $configuration; /** @var Router */ @@ -179,7 +176,6 @@ class AdminModelAdapter extends \PrestaShopBundle\Model\AdminModelAdapter * @param Tools $toolsAdapter * @param ProductDataProvider $productDataProvider * @param SupplierDataProvider $supplierDataProvider - * @param WarehouseDataProvider $warehouseDataProvider * @param FeatureDataProvider $featureDataProvider * @param PackDataProvider $packDataProvider * @param ShopContext $shopContext @@ -194,7 +190,6 @@ public function __construct( Tools $toolsAdapter, ProductDataProvider $productDataProvider, SupplierDataProvider $supplierDataProvider, - WarehouseDataProvider $warehouseDataProvider, FeatureDataProvider $featureDataProvider, PackDataProvider $packDataProvider, ShopContext $shopContext, @@ -210,7 +205,6 @@ public function __construct( $this->tools = $toolsAdapter; $this->productAdapter = $productDataProvider; $this->supplierAdapter = $supplierDataProvider; - $this->warehouseAdapter = $warehouseDataProvider; $this->featureAdapter = $featureDataProvider; $this->packAdapter = $packDataProvider; $this->shopContext = $shopContext; @@ -422,23 +416,6 @@ public function getModelData($form_data, $isMultiShopContext = false) $form_data['inputAccessories'] = $inputAccessories; } - //map warehouseProductLocations - $form_data['warehouse_loaded'] = 1; - $warehouses = $this->warehouseAdapter->getWarehouses(); - foreach ($warehouses as $warehouse) { - foreach ($form_data['warehouse_combination_' . $warehouse['id_warehouse']] as $combination) { - $key = $combination['warehouse_id'] - . '_' . $combination['product_id'] - . '_' . $combination['id_product_attribute']; - if ($combination['activated']) { - $form_data['check_warehouse_' . $key] = '1'; - } - $form_data['location_warehouse_' . $key] = $combination['location']; - - unset($form_data['warehouse_combination_' . $warehouse['id_warehouse']]); - } - } - //force customization fields values $form_data['uploadable_files'] = 0; $form_data['text_fields'] = 0; @@ -503,12 +480,6 @@ public function getFormData(Product $product) //Inject data form for supplier combinations $this->formData['step6'] = array_merge($this->formData['step6'], $this->getDataSuppliersCombinations($product)); - //Inject data form for warehouse combinations - $this->formData['step4'] = array_merge( - $this->formData['step4'], - $this->getDataWarehousesCombinations($product) - ); - return $this->formData; } @@ -616,8 +587,6 @@ private function mapStep2FormData(Product $product) private function mapStep3FormData(Product $product) { return [ - 'advanced_stock_management' => (bool) $product->advanced_stock_management, - 'depends_on_stock' => $product->depends_on_stock ? '1' : '0', 'qty_0' => $product::getQuantity($product->id), 'id_product_attributes' => $this->getProductAttributes($product), 'out_of_stock' => $product->out_of_stock, @@ -872,51 +841,6 @@ private function getDataSuppliersCombinations(Product $product) return $dataSuppliersCombinations; } - /** - * Generate form warehouses/combinations references. - * - * @param Product $product - * - * @return array filled data form references combinations - */ - private function getDataWarehousesCombinations(Product $product) - { - $combinations = $product->getAttributesResume($this->locales[0]['id_lang']) ?: []; - if (empty($combinations)) { - $combinations[] = [ - 'id_product' => $product->id, - 'id_product_attribute' => 0, - 'attribute_designation' => $product->name[$this->locales[0]['id_lang']], - ]; - } - - //for each warehouse, generate combinations list - $dataWarehousesCombinations = []; - - foreach ($this->warehouseAdapter->getWarehouses() as $warehouse) { - $warehouseId = $warehouse['id_warehouse']; - foreach ($combinations as $combination) { - $warehouseProductLocationData = $this->warehouseAdapter->getWarehouseProductLocationData( - $product->id, - $combination['id_product_attribute'], - $warehouseId - ); - $dataWarehousesCombinations['warehouse_combination_' . $warehouseId][] = [ - 'label' => $combination['attribute_designation'], - 'activated' => (bool) $warehouseProductLocationData['activated'], - 'warehouse_id' => $warehouseId, - 'product_id' => $product->id, - 'id_product_attribute' => $combination['id_product_attribute'], - 'location' => isset($warehouseProductLocationData['location']) - ? $warehouseProductLocationData['location'] - : '', - ]; - } - } - - return $dataWarehousesCombinations; - } - /** * get form product features. * diff --git a/src/PrestaShopBundle/PrestaShopBundle.php b/src/PrestaShopBundle/PrestaShopBundle.php index a9ee1d8fc55ac..70d74c405c7a3 100644 --- a/src/PrestaShopBundle/PrestaShopBundle.php +++ b/src/PrestaShopBundle/PrestaShopBundle.php @@ -27,7 +27,7 @@ namespace PrestaShopBundle; use PrestaShopBundle\DependencyInjection\Compiler\CommandAndQueryCollectorPass; -use PrestaShopBundle\DependencyInjection\Compiler\ContainerInjectionPass; +use PrestaShopBundle\DependencyInjection\Compiler\CommandAndQueryRegisterPass; use PrestaShopBundle\DependencyInjection\Compiler\DynamicRolePass; use PrestaShopBundle\DependencyInjection\Compiler\GridDefinitionServiceIdsCollectorPass; use PrestaShopBundle\DependencyInjection\Compiler\IdentifiableObjectFormTypesCollectorPass; @@ -57,6 +57,10 @@ class PrestaShopBundle extends Bundle */ public const LOAD_MODULE_SERVICES_PASS_PRIORITY = 200; + public function __construct(private \AppKernel $kernel) + { + } + /** * {@inheritdoc} */ @@ -73,15 +77,15 @@ public function build(ContainerBuilder $container) $container->addCompilerPass(new DynamicRolePass()); $container->addCompilerPass(new PopulateTranslationProvidersPass()); $container->addCompilerPass(new LoadServicesFromModulesPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, self::LOAD_MODULE_SERVICES_PASS_PRIORITY); - $container->addCompilerPass(new LoadServicesFromModulesPass('admin'), PassConfig::TYPE_BEFORE_OPTIMIZATION, self::LOAD_MODULE_SERVICES_PASS_PRIORITY); + $container->addCompilerPass(new LoadServicesFromModulesPass($this->kernel->getAppType()), PassConfig::TYPE_BEFORE_OPTIMIZATION, self::LOAD_MODULE_SERVICES_PASS_PRIORITY); $container->addCompilerPass(new RemoveXmlCompiledContainerPass(), PassConfig::TYPE_AFTER_REMOVING); $container->addCompilerPass(new RouterPass(), PassConfig::TYPE_AFTER_REMOVING); $container->addCompilerPass(new OverrideTranslatorServiceCompilerPass()); $container->addCompilerPass(new ModulesDoctrineCompilerPass()); + $container->addCompilerPass(new CommandAndQueryRegisterPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, self::LOAD_MODULE_SERVICES_PASS_PRIORITY); $container->addCompilerPass(new CommandAndQueryCollectorPass()); $container->addCompilerPass(new OptionsFormHookNameCollectorPass()); $container->addCompilerPass(new GridDefinitionServiceIdsCollectorPass()); $container->addCompilerPass(new IdentifiableObjectFormTypesCollectorPass()); - $container->addCompilerPass(new ContainerInjectionPass()); } } diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/configure/advanced_parameters/authorization_server.yml b/src/PrestaShopBundle/Resources/config/routing/admin/configure/advanced_parameters/authorization_server.yml index a568ccf2b2cec..db303a6ae8633 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/configure/advanced_parameters/authorization_server.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/configure/advanced_parameters/authorization_server.yml @@ -39,10 +39,30 @@ admin_authorized_applications_delete: _controller: PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters\AuthorizationServer\ApplicationController::deleteAction _legacy_controller: AdminAuthorizationServer - admin_api_accesses_create: path: /applications/api-accesses/create methods: [ GET, POST, PATCH ] defaults: _controller: PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters\AuthorizationServer\ApiAccessController::createAction _legacy_controller: AdminAuthorizationServer + +admin_api_accesses_edit: + path: /applications/api-accesses/{apiAccessId}/edit + methods: [ GET, POST, PATCH ] + defaults: + _controller: PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters\AuthorizationServer\ApiAccessController::editAction + _legacy_controller: ApiAccessController + +admin_api_accesses_delete: + path: /applications/api-accesses/{apiAccessId}/delete + methods: [ POST ] + defaults: + _controller: PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters\AuthorizationServer\ApiAccessController::deleteAction + _legacy_controller: ApiAccessController + +admin_api_accesses_toggle_active: + path: /applications/api-accesses/{apiAccessId}/toggle-active + methods: [ POST ] + defaults: + _controller: PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters\AuthorizationServer\ApiAccessController::toggleActiveAction + _legacy_controller: ApiAccessController diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/order_states.yml b/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/order_states.yml index a4834cb1ff66c..e44d0aef47b05 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/order_states.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/order_states.yml @@ -5,7 +5,6 @@ admin_order_states: _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\OrderStateController::indexAction _legacy_controller: AdminStatuses _legacy_link: AdminStatuses - _legacy_feature_flag: order_state admin_order_states_filter: path: / @@ -16,7 +15,6 @@ admin_order_states_filter: gridDefinitionFactoryServiceId: prestashop.core.grid.definition.factory.order_states redirectRoute: admin_order_states _legacy_link: AdminStatuses:submitFilterstate - _legacy_feature_flag: order_state admin_order_states_create: path: /new diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/search_preferences.yml b/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/search_preferences.yml index 02ac7e8ec5cc5..e88c3f583149e 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/search_preferences.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/search_preferences.yml @@ -3,7 +3,7 @@ admin_search_index: path: / methods: [ GET ] defaults: - _controller: 'PrestaShopBundle\Controller\Admin\Configure\ShopParameters\SearchController::indexAction' + _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\SearchController::indexAction _legacy_controller: AdminSearchConf # _legacy_link: AdminSearchConf # _legacy_feature_flag: search @@ -15,5 +15,13 @@ admin_alias_search: _controller: PrestaShopBundle\Controller\Admin\CommonController::searchGridAction gridDefinitionFactoryServiceId: prestashop.core.grid.definition.factory.alias redirectRoute: admin_search_index - _legacy_controller: AdminSearchConf +# _legacy_controller: AdminSearchConf # _legacy_link: AdminSearchConf:submitFilteralias + +admin_alias_search_search_term_action: + path: / + methods: [ GET, POST ] + defaults: + _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\SearchController::searchAliasesForAssociationAction +# _legacy_controller: AdminSearchConf +# _legacy_link: AdminSearchConf diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/titles.yml b/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/titles.yml index 8b72c9e477c85..bb92b71a3a0c0 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/titles.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/titles.yml @@ -2,10 +2,9 @@ admin_title_index: path: / methods: [ GET ] defaults: - _controller: 'PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::indexAction' + _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::indexAction _legacy_controller: AdminGenders _legacy_link: AdminGenders - _legacy_feature_flag: title admin_title_search: path: / @@ -16,25 +15,22 @@ admin_title_search: redirectRoute: admin_title_index _legacy_controller: AdminGenders _legacy_link: AdminGenders:submitFiltergenders - _legacy_feature_flag: title admin_title_create: path: /new methods: [ GET, POST ] defaults: - _controller: 'PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::createAction' + _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::createAction _legacy_controller: AdminGenders _legacy_link: AdminGenders:addgender - _legacy_feature_flag: title admin_title_edit: path: /{titleId}/edit methods: [ GET, POST ] defaults: - _controller: 'PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::editAction' + _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::editAction _legacy_controller: AdminGenders _legacy_link: AdminGenders:updategender - _legacy_feature_flag: title requirements: titleId: \d+ @@ -42,10 +38,9 @@ admin_title_delete: path: /{titleId}/delete methods: [ POST, DELETE ] defaults: - _controller: 'PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::deleteAction' + _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::deleteAction _legacy_controller: AdminGenders _legacy_link: AdminGenders:deletegender - _legacy_feature_flag: title requirements: titleId: \d+ @@ -53,7 +48,6 @@ admin_title_bulk_delete: path: /bulk-delete methods: [ POST ] defaults: - _controller: 'PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::bulkDeleteAction' + _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::bulkDeleteAction _legacy_controller: AdminGenders _legacy_link: AdminGenders:submitBulkdeletegender - _legacy_feature_flag: title diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute.yml index 064707d9c3cab..def5d62f8018c 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute.yml @@ -7,7 +7,8 @@ admin_attributes_index: _legacy_controller: AdminAttributesGroups redirectQueryParamsToKeep: - 'attributeGroupId' - # _legacy_link: AdminAttributesGroups:viewattribute_group + _legacy_link: AdminAttributesGroups:viewattribute_group + _legacy_feature_flag: attribute_group _legacy_parameters: id_attribute_group: attributeGroupId requirements: @@ -19,9 +20,10 @@ admin_attributes_search: defaults: _controller: PrestaShopBundle\Controller\Admin\CommonController::searchGridAction _legacy_controller: AdminAttributesGroups + _legacy_link: AdminAttributesGroups:submitFilterattribute + _legacy_feature_flag: attribute_group gridDefinitionFactoryServiceId: prestashop.core.grid.definition.factory.attribute redirectRoute: admin_attributes_index - # _legacy_link: AdminAttributesGroups:submitFilterattribute_values redirectQueryParamsToKeep: - 'attributeGroupId' @@ -31,9 +33,10 @@ admin_attributes_create: defaults: _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\AttributeController::createAction' _legacy_controller: AdminAttributesGroups + _legacy_link: AdminAttributesGroups:addattribute + _legacy_feature_flag: attribute_group redirectQueryParamsToKeep: - 'attributeGroupId' -# _legacy_link: AdminAttributesGroups:addattribute_group admin_attributes_edit: path: /{attributeId}/edit @@ -43,10 +46,10 @@ admin_attributes_edit: _legacy_controller: AdminAttributesGroups redirectQueryParamsToKeep: - 'attributeGroupId' - # _legacy_link: AdminAttributesGroups:updateattribute + _legacy_link: AdminAttributesGroups:updateattribute + _legacy_feature_flag: attribute_group _legacy_parameters: id_attribute_group: attributeGroupId - id_attribute: attributeId requirements: attributeId: \d+ @@ -58,7 +61,8 @@ admin_attributes_delete: _legacy_controller: AdminAttributesGroups redirectQueryParamsToKeep: - 'attributeGroupId' - # _legacy_link: AdminAttributesGroups:deleteattribute + _legacy_link: AdminAttributesGroups:deleteattribute + _legacy_feature_flag: attribute_group _legacy_parameters: id_attribute_group: attributeGroupId id_attribute: attributeId @@ -68,13 +72,11 @@ admin_attributes_bulk_delete: methods: POST defaults: _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\AttributeController::bulkDeleteAction' - _legacy_controller: AdminAttributesGroups redirectQueryParamsToKeep: - 'attributeGroupId' - # _legacy_link: AdminAttributesGroups:bulkdeleteattribute - _legacy_parameters: - id_attribute_group: attributeGroupId - id_attribute: attributeId + _legacy_link: AdminAttributesGroups:submitBulkdeleteattribute + _legacy_controller: AdminAttributesGroups + _legacy_feature_flag: attribute_group admin_attributes_update_position: path: /update-position @@ -82,4 +84,3 @@ admin_attributes_update_position: defaults: _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\AttributeController::updatePositionAction' _legacy_controller: AdminAttributesGroups -# _legacy_link: AdminAttributesGroups:updateAttributesPositions diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute_group.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute_group.yml index aef6cfc7ec38b..8834471c9ed62 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute_group.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute_group.yml @@ -1,4 +1,3 @@ -# @todo: uncomment legacy links after page migration admin_attribute_groups_index: path: / methods: GET @@ -23,8 +22,7 @@ admin_attribute_groups_create: path: /new methods: [ GET, POST ] defaults: - # todo: implement create - _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\AttributeGroupController::indexAction' + _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\AttributeGroupController::createAction' _legacy_controller: AdminAttributesGroups _legacy_link: AdminAttributeGroups:addattribute_group _legacy_feature_flag: attribute_group @@ -92,5 +90,3 @@ admin_attribute_groups_update_position: defaults: _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\AttributeGroupController::updatePositionAction' _legacy_controller: AdminAttributesGroups - _legacy_link: AdminAttributesGroups:updateGroupsPositions - _legacy_feature_flag: attribute_group diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/cart_rule.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/cart_rule.yml index dbbeb7fdf0c5b..9f072344c4467 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/cart_rule.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/cart_rule.yml @@ -13,8 +13,8 @@ admin_cart_rules_create: defaults: _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\CartRuleController::createAction' _legacy_controller: AdminCartRules - # _legacy_link: AdminCartRules:addcartrule - # _legacy_feature_flag: cart_rule + _legacy_link: AdminCartRules:addcartrule + _legacy_feature_flag: cart_rule admin_cart_rules_search: path: /search diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/categories.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/categories.yml index a3ca66e3fb237..ce433f89b5cc2 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/categories.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/categories.yml @@ -127,19 +127,6 @@ admin_categories_delete_cover_image: requirements: categoryId: \d+ -admin_categories_delete_menu_thumbnail: - path: /{categoryId}/menu-thumbnails/{menuThumbnailId}/delete - methods: [ POST ] - defaults: - _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\CategoryController::deleteMenuThumbnailAction - _legacy_controller: AdminCategories - _legacy_link: AdminCategories:forceDeleteThumb - _legacy_parameters: - id_category: categoryId - requirements: - categoryId: \d+ - menuThumbnailId: 0|1|2 - admin_categories_update_position: path: /update-positions methods: [ POST ] diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml index 301f9b7433eeb..2838d2f584e41 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml @@ -1,4 +1,3 @@ -# @todo: legacy links can be uncommented when page is fully migrated. admin_features_index: path: / methods: [ GET ] @@ -6,7 +5,6 @@ admin_features_index: _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureController::indexAction _legacy_controller: AdminFeatures _legacy_link: AdminFeatures - _legacy_feature_flag: feature admin_features_horizontal_index: path: /horizontal @@ -21,7 +19,7 @@ admin_features_search: defaults: _controller: PrestaShopBundle\Controller\Admin\CommonController::searchGridAction _legacy_controller: AdminFeatures - # _legacy_link: AdminFeatures + _legacy_link: AdminTracking:submitFilterfeature gridDefinitionFactoryServiceId: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureGridDefinitionFactory redirectRoute: admin_features_index @@ -32,7 +30,6 @@ admin_features_add: _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureController::createAction _legacy_controller: AdminFeatures _legacy_link: AdminFeatures:addfeature - _legacy_feature_flag: feature admin_features_edit: path: /{featureId}/edit @@ -41,7 +38,6 @@ admin_features_edit: _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureController::editAction _legacy_controller: AdminFeatures _legacy_link: AdminFeatures:updatefeature - _legacy_feature_flag: feature _legacy_parameters: id_feature: featureId requirements: @@ -51,8 +47,9 @@ admin_features_export: path: /export methods: GET defaults: - _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureController::exportAction' + _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureController::exportAction _legacy_controller: AdminFeatures + _legacy_link: AdminThemes:exportfeature admin_features_update_position: path: /update-position @@ -60,6 +57,7 @@ admin_features_update_position: defaults: _controller: PrestaShopBundle\Controller\Admin\CommonController::updatePositionAction _legacy_controller: AdminFeatures + _legacy_link: AdminFeatures:updateFeaturesPositions position_definition: prestashop.core.grid.feature.position_definition redirect_route: admin_features_index @@ -80,3 +78,77 @@ admin_features_bulk_delete: _legacy_controller: AdminFeatures requirements: featureId: \d+ + +admin_feature_values_index: + path: /{featureId}/values + methods: [ GET ] + defaults: + _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::indexAction + _legacy_controller: AdminFeatures + _legacy_link: AdminFeatures:viewfeature + _legacy_parameters: + id_feature: featureId + requirements: + featureId: \d+ + +admin_feature_values_search: + path: /{featureId}/values + methods: [ POST ] + defaults: + _controller: PrestaShopBundle\Controller\Admin\CommonController::searchGridAction + gridDefinitionFactoryServiceId: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureValueGridDefinitionFactory + redirectRoute: admin_feature_values_index + _legacy_controller: AdminFeatures + _legacy_link: AdminFeatures + redirectQueryParamsToKeep: + - 'featureId' + requirements: + featureId: \d+ + +admin_feature_values_add: + path: /new-value + methods: [ GET, POST ] + defaults: + _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::createAction + _legacy_controller: AdminFeatures + _legacy_link: AdminFeatures:addfeature_value + +admin_feature_values_edit: + path: /{featureId}/values/{featureValueId}/edit + methods: [ GET, POST ] + defaults: + _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::editAction + _legacy_controller: AdminFeatures + _legacy_link: AdminFeatures:updatefeature_value + _legacy_parameters: + id_feature: featureId + id_feature_value: featureValueId + redirectQueryParamsToKeep: + - 'featureId' + +admin_feature_values_export: + path: /{featureId}/values/export + methods: GET + defaults: + _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::exportAction + _legacy_controller: AdminFeatures + +admin_feature_values_delete: + path: /{featureId}/values/{featureValueId}/delete + methods: [ POST, DELETE ] + defaults: + _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::deleteAction + _legacy_controller: AdminFeatures + requirements: + featureId: \d+ + featureValueId: \d+ + +admin_feature_values_bulk_delete: + path: /{featureId}/values/bulk-delete + methods: [ POST, DELETE ] + defaults: + _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::bulkDeleteAction + _legacy_controller: AdminFeatures + requirements: + featureId: \d+ + featureValueId: \d+ diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/monitoring.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/monitoring.yml index bb414fef0441f..7e449002f17f1 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/monitoring.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/monitoring.yml @@ -12,6 +12,7 @@ admin_monitorings_search: defaults: _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\MonitoringController::searchAction' _legacy_controller: AdminTracking + _legacy_link: AdminTracking:submitFiltermonitoring admin_monitoring_products_bulk_delete: path: /delete-bulk @@ -19,3 +20,4 @@ admin_monitoring_products_bulk_delete: defaults: _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\MonitoringController::deleteBulkAction' _legacy_controller: AdminTracking + _legacy_link: AdminTracking:submitBulkdeletemonitoring diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/products.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/products.yml index 79b166876e496..d3f0258c3264b 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/products.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/products.yml @@ -25,10 +25,6 @@ _product_suppliers: resource: "suppliers.yml" prefix: /suppliers/ -_product_warehouses: - resource: "warehouses.yml" - prefix: /warehouses/ - # Product List admin_product_catalog: path: /{offset}/{limit}/{orderBy}/{sortOrder} diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/warehouses.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/warehouses.yml deleted file mode 100644 index ad4aa218d7b72..0000000000000 --- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/warehouses.yml +++ /dev/null @@ -1,9 +0,0 @@ -admin_warehouse_refresh_product_warehouse_combination_form: - path: /refresh-product-warehouse-combination-form/{idProduct} - methods: [ GET ] - defaults: - _controller: PrestaShopBundle\Controller\Admin\WarehouseController::refreshProductWarehouseCombinationFormAction - _legacy_controller: AdminProducts - idProduct: 0 - requirements: - idProduct: \d+ diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products_v2/product.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products_v2/product.yml index 1c02df32f3c19..8c417497d013b 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products_v2/product.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products_v2/product.yml @@ -13,6 +13,7 @@ admin_products_index: defaults: _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\Product\ProductController::indexAction _legacy_controller: AdminProducts + _legacy_link: AdminProducts admin_products_light_list: path: /light-list @@ -330,8 +331,7 @@ admin_products_bulk_disable_shop_group: defaults: _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\Product\ProductController::bulkDisableShopGroupAction _legacy_controller: AdminProducts - _legacy_link: - - AdminProducts:submitBulkenableSelectionproduct + _legacy_link: AdminProducts:submitBulkdisableSelectionproduct requirements: productId: \d+ shopGroupId: \d+ diff --git a/src/PrestaShopBundle/Resources/config/services.yml b/src/PrestaShopBundle/Resources/config/services.yml index 2dd1a2a0dfea4..93acdc58941c2 100644 --- a/src/PrestaShopBundle/Resources/config/services.yml +++ b/src/PrestaShopBundle/Resources/config/services.yml @@ -7,3 +7,4 @@ imports: - { resource: services/adapter/*.yml } - { resource: services/legacy.yml } - { resource: services/alias.yml } + - { resource: services/front_legacy.yml } diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/address.yml b/src/PrestaShopBundle/Resources/config/services/adapter/address.yml index d351c2a681550..34910b8166726 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/address.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/address.yml @@ -6,79 +6,57 @@ services: prestashop.adapter.address.command_handler.delete_address_handler: class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\DeleteAddressHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\DeleteAddressCommand' } + autoconfigure: true prestashop.adapter.address.command_handler.bulk_delete_address_handler: class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\BulkDeleteAddressHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\BulkDeleteAddressCommand' } + autoconfigure: true prestashop.adapter.address.command_handler.add_manufacturer_address_handler: class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\AddManufacturerAddressHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\AddManufacturerAddressCommand' + autoconfigure: true prestashop.adapter.address.command_handler.edit_manufacturer_address_handler: class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\EditManufacturerAddressHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditManufacturerAddressCommand' + autoconfigure: true prestashop.adapter.address.query_handler.get_manufacturer_address_for_editing_handler: class: 'PrestaShop\PrestaShop\Adapter\Address\QueryHandler\GetManufacturerAddressForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Address\Query\GetManufacturerAddressForEditing' + autoconfigure: true prestashop.adapter.address.query_handler.get_required_fields_for_address: class: 'PrestaShop\PrestaShop\Adapter\Address\QueryHandler\GetRequiredFieldsForAddressHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Address\Query\GetRequiredFieldsForAddress' + autoconfigure: true prestashop.adapter.address.command_handler.set_required_fields_for_address: class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\SetRequiredFieldsForAddressHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\SetRequiredFieldsForAddressCommand' + autoconfigure: true prestashop.adapter.address.command_handler.add_customer_address_handler: class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\AddCustomerAddressHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\AddCustomerAddressCommand' + autoconfigure: true prestashop.adapter.address.query_handler.get_customer_address_for_editing_handler: class: 'PrestaShop\PrestaShop\Adapter\Address\QueryHandler\GetCustomerAddressForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Address\Query\GetCustomerAddressForEditing' + autoconfigure: true prestashop.adapter.address.command_handler.edit_customer_address_handler: class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\EditCustomerAddressHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCustomerAddressCommand' + autoconfigure: true prestashop.adapter.address.command_handler.edit_order_address_handler: class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\EditOrderAddressHandler' + autoconfigure: true arguments: - '@prestashop.adapter.address.command_handler.edit_customer_address_handler' - '@prestashop.adapter.order.command_handler.change_order_delivery_address_handler' - '@prestashop.adapter.order.command_handler.change_order_invoice_address_handler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditOrderAddressCommand' prestashop.adapter.address.command_handler.edit_cart_address_handler: class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\EditCartAddressHandler' + autoconfigure: true arguments: - '@prestashop.adapter.address.command_handler.edit_customer_address_handler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCartAddressCommand' prestashop.adapter.address.formatter: class: 'PrestaShop\PrestaShop\Adapter\Address\AddressFormatter' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/admin.yml b/src/PrestaShopBundle/Resources/config/services/adapter/admin.yml index 2b80824f01641..3171686212270 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/admin.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/admin.yml @@ -8,10 +8,6 @@ services: - !php/const _PS_MODE_DEV_ decorates: prestashop.core.admin.page_preference_interface - prestashop.adapter.admin.page_preference: - alias: PrestaShop\PrestaShop\Adapter\Admin\PagePreference - deprecated: ~ - prestashop.adapter.legacy_db: public: true class: 'Db' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml index cbe94e78f1f81..e15ee34c8c6ac 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml @@ -11,21 +11,25 @@ services: $dbPrefix: '%database_prefix%' PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\AddAliasHandler: - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\AddAliasCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Alias\QueryHandler\GetAliasForEditingHandler: - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Alias\Query\GetAliasForEditing + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\DeleteAliasHandler: + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\BulkDeleteAliasHandler: + autoconfigure: true PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\UpdateAliasStatusHandler: - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasStatusCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\BulkUpdateAliasStatusHandler: - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkUpdateAliasStatusCommand + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\UpdateAliasHandler: + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\Alias\QueryHandler\SearchForSearchTermHandler: + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml b/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml index 684557a660c6b..6492ec62301f1 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml @@ -4,29 +4,25 @@ services: prestashop.adapter.attachment.command_handler.delete_attachment_handler: public: true + autoconfigure: true class: 'PrestaShop\PrestaShop\Adapter\Attachment\CommandHandler\DeleteAttachmentHandler' parent: 'prestashop.adapter.attachment.command_handler.abstract_attachment_handler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\DeleteAttachmentCommand' } prestashop.adapter.attachment.command_handler.bulk_delete_attachment_handler: public: true + autoconfigure: true class: 'PrestaShop\PrestaShop\Adapter\Attachment\CommandHandler\BulkDeleteAttachmentsHandler' parent: 'prestashop.adapter.attachment.command_handler.abstract_attachment_handler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\BulkDeleteAttachmentsCommand' } prestashop.adapter.attachment.query_handler.get_attachment_handler: class: 'PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler\GetAttachmentHandler' + autoconfigure: true arguments: - !php/const _PS_DOWNLOAD_DIR_ - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachment' } prestashop.adapter.contact.query_handler.get_attachment_handler: class: 'PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler\GetAttachmentForEditingHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachmentForEditing' } + autoconfigure: true prestashop.adapter.attachment.uploader.attachment_file_uploader: class: 'PrestaShop\PrestaShop\Adapter\File\Uploader\AttachmentFileUploader' @@ -42,43 +38,33 @@ services: prestashop.adapter.attachment.command_handler.edit_attachment_handler: public: true + autoconfigure: true class: 'PrestaShop\PrestaShop\Adapter\Attachment\CommandHandler\EditAttachmentHandler' parent: 'prestashop.adapter.attachment.command_handler.abstract_attachment_handler' arguments: - '@prestashop.adapter.attachment.uploader.attachment_file_uploader' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\EditAttachmentCommand' } prestashop.adapter.attachment.command_handler.create_attachment_handler: public: true + autoconfigure: true class: 'PrestaShop\PrestaShop\Adapter\Attachment\CommandHandler\AddAttachmentHandler' parent: 'prestashop.adapter.attachment.command_handler.abstract_attachment_handler' arguments: - '@prestashop.adapter.attachment.uploader.attachment_file_uploader' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\AddAttachmentCommand' } PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository: arguments: - '@doctrine.dbal.default_connection' - '%database_prefix%' - prestashop.adapter.attachment.attachment_repository: - alias: PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository - deprecated: ~ - prestashop.adapter.attachment.query_handler.get_attachment_information_handler: class: PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler\GetAttachmentInformationHandler + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachmentInformation prestashop.adapter.attachment.query_handler.search_attachment_handler: class: PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler\SearchAttachmentHandler + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Attachment\Query\SearchAttachment diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/attribute.yml b/src/PrestaShopBundle/Resources/config/services/adapter/attribute.yml index d2f64172939e1..1b8c7ca4cf143 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/attribute.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/attribute.yml @@ -3,14 +3,10 @@ services: public: true PrestaShop\PrestaShop\Adapter\Attribute\CommandHandler\DeleteAttributeHandler: - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\DeleteAttributeCommand' + autoconfigure: true PrestaShop\PrestaShop\Adapter\Attribute\CommandHandler\BulkDeleteAttributeHandler: - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\BulkDeleteAttributeCommand' + autoconfigure: true PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository: arguments: diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml b/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml index eecc159e7d5c8..32af69438a75f 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml @@ -2,41 +2,44 @@ services: _defaults: public: true + PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler\AddAttributeGroupHandler: + autowire: true + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler\EditAttributeGroupHandler: + autowire: true + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\AttributeGroup\QueryHandler\GetAttributeGroupForEditingHandler: + autowire: true + autoconfigure: true + PrestaShop\PrestaShop\Adapter\AttributeGroup\AttributeGroupViewDataProvider: arguments: - "@=service('prestashop.adapter.legacy.context').getContext().language.id" - '@PrestaShop\PrestaShop\Core\ConfigurationInterface' - prestashop.adapter.product.attribute_group.attribute_group_view_data_provider: - alias: PrestaShop\PrestaShop\Adapter\AttributeGroup\AttributeGroupViewDataProvider - deprecated: ~ - PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler\DeleteAttributeGroupHandler: - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\DeleteAttributeGroupCommand' + autoconfigure: true PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler\BulkDeleteAttributeGroupHandler: - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\BulkDeleteAttributeGroupCommand' + autoconfigure: true PrestaShop\PrestaShop\Adapter\AttributeGroup\QueryHandler\GetAttributeGroupListHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository' - '@PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupList' PrestaShop\PrestaShop\Adapter\Product\AttributeGroup\QueryHandler\GetProductAttributeGroupsHandler: autowire: true public: false - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Query\GetProductAttributeGroups' + autoconfigure: true PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository: + autowire: true arguments: - '@doctrine.dbal.default_connection' - '%database_prefix%' + + PrestaShop\PrestaShop\Adapter\AttributeGroup\Validate\AttributeGroupValidator: diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/backup.yml b/src/PrestaShopBundle/Resources/config/services/adapter/backup.yml index be70904bc8a4c..3019101f3df5b 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/backup.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/backup.yml @@ -12,18 +12,3 @@ services: PrestaShop\PrestaShop\Core\Backup\Manager\BackupRemoverInterface: class: PrestaShop\PrestaShop\Adapter\Backup\BackupRemover public: true - - prestashop.adapter.backup.database_creator: - alias: PrestaShop\PrestaShop\Core\Backup\BackupInterface - public: true - deprecated: ~ - - prestashop.adapter.backup.backup_provider: - alias: PrestaShop\PrestaShop\Core\Backup\Repository\BackupRepositoryInterface - public: true - deprecated: ~ - - prestashop.adapter.backup.backup_remover: - alias: PrestaShop\PrestaShop\Core\Backup\Manager\BackupRemoverInterface - public: true - deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cache.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cache.yml index ae571d917cca4..dc488cbd9bc8d 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/cache.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/cache.yml @@ -16,3 +16,7 @@ services: prestashop.adapter.cache.clearer.xml_cache_clearer: class: 'PrestaShop\PrestaShop\Adapter\Cache\Clearer\XmlCacheClearer' + + PrestaShop\PrestaShop\Adapter\Cache\Clearer\DoctrineCacheClearer: + arguments: + - '@doctrine.cache.provider' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/carrier.yml b/src/PrestaShopBundle/Resources/config/services/adapter/carrier.yml index 11ae6131bdb92..c2bfaacb6622b 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/carrier.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/carrier.yml @@ -9,28 +9,23 @@ services: prestashop.adapter.carrier.command_handler.toggle_carrier_status: class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\ToggleCarrierStatusHandler' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\ToggleCarrierStatusCommand } + autoconfigure: true prestashop.adapter.carrier.command_handler.toggle_carrier_is_free_status: class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\ToggleCarrierIsFreeHandler' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\ToggleCarrierIsFreeCommand } + autoconfigure: true prestashop.adapter.carrier.command_handler.delete_carrier: class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\DeleteCarrierHandler' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\DeleteCarrierCommand } + autoconfigure: true prestashop.adapter.carrier.command_handler.bulk_delete_carrier: class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\BulkDeleteCarrierHandler' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\BulkDeleteCarrierCommand } + autoconfigure: true prestashop.adapter.carrier.command_handler.bulk_toggle_carrier_status: class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\BulkToggleCarrierStatusHandler' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\BulkToggleCarrierStatusCommand } + autoconfigure: true prestashop.adapter.carrier.carrier_module_advice_alert_checker: class: 'PrestaShop\PrestaShop\Adapter\Carrier\CarrierModuleAdviceAlertChecker' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml index 54a8255738874..840ab61d208f9 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml @@ -4,127 +4,94 @@ services: prestashop.adapter.cart.command_handler.create_empty_customer_cart_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\CreateEmptyCustomerCartHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\CreateEmptyCustomerCartCommand' + autoconfigure: true prestashop.adapter.cart.command_handler.update_cart_currency_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartCurrencyHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartCurrencyCommand' + autoconfigure: true prestashop.adapter.cart.command_handler.update_cart_language_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartLanguageHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartLanguageCommand' + autoconfigure: true prestashop.adapter.cart.command_handler.update_cart_addresses_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartAddressesHandler' + autoconfigure: true arguments: - '@prestashop.adapter.command_handler.update_cart_carrier_handler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartAddressesCommand' prestashop.adapter.cart.command_handler.update_delivery_options_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartDeliverySettingsHandler' + autoconfigure: true arguments: - '@translator' - '@prestashop.adapter.legacy.configuration' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartDeliverySettingsCommand' prestashop.adapter.command_handler.update_product_quantity_in_cart_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateProductQuantityInCartHandler' + autoconfigure: true arguments: - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateProductQuantityInCartCommand' prestashop.adapter.command_handler.update_cart_carrier_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartCarrierHandler' + autoconfigure: true arguments: - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartCarrierCommand' prestashop.adapter.command_handler.add_cart_rule_to_cart_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\AddCartRuleToCartHandler' + autoconfigure: true arguments: - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddCartRuleToCartCommand' prestashop.adapter.command_handler.remove_cart_rule_from_cart_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\RemoveCartRuleFromCartHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\RemoveCartRuleFromCartCommand' + autoconfigure: true prestashop.adapter.command_handler.remove_product_from_cart_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\RemoveProductFromCartHandler' + autoconfigure: true arguments: - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\RemoveProductFromCartCommand' prestashop.adapter.command_handler.update_product_price_in_cart_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateProductPriceInCartHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateProductPriceInCartCommand' + autoconfigure: true prestashop.adapter.command_handler.send_cart_to_customer_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\SendCartToCustomerHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\SendCartToCustomerCommand' + deprecated: 'The "%service_id%" service is deprecated since 9.0 and will be removed in next major.' + autoconfigure: true prestashop.adapter.query_handler.get_cart_for_viewing_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\QueryHandler\GetCartForViewingHandler' + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\ImageManager' - "@prestashop.core.localization.locale.context_locale" - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetCartForViewing' prestashop.adapter.cart.query_handler.get_last_empty_customer_cart_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\QueryHandler\GetLastEmptyCustomerCartHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetLastEmptyCustomerCart' + autoconfigure: true prestashop.adapter.query_handler.get_cart_information_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\QueryHandler\GetCartForOrderCreationHandler' + autoconfigure: true arguments: - "@prestashop.core.localization.locale.context_locale" - '@=service("prestashop.adapter.legacy.context").getContext().language.id' - '@=service("prestashop.adapter.legacy.context").getContext().link' - '@prestashop.adapter.context_state_manager' - '@=service("prestashop.adapter.legacy.configuration").getInt("PS_CARRIER_DEFAULT")' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetCartForOrderCreation' prestashop.adapter.command_handler.add_customization_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\AddCustomizationHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddCustomizationCommand' + autoconfigure: true prestashop.adapter.command_handler.add_product_to_cart_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\AddProductToCartHandler' + autoconfigure: true arguments: - '@prestashop.adapter.command_handler.add_customization_handler' - '@prestashop.adapter.command_handler.update_product_quantity_in_cart_handler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddProductToCartCommand' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml index 45b197926a799..f32173a3fc13b 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml @@ -5,46 +5,34 @@ services: PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\AddCartRuleHandler: autowire: true public: false - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\AddCartRuleCommand } + autoconfigure: true - prestashop.adapter.cart_rule.query_handler.get_cart_rule_for_editing: - class: 'PrestaShop\PrestaShop\Adapter\CartRule\QueryHandler\GetCartRuleForEditingHandler' - arguments: - - '@prestashop.core.image.parser.image_tag_source_parser' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Query\GetCartRuleForEditing' + PrestaShop\PrestaShop\Adapter\CartRule\QueryHandler\GetCartRuleForEditingHandler: + autowire: true + public: false + autoconfigure: true prestashop.adapter.cart_rule.query_handler.search_cart_rules_handler: class: PrestaShop\PrestaShop\Adapter\CartRule\QueryHandler\SearchCartRulesHandler + autoconfigure: true arguments: - "@=service('prestashop.adapter.legacy.context').getContext().language.id" - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Query\SearchCartRules } prestashop.adapter.cart_rule.command_handler.delete_cart_rule_handler: class: 'PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\DeleteCartRuleHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\DeleteCartRuleCommand' + autoconfigure: true prestashop.adapter.cart_rule.command_handler.bulk_delete_cart_rule_handler: class: 'PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\BulkDeleteCartRuleHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkDeleteCartRuleCommand' + autoconfigure: true prestashop.adapter.cart_rule.command_handler.toggle_cart_rule_status_handler: class: 'PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\ToggleCartRuleStatusHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\ToggleCartRuleStatusCommand' + autoconfigure: true prestashop.adapter.cart_rule.command_handler.bulk_toggle_cart_rule_status_handler: class: 'PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\BulkToggleCartRuleStatusHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkToggleCartRuleStatusCommand' } + autoconfigure: true PrestaShop\PrestaShop\Adapter\CartRule\Validate\CartRuleValidator: autowire: true @@ -53,13 +41,20 @@ services: PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository: autowire: true public: false + arguments: + $connection: '@doctrine.dbal.default_connection' + $dbPrefix: '%database_prefix%' PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\EditCartRuleHandler: autowire: true public: false - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\EditCartRuleCommand } + autoconfigure: true PrestaShop\PrestaShop\Adapter\CartRule\CartRuleActionFiller: autowire: true public: false + + PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\SetCartRuleRestrictionsHandler: + autowire: true + public: false + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/catalog_price_rule.yml b/src/PrestaShopBundle/Resources/config/services/adapter/catalog_price_rule.yml index 01947881d413c..e01531b99bb2a 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/catalog_price_rule.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/catalog_price_rule.yml @@ -4,41 +4,29 @@ services: prestashop.adapter.catalog_price_rule.command_handler.delete_catalog_price_rule_handler: class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler\DeleteCatalogPriceRuleHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\DeleteCatalogPriceRuleCommand' + autoconfigure: true prestashop.adapter.catalog_price_rule.command_handler.bulk_delete_catalog_price_rule_handler: class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler\BulkDeleteCatalogPriceRuleHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\BulkDeleteCatalogPriceRuleCommand' + autoconfigure: true prestashop.adapter.catalog_price_rule.command_handler.add_catalog_price_rule_handler: class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler\AddCatalogPriceRuleHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\AddCatalogPriceRuleCommand' + autoconfigure: true prestashop.adapter.catalog_price_rule.command_handler.edit_catalog_price_rule_handler: class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler\EditCatalogPriceRuleHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\EditCatalogPriceRuleCommand' + autoconfigure: true prestashop.adapter.catalog_price_rule.command_handler.get_catalog_price_rule_for_editing_handler: class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\QueryHandler\GetCatalogPriceRuleForEditingHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Query\GetCatalogPriceRuleForEditing' + autoconfigure: true prestashop.adapter.catalog_price_rule.query_handler.get_catalog_price_rule_list_for_product_handler: class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\QueryHandler\GetCatalogPriceRuleListForProductHandler' + autoconfigure: true arguments: - '@prestashop.adapter.catalog_price_rule.repository.catalog_price_rule_repository' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Query\GetCatalogPriceRuleListForProduct' prestashop.adapter.catalog_price_rule.repository.catalog_price_rule_repository: class: PrestaShop\PrestaShop\Adapter\CatalogPriceRule\Repository\CatalogPriceRuleRepository diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/category.yml b/src/PrestaShopBundle/Resources/config/services/adapter/category.yml index 9af97e74fa899..cdc99466414fb 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/category.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/category.yml @@ -12,27 +12,19 @@ services: prestashop.adapter.category.command_handler.bulk_update_categories_status_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\BulkUpdateCategoriesStatusHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkUpdateCategoriesStatusCommand + autoconfigure: true prestashop.adapter.category.command_handler.bulk_enable_categories_status_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\BulkUpdateCategoriesStatusHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkEnableCategoriesCommand + autoconfigure: true prestashop.adapter.category.command_handler.bulk_disable_categories_status_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\BulkUpdateCategoriesStatusHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkDisableCategoriesCommand + autoconfigure: true prestashop.adapter.category.command_handler.set_category_is_enabled_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\SetCategoryIsEnabledHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\SetCategoryIsEnabledCommand + autoconfigure: true prestashop.adapter.category.command_handler.abstract_delete_category_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\AbstractDeleteCategoryHandler @@ -46,24 +38,19 @@ services: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\DeleteCategoryHandler parent: prestashop.adapter.category.command_handler.abstract_delete_category_handler public: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCommand + autoconfigure: true prestashop.adapter.category.command_handler.bulk_delete_categories_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\BulkDeleteCategoriesHandler parent: prestashop.adapter.category.command_handler.abstract_delete_category_handler public: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkDeleteCategoriesCommand + autoconfigure: true prestashop.adapter.category.command_handler.add_category_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\AddCategoryHandler public: true autowire: true - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Category\Command\AddCategoryCommand } + autoconfigure: true prestashop.adapter.category.command_handler.add_root_category_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\AddRootCategoryHandler @@ -71,72 +58,46 @@ services: - '@prestashop.adapter.legacy.configuration' public: true autowire: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\AddRootCategoryCommand + autoconfigure: true prestashop.adapter.category.command_handler.edit_root_category_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\EditRootCategoryHandler public: true autowire: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\EditRootCategoryCommand + autoconfigure: true prestashop.adapter.category.command_handler.edit_category_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\EditCategoryHandler public: true autowire: true - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Category\Command\EditCategoryCommand } + autoconfigure: true prestashop.adapter.category.query_handler.get_category_for_editing: class: PrestaShop\PrestaShop\Adapter\Category\QueryHandler\GetCategoryForEditingHandler + autoconfigure: true arguments: - '@prestashop.core.image.parser.image_tag_source_parser' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryForEditing } prestashop.adapter.category.command_handler.delete_category_cover_image_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\DeleteCategoryCoverImageHandler + autoconfigure: true arguments: - '@filesystem' - '@prestashop.adapter.legacy.configuration' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCoverImageCommand - - prestashop.adapter.category.command_handler.delete_category_menu_thumbnail_image_handler: - class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\DeleteCategoryMenuThumbnailImageHandler - arguments: - - '@filesystem' - - '@prestashop.adapter.legacy.configuration' - - '@prestashop.adapter.cache.clearer.smarty_cache_clearer' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryMenuThumbnailImageCommand prestashop.adapter.category.command_handler.update_category_position_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\UpdateCategoryPositionHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\UpdateCategoryPositionCommand + autoconfigure: true prestashop.adapter.category.command_handler.get_category_status_handler: class: PrestaShop\PrestaShop\Adapter\Category\QueryHandler\GetCategoryIsEnabledHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryIsEnabled + autoconfigure: true PrestaShop\PrestaShop\Adapter\Category\Repository\CategoryRepository: arguments: - '@doctrine.dbal.default_connection' - '%database_prefix%' - prestashop.adapter.category.repository.category_repository: - alias: PrestaShop\PrestaShop\Adapter\Category\Repository\CategoryRepository - deprecated: ~ - PrestaShop\PrestaShop\Adapter\Category\Repository\CategoryPreviewRepository: arguments: - '@PrestaShop\PrestaShop\Adapter\Category\Repository\CategoryRepository' @@ -144,11 +105,9 @@ services: prestashop.adapter.category.query_handler.get_categories_tree_handler: class: PrestaShop\PrestaShop\Adapter\Category\QueryHandler\GetCategoriesTreeHandler + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Core\Category\NameBuilder\CategoryDisplayNameBuilder' - '@prestashop.adapter.context_state_manager' - '@PrestaShop\PrestaShop\Adapter\Shop\Repository\ShopRepository' - "@=service('prestashop.adapter.legacy.configuration').get('PS_ROOT_CATEGORY')" - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoriesTree diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cms_page.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cms_page.yml index ad15bb12b6544..61d090dc92b27 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/cms_page.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/cms_page.yml @@ -4,57 +4,39 @@ services: prestashop.adapter.cms_page.command_handler.bulk_disable_cms_page: class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\BulkDisableCmsPageHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkDisableCmsPageCommand + autoconfigure: true prestashop.adapter.cms_page.command_handler.bulk_enable_cms_page: class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\BulkEnableCmsPageHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkEnableCmsPageCommand + autoconfigure: true prestashop.adapter.cms_page.command_handler.toggle_cms_page_status: class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\ToggleCmsPageStatusHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\ToggleCmsPageStatusCommand + autoconfigure: true prestashop.adapter.cms_page.query_handler.get_cms_category_id_for_redirection: class: PrestaShop\PrestaShop\Adapter\CMS\Page\QueryHandler\GetCmsCategoryIdForRedirectionHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Query\GetCmsCategoryIdForRedirection + autoconfigure: true prestashop.adapter.cms_page.command_handler.delete_cms_page: class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\DeleteCmsPageHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\DeleteCmsPageCommand + autoconfigure: true prestashop.adapter.cms_page.command_handler.bulk_delete_cms_page: class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\BulkDeleteCmsPageHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkDeleteCmsPageCommand + autoconfigure: true prestashop.adapter.cms_page.command_handler.add_cms_page_handler: class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\AddCmsPageHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\AddCmsPageCommand + autoconfigure: true prestashop.adapter.cms_page.command_handler.edit_cms_page_handler: class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\EditCmsPageHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\EditCmsPageCommand + autoconfigure: true prestashop.adapter.cms_page.query_handler.get_cms_page_for_editing_handler: class: PrestaShop\PrestaShop\Adapter\CMS\Page\QueryHandler\GetCmsPageForEditingHandler + autoconfigure: true arguments: - "@=service('prestashop.adapter.legacy.context').getContext().link" - "@=service('prestashop.adapter.legacy.context').getContext().language.id" - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Query\GetCmsPageForEditing diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cms_page_category.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cms_page_category.yml index 055ceea1bb90c..db2cff2547582 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/cms_page_category.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/cms_page_category.yml @@ -12,71 +12,51 @@ services: prestashop.adapter.cms_page_category.command_handler.delete_cms_page_category_handler: class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\DeleteCmsPageCategoryHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\DeleteCmsPageCategoryCommand + autoconfigure: true prestashop.adapter.cms_page_category.command_handler.toggle_cms_page_category_status_handler: class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\ToggleCmsPageCategoryStatusHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\ToggleCmsPageCategoryStatusCommand + autoconfigure: true prestashop.adapter.cms_page_category.command_handler.bulk_delete_cms_page_category_handler: class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\BulkDeleteCmsPageCategoryHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkDeleteCmsPageCategoryCommand + autoconfigure: true prestashop.adapter.cms_page.command_handler.bulk_enable_cms_page_category_handler: class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\BulkEnableCmsPageCategoryHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkEnableCmsPageCategoryCommand + autoconfigure: true prestashop.adapter.cms_page.command_handler.bulk_disable_cms_page_category_handler: class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\BulkDisableCmsPageCategoryHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkDisableCmsPageCategoryCommand + autoconfigure: true prestashop.adapter.cms_page.command_handler.add_cms_page_category_handler: class: 'PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\AddCmsPageCategoryHandler' parent: 'prestashop.adapter.cms_page_category.command_handler.abstract_cms_page_category_handler' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\AddCmsPageCategoryCommand + autoconfigure: true public: true prestashop.adapter.cms_page.command_handler.edit_cms_page_category_handler: class: 'PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\EditCmsPageCategoryHandler' parent: 'prestashop.adapter.cms_page_category.command_handler.abstract_cms_page_category_handler' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\EditCmsPageCategoryCommand + autoconfigure: true public: true # Query handlers prestashop.adapter.cms_page.query_handler.get_cms_page_categories_for_breadcrumbs: class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler\GetCmsPageCategoriesForBreadcrumbHandler + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.id' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoriesForBreadcrumb prestashop.adapter.cms_page.query_handler.get_cms_page_categories_for_redirection: class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler\GetCmsPageParentCategoryIdForRedirectionHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageParentCategoryIdForRedirection + autoconfigure: true prestashop.adapter.cms_page.query_handler.get_cms_page_category_for_editing: class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler\GetCmsPageCategoryForEditingHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoryForEditing + autoconfigure: true prestashop.adapter.cms_page.categories_provider: class: 'PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CategoriesProvider' @@ -86,9 +66,7 @@ services: prestashop.adapter.cms_page.query_handler.get_cms_page_category_name_for_listing: class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler\GetCmsPageCategoryNameForListingHandler + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.id' - '@request_stack' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoryNameForListing diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/common.yml b/src/PrestaShopBundle/Resources/config/services/adapter/common.yml index f912eac496874..cd7a8ad833dc7 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/common.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/common.yml @@ -9,6 +9,7 @@ services: PrestaShop\PrestaShop\Adapter\Tools: ~ + # Deprecated in 8.1 prestashop.adapter.tools: alias: PrestaShop\PrestaShop\Adapter\Tools deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/configuration.yml b/src/PrestaShopBundle/Resources/config/services/adapter/configuration.yml index e9576c231416e..071425b1c57ee 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/configuration.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/configuration.yml @@ -4,7 +4,6 @@ services: prestashop.adapter.configuration.command_handler.switch_debug_mode_handler: class: 'PrestaShop\PrestaShop\Adapter\Configuration\CommandHandler\SwitchDebugModeHandler' + autoconfigure: true arguments: - '@prestashop.adapter.debug_mode' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Configuration\Command\SwitchDebugModeCommand } diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/contact.yml b/src/PrestaShopBundle/Resources/config/services/adapter/contact.yml index 009814f0c3d92..35d144e02008a 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/contact.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/contact.yml @@ -10,21 +10,18 @@ services: prestashop.adapter.contact.query_handler.get_contact_for_editing: class: 'PrestaShop\PrestaShop\Adapter\Contact\QueryHandler\GetContactForEditingHandler' + autoconfigure: true arguments: - '@PrestaShopBundle\Form\DataTransformer\StringArrayToIntegerArrayDataTransformer' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Contact\Query\GetContactForEditing' } prestashop.adapter.contact.command_handler.edit_contact: class: 'PrestaShop\PrestaShop\Adapter\Contact\CommandHandler\EditContactHandler' + autoconfigure: true arguments: - '@validator' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Contact\Command\EditContactCommand' } prestashop.adapter.contact.command_handler.add_contact: class: 'PrestaShop\PrestaShop\Adapter\Contact\CommandHandler\AddContactHandler' + autoconfigure: true arguments: - '@validator' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Contact\Command\AddContactCommand' } diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/country.yml b/src/PrestaShopBundle/Resources/config/services/adapter/country.yml index d6e76e945d882..bd7be5588ae8b 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/country.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/country.yml @@ -4,11 +4,9 @@ services: prestashop.adapter.country.query_handler.get_country_required_fields: class: 'PrestaShop\PrestaShop\Adapter\Country\QueryHandler\GetCountryRequiredFieldsHandler' + autoconfigure: true arguments: - '@prestashop.adapter.country.country_required_fields_provider' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Country\Query\GetCountryRequiredFields' prestashop.adapter.country.country_zip_code_requirements_provider: class: 'PrestaShop\PrestaShop\Adapter\Country\CountryZipCodeRequirementsProvider' @@ -27,25 +25,21 @@ services: PrestaShop\PrestaShop\Adapter\Country\CommandHandler\AddCountryHandler: public: true autowire: true - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Country\Command\AddCountryCommand' } + autoconfigure: true PrestaShop\PrestaShop\Adapter\Country\CommandHandler\DeleteCountryHandler: public: false autowire: true - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Country\Command\DeleteCountryCommand' } + autoconfigure: true PrestaShop\PrestaShop\Adapter\Country\CommandHandler\EditCountryHandler: public: false autowire: true - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Country\Command\EditCountryCommand' } + autoconfigure: true PrestaShop\PrestaShop\Adapter\Country\QueryHandler\GetCountryForEditingHandler: public: false autowire: true - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Country\Query\GetCountryForEditing' } + autoconfigure: true PrestaShop\PrestaShop\Adapter\Country\Validate\CountryValidator: diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/credit_slip.yml b/src/PrestaShopBundle/Resources/config/services/adapter/credit_slip.yml index 14fa44bda7c9a..4d74fa5ff0631 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/credit_slip.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/credit_slip.yml @@ -4,6 +4,4 @@ services: prestashop.adapter.credit_slip.query_handler.get_credit_slip_ids_by_date_range_handler: class: 'PrestaShop\PrestaShop\Adapter\CreditSlip\QueryHandler\GetCreditSlipIdsByDateRangeHandler' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CreditSlip\Query\GetCreditSlipIdsByDateRange + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml b/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml index 5643cf03faf09..9065d5d161599 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml @@ -14,107 +14,90 @@ services: prestashop.adapter.currency.command_handler.toggle_currency_status: class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\ToggleCurrencyStatusHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\ToggleCurrencyStatusCommand' } prestashop.adapter.currency.command_handler.delete_currency: class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\DeleteCurrencyHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\DeleteCurrencyCommand' } prestashop.adapter.currency.command_handler.create_currency: class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\AddOfficialCurrencyHandler' + autoconfigure: true arguments: - '@prestashop.core.localization.cldr.locale_repository' - "@=service('prestashop.core.admin.lang.repository').findAll()" - "@prestashop.adapter.currency.command_handler.command_validator" - '@prestashop.adapter.data_provider.currency' - '@prestashop.core.localization.currency.pattern_transformer' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddCurrencyCommand' } prestashop.adapter.currency.command_handler.create_unofficial_currency: class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\AddUnofficialCurrencyHandler' + autoconfigure: true arguments: - '@prestashop.core.localization.cldr.locale_repository' - "@=service('prestashop.core.admin.lang.repository').findAll()" - "@prestashop.adapter.currency.command_handler.command_validator" - '@prestashop.adapter.data_provider.currency' - '@prestashop.core.localization.currency.pattern_transformer' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddUnofficialCurrencyCommand' } prestashop.adapter.currency.command_handler.update_official_currency: class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\EditOfficialCurrencyHandler' + autoconfigure: true arguments: - '@prestashop.core.localization.cldr.locale_repository' - "@=service('prestashop.core.admin.lang.repository').findAll()" - "@prestashop.adapter.currency.command_handler.command_validator" - "@prestashop.core.localization.currency.pattern_transformer" - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditCurrencyCommand' } prestashop.adapter.currency.command_handler.update_unofficial_currency: class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\EditUnofficialCurrencyHandler' + autoconfigure: true arguments: - '@prestashop.core.localization.cldr.locale_repository' - "@=service('prestashop.core.admin.lang.repository').findAll()" - "@prestashop.adapter.currency.command_handler.command_validator" - "@prestashop.core.localization.currency.pattern_transformer" - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditUnofficialCurrencyCommand' } prestashop.adapter.currency.command_handler.update_exchange_rates: class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\RefreshExchangeRatesHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\RefreshExchangeRatesCommand' } + autoconfigure: true prestashop.adapter.currency.command_handler.bulk_toggle_currencies_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\BulkToggleCurrenciesStatusHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")' - tags: - - { name: tactician.handler, command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\BulkToggleCurrenciesStatusCommand' } prestashop.adapter.currency.command_handler.bulk_delete_currencies_handler: class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\BulkDeleteCurrenciesHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")' - tags: - - { name: tactician.handler, command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\BulkDeleteCurrenciesCommand' } - # Query handlers prestashop.adapter.currency.query_handler.get_currency_for_editing: class: 'PrestaShop\PrestaShop\Adapter\Currency\QueryHandler\GetCurrencyForEditingHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.context").getContext().shop.id' - '@prestashop.core.localization.currency.pattern_transformer' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetCurrencyForEditing' } prestashop.adapter.currency.query_handler.get_currency_exchange_rate: class: 'PrestaShop\PrestaShop\Adapter\Currency\QueryHandler\GetCurrencyExchangeRateHandler' + autoconfigure: true arguments: - '@prestashop.core.exchange_rate.provider' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetCurrencyExchangeRate' } prestashop.adapter.currency.query_handler.get_reference_currency: class: 'PrestaShop\PrestaShop\Adapter\Currency\QueryHandler\GetReferenceCurrencyHandler' + autoconfigure: true arguments: - '@prestashop.core.localization.cldr.locale_repository' - '@=service("prestashop.core.admin.lang.repository").findAll()' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetReferenceCurrency' } PrestaShop\PrestaShop\Adapter\Currency\Repository\CurrencyRepository: ~ - - prestashop.adapter.currency.repository.currency_repository: - alias: PrestaShop\PrestaShop\Adapter\Currency\Repository\CurrencyRepository - deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/customer.yml b/src/PrestaShopBundle/Resources/config/services/adapter/customer.yml index 4b936239c50b6..4e4f86535a2bf 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/customer.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/customer.yml @@ -4,114 +4,86 @@ services: prestashop.adapter.customer.query_handler.get_customer_for_viewing: class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerForViewingHandler' + autoconfigure: true arguments: - '@translator' - "@=service('prestashop.adapter.legacy.context').getContext().language.id" - "@prestashop.core.localization.locale.context_locale" - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForViewing' prestashop.adapter.customer.command_handler.set_private_note_about_customer_handler: class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\SetPrivateNoteAboutCustomerHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\SetPrivateNoteAboutCustomerCommand' + autoconfigure: true prestashop.adapter.customer.command_handler.transform_guest_to_customer: class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\TransformGuestToCustomerHandler' + autoconfigure: true arguments: - "@=service('prestashop.adapter.legacy.context').getContext().language.id" - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\TransformGuestToCustomerCommand' prestashop.adapter.customer.command_handler.set_required_fields_for_customer: class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\SetRequiredFieldsForCustomerHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\SetRequiredFieldsForCustomerCommand' + autoconfigure: true prestashop.adapter.customer.query_handler.get_required_fields_for_customer: class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetRequiredFieldsForCustomerHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetRequiredFieldsForCustomer' + autoconfigure: true prestashop.adapter.customer.command_handler.add_customer: class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\AddCustomerHandler' + autoconfigure: true arguments: - '@prestashop.core.crypto.hashing' - '@=service("prestashop.adapter.legacy.configuration").get("_COOKIE_KEY_")' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\AddCustomerCommand' prestashop.adapter.customer.query_handler.get_customer_for_editing: class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForEditing' + autoconfigure: true prestashop.adapter.customer.command_handler.edit_customer_handler: class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\EditCustomerHandler' + autoconfigure: true arguments: - '@prestashop.core.crypto.hashing' - '@=service("prestashop.adapter.legacy.configuration").get("_COOKIE_KEY_")' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\EditCustomerCommand' prestashop.adapter.customer.command_handler.bulk_enable_customer_handler: class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\BulkEnableCustomerHandler' - tags: - - { name: tactician.handler, command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkEnableCustomerCommand' } + autoconfigure: true prestashop.adapter.customer.command_handler.bulk_disable_customer_handler: class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\BulkDisableCustomerHandler' - tags: - - { name: tactician.handler, command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkDisableCustomerCommand' } + autoconfigure: true prestashop.adapter.customer.command_handler.delete_customer_handler: class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\DeleteCustomerHandler' - tags: - - { name: tactician.handler, command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\DeleteCustomerCommand' } + autoconfigure: true prestashop.adapter.customer.command_handler.bulk_delete_customer_handler: class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\BulkDeleteCustomerHandler' - tags: - - { name: tactician.handler, command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkDeleteCustomerCommand' } + autoconfigure: true prestashop.adapter.customer.query_handler.search_customers: class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\SearchCustomersHandler' + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - "@=service('prestashop.adapter.legacy.context').getContext().language.id" - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\SearchCustomers' prestashop.adapter.customer.query_handler.get_customer_carts_handler: class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerCartsHandler' + autoconfigure: true arguments: - "@prestashop.core.localization.locale.context_locale" - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerCarts' prestashop.adapter.customer.query_handler.get_customer_orders_handler: class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerOrdersHandler' + autoconfigure: true arguments: - "@prestashop.core.localization.locale.context_locale" - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerOrders' prestashop.adapter.customer.query_handler.get_customer_for_address_creation: class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerForAddressCreationHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForAddressCreation' + autoconfigure: true prestashop.adapter.customer.customer_data_source: class: 'PrestaShop\PrestaShop\Adapter\Customer\CustomerDataSource' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml index 90c44d6409ea7..c439a37995c8c 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml @@ -20,10 +20,6 @@ services: class: PrestaShop\PrestaShop\Adapter\Supplier\SupplierDataProvider deprecated: ~ - prestashop.adapter.data_provider.warehouse: - class: PrestaShop\PrestaShop\Adapter\Warehouse\WarehouseDataProvider - deprecated: ~ - prestashop.adapter.data_provider.category: class: PrestaShop\PrestaShop\Adapter\Category\CategoryDataProvider arguments: [ "@=service('prestashop.adapter.legacy.context')" ] @@ -82,11 +78,6 @@ services: class: PrestaShop\PrestaShop\Adapter\Pack\PackDataProvider deprecated: ~ - prestashop.adapter.data_provider.tab: - alias: PrestaShop\PrestaShop\Adapter\Tab\TabDataProvider - deprecated: ~ - public: true - PrestaShop\PrestaShop\Adapter\Tab\TabDataProvider: class: PrestaShop\PrestaShop\Adapter\Tab\TabDataProvider public: false @@ -107,11 +98,18 @@ services: calls: - [ "setEmployeeId", [ "@=service('prestashop.adapter.legacy.context').getContext().employee?service('prestashop.adapter.legacy.context').getContext().employee.id:0" ] ] + PrestaShop\PrestaShop\Adapter\Category\CategoriesProviderBuilder: + arguments: + - '@prestashop.adapter.legacy.context' + - '@prestashop.core.addon.theme.repository' + - !php/const _PS_CACHE_DIR_ + - !php/const _PS_ROOT_DIR_ + - '/app/config/addons/categories.yml' + prestashop.categories_provider: + lazy: true class: PrestaShopBundle\Service\DataProvider\Admin\CategoriesProvider - arguments: - - "%prestashop.addons.categories%" - - "@=service('prestashop.adapter.legacy.context').getContext().shop.theme_name?service('prestashop.core.addon.theme.repository').getInstanceByName(service('prestashop.adapter.legacy.context').getContext().shop.theme_name).getModulesToEnable():[]" + factory: [ '@PrestaShop\PrestaShop\Adapter\Category\CategoriesProviderBuilder', 'build' ] prestashop.adapter.data_provider.default_route: class: PrestaShop\PrestaShop\Adapter\Routes\DefaultRouteProvider diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml b/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml index e710c3461df5d..f23f0eee3f1f0 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml @@ -4,30 +4,25 @@ services: prestashop.adapter.profile.employee.command_handler.toggle_employee_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\ToggleEmployeeStatusHandler' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\ToggleEmployeeStatusCommand } + autoconfigure: true prestashop.adapter.profile.employee.command_handler.bulk_update_employee_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\BulkUpdateEmployeeStatusHandler' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkUpdateEmployeeStatusCommand } + autoconfigure: true prestashop.adapter.profile.employee.command_handler.delete_employee_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\DeleteEmployeeHandler' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\DeleteEmployeeCommand } + autoconfigure: true prestashop.adapter.profile.employee.command_handler.bulk_delete_employee_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\BulkDeleteEmployeeHandler' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkDeleteEmployeeCommand } + autoconfigure: true prestashop.adapter.employee.query_handler.get_employee_for_editing: class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\QueryHandler\GetEmployeeForEditingHandler' + autoconfigure: true arguments: - '@prestashop.core.image.parser.image_tag_source_parser' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Query\GetEmployeeForEditing } prestashop.adapter.employee.form_access_checker: class: 'PrestaShop\PrestaShop\Adapter\Employee\EmployeeFormAccessChecker' @@ -37,22 +32,20 @@ services: prestashop.adapter.employee.command_handler.add_employee_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\AddEmployeeHandler' + autoconfigure: true arguments: - '@prestashop.core.crypto.hashing' - '@prestashop.core.employee.profile_access_checker' - '@prestashop.adapter.data_provider.employee' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\AddEmployeeCommand } prestashop.adapter.employee.command_handler.edit_employee_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\EditEmployeeHandler' + autoconfigure: true arguments: - '@prestashop.core.crypto.hashing' - '@prestashop.core.employee.profile_access_checker' - '@prestashop.adapter.data_provider.employee' - '@prestashop.adapter.legacy.context' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\EditEmployeeCommand } prestashop.adapter.employee.avatar_provider: class: 'PrestaShop\PrestaShop\Adapter\Employee\AvatarProvider' @@ -74,5 +67,4 @@ services: prestashop.adapter.employee.query_handler.get_employee_email_by_id_handler: class: PrestaShop\PrestaShop\Adapter\Profile\Employee\QueryHandler\GetEmployeeEmailByIdHandler - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Query\GetEmployeeEmailById } + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml b/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml index 5184bb2ba5cd0..a9c779812343a 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml @@ -8,57 +8,51 @@ services: PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\AddFeatureHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\AddFeatureCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\EditFeatureHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\EditFeatureCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Feature\QueryHandler\GetFeatureForEditingHandler: - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureForEditing + autoconfigure: true PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\AddFeatureValueHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository' - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\AddFeatureValueCommand PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\EditFeatureValueHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\EditFeatureValueCommand PrestaShop\PrestaShop\Adapter\Feature\QueryHandler\GetFeatureValueForEditingHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureValueForEditing PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\DeleteFeatureHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\DeleteFeatureCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\BulkDeleteFeatureHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\BulkDeleteFeatureCommand + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\DeleteFeatureValueHandler: + autowire: true + public: false + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\BulkDeleteFeatureValueHandler: + autowire: true + public: false + autoconfigure: true PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository: autowire: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/form.yml b/src/PrestaShopBundle/Resources/config/services/adapter/form.yml index 350e99b46d11b..6d8511e9a8183 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/form.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/form.yml @@ -71,13 +71,6 @@ services: arguments: - '@=service("prestashop.adapter.legacy.context").getLanguage().id' - prestashop.adapter.form.choice_provider.features_choice_provider: - class: 'PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\FeaturesChoiceProvider' - arguments: - - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository' - - '@prestashop.adapter.legacy.context' - - "@=service('prestashop.adapter.legacy.configuration').getInt('PS_LANG_DEFAULT')" - prestashop.adapter.form.choice_provider.feature_values_choice_provider: class: 'PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\FeatureValuesChoiceProvider' arguments: @@ -105,12 +98,19 @@ services: - '@PrestaShop\PrestaShop\Core\Product\Combination\NameBuilder\CombinationNameBuilderInterface' - '@=service("prestashop.adapter.legacy.context").getLanguage().id' - PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\ShopTreeChoiceProvider: autowire: true public: false + PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\FeaturesChoiceProvider: + public: false + autowire: true + # deprecated prestashop.adapter.form.choice_provider.shop_tree_choice_provider: alias: PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\ShopTreeChoiceProvider deprecated: ~ + + prestashop.adapter.form.choice_provider.features_choice_provider: + alias: PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\FeaturesChoiceProvider + deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/group.yml b/src/PrestaShopBundle/Resources/config/services/adapter/group.yml index 739be9702fe2a..5561adb28a62d 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/group.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/group.yml @@ -21,16 +21,12 @@ services: PrestaShop\PrestaShop\Adapter\Customer\Group\CommandHandler\AddCustomerGroupHandler: public: false autowire: true - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Group\Command\AddCustomerGroupCommand' + autoconfigure: true PrestaShop\PrestaShop\Adapter\Customer\Group\QueryHandler\GetCustomerGroupForEditingHandler: public: false autowire: true - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Group\Query\GetCustomerGroupForEditing' + autoconfigure: true PrestaShop\PrestaShop\Adapter\Customer\Group\Validate\CustomerGroupValidator: public: false diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml b/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml index 278d5adcd350d..59067b2ab410f 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml @@ -4,17 +4,22 @@ services: prestashop.adapter.hook.command_handler.update_hook_status_handler: class: PrestaShop\PrestaShop\Adapter\Hook\CommandHandler\UpdateHookStatusCommandHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Hook\Command\UpdateHookStatusCommand + autoconfigure: true prestashop.adapter.hook.command_handler.get_hook_status_handler: class: PrestaShop\PrestaShop\Adapter\Hook\QueryHandler\GetHookStatusHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\Hook\QueryHandler\GetHookHandler: + autoconfigure: true PrestaShop\PrestaShop\Adapter\HookManager: ~ prestashop.adapter.hook.manager: alias: PrestaShop\PrestaShop\Adapter\HookManager + + prestashop.attributes.ressource.metadata.collection.factory: + class: PrestaShopBundle\ApiPlatform\Decorator\AttributesResourceMetadataCollectionFactoryDecorator + decorates: api_platform.metadata.resource.metadata_collection_factory + arguments: + $innerFactory: '@prestashop.attributes.ressource.metadata.collection.factory.inner' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/image.yml b/src/PrestaShopBundle/Resources/config/services/adapter/image.yml index c85cfc524c24d..155c257792d3d 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/image.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/image.yml @@ -8,18 +8,11 @@ services: prestashop.adapter.image.uploader.category_thumbnail_image_uploader: class: 'PrestaShop\PrestaShop\Adapter\Image\Uploader\CategoryThumbnailImageUploader' - prestashop.adapter.image.uploader.category_menu_thumbnail_image_uploader: - class: 'PrestaShop\PrestaShop\Adapter\Image\Uploader\CategoryMenuThumbnailUploader' - arguments: - - '@prestashop.adapter.cache.clearer.smarty_cache_clearer' - - '@PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider' - PrestaShop\PrestaShop\Adapter\Image\Uploader\CategoryImageUploader: autowire: true arguments: - '@prestashop.adapter.image.uploader.category_cover_image_uploader' - '@prestashop.adapter.image.uploader.category_thumbnail_image_uploader' - - '@prestashop.adapter.image.uploader.category_menu_thumbnail_image_uploader' prestashop.adapter.image.uploader.employee_image_uploader: class: 'PrestaShop\PrestaShop\Adapter\Image\Uploader\EmployeeImageUploader' @@ -41,7 +34,7 @@ services: PrestaShop\PrestaShop\Adapter\Image\ImageGenerator: arguments: - - '@prestashop.core.admin.feature_flag.repository' + - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager' - '@PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration' PrestaShop\PrestaShop\Adapter\Image\ImageValidator: @@ -53,10 +46,6 @@ services: - '@=service("prestashop.core.configuration.upload_size_configuration").getMaxUploadSizeInBytes()' - '@prestashop.adapter.upload_quota.configuration' - prestashop.adapter.image.image_validator: - alias: PrestaShop\PrestaShop\Adapter\Image\ImageValidator - deprecated: ~ - prestashop.adapter.image.category_image_path_factory: class: 'PrestaShop\PrestaShop\Adapter\Image\ImagePathFactory' arguments: diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/language.yml b/src/PrestaShopBundle/Resources/config/services/adapter/language.yml index eaf6a34ef6a9e..e8a3f1878b966 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/language.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/language.yml @@ -21,55 +21,47 @@ services: prestashop.adapter.language.command_handler.add_language_handler: class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\AddLanguageHandler' + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Image\ImageValidator' - '@prestashop.adapter.file.robots_text_file_generator' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\AddLanguageCommand' prestashop.adapter.language.command_handler.edit_language_handler: class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\EditLanguageHandler' + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Image\ImageValidator' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\EditLanguageCommand' prestashop.adapter.language.query_handler.get_language_for_editing: class: 'PrestaShop\PrestaShop\Adapter\Language\QueryHandler\GetLanguageForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Language\Query\GetLanguageForEditing' + autoconfigure: true prestashop.adapter.language.command_handler.toggle_language_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\ToggleLanguageStatusHandler' + autoconfigure: true arguments: - '@prestashop.adapter.file.robots_text_file_generator' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\ToggleLanguageStatusCommand' prestashop.adapter.language.command_handler.bulk_toggle_languages_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\BulkToggleLanguagesStatusHandler' + autoconfigure: true arguments: - '@prestashop.adapter.file.robots_text_file_generator' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\BulkToggleLanguagesStatusCommand' prestashop.adapter.language.command_handler.bulk_delete_languages_handler: class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\BulkDeleteLanguagesHandler' + autoconfigure: true arguments: - '@prestashop.adapter.file.robots_text_file_generator' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\BulkDeleteLanguagesCommand' prestashop.adapter.language.command_handler.delete_language_handler: class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\DeleteLanguageHandler' + autoconfigure: true arguments: - '@prestashop.adapter.file.robots_text_file_generator' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\DeleteLanguageCommand' + + PrestaShop\PrestaShop\Adapter\Language\ContextLanguageProvider: + autowire: true + public: false + arguments: + $context: '@prestashop.adapter.legacy.context' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/manufacturer.yml b/src/PrestaShopBundle/Resources/config/services/adapter/manufacturer.yml index 92e52d0b5eff8..1be890cdb0f23 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/manufacturer.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/manufacturer.yml @@ -11,57 +11,43 @@ services: prestashop.adapter.manufacturer.command_handler.toggle_manufacturer_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\ToggleManufacturerStatusHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\ToggleManufacturerStatusCommand' } + autoconfigure: true prestashop.adapter.manufacturer.command_handler.bulk_toggle_manufacturer_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\BulkToggleManufacturerStatusHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\BulkToggleManufacturerStatusCommand' } + autoconfigure: true prestashop.adapter.manufacturer.command_handler.delete_manufacturer_handler: class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\DeleteManufacturerHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\DeleteManufacturerCommand' } + autoconfigure: true prestashop.adapter.manufacturer.command_handler.delete_manufacturer_logo_image_handler: class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\DeleteManufacturerLogoImageHandler' + autoconfigure: true arguments: - !php/const _PS_MANU_IMG_DIR_ - !php/const _PS_TMP_IMG_DIR_ - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\DeleteManufacturerLogoImageCommand' prestashop.adapter.manufacturer.command_handler.bulk_delete_manufacturer_handler: class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\BulkDeleteManufacturerHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\BulkDeleteManufacturerCommand' } + autoconfigure: true prestashop.adapter.manufacturer.query_handler.get_manufacturer_for_editing: class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\QueryHandler\GetManufacturerForEditingHandler' + autoconfigure: true arguments: - '@prestashop.core.image.parser.image_tag_source_parser' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Query\GetManufacturerForEditing' prestashop.adapter.manufacturer.command_handler.edit_manufacturer_handler: class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\EditManufacturerHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\EditManufacturerCommand' + autoconfigure: true prestashop.adapter.manufacturer.command_handler.add_manufacturer_handler: class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\AddManufacturerHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\AddManufacturerCommand' + autoconfigure: true prestashop.adapter.manufacturer.query_handler.get_manufacturer_for_viewing_handler: class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\QueryHandler\GetManufacturerForViewingHandler' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Manufacturer\Query\GetManufacturerForViewing + autoconfigure: true PrestaShop\PrestaShop\Adapter\Manufacturer\Repository\ManufacturerRepository: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/meta.yml b/src/PrestaShopBundle/Resources/config/services/adapter/meta.yml index 5094f1b53a687..5fe20bf161c61 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/meta.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/meta.yml @@ -12,37 +12,29 @@ services: prestashop.adapter.meta.command_handler.save_meta: class: 'PrestaShop\PrestaShop\Adapter\Meta\CommandHandler\AddMetaHandler' + autoconfigure: true arguments: - '@prestashop.core.hook.dispatcher' - '@validator' - '@=service("prestashop.adapter.legacy.configuration").get("PS_LANG_DEFAULT")' - '@prestashop.adapter.meta.data_provider' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Meta\Command\AddMetaCommand' prestashop.adapter.meta.command_handler.edit_meta: class: 'PrestaShop\PrestaShop\Adapter\Meta\CommandHandler\EditMetaHandler' + autoconfigure: true arguments: - '@validator' - '@prestashop.adapter.meta.data_provider' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Meta\Command\EditMetaCommand' # QUERY HANDLERS prestashop.adapter.meta.query_handler.get_meta_for_editing: class: 'PrestaShop\PrestaShop\Adapter\Meta\QueryHandler\GetMetaForEditingHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Meta\Query\GetMetaForEditing' + autoconfigure: true prestashop.adapter.meta.query_handler.get_pages_for_layout_customization_handler: class: 'PrestaShop\PrestaShop\Adapter\Meta\QueryHandler\GetPagesForLayoutCustomizationHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.id' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Meta\Query\GetPagesForLayoutCustomization' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/module.yml b/src/PrestaShopBundle/Resources/config/services/adapter/module.yml index 9f5753377620f..ae55ff9b142d2 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/module.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/module.yml @@ -4,18 +4,16 @@ services: prestashop.adapter.module.command_handler.bulk_toggle_module_status_handler: class: PrestaShop\PrestaShop\Adapter\Module\CommandHandler\BulkToggleModuleStatusHandler + autoconfigure: true arguments: - - '@prestashop.module.manager' + - '@PrestaShop\PrestaShop\Core\Module\ModuleManager' - '@prestashop.adapter.legacy.logger' - '@prestashop.core.cache.clearer.cache_clearer_chain' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Module\Command\BulkToggleModuleStatusCommand' prestashop.adapter.module.self_configurator: class: PrestaShop\PrestaShop\Adapter\Module\Configuration\ModuleSelfConfigurator arguments: - - "@prestashop.core.admin.module.repository" + - '@PrestaShop\PrestaShop\Core\Module\ModuleRepository' - "@prestashop.adapter.legacy.configuration" - "@doctrine.dbal.default_connection" - "@filesystem" @@ -61,7 +59,7 @@ services: prestashop.adapter.module.payment_module_provider: class: PrestaShop\PrestaShop\Adapter\Module\PaymentModuleListProvider arguments: - - '@prestashop.core.admin.module.repository' + - '@PrestaShop\PrestaShop\Core\Module\ModuleRepository' - '@prestashop.bundle.repository.module' - '@=service("prestashop.adapter.legacy.context").getContext().shop.id' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/notification.yml b/src/PrestaShopBundle/Resources/config/services/adapter/notification.yml index 1000612dbfba7..667da21dc97c9 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/notification.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/notification.yml @@ -5,14 +5,10 @@ services: prestashop.adapter.notification.command_handler.update_employee_notification_last_element_handler: class: 'PrestaShop\PrestaShop\Adapter\Notification\CommandHandler\UpdateEmployeeNotificationLastElementHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Notification\Command\UpdateEmployeeNotificationLastElementCommand' + autoconfigure: true prestashop.adapter.notification.query_handler.get_notification_last_elements_handler: class: 'PrestaShop\PrestaShop\Adapter\Notification\QueryHandler\GetNotificationLastElementsHandler' + autoconfigure: true arguments: - '@prestashop.adapter.notifications.configuration' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Notification\Query\GetNotificationLastElements' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order.yml index faa5b37caa72d..904b39ac01908 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/order.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/order.yml @@ -4,122 +4,95 @@ services: prestashop.adapter.order.command_handler.duplicate_order_cart_handler: class: 'PrestaShop\PrestaShop\Adapter\Order\CommandHandler\DuplicateOrderCartHandler' + autoconfigure: true arguments: - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Order\Command\DuplicateOrderCartCommand' prestashop.adapter.order.command_handler.add_order_from_back_office_handler: class: 'PrestaShop\PrestaShop\Adapter\Order\CommandHandler\AddOrderFromBackOfficeHandler' + autoconfigure: true arguments: - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Order\Command\AddOrderFromBackOfficeCommand' prestashop.adapter.order.command_handler.add_product_to_order_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\AddProductToOrderHandler + autoconfigure: true arguments: - '@translator' - '@prestashop.adapter.context_state_manager' - '@prestashop.adapter.order.amount.updater' - '@prestashop.adapter.order.product_quantity.updater' - '@prestashop.adapter.order.order_detail.updater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\AddProductToOrderCommand prestashop.adapter.order.command_handler.update_order_status_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\UpdateOrderStatusHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\UpdateOrderStatusCommand + autoconfigure: true prestashop.adapter.order.command_handler.update_product_in_order_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\UpdateProductInOrderHandler + autoconfigure: true arguments: - '@prestashop.adapter.order.product_quantity.updater' - '@prestashop.adapter.order.order_detail.updater' - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\UpdateProductInOrderCommand prestashop.adapter.order.command_handler.change_order_delivery_address_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\ChangeOrderDeliveryAddressHandler + autoconfigure: true arguments: - '@prestashop.adapter.order.amount.updater' - '@prestashop.adapter.order.order_detail.updater' - '@prestashop.adapter.context_state_manager' - '@prestashop.adapter.order.product_quantity.updater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderDeliveryAddressCommand prestashop.adapter.order.command_handler.change_order_invoice_address_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\ChangeOrderInvoiceAddressHandler + autoconfigure: true arguments: - '@prestashop.adapter.order.amount.updater' - '@prestashop.adapter.order.order_detail.updater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderInvoiceAddressCommand prestashop.adapter.order.command_handler.change_order_currency_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\ChangeOrderCurrencyHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderCurrencyCommand + autoconfigure: true prestashop.adapter.order.command_handler.add_payment_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\AddPaymentHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Payment\Command\AddPaymentCommand + autoconfigure: true prestashop.adapter.order.command_handler.generate_invoice_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\GenerateInvoiceHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Invoice\Command\GenerateInvoiceCommand + autoconfigure: true prestashop.adapter.order.command_handler.update_order_shipping_details_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\UpdateOrderShippingDetailsHandler + autoconfigure: true arguments: - '@prestashop.adapter.order.amount.updater' - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\UpdateOrderShippingDetailsCommand prestashop.adapter.order.command_handler.delete_cart_rule_from_order_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\DeleteCartRuleFromOrderHandler + autoconfigure: true arguments: - '@prestashop.adapter.order.amount.updater' - '@prestashop.adapter.order.product_quantity.updater' - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\DeleteCartRuleFromOrderCommand prestashop.adapter.order.command_handler.add_cart_rule_to_order_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\AddCartRuleToOrderHandler + autoconfigure: true arguments: - '@prestashop.adapter.order.amount.updater' - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\AddCartRuleToOrderCommand prestashop.adapter.order.command_handler.update_invoice_note_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\UpdateInvoiceNoteHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Invoice\Command\UpdateInvoiceNoteCommand + autoconfigure: true prestashop.adapter.order.command_handler.issue_partial_refund_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\IssuePartialRefundHandler + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - '@prestashop.adapter.order.refund.order_refund_calculator' @@ -127,12 +100,10 @@ services: - '@prestashop.adapter.order.refund.voucher_generator' - '@prestashop.adapter.order.refund.updater' - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\IssuePartialRefundCommand prestashop.adapter.order.command_handler.issue_standard_refund_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\IssueStandardRefundHandler + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - '@prestashop.adapter.order.refund.order_refund_calculator' @@ -140,12 +111,10 @@ services: - '@prestashop.adapter.order.refund.voucher_generator' - '@prestashop.adapter.order.refund.updater' - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\IssueStandardRefundCommand prestashop.adapter.order.command_handler.issue_return_product_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\IssueReturnProductHandler + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - '@prestashop.adapter.order.refund.order_refund_calculator' @@ -153,9 +122,6 @@ services: - '@prestashop.adapter.order.refund.voucher_generator' - '@prestashop.adapter.order.refund.updater' - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\IssueReturnProductCommand prestashop.adapter.order.refund.order_refund_calculator: class: PrestaShop\PrestaShop\Adapter\Order\Refund\OrderRefundCalculator @@ -180,21 +146,18 @@ services: prestashop.adapter.order.command_handler.delete_product_from_order_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\DeleteProductFromOrderHandler + autoconfigure: true arguments: - '@prestashop.adapter.context_state_manager' - '@prestashop.adapter.order.product_quantity.updater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\DeleteProductFromOrderCommand prestashop.adapter.order.command_handler.bulk_change_order_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Order\CommandHandler\BulkChangeOrderStatusHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Order\Command\BulkChangeOrderStatusCommand' + autoconfigure: true prestashop.adapter.order.query_handler.get_order_for_viewing_handler: class: PrestaShop\PrestaShop\Adapter\Order\QueryHandler\GetOrderForViewingHandler + autoconfigure: true arguments: - '@translator' - '@=service("prestashop.adapter.legacy.context").getContext().language.id' @@ -204,55 +167,41 @@ services: - '@prestashop.adapter.order.query_handler.get_order_products_for_viewing_handler' - '@prestashop.adapter.legacy.configuration' - '@prestashop.adapter.address.formatter' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderForViewing prestashop.adapter.order.query_handler.get_order_products_for_viewing_handler: class: PrestaShop\PrestaShop\Adapter\Order\QueryHandler\GetOrderProductsForViewingHandler + autoconfigure: true arguments: - '@prestashop.core.image.parser.image_tag_source_parser' - '@=service("prestashop.adapter.legacy.context").getContext().language.id' - "@prestashop.core.localization.locale.context_locale" - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderProductsForViewing - prestashop.adapter.order.command_handler.resend_order_email_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\ResendOrderEmailHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\ResendOrderEmailCommand + autoconfigure: true prestashop.adapter.order.query_handler.get_order_preview_handler: class: 'PrestaShop\PrestaShop\Adapter\Order\QueryHandler\GetOrderPreviewHandler' + autoconfigure: true arguments: - '@prestashop.core.localization.locale.repository' - "@=service('prestashop.adapter.legacy.context').getContext().language.getLocale()" - '@prestashop.adapter.address.formatter' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderPreview' prestashop.adapter.order.command_handler.send_process_order_email_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\SendProcessOrderEmailHandler + autoconfigure: true arguments: - '@translator' - '@=service("prestashop.adapter.legacy.context").getContext().link' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\SendProcessOrderEmailCommand prestashop.adapter.order.command_handler.cancel_order_product_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\CancelOrderProductHandler + autoconfigure: true arguments: - '@prestashop.adapter.order.product_quantity.updater' - '@logger' - '@translator' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\CancelOrderProductCommand prestashop.adapter.order.order_sibling_provider: class: PrestaShop\PrestaShop\Adapter\Order\OrderSiblingProvider @@ -280,9 +229,7 @@ services: prestashop.adapter.order.command_handler.set_internal_order_note_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\SetInternalOrderNoteHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\SetInternalOrderNoteCommand + autoconfigure: true prestashop.adapter.order.repository.order_repository: class: PrestaShop\PrestaShop\Adapter\Order\Repository\OrderRepository diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order_message.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order_message.yml index 8a958836bda53..4e5fec11330ab 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/order_message.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/order_message.yml @@ -4,33 +4,23 @@ services: prestashop.adapter.order_message.command_handler.add_order_message_handler: class: PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler\AddOrderMessageHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\AddOrderMessageCommand + autoconfigure: true prestashop.adapter.order_message.command_handler.edit_order_message_handler: class: PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler\EditOrderMessageHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\EditOrderMessageCommand + autoconfigure: true prestashop.adapter.order_message.query_handler.get_order_message_for_editing_handler: class: PrestaShop\PrestaShop\Adapter\OrderMessage\QueryHandler\GetOrderMessageForEditingHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Query\GetOrderMessageForEditing + autoconfigure: true prestashop.adapter.order_message.command_handler.delete_order_message_handler: class: PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler\DeleteOrderMessageHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\DeleteOrderMessageCommand + autoconfigure: true prestashop.adapter.order_message.command_handler.bulk_delete_order_message_handler: class: PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler\BulkDeleteOrderMessageHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\BulkDeleteOrderMessageCommand + autoconfigure: true prestashop.adapter.order_message.order_message_provider: class: 'PrestaShop\PrestaShop\Adapter\OrderMessage\OrderMessageProvider' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order_return.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order_return.yml index 6d679c03643fd..b3335b105e1b9 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/order_return.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/order_return.yml @@ -4,9 +4,7 @@ services: prestashop.adapter.order_return.query_handler.get_order_return_for_editing_handler: class: 'PrestaShop\PrestaShop\Adapter\OrderReturn\QueryHandler\GetOrderReturnForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturn\Query\GetOrderReturnForEditing' + autoconfigure: true arguments: - '@prestashop.adapter.order_return.repository.order_return_repository' - '@PrestaShop\PrestaShop\Adapter\Customer\Repository\CustomerRepository' @@ -14,9 +12,7 @@ services: prestashop.adapter.order_return.command_handler.update_order_return_state_handler: class: 'PrestaShop\PrestaShop\Adapter\OrderReturn\CommandHandler\UpdateOrderReturnStateHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturn\Command\UpdateOrderReturnStateCommand' + autoconfigure: true arguments: - '@prestashop.adapter.order_return.repository.order_return_repository' - '@prestashop.adapter.order_return_state.repository.order_return_state_repository' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order_return_state.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order_return_state.yml index ca7adcbe44089..7d53f660562b0 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/order_return_state.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/order_return_state.yml @@ -4,33 +4,23 @@ services: prestashop.adapter.order_return_state.command_handler.add_order_return_state: class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler\AddOrderReturnStateHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\AddOrderReturnStateCommand' + autoconfigure: true prestashop.adapter.order_return_state.query_handler.get_order_return_state_for_editing: class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\QueryHandler\GetOrderReturnStateForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Query\GetOrderReturnStateForEditing' + autoconfigure: true prestashop.adapter.order_return_state.command_handler.edit_order_return_state_handler: class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler\EditOrderReturnStateHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\EditOrderReturnStateCommand' + autoconfigure: true prestashop.adapter.order_return_state.repository.order_return_state_repository: class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\Repository\OrderReturnStateRepository' prestashop.adapter.order_return_state.command_handler.delete_order_return_state_handler: class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler\DeleteOrderReturnStateHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\DeleteOrderReturnStateCommand' + autoconfigure: true prestashop.adapter.order_return_state.command_handler.bulk_delete_order_return_state_handler: class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler\BulkDeleteOrderReturnStateHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\BulkDeleteOrderReturnStateCommand' + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml index afcf58137f047..4a5cd8c111350 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml @@ -4,28 +4,28 @@ services: prestashop.adapter.order_state.command_handler.add_order_state: class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\AddOrderStateHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\AddOrderStateCommand' + autoconfigure: true + arguments: + - '@PrestaShop\PrestaShop\Adapter\File\Uploader\OrderStateFileUploader' prestashop.adapter.order_state.query_handler.get_order_state_for_editing: class: 'PrestaShop\PrestaShop\Adapter\OrderState\QueryHandler\GetOrderStateForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Query\GetOrderStateForEditing' + autoconfigure: true prestashop.adapter.order_state.command_handler.edit_order_state_handler: class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\EditOrderStateHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\EditOrderStateCommand' + autoconfigure: true + arguments: + - '@PrestaShop\PrestaShop\Adapter\File\Uploader\OrderStateFileUploader' prestashop.adapter.order_state.command_handler.delete_order_state_handler: class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\DeleteOrderStateHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\DeleteOrderStateCommand' } + autoconfigure: true prestashop.adapter.order_state.command_handler.bulk_delete_order_state_handler: class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\BulkDeleteOrderStateHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\BulkDeleteOrderStateCommand' } + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\File\Uploader\OrderStateFileUploader: + arguments: + - '@prestashop.core.configuration.upload_size_configuration' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product.yml index 80dbbf45ad95d..2e7021bb8727c 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/product.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/product.yml @@ -5,6 +5,20 @@ services: _defaults: public: true + PrestaShop\PrestaShop\Adapter\Product\CommandHandler\AssignProductToCategoryHandler: + autowire: true + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\Product\QueryHandler\SearchProductsHandler: + autoconfigure: true + arguments: + - '@=service("PrestaShop\\PrestaShop\\Adapter\\LegacyContext").getContext().language.id' + - '@PrestaShop\PrestaShop\Core\Localization\LocaleInterface' + - '@PrestaShop\PrestaShop\Adapter\Tools' + - '@PrestaShop\PrestaShop\Core\Currency\CurrencyDataProviderInterface' + - '@PrestaShop\PrestaShop\Adapter\ContextStateManager' + + # Deprecated in 8.1 PrestaShop\PrestaShop\Adapter\Product\AdminProductDataProvider: decorates: prestashop.core.admin.data_provider.product_interface arguments: @@ -14,23 +28,6 @@ services: public: false deprecated: ~ - prestashop.adapter.admin.data_provider.product: - alias: PrestaShop\PrestaShop\Adapter\Product\AdminProductDataProvider - deprecated: ~ - - PrestaShop\PrestaShop\Adapter\Product\AdminProductDataUpdater: - class: PrestaShop\PrestaShop\Adapter\Product\AdminProductDataUpdater - decorates: prestashop.core.admin.data_updater.product_interface - public: false - arguments: - - '@PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface' - - "@prestashop.static_cache.adapter" - deprecated: ~ - - prestashop.adapter.admin.data_updater.product: - alias: PrestaShop\PrestaShop\Adapter\Product\AdminProductDataUpdater - deprecated: ~ - PrestaShop\PrestaShop\Adapter\Product\AdminProductWrapper: arguments: - "@translator" @@ -39,59 +36,31 @@ services: - '@PrestaShopBundle\Utils\FloatParser' deprecated: ~ - prestashop.adapter.admin.wrapper.product: - alias: PrestaShop\PrestaShop\Adapter\Product\AdminProductWrapper - deprecated: ~ - PrestaShop\PrestaShop\Adapter\Attribute\AdminAttributeGeneratorControllerWrapper: deprecated: ~ - prestashop.adapter.admin.controller.attribute_generator: - alias: PrestaShop\PrestaShop\Adapter\Attribute\AdminAttributeGeneratorControllerWrapper - deprecated: ~ - PrestaShop\PrestaShop\Adapter\Product\FilterCategoriesRequestPurifier: deprecated: ~ - prestashop.adapter.product.filter_categories_request_purifier: - alias: PrestaShop\PrestaShop\Adapter\Product\FilterCategoriesRequestPurifier - deprecated: ~ - PrestaShop\PrestaShop\Adapter\Product\ListParametersUpdater: deprecated: ~ - prestashop.adapter.product.list_parameters_updater: - alias: PrestaShop\PrestaShop\Adapter\Product\ListParametersUpdater - deprecated: ~ - - PrestaShop\PrestaShop\Adapter\Product\CommandHandler\AssignProductToCategoryHandler: - autowire: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\AssignProductToCategoryCommand - - PrestaShop\PrestaShop\Adapter\Product\QueryHandler\SearchProductsHandler: + PrestaShop\PrestaShop\Adapter\Product\AdminProductDataUpdater: + class: PrestaShop\PrestaShop\Adapter\Product\AdminProductDataUpdater + decorates: prestashop.core.admin.data_updater.product_interface + public: false arguments: - - '@=service("PrestaShop\\PrestaShop\\Adapter\\LegacyContext").getContext().language.id' - - '@PrestaShop\PrestaShop\Core\Localization\LocaleInterface' - - '@PrestaShop\PrestaShop\Adapter\Tools' - - '@PrestaShop\PrestaShop\Core\Currency\CurrencyDataProviderInterface' - - '@PrestaShop\PrestaShop\Adapter\ContextStateManager' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProducts + - '@PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface' + - "@prestashop.static_cache.adapter" + deprecated: ~ PrestaShop\PrestaShop\Adapter\Product\QueryHandler\SearchProductsForAssociationHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProductsForAssociation + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\QueryHandler\GetProductIsEnabledHandler: - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Query\GetProductIsEnabled + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Grid\Data\Factory\ProductGridDataFactoryDecorator: arguments: @@ -126,104 +95,76 @@ services: PrestaShop\PrestaShop\Adapter\Product\QueryHandler\GetProductForEditingHandler: autowire: true public: false + autoconfigure: true arguments: $countryId: '@=service("PrestaShop\\PrestaShop\\Adapter\\Configuration").getInt("PS_COUNTRY_DEFAULT")' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Query\GetProductForEditing PrestaShop\PrestaShop\Adapter\Product\CommandHandler\AddProductHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\AddProductCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\CommandHandler\SetProductTagsHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetProductTagsCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\CommandHandler\UpdateProductsPositionsHandler: + autoconfigure: true arguments: - '@prestashop.core.grid.product.position_definition' - '@PrestaShop\PrestaShop\Core\Grid\Position\PositionUpdateFactoryInterface' - '@PrestaShop\PrestaShop\Core\Grid\Position\GridPositionUpdaterInterface' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductsPositionsCommand PrestaShop\PrestaShop\Adapter\Product\CommandHandler\RemoveAllProductTagsHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllProductTagsCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\CommandHandler\SetAssociatedProductCategoriesHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductCategoryUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetAssociatedProductCategoriesCommand PrestaShop\PrestaShop\Adapter\Product\CommandHandler\RemoveAllAssociatedProductCategoriesHandler: autowire: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllAssociatedProductCategoriesCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\CommandHandler\SetCarriersHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetCarriersCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\QueryHandler\GetProductSupplierOptionsHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Query\GetProductSupplierOptions + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Supplier\QueryHandler\GetAssociatedSuppliersHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Query\GetAssociatedSuppliers PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler\SetSuppliersHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\SetSuppliersCommand PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler\SetProductDefaultSupplierHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\SetProductDefaultSupplierCommand PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler\UpdateProductSuppliersHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater' - '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\UpdateProductSuppliersCommand PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler\RemoveAllAssociatedProductSuppliersHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\RemoveAllAssociatedProductSuppliersCommand PrestaShop\PrestaShop\Adapter\Product\Update\ProductAttachmentUpdater: autowire: true @@ -246,43 +187,31 @@ services: PrestaShop\PrestaShop\Adapter\Product\CommandHandler\DeleteProductHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\DeleteProductCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\CommandHandler\BulkDeleteProductHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkDeleteProductCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\CommandHandler\BulkDuplicateProductHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductDuplicator' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkDuplicateProductCommand PrestaShop\PrestaShop\Adapter\Product\CommandHandler\BulkUpdateProductStatusHandler: autowire: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkUpdateProductStatusCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Attachment\CommandHandler\SetAssociatedProductAttachmentsHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductAttachmentUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Attachment\Command\SetAssociatedProductAttachmentsCommand PrestaShop\PrestaShop\Adapter\Product\Attachment\CommandHandler\RemoveAllAssociatedProductAttachmentsHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductAttachmentUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Attachment\Command\RemoveAllAssociatedProductAttachmentsCommand PrestaShop\PrestaShop\Adapter\Product\Validate\ProductSupplierValidator: autowire: true @@ -305,25 +234,19 @@ services: public: false PrestaShop\PrestaShop\Adapter\Product\CommandHandler\SetRelatedProductsHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\RelatedProductsUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetRelatedProductsCommand PrestaShop\PrestaShop\Adapter\Product\QueryHandler\GetRelatedProductsHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Query\GetRelatedProducts + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\CommandHandler\RemoveAllRelatedProductsHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\RelatedProductsUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllRelatedProductsCommand PrestaShop\PrestaShop\Adapter\Product\Repository\TagRepository: arguments: @@ -340,11 +263,9 @@ services: public: false PrestaShop\PrestaShop\Adapter\Product\CommandHandler\DuplicateProductHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductDuplicator' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\DuplicateProductCommand PrestaShop\PrestaShop\Adapter\Product\Update\ProductDuplicator: autowire: true @@ -354,11 +275,9 @@ services: $productImageSystemPathFactory: '@prestashop.adapter.product.image.product_image_filesystem_path_factory' PrestaShop\PrestaShop\Adapter\Product\CommandHandler\UpdateProductTypeHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductTypeUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductTypeCommand PrestaShop\PrestaShop\Adapter\Product\Update\ProductIndexationUpdater: arguments: @@ -376,25 +295,19 @@ services: PrestaShop\PrestaShop\Adapter\Product\Shop\CommandHandler\SetProductShopsHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Shop\Command\SetProductShopsCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\CommandHandler\UpdateProductHandler: autowire: true public: false + autoconfigure: true arguments: $productUpdatablePropertyFiller: '@PrestaShop\PrestaShop\Adapter\Product\Update\Filler\ProductFiller' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductCommand PrestaShop\PrestaShop\Adapter\Product\Stock\CommandHandler\UpdateProductStockAvailableHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Stock\Command\UpdateProductStockAvailableCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Update\Filler\ProductFiller: arguments: diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_combination.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_combination.yml index a756081305e9f..88cc9cf54de30 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_combination.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_combination.yml @@ -3,49 +3,37 @@ services: public: true PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\GenerateProductCombinationsHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Create\CombinationCreator' - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\GenerateProductCombinationsCommand PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\UpdateCombinationHandler: autowire: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\UpdateCombinationStockAvailableHandler: autowire: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationStockAvailableCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Combination\QueryHandler\GetCombinationForEditingHandler: autowire: true public: false + autoconfigure: true arguments: $contextLanguageId: "@=service('prestashop.adapter.legacy.context').getContext().language.id" - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationForEditing PrestaShop\PrestaShop\Adapter\Product\Combination\QueryHandler\GetEditableCombinationsListHandler: autowire: true public: false + autoconfigure: true arguments: $combinationQueryBuilder: '@PrestaShop\PrestaShop\Core\Grid\Query\ProductCombinationQueryBuilder' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetEditableCombinationsList PrestaShop\PrestaShop\Adapter\Product\Combination\QueryHandler\SearchCombinationsForAssociationHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\SearchCombinationsForAssociation + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Combination\Validate\CombinationValidator: ~ @@ -82,61 +70,45 @@ services: - '%database_prefix%' PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\UpdateCombinationSuppliersHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Repository\CombinationRepository' - '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository' - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationSuppliersCommand PrestaShop\PrestaShop\Adapter\Product\Combination\QueryHandler\GetCombinationSuppliersHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository' - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Repository\CombinationRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationSuppliers PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\SetCombinationImagesHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationImagesUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\SetCombinationImagesCommand PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\RemoveAllCombinationImagesHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationImagesUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\RemoveAllCombinationImagesCommand PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\DeleteCombinationHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationDeleter' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\DeleteCombinationCommand PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\BulkDeleteCombinationHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationDeleter' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\BulkDeleteCombinationCommand PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryHandler\SearchProductCombinationsHandler: autowire: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\SearchProductCombinations + autoconfigure: true PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryHandler\GetCombinationIdsHandler: autowire: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationIds + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Combination\Update\Filler\CombinationFiller: arguments: diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_customization.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_customization.yml index bd92cab05b0c6..63357e4c4ae2a 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_customization.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_customization.yml @@ -19,23 +19,17 @@ services: public: false PrestaShop\PrestaShop\Adapter\Product\Customization\QueryHandler\GetProductCustomizationFieldsHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Customization\Repository\CustomizationFieldRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Customization\Query\GetProductCustomizationFields PrestaShop\PrestaShop\Adapter\Product\Customization\CommandHandler\SetProductCustomizationFieldsHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Customization\Repository\CustomizationFieldRepository' - '@PrestaShop\PrestaShop\Adapter\Product\Customization\Update\ProductCustomizationFieldUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Customization\Command\SetProductCustomizationFieldsCommand PrestaShop\PrestaShop\Adapter\Product\Customization\CommandHandler\RemoveAllCustomizationFieldsFromProductHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Customization\Command\RemoveAllCustomizationFieldsFromProductCommand + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_feature_value.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_feature_value.yml index 72abbecfd26a2..b2f8e621ecfe6 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_feature_value.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_feature_value.yml @@ -3,25 +3,19 @@ services: public: true PrestaShop\PrestaShop\Adapter\Product\FeatureValue\CommandHandler\SetProductFeatureValuesHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\FeatureValue\Update\ProductFeatureValueUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Command\SetProductFeatureValuesCommand PrestaShop\PrestaShop\Adapter\Product\FeatureValue\CommandHandler\RemoveAllFeatureValuesFromProductHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\FeatureValue\Update\ProductFeatureValueUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Command\RemoveAllFeatureValuesFromProductCommand PrestaShop\PrestaShop\Adapter\Product\FeatureValue\QueryHandler\GetProductFeatureValuesHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Query\GetProductFeatureValues PrestaShop\PrestaShop\Adapter\Product\FeatureValue\Update\ProductFeatureValueUpdater: autowire: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_image.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_image.yml index 8fd704e727e1a..f9cf25c76dc0c 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_image.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_image.yml @@ -5,54 +5,40 @@ services: PrestaShop\PrestaShop\Adapter\Product\Image\CommandHandler\AddProductImageHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\AddProductImageCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Image\CommandHandler\UpdateProductImageHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository' - '@PrestaShop\PrestaShop\Adapter\Product\Image\Update\ProductImageUpdater' - '@PrestaShop\PrestaShop\Adapter\Product\Image\Uploader\ProductImageUploader' - '@PrestaShop\PrestaShop\Adapter\Image\ProductImageFileValidator' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\UpdateProductImageCommand PrestaShop\PrestaShop\Adapter\Product\Image\CommandHandler\DeleteProductImageHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Image\Update\ProductImageUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\DeleteProductImageCommand PrestaShop\PrestaShop\Adapter\Product\Image\CommandHandler\SetProductImagesForAllShopHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\SetProductImagesForAllShopCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Image\QueryHandler\GetProductImagesHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetProductImages + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Image\QueryHandler\GetShopProductImagesHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetShopProductImages + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Image\QueryHandler\GetProductImageHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetProductImage + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Image\Validate\ProductImageValidator: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_pack.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_pack.yml index 6620d43b7b762..75a637081d597 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_pack.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_pack.yml @@ -12,25 +12,19 @@ services: public: false PrestaShop\PrestaShop\Adapter\Product\Pack\CommandHandler\SetPackProductsHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Pack\Update\ProductPackUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Pack\Command\SetPackProductsCommand PrestaShop\PrestaShop\Adapter\Product\Pack\CommandHandler\RemoveAllProductsFromPackHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Pack\Update\ProductPackUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Pack\Command\RemoveAllProductsFromPackCommand PrestaShop\PrestaShop\Adapter\Product\Pack\QueryHandler\GetPackedProductsHandler: autowire: true public: false + autoconfigure: true arguments: $defaultLangId: '@=service("prestashop.adapter.legacy.context").getContext().language.id' $translator: '@translator' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Pack\Query\GetPackedProducts diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_specific_prices.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_specific_prices.yml index 3b4a92122d60d..c1e461dd94947 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_specific_prices.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_specific_prices.yml @@ -3,56 +3,42 @@ services: public: true PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\QueryHandler\GetSpecificPriceListHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository' - '@PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository' - '@PrestaShop\PrestaShop\Core\Product\Combination\NameBuilder\CombinationNameBuilderInterface' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Query\GetSpecificPriceList PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\QueryHandler\GetSpecificPriceForEditingHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository' - '@PrestaShop\PrestaShop\Adapter\Customer\Repository\CustomerRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Query\GetSpecificPriceForEditing PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\AddSpecificPriceHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\AddSpecificPriceCommand PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\EditSpecificPriceHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\EditSpecificPriceCommand PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\DeleteSpecificPriceHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\DeleteSpecificPriceCommand PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\SetSpecificPricePriorityForProductHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\SetSpecificPricePriorityForProductCommand PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\RemoveSpecificPricePriorityForProductHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\RemoveSpecificPricePriorityForProductCommand PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater: public: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_stock.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_stock.yml index 886f026e61c76..e8abef4d9ecd7 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_stock.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_stock.yml @@ -21,22 +21,18 @@ services: - '@PrestaShop\PrestaShop\Core\ConfigurationInterface' PrestaShop\PrestaShop\Adapter\Product\Stock\QueryHandler\GetProductStockMovementsHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Stock\Repository\StockAvailableRepository' - '@PrestaShop\PrestaShop\Adapter\Product\Stock\Repository\StockMovementRepository' - '@translator' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Stock\Query\GetProductStockMovements PrestaShop\PrestaShop\Adapter\Product\Stock\QueryHandler\GetCombinationStockMovementsHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Stock\Repository\StockAvailableRepository' - '@PrestaShop\PrestaShop\Adapter\Product\Stock\Repository\StockMovementRepository' - '@translator' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Stock\Query\GetCombinationStockMovements PrestaShop\PrestaShop\Adapter\Product\Stock\Update\ProductStockUpdater: autowire: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_virtual_product.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_virtual_product.yml index 24a32ebd09961..8468854cf0054 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_virtual_product.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_virtual_product.yml @@ -3,19 +3,15 @@ services: public: true PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\CommandHandler\AddVirtualProductFileHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\AddVirtualProductFileCommand PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\CommandHandler\UpdateVirtualProductFileHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater' - '@PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Repository\VirtualProductFileRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\UpdateVirtualProductFileCommand PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater: autowire: true @@ -37,8 +33,6 @@ services: - !php/const _PS_DOWNLOAD_DIR_ PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\CommandHandler\DeleteVirtualProductFileHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\DeleteVirtualProductFileCommand diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/profile.yml b/src/PrestaShopBundle/Resources/config/services/adapter/profile.yml index db16e18a38193..7d2b6c68c1905 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/profile.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/profile.yml @@ -5,52 +5,41 @@ services: prestashop.adapter.profile.command_handler.delete_profile: class: 'PrestaShop\PrestaShop\Adapter\Profile\CommandHandler\DeleteProfileHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.configuration").get("_PS_ADMIN_PROFILE_")' - '@prestashop.adapter.data_provider.employee' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\DeleteProfileCommand' prestashop.adapter.profile.command_handler.bulk_delete_profile: class: 'PrestaShop\PrestaShop\Adapter\Profile\CommandHandler\BulkDeleteProfileHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.configuration").get("_PS_ADMIN_PROFILE_")' - '@prestashop.adapter.data_provider.employee' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\BulkDeleteProfileCommand' prestashop.adapter.profile.command_handler.add_profile_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\CommandHandler\AddProfileHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\AddProfileCommand' + autoconfigure: true prestashop.adapter.profile.command_handler.edit_profile_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\CommandHandler\EditProfileHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\EditProfileCommand' + autoconfigure: true prestashop.adapter.profile.query_handler.get_profile_for_editing_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\QueryHandler\GetProfileForEditingHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.employee.avatar_provider").getDefaultAvatarUrl()' - '@prestashop.core.image.parser.image_tag_source_parser' - !php/const _PS_PROFILE_IMG_DIR_ - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Query\GetProfileForEditing' prestashop.adapter.profile.permission.command_handler.update_tab_permissions_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\Permission\CommandHandler\UpdateTabPermissionsHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Command\UpdateTabPermissionsCommand' + autoconfigure: true prestashop.adapter.profile.permission.query_handler.get_permissions_for_configuration_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\Permission\QueryHandler\GetPermissionsForConfigurationHandler' + autoconfigure: true arguments: - '@security.authorization_checker' - '@=service("prestashop.adapter.legacy.context").getContext().language.id' @@ -58,12 +47,7 @@ services: - 'AdminLogin' - 'AdminQuickAccesses' - 'AdminTabs' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Query\GetPermissionsForConfiguration' prestashop.adapter.profile.permission.command_handler.update_module_permissions_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\Permission\CommandHandler\UpdateModulePermissionsHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Command\UpdateModulePermissionsCommand' + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/quick_access.yml b/src/PrestaShopBundle/Resources/config/services/adapter/quick_access.yml new file mode 100644 index 0000000000000..55b1fd57e46c9 --- /dev/null +++ b/src/PrestaShopBundle/Resources/config/services/adapter/quick_access.yml @@ -0,0 +1,11 @@ +services: + _defaults: + public: false + autowire: true + bind: + $dbPrefix: '%database_prefix%' + + PrestaShop\PrestaShop\Core\QuickAccess\QuickAccessRepositoryInterface: + alias: PrestaShop\PrestaShop\Adapter\QuickAccess\Repository\QuickAccessRepository + + PrestaShop\PrestaShop\Adapter\QuickAccess\Repository\QuickAccessRepository: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/search_engine.yml b/src/PrestaShopBundle/Resources/config/services/adapter/search_engine.yml index 001ed1ce3d2a6..bfc6e8ecf1916 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/search_engine.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/search_engine.yml @@ -5,31 +5,21 @@ services: # Command Handlers prestashop.adapter.search_engine.command_handler.add_search_engine_handler: class: PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler\AddSearchEngineHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\AddSearchEngineCommand + autoconfigure: true prestashop.adapter.search_engine.command_handler.bulk_delete_search_engine_handler: class: PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler\BulkDeleteSearchEngineHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\BulkDeleteSearchEngineCommand + autoconfigure: true prestashop.adapter.search_engine.command_handler.delete_search_engine_handler: class: PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler\DeleteSearchEngineHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\DeleteSearchEngineCommand + autoconfigure: true prestashop.adapter.search_engine.command_handler.edit_search_engine_handler: class: PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler\EditSearchEngineHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\EditSearchEngineCommand + autoconfigure: true # Query Handlers prestashop.adapter.search_engine.query_handler.get_search_engine_for_editing_handler: class: PrestaShop\PrestaShop\Adapter\SearchEngine\QueryHandler\GetSearchEngineForEditingHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Query\GetSearchEngineForEditing + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/security.yml b/src/PrestaShopBundle/Resources/config/services/adapter/security.yml index 5df6c5eec6bb2..1b64152380aa4 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/security.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/security.yml @@ -4,51 +4,39 @@ services: prestashop.adapter.security.command_handler.delete_customer_session_handler: class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\DeleteCustomerSessionHandler' + autoconfigure: true arguments: - '@prestashop.adapter.security.repository.customer_session_repository' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\DeleteCustomerSessionCommand' prestashop.adapter.security.command_handler.clear_customer_session_handler: class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\ClearOutdatedCustomerSessionHandler' + autoconfigure: true arguments: - '@prestashop.adapter.security.repository.customer_session_repository' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\ClearOutdatedCustomerSessionCommand' prestashop.adapter.security.command_handler.delete_employee_session_handler: class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\DeleteEmployeeSessionHandler' + autoconfigure: true arguments: - '@prestashop.adapter.security.repository.employee_session_repository' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\DeleteEmployeeSessionCommand' prestashop.adapter.security.command_handler.clear_employee_session_handler: class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\ClearOutdatedEmployeeSessionHandler' + autoconfigure: true arguments: - '@prestashop.adapter.security.repository.employee_session_repository' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\ClearOutdatedEmployeeSessionCommand' prestashop.adapter.security.command_handler.bulk_delete_employees_sessions_handler: class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\BulkDeleteEmployeeSessionsHandler' + autoconfigure: true arguments: - '@prestashop.adapter.security.repository.employee_session_repository' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\BulkDeleteEmployeeSessionsCommand' prestashop.adapter.security.command_handler.bulk_delete_customers_sessions_handler: class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\BulkDeleteCustomerSessionsHandler' + autoconfigure: true arguments: - '@prestashop.adapter.security.repository.customer_session_repository' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\BulkDeleteCustomerSessionsCommand' prestashop.adapter.security.repository.customer_session_repository: class: 'PrestaShop\PrestaShop\Adapter\Session\Repository\CustomerSessionRepository' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/services.yml b/src/PrestaShopBundle/Resources/config/services/adapter/services.yml index 5757b327fc17e..f69fb0c4ed789 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/services.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/services.yml @@ -75,8 +75,13 @@ services: class: PrestaShop\PrestaShop\Adapter\Product\PriceFormatter # Other adapters + PrestaShop\PrestaShop\Adapter\Shop\Context: + public: false + prestashop.adapter.shop.context: - class: PrestaShop\PrestaShop\Adapter\Shop\Context + alias: PrestaShop\PrestaShop\Adapter\Shop\Context + public: true + deprecated: ~ PrestaShop\PrestaShop\Core\Multistore\MultistoreContextCheckerInterface: '@prestashop.adapter.shop.context' PrestaShop\PrestaShop\Core\Shop\ShopContextInterface: '@prestashop.adapter.shop.context' @@ -85,10 +90,6 @@ services: PrestaShop\PrestaShop\Adapter\ImageManager: arguments: [ '@PrestaShop\PrestaShop\Adapter\LegacyContext' ] - prestashop.adapter.image_manager: - alias: PrestaShop\PrestaShop\Adapter\ImageManager - deprecated: ~ - prestashop.core.module.updater: class: PrestaShop\PrestaShop\Adapter\Module\ModuleDataUpdater @@ -100,7 +101,6 @@ services: - '@PrestaShop\PrestaShop\Adapter\Tools' - "@prestashop.adapter.data_provider.product" - "@prestashop.adapter.data_provider.supplier" - - "@prestashop.adapter.data_provider.warehouse" - "@prestashop.adapter.data_provider.feature" - "@prestashop.adapter.data_provider.pack" - "@prestashop.adapter.shop.context" @@ -115,7 +115,7 @@ services: arguments: - '@prestashop.service.translation' - '@=service("PrestaShop\\PrestaShop\\Adapter\\LegacyContext").getContext().link' - - '@prestashop.core.admin.module.repository' + - '@PrestaShop\PrestaShop\Core\Module\ModuleRepository' prestashop.adapter.shop.shop_url: class: 'PrestaShop\PrestaShop\Adapter\Shop\ShopUrlDataProvider' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/shop.yml b/src/PrestaShopBundle/Resources/config/services/adapter/shop.yml index 2d5c0186cc130..68e7ba04e3cb4 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/shop.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/shop.yml @@ -4,12 +4,11 @@ services: prestashop.adapter.shop.command_handler.upload_logos_handler: class: 'PrestaShop\PrestaShop\Adapter\Shop\CommandHandler\UploadLogosHandler' + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - '@prestashop.core.shop.logo_uploader' - '@prestashop.core.hook.dispatcher' - tags: - - { name: tactician.handler, command: 'PrestaShop\PrestaShop\Core\Domain\Shop\Command\UploadLogosCommand' } prestashop.adapter.shop.url.base_url_provider: class: 'PrestaShop\PrestaShop\Adapter\Shop\Url\BaseUrlProvider' @@ -48,21 +47,17 @@ services: prestashop.adapter.shop.query_handler.get_logos_paths_handler: class: 'PrestaShop\PrestaShop\Adapter\Shop\QueryHandler\GetLogosPathsHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.configuration").get("_PS_IMG_")' - '@=service("prestashop.adapter.legacy.configuration").get("_PS_IMG_DIR_")' - tags: - - name: 'tactician.handler' - command: PrestaShop\PrestaShop\Core\Domain\Shop\Query\GetLogosPaths prestashop.adapter.shop.query_handler.search_shops_handler: class: 'PrestaShop\PrestaShop\Adapter\Shop\QueryHandler\SearchShopsHandler' + autoconfigure: true arguments: - '@prestashop.core.admin.shop.repository' - '@prestashop.core.admin.shop_group.repository' - tags: - - name: 'tactician.handler' - command: PrestaShop\PrestaShop\Core\Domain\Shop\Query\SearchShops prestashop.adapter.shop.url.product_image_folder_provider: class: 'PrestaShop\PrestaShop\Adapter\Shop\Url\ImageFolderProvider' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/sql_manager.yml b/src/PrestaShopBundle/Resources/config/services/adapter/sql_manager.yml index e6d77133de820..1b359991a4603 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/sql_manager.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/sql_manager.yml @@ -8,49 +8,41 @@ services: # Command handlers prestashop.adapter.sql_manager.command_handler.add_request_sql: class: 'PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler\AddSqlRequestHandler' + autoconfigure: true arguments: - '@prestashop.adapter.sql_manager.sql_query_validator' - '@translator' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\AddSqlRequestCommand' } prestashop.adapter.sql_manager.command_handler.edit_request_sql: class: 'PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler\EditSqlRequestHandler' + autoconfigure: true arguments: - '@prestashop.adapter.sql_manager.sql_query_validator' - '@translator' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\EditSqlRequestCommand' } prestashop.adapter.sql_manager.command_handler.delete_request_sql: class: 'PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler\DeleteSqlRequestHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\DeleteSqlRequestCommand' } + autoconfigure: true prestashop.adapter.sql_manager.command_handler.bulk_delete_request_sql: class: 'PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler\BulkDeleteSqlRequestHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\BulkDeleteSqlRequestCommand' } + autoconfigure: true # Query handlers prestashop.adapter.sql_manager.query_handler.get_request_sql_for_editing: class: 'PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler\GetSqlRequestForEditingHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestForEditing' } + autoconfigure: true prestashop.adapter.sql_manager.query_handler.get_request_sql_execution_result: class: 'PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler\GetSqlRequestExecutionResultHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestExecutionResult' } + autoconfigure: true prestashop.adapter.sql_manager.query_handler.get_database_tables_list: class: 'PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler\GetDatabaseTablesListHandler' + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetDatabaseTablesList' } prestashop.adapter.sql_manager.query_handler.get_database_table_fields_list: class: 'PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler\GetDatabaseTableFieldsListHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetDatabaseTableFieldsList' } + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/state.yml b/src/PrestaShopBundle/Resources/config/services/adapter/state.yml index 39ad090a40587..63311e7be8b86 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/state.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/state.yml @@ -4,42 +4,28 @@ services: prestashop.adapter.state.command_handler.create_state_handler: class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\AddStateHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\AddStateCommand' + autoconfigure: true prestashop.adapter.state.command_handler.edit_state_handler: class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\EditStateHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\EditStateCommand' + autoconfigure: true prestashop.adapter.state.command_handler.toggle_state_status_handler: class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\ToggleStateStatusHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\ToggleStateStatusCommand' + autoconfigure: true prestashop.adapter.state.query_handler.get_state_for_editing_handler: class: 'PrestaShop\PrestaShop\Adapter\State\QueryHandler\GetStateForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\State\Query\GetStateForEditing' + autoconfigure: true prestashop.adapter.state.command_handler.delete_state_handler: class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\DeleteStateHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\DeleteStateCommand' + autoconfigure: true prestashop.adapter.state.command_handler.bulk_delete_state_handler: class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\BulkDeleteStateHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\BulkDeleteStateCommand' + autoconfigure: true prestashop.adapter.state.command_handler.bulk_toggle_state_status_handler: class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\BulkToggleStateStatusHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\BulkToggleStateStatusCommand' + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/store.yml b/src/PrestaShopBundle/Resources/config/services/adapter/store.yml index 661eb9da1b6ad..ffcd1ac7b5d4e 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/store.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/store.yml @@ -11,38 +11,33 @@ services: prestashop.adapter.store.query_handler.get_store_for_editing: class: 'PrestaShop\PrestaShop\Adapter\Store\QueryHandler\GetStoreForEditingHandler' + autoconfigure: true arguments: - '@prestashop.core.domain.store.repository.store_repository' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Store\Query\GetStoreForEditing' } prestashop.adapter.store.command_handler.toggle_store_status: class: 'PrestaShop\PrestaShop\Adapter\Store\CommandHandler\ToggleStoreStatusHandler' + autoconfigure: true arguments: - '@prestashop.core.domain.store.repository.store_repository' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Command\ToggleStoreStatusCommand } prestashop.adapter.store.command_handler.bulk_toggle_store_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Store\CommandHandler\BulkUpdateStoreStatusHandler' + autoconfigure: true arguments: - '@prestashop.core.domain.store.repository.store_repository' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Command\BulkUpdateStoreStatusCommand } prestashop.adapter.store.command_handler.delete_store: class: 'PrestaShop\PrestaShop\Adapter\Store\CommandHandler\DeleteStoreHandler' + autoconfigure: true arguments: - '@prestashop.core.domain.store.repository.store_repository' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Command\DeleteStoreCommand } prestashop.adapter.store.command_handler.bulk_delete_store_handler: class: 'PrestaShop\PrestaShop\Adapter\Store\CommandHandler\BulkDeleteStoreHandler' + autoconfigure: true arguments: - '@prestashop.core.domain.store.repository.store_repository' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Command\BulkDeleteStoreCommand } # deprecated prestashop.core.domain.store.repository.store_repository: diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml b/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml index 48e29eb47a986..e14ee787a8ca2 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml @@ -13,6 +13,7 @@ services: prestashop.adapter.supplier.supplier_order_validator: class: 'PrestaShop\PrestaShop\Adapter\Supplier\SupplierOrderValidator' + deprecated: ~ # Command handlers @@ -20,7 +21,6 @@ services: class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\AbstractDeleteSupplierHandler' abstract: true arguments: - - '@prestashop.adapter.supplier.supplier_order_validator' - '@prestashop.adapter.supplier.provider.supplier_address' - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater' - '%database_prefix%' @@ -28,74 +28,54 @@ services: prestashop.adapter.supplier.command_handler.toggle_supplier_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\ToggleSupplierStatusHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\ToggleSupplierStatusCommand' + autoconfigure: true prestashop.adapter.supplier.command_handler.delete_supplier_handler: class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\DeleteSupplierHandler' parent: 'prestashop.adapter.supplier.command_handler.abstract_delete_supplier_handler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\DeleteSupplierCommand' + autoconfigure: true public: true prestashop.adapter.supplier.command_handler.delete_supplier_logo_image_handler: class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\DeleteSupplierLogoImageHandler' + autoconfigure: true arguments: - !php/const _PS_SUPP_IMG_DIR_ - !php/const _PS_TMP_IMG_DIR_ - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\DeleteSupplierLogoImageCommand' prestashop.adapter.supplier.command_handler.bulk_delete_supplier_handler: class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\BulkDeleteSupplierHandler' parent: 'prestashop.adapter.supplier.command_handler.abstract_delete_supplier_handler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkDeleteSupplierCommand' + autoconfigure: true public: true prestashop.adapter.supplier.command_handler.bulk_disable_supplier_handler: class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\BulkDisableSupplierHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkDisableSupplierCommand' + autoconfigure: true prestashop.adapter.supplier.command_handler.bulk_enable_supplier_handler: class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\BulkEnableSupplierHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkEnableSupplierCommand' + autoconfigure: true prestashop.adapter.supplier.query_handler.get_supplier_for_viewing_handler: class: 'PrestaShop\PrestaShop\Adapter\Supplier\QueryHandler\GetSupplierForViewingHandler' + autoconfigure: true arguments: - '@prestashop.core.localization.locale.context_locale' - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Query\GetSupplierForViewing' prestashop.adapter.supplier.command_handler.add_supplier_handler: class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\AddSupplierHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\AddSupplierCommand' + autoconfigure: true prestashop.adapter.supplier.query_handler.get_supplier_for_editing: class: 'PrestaShop\PrestaShop\Adapter\Supplier\QueryHandler\GetSupplierForEditingHandler' + autoconfigure: true arguments: - '@prestashop.core.image.parser.image_tag_source_parser' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Query\GetSupplierForEditing' prestashop.adapter.supplier.command_handler.edit_supplier_handler: class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\EditSupplierHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\EditSupplierCommand' + autoconfigure: true PrestaShop\PrestaShop\Adapter\Supplier\Repository\SupplierRepository: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/tab.yml b/src/PrestaShopBundle/Resources/config/services/adapter/tab.yml index 086cafad801ef..2c79a2c7f562d 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/tab.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/tab.yml @@ -4,7 +4,6 @@ services: prestashop.adapter.tab.command_handler.update_tab_status_by_class_name_command_handler: class: PrestaShop\PrestaShop\Adapter\Tab\CommandHandler\UpdateTabStatusByClassNameHandler + autoconfigure: true arguments: - '@doctrine.orm.entity_manager' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tab\Command\UpdateTabStatusByClassNameCommand' } diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml b/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml index da64cc9f2b05a..4b4a4828c974e 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml @@ -9,45 +9,31 @@ services: arguments: - '@PrestaShop\PrestaShop\Adapter\TaxRulesGroup\Repository\TaxRulesGroupRepository' - prestashop.adapter.tax.tax_computer: - alias: PrestaShop\PrestaShop\Adapter\Tax\TaxComputer - deprecated: ~ - # Command handlers prestashop.adapter.tax.command_handler.delete_tax_handler: class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\DeleteTaxHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\DeleteTaxCommand' } + autoconfigure: true prestashop.adapter.tax.command_handler.toggle_tax_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\ToggleTaxStatusHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\ToggleTaxStatusCommand' } + autoconfigure: true prestashop.adapter.tax.command_handler.bulk_toggle_tax_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\BulkToggleTaxStatusHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\BulkToggleTaxStatusCommand' } + autoconfigure: true prestashop.adapter.tax.command_handler.bulk_delete_tax_handler: class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\BulkDeleteTaxHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\BulkDeleteTaxCommand' } + autoconfigure: true prestashop.adapter.tax.query_handler.get_tax_for_editing_handler: class: 'PrestaShop\PrestaShop\Adapter\Tax\QueryHandler\GetTaxForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Query\GetTaxForEditing' + autoconfigure: true prestashop.adapter.tax.command_handler.edit_tax_handler: class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\EditTaxHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\EditTaxCommand' + autoconfigure: true prestashop.adapter.tax.command_handler.add_tax_handler: class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\AddTaxHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\AddTaxCommand' + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml b/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml index 4681ec56f5ac0..88a218eebb042 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml @@ -4,45 +4,31 @@ services: PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\AddTaxRulesGroupHandler: autowire: true - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\AddTaxRulesGroupCommand' + autoconfigure: true PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\EditTaxRulesGroupHandler: autowire: true - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\EditTaxRulesGroupCommand' + autoconfigure: true prestashop.adapter.tax_rules_group.command_handler.delete_tax_rules_group_handler: class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\DeleteTaxRulesGroupHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\DeleteTaxRulesGroupCommand' + autoconfigure: true prestashop.adapter.tax_rules_group.command_handler.bulk_delete_tax_rules_group_handler: class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\BulkDeleteTaxRulesGroupHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\BulkDeleteTaxRulesGroupCommand' + autoconfigure: true prestashop.adapter.tax_rules_group.command_handler.bulk_set_tax_rules_group_status_handler: class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\BulkSetTaxRulesGroupStatusHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\BulkSetTaxRulesGroupStatusCommand' + autoconfigure: true prestashop.adapter.tax_rules_group.query_handler.get_tax_rules_group_for_editing: class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\QueryHandler\GetTaxRulesGroupForEditingHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Query\GetTaxRulesGroupForEditing' + autoconfigure: true prestashop.adapter.tax_rules_group.command_handler.set_tax_rules_group_status_handler: class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\SetTaxRulesGroupStatusHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\SetTaxRulesGroupStatusCommand' + autoconfigure: true PrestaShop\PrestaShop\Adapter\TaxRulesGroup\Repository\TaxRulesGroupRepository: arguments: @@ -51,7 +37,3 @@ services: - '@PrestaShop\PrestaShop\Adapter\TaxRulesGroup\Validate\TaxRulesGroupValidator' PrestaShop\PrestaShop\Adapter\TaxRulesGroup\Validate\TaxRulesGroupValidator: ~ - - prestashop.adapter.tax_rules_group.repository.tax_rules_group_repository: - alias: PrestaShop\PrestaShop\Adapter\TaxRulesGroup\Repository\TaxRulesGroupRepository - deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/title.yml b/src/PrestaShopBundle/Resources/config/services/adapter/title.yml index 1aa157cddd615..afcb28f58b840 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/title.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/title.yml @@ -4,15 +4,11 @@ services: PrestaShop\PrestaShop\Adapter\Title\CommandHandler\AddTitleHandler: autowire: true - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\AddTitleCommand' + autoconfigure: true PrestaShop\PrestaShop\Adapter\Title\CommandHandler\EditTitleHandler: autowire: true - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\EditTitleCommand' + autoconfigure: true prestashop.adapter.title.title_image_thumbnail_provider: class: 'PrestaShop\PrestaShop\Adapter\Title\TitleImageThumbnailProvider' @@ -24,22 +20,16 @@ services: prestashop.adapter.title.command_handler.delete_title_handler: class: 'PrestaShop\PrestaShop\Adapter\Title\CommandHandler\DeleteTitleHandler' autowire: true - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\DeleteTitleCommand' + autoconfigure: true prestashop.adapter.title.command_handler.bulk_delete_title_handler: class: 'PrestaShop\PrestaShop\Adapter\Title\CommandHandler\BulkDeleteTitleHandler' autowire: true - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\BulkDeleteTitleCommand' + autoconfigure: true PrestaShop\PrestaShop\Adapter\Title\QueryHandler\GetTitleForEditingHandler: autowire: true - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Title\Query\GetTitleForEditing' + autoconfigure: true PrestaShop\PrestaShop\Adapter\Title\Repository\TitleRepository: autowire: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml b/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml index 14ad8b58e51cb..607730bfa5906 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml @@ -12,18 +12,12 @@ services: prestashop.adapter.webservice.query_handler.get_webservice_key_for_editing_handler: class: 'PrestaShop\PrestaShop\Adapter\Webservice\QueryHandler\GetWebserviceKeyForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Webservice\Query\GetWebserviceKeyForEditing' + autoconfigure: true prestashop.adapter.webservice.command_handler.add_webservice_key_handler: class: 'PrestaShop\PrestaShop\Adapter\Webservice\CommandHandler\AddWebserviceKeyHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Webservice\Command\AddWebserviceKeyCommand' + autoconfigure: true prestashop.adapter.webservice.command_handler.edit_webservice_key_handler: class: 'PrestaShop\PrestaShop\Adapter\Webservice\CommandHandler\EditWebserviceKeyHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Webservice\Command\EditWebserviceKeyCommand' + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/zone.yml b/src/PrestaShopBundle/Resources/config/services/adapter/zone.yml index 4481644edaa4d..dd1e485e047c6 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/zone.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/zone.yml @@ -4,42 +4,28 @@ services: prestashop.adapter.zone.command_handler.add_zone_handler: class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\AddZoneHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\AddZoneCommand' + autoconfigure: true prestashop.adapter.zone.command_handler.toggle_zone_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\ToggleZoneStatusHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\ToggleZoneStatusCommand' + autoconfigure: true prestashop.adapter.zone.command_handler.edit_zone_handler: class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\EditZoneHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\EditZoneCommand' + autoconfigure: true prestashop.adapter.zone.query_handler.get_zone_for_editing_handler: class: 'PrestaShop\PrestaShop\Adapter\Zone\QueryHandler\GetZoneForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Query\GetZoneForEditing' + autoconfigure: true prestashop.adapter.zone.command_handler.delete_zone_handler: class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\DeleteZoneHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\DeleteZoneCommand' + autoconfigure: true prestashop.adapter.zone.command_handler.bulk_delete_zone_handler: class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\BulkDeleteZoneHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\BulkDeleteZoneCommand' + autoconfigure: true prestashop.adapter.zone.command_handler.bulk_toggle_zone_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\BulkToggleZoneStatusHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\BulkToggleZoneStatusCommand' + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/bridge/_admin_controller.yml b/src/PrestaShopBundle/Resources/config/services/bundle/bridge/_admin_controller.yml index ec7e5c9c87fa5..1a6e59453441f 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/bridge/_admin_controller.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/bridge/_admin_controller.yml @@ -22,3 +22,6 @@ services: arguments: - '@prestashop.adapter.legacy.context' - '@prestashop.core.localization.locale.repository' + + PrestaShopBundle\Bridge\Helper\AddFlashMessage: + autowire: true diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/command.yml b/src/PrestaShopBundle/Resources/config/services/bundle/command.yml index 7ffeb67d4adf4..2be85d2386206 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/command.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/command.yml @@ -42,7 +42,7 @@ services: - '@translator' - '@prestashop.adapter.legacy.context' - '@prestashop.adapter.module.self_configurator' - - '@prestashop.module.manager' + - '@PrestaShop\PrestaShop\Core\Module\ModuleManager' tags: - 'console.command' diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/context.yml b/src/PrestaShopBundle/Resources/config/services/bundle/context.yml new file mode 100644 index 0000000000000..27c6bde54dd89 --- /dev/null +++ b/src/PrestaShopBundle/Resources/config/services/bundle/context.yml @@ -0,0 +1,13 @@ +services: + _defaults: + public: false + autowire: true + autoconfigure: true + + PrestaShopBundle\EventListener\Context\Admin\EmployeeContextListener: + tags: + - { name: kernel.event_listener, method: onKernelRequest } + + PrestaShopBundle\EventListener\Context\Admin\ShopContextListener: + tags: + - { name: kernel.event_listener, method: onKernelRequest } diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/controller.yml b/src/PrestaShopBundle/Resources/config/services/bundle/controller.yml index 924e918458ab4..43513a2e92238 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/controller.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/controller.yml @@ -2,29 +2,22 @@ services: _defaults: public: true + # Legacy controllers don't extend the base controller, so we need to inject the container manually. PrestaShopBundle\Controller\Api\ApiController: class: PrestaShopBundle\Controller\Api\ApiController calls: - [ setLogger, [ '@logger' ] ] - [ setContainer, [ '@service_container' ] ] - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } + # Every single controller should be loaded here, except the legacy ones, and some misplaced files are also excluded. PrestaShopBundle\Controller\: resource: "%kernel.project_dir%/src/PrestaShopBundle/Controller/*" exclude: - "%kernel.project_dir%/src/PrestaShopBundle/Controller/Api" - - "%kernel.project_dir%/../src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product" - public: true - tags: - - !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG - - PrestaShopBundle\Controller\Admin\Sell\Catalog\Product\: - resource: "%kernel.project_dir%/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/*" + - "%kernel.project_dir%/src/PrestaShopBundle/Controller/ArgumentResolver" + - "%kernel.project_dir%/src/PrestaShopBundle/Controller/Exception" autoconfigure: true autowire: true - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.controller: alias: PrestaShopBundle\Controller\Api\ApiController @@ -37,8 +30,6 @@ services: movements: "@prestashop.core.api.stock.movements_collection" stockRepository: "@prestashop.core.api.stock.repository" queryParams: "@prestashop.core.api.query_stock_params_collection" - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.stock.controller: alias: PrestaShopBundle\Controller\Api\StockController @@ -50,8 +41,6 @@ services: properties: stockMovementRepository: "@prestashop.core.api.stock_movement.repository" queryParams: "@prestashop.core.api.query_stock_movement_params_collection" - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.stock_movement.controller: alias: PrestaShopBundle\Controller\Api\StockMovementController @@ -62,8 +51,6 @@ services: public: true properties: supplierRepository: "@prestashop.core.api.supplier.repository" - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.supplier.controller: alias: PrestaShopBundle\Controller\Api\SupplierController @@ -74,8 +61,6 @@ services: public: true properties: manufacturerRepository: "@prestashop.core.api.manufacturer.repository" - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.manufacturer.controller: alias: PrestaShopBundle\Controller\Api\ManufacturerController @@ -86,8 +71,6 @@ services: public: true properties: categoryRepository: "@prestashop.core.api.category.repository" - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.category.controller: alias: PrestaShopBundle\Controller\Api\CategoryController @@ -98,8 +81,6 @@ services: public: true properties: featureAttributeRepository: "@prestashop.core.api.feature_attribute.repository" - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.attribute.controller: alias: PrestaShopBundle\Controller\Api\AttributeController @@ -110,8 +91,6 @@ services: public: true properties: featureAttributeRepository: "@prestashop.core.api.feature_attribute.repository" - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.feature.controller: alias: PrestaShopBundle\Controller\Api\FeatureController @@ -120,8 +99,6 @@ services: class: PrestaShopBundle\Controller\Api\I18nController parent: PrestaShopBundle\Controller\Api\ApiController public: true - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.i18n.controller: alias: PrestaShopBundle\Controller\Api\I18nController @@ -133,8 +110,6 @@ services: properties: translationService: "@prestashop.service.translation" queryParams: "@prestashop.core.api.query_translation_params_collection" - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.translation.controller: alias: PrestaShopBundle\Controller\Api\TranslationController @@ -143,8 +118,6 @@ services: class: PrestaShopBundle\Controller\Api\Improve\Design\PositionsController parent: PrestaShopBundle\Controller\Api\ApiController public: true - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.improve.design.postions.controller: alias: PrestaShopBundle\Controller\Api\Improve\Design\PositionsController @@ -158,5 +131,5 @@ services: multiStoreContext: "@prestashop.adapter.shop.context" entityManager: "@doctrine.orm.entity_manager" productRepository: '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository' - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } + calls: + - [ setContainer, [ '@service_container' ] ] diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/data_collector.yml b/src/PrestaShopBundle/Resources/config/services/bundle/data_collector.yml index 634840ea86b9b..c2228e16710fb 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/data_collector.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/data_collector.yml @@ -12,10 +12,9 @@ services: tags: - { name: data_collector, template: '@PrestaShop/Admin/WebProfiler/hooks_collector.html.twig', id: 'ps.hooks_collector' } - prestashop.bundle.data_collector.commands_and_queries_collector: - class: PrestaShopBundle\DataCollector\CommandsAndQueriesDataCollector - arguments: - - '@prestashop.core.command_bus.executed_command_registry' + PrestaShopBundle\DataCollector\CommandsAndQueriesDataCollector: + autowire: true + public: false tags: - name: data_collector id: ps.commands_and_queries_collector diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml b/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml index 95e10e7de9849..a4ad6ce312414 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml @@ -56,16 +56,11 @@ services: tags: - { name: kernel.event_listener, event: kernel.exception, method: onKernelException } - prestashop.demo_mode_enabled.listener: - class: PrestaShopBundle\EventListener\DemoModeEnabledListener + PrestaShopBundle\EventListener\DemoModeEnabledListener: + autowire: true + autoconfigure: true arguments: - - "@router" - - "@translator" - - "@session" - - "@annotation_reader" - - "@=service('prestashop.adapter.legacy.configuration').getBoolean('_PS_MODE_DEMO_')" - tags: - - { name: kernel.event_listener, event: kernel.controller, method: onKernelController } + $session: "@session" prestashop.module_activated.listener: class: PrestaShopBundle\EventListener\ModuleActivatedListener @@ -74,7 +69,7 @@ services: - "@translator" - "@session" - "@annotation_reader" - - "@prestashop.core.admin.module.repository" + - '@PrestaShop\PrestaShop\Core\Module\ModuleRepository' tags: - { name: kernel.event_listener, event: kernel.controller, method: onKernelController } @@ -109,12 +104,6 @@ services: tags: - { name: kernel.event_subscriber } - PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\FeatureFlag\EventListener\FeatureFlagTypeListener: - class: PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\FeatureFlag\EventListener\FeatureFlagTypeListener - autowire: true - tags: - - { name: core.legacy.hook.subscriber } - PrestaShopBundle\EventListener\ShopConstraintListener: public: false arguments: diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form.yml index 3ff7d437a2e8a..e55d8e70bf6f5 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/form.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/form.yml @@ -42,3 +42,7 @@ services: PrestaShopBundle\Form\Admin\Type\CustomMoneyType: alias: 'PrestaShopBundle\Form\Extension\CustomMoneyTypeExtension' deprecated: ~ + + PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\FeatureFlag\EventListener\FeatureFlagTypeListener: + tags: + - { name: core.legacy.hook.subscriber } diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form.yml index a5e6e312167cb..ef7b5e26bda80 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form.yml @@ -1,15 +1,12 @@ # This file will be removed in next version, do not add any service here services: - form.form_cloner: - alias: PrestaShopBundle\Form\FormCloner - deprecated: ~ - public: true - + # Deprecated in 9.0.0 form.form_builder_modifier: alias: PrestaShopBundle\Form\FormBuilderModifier deprecated: ~ public: true + # Deprecated in 9.0.0 prestashop.multistore_checkbox_enabler: alias: 'PrestaShopBundle\Service\Form\MultistoreCheckboxEnabler' deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_provider.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_provider.yml index c3ae0aacb32a8..e040a9faaf51d 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_provider.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_provider.yml @@ -274,6 +274,7 @@ services: - '@doctrine.orm.entity_manager' - 'stable' - '@prestashop.bundle.routing.converter.cache_provider' + - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager' prestashop.admin.configure.advanced_parameters.beta_feature_flags_form_data_provider: class: 'PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\FeatureFlag\FeatureFlagsFormDataProvider' @@ -281,6 +282,7 @@ services: - '@doctrine.orm.entity_manager' - 'beta' - '@prestashop.bundle.routing.converter.cache_provider' + - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager' prestashop.adapter.security.general.form_provider: class: 'PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\Security\FormDataProvider' diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_transformer.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_transformer.yml index 9ac50d022d392..075334a3a7146 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_transformer.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_transformer.yml @@ -1,20 +1,24 @@ # This file will be removed in next version, do not add any service here services: + # Deprecated in 9.0.0 prestashop.bundle.form.data_transformer.string_array_to_integer_array: alias: 'PrestaShopBundle\Form\DataTransformer\StringArrayToIntegerArrayDataTransformer' deprecated: ~ public: true + # Deprecated in 9.0.0 prestashop.bundle.form.data_transformer.default_language_to_filled_array: alias: 'PrestaShopBundle\Form\DataTransformer\DefaultLanguageToFilledArrayDataTransformer' deprecated: ~ public: true + # Deprecated in 9.0.0 prestashop.bundle.form.data_transformer.arabic_to_latin_digit: alias: 'PrestaShopBundle\Form\DataTransformer\ArabicToLatinDigitDataTransformer' deprecated: ~ public: true + # Deprecated in 9.0.0 prestashop.bundle.form.data_transformer.idn_converter: alias: 'PrestaShopBundle\Form\DataTransformer\IDNConverterDataTransformer' deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_extension.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_extension.yml index cb5d1c481bd60..a09cdda5a535c 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_extension.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_extension.yml @@ -1,81 +1,101 @@ # This file will be removed in next version, do not add any service here services: + # Deprecated in 9.0.0 form.extension.comma_transformer: alias: 'PrestaShopBundle\Form\Extension\CommaTransformerExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.type.extension.money: alias: 'PrestaShopBundle\Form\Extension\CustomMoneyTypeExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.type.extension.resizable_text: alias: 'PrestaShopBundle\Form\Extension\ResizableTextTypeExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.help_text: alias: 'PrestaShopBundle\Form\Extension\HelpTextExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.hint_text: alias: 'PrestaShopBundle\Form\Extension\HintTextExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.default_empty_data: alias: 'PrestaShopBundle\Form\Extension\DefaultEmptyDataExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.data_list: alias: 'PrestaShopBundle\Form\Extension\DataListExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.row_attributes: alias: 'PrestaShopBundle\Form\Extension\RowAttributesExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.external_link: alias: 'PrestaShopBundle\Form\Extension\ExternalLinkExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.alert: alias: 'PrestaShopBundle\Form\Extension\AlertExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.label_options: alias: 'PrestaShopBundle\Form\Extension\LabelOptionsExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.form_theme: alias: 'PrestaShopBundle\Form\Extension\FormThemeExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.columns_number: alias: 'PrestaShopBundle\Form\Extension\ColumnsNumberExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.multistore_configuration: alias: 'PrestaShopBundle\Form\Extension\MultistoreConfigurationTypeExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.unit: alias: 'PrestaShopBundle\Form\Extension\UnitTypeExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.multistore_dropdown: alias: 'PrestaShopBundle\Form\Extension\MultistoreExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.downloadable_file: alias: 'PrestaShopBundle\Form\Extension\DownloadFileExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.alerts_tracking_extension: alias: 'PrestaShopBundle\Form\Extension\AlertsTrackingExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.modify_all_shops_extension: alias: 'PrestaShopBundle\Form\Extension\ModifyAllShopsExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.disabling_switch_extension: alias: 'PrestaShopBundle\Form\Extension\DisablingSwitchExtension' deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_factory.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_factory.yml index 6cbab988a7069..c2aa04dd8aed3 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_factory.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_factory.yml @@ -1,5 +1,6 @@ # This file will be removed in next version, do not add any service here services: + # Deprecated in 9.0.0 prestashop.bundle.form.admin.improve.design.theme.page_layout_customization_form_factory: alias: 'PrestaShopBundle\Form\Admin\Improve\Design\Theme\PageLayoutCustomizationFormFactory' deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml index 03d9fcd6a5696..456b77847ec68 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml @@ -69,6 +69,9 @@ services: arguments: - '@prestashop.bundle.form.data_transformer.idn_converter' + PrestaShopBundle\Form\Admin\Type\GeoCoordinatesType: + + PrestaShopBundle\Form\Admin\Type\LocaleChoiceType: PrestaShopBundle\Form\Admin\Type\DateRangeType: PrestaShopBundle\Form\Admin\Category\SimpleCategory: deprecated: ~ @@ -126,7 +129,6 @@ services: deprecated: ~ PrestaShopBundle\Form\Admin\Product\ProductShipping: arguments: - $warehouseDataProvider: "@prestashop.adapter.data_provider.warehouse" $carrierDataProvider: "@prestashop.adapter.data_provider.carrier" deprecated: ~ PrestaShopBundle\Form\Admin\Product\ProductSpecificPrice: @@ -145,8 +147,6 @@ services: deprecated: ~ PrestaShopBundle\Form\Admin\Product\ProductVirtual: deprecated: ~ - PrestaShopBundle\Form\Admin\Product\ProductWarehouseCombination: - deprecated: ~ PrestaShopBundle\Form\Admin\Type\TypeaheadProductCollectionType: arguments: - "@prestashop.adapter.data_provider.product" @@ -430,7 +430,9 @@ services: $orderInvoiceChoiceProvider: '@prestashop.adapter.form.choice_provider.order_invoice_by_id' $installedPaymentModulesChoiceProvider: '@prestashop.adapter.form.choice_provider.installed_payment_modules' - PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureType: + PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureType: ~ + PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureValueType: ~ + PrestaShopBundle\Form\Admin\Sell\Catalog\AttributeGroupType: ~ PrestaShopBundle\Form\Admin\Sell\Order\ChangeOrderCurrencyType: arguments: @@ -504,7 +506,6 @@ services: PrestaShopBundle\Form\Admin\Sell\Product\Details\FeatureValueType: arguments: - $featuresChoiceProvider: '@prestashop.adapter.form.choice_provider.features_choice_provider' $featureValueListener: '@PrestaShopBundle\Form\Admin\Sell\Product\EventListener\FeatureValueListener' PrestaShopBundle\Form\Admin\Sell\Product\Stock\StockType: @@ -516,8 +517,6 @@ services: $maxFileSizeInMegabytes: "@=service('prestashop.adapter.legacy.configuration').getInt('PS_ATTACHMENT_MAXIMUM_SIZE')" $virtualProductFileListener: '@PrestaShopBundle\Form\Admin\Sell\Product\EventListener\VirtualProductFileListener' - PrestaShopBundle\Form\Admin\Sell\Product\EventListener\VirtualProductFileListener: - PrestaShopBundle\Form\Admin\Sell\Product\Stock\AvailabilityType: arguments: $outOfStockTypeChoiceProvider: '@prestashop.core.form.choice_provider.out_of_stock_type_choice_provider' @@ -579,7 +578,7 @@ services: PrestaShopBundle\Form\Admin\Sell\Product\ExtraModulesType: arguments: $moduleDataProvider: '@prestashop.adapter.data_provider.module' - $moduleRepository: '@prestashop.core.admin.module.repository' + $moduleRepository: '@PrestaShop\PrestaShop\Core\Module\ModuleRepository' PrestaShopBundle\Form\Admin\Sell\Product\FooterType: arguments: @@ -657,38 +656,59 @@ services: $permissionChoices: '@=service("prestashop.core.form.choice_provider.permissions_choice_provider").getChoices()' PrestaShopBundle\Form\Admin\Improve\International\Tax\TaxRulesGroupType: + PrestaShopBundle\Form\Admin\Type\FeatureChoiceType: + arguments: + $featureChoiceProvider: '@PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\FeaturesChoiceProvider' - - # Deprecated + # Deprecated in 9.0.0 form.type.sell.product.event_listener.categories_listener: alias: 'PrestaShopBundle\Form\Admin\Sell\Product\EventListener\CategoriesListener' public: true deprecated: ~ + # Deprecated in 9.0.0 form.type.sell.product.event_listener.feature_value_listener: alias: 'PrestaShopBundle\Form\Admin\Sell\Product\EventListener\FeatureValueListener' public: true deprecated: ~ + # Deprecated in 9.0.0 form.event_listener.add_disabling_switch_listener: alias: 'PrestaShopBundle\Form\Admin\Type\EventListener\AddDisablingSwitchListener' public: true deprecated: ~ + # Deprecated in 9.0.0 form.type.sell.product.event_listener.product_type_listener: alias: 'PrestaShopBundle\Form\Admin\Sell\Product\EventListener\ProductTypeListener' public: true deprecated: ~ + # Deprecated in 9.0.0 form.event_listener.price_reduction: alias: 'PrestaShopBundle\Form\Admin\Type\EventListener\PriceReductionListener' public: true deprecated: ~ + # Deprecated in 9.0.0 form.type.sell.product.toolbar_buttons_provider: alias: 'PrestaShopBundle\Form\Toolbar\ToolbarButtonsProviderInterface' public: true deprecated: ~ + # Deprecated in 9.0.0 form.type.sell.product.event_listener.redirect_option_listener: alias: 'PrestaShopBundle\Form\Admin\Sell\Product\EventListener\RedirectOptionListener' public: true deprecated: ~ + # Deprecated in 9.0.0 form.type.sell.product.event_listener.combination_listener: alias: 'PrestaShopBundle\Form\Admin\Sell\Product\EventListener\CombinationListener' public: true deprecated: ~ + + PrestaShopBundle\Form\Admin\Sell\Product\EventListener\VirtualProductFileListener: + autowire: true + autoconfigure: true + public: false + + PrestaShopBundle\Form\Admin\Type\ReorderPositionsButtonType: + autowire: true + autoconfigure: true + public: false + arguments: + $locales: "@=service('prestashop.adapter.legacy.context').getLanguages()" diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_validator.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_validator.yml index 74491a2b9f9e0..19229eb11f022 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_validator.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_validator.yml @@ -1,5 +1,6 @@ # This file will be removed in next version, do not add any service here services: + # Deprecated in 9.0.0 validator.unique.tinymce_max_length_validator: alias: PrestaShopBundle\Form\Validator\Constraints\TinyMceMaxLengthValidator deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml b/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml index 46b2648140809..73e66b6d5a060 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml @@ -5,7 +5,7 @@ services: PrestaShopBundle\Security\OAuth2\Repository\ClientRepository: arguments: - '@security.user.provider.concrete.oauth2' - - '@security.user_password_encoder.generic' + - '@security.user_password_hasher' PrestaShopBundle\Security\OAuth2\Repository\AccessTokenRepository: @@ -50,3 +50,7 @@ services: PrestaShopBundle\Controller\Api\OAuth2\AccessTokenController: autowire: true autoconfigure: true + + PrestaShopBundle\ApiPlatform\Normalizer\: + resource: "../../../../ApiPlatform/Normalizer/*" + tags: [ 'prestashop.api.denormalizers' ] diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml b/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml index 9060ab6b50483..58b6537287268 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml @@ -2,12 +2,16 @@ services: _defaults: public: true - prestashop.core.admin.tab.repository: - class: PrestaShopBundle\Entity\Repository\TabRepository + PrestaShopBundle\Entity\Repository\TabRepository: factory: [ '@doctrine.orm.default_entity_manager', getRepository ] + public: false arguments: - PrestaShopBundle\Entity\Tab + prestashop.core.admin.tab.repository: + alias: PrestaShopBundle\Entity\Repository\TabRepository + deprecated: ~ + prestashop.core.admin.shop.repository: class: 'PrestaShopBundle\Entity\Repository\ShopRepository' factory: [ '@doctrine.orm.default_entity_manager', getRepository ] @@ -129,12 +133,13 @@ services: arguments: - PrestaShopBundle\Entity\FeatureFlag - prestashop.core.admin.feature_flag.repository: - alias: PrestaShopBundle\Entity\Repository\FeatureFlagRepository - deprecated: ~ - PrestaShopBundle\Entity\Repository\AuthorizedApplicationRepository: factory: [ '@doctrine.orm.default_entity_manager', getRepository ] arguments: - PrestaShopBundle\Entity\AuthorizedApplication public: true + + PrestaShopBundle\Entity\Repository\ApiAccessRepository: + factory: [ '@doctrine.orm.default_entity_manager', getRepository ] + arguments: + - PrestaShopBundle\Entity\ApiAccess diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml b/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml index c3e706ed01444..3f9801b621432 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml @@ -12,13 +12,13 @@ services: - '@router' - '@prestashop.bundle.routing.converter.cache_provider' + PrestaShopBundle\Routing\Converter\LegacyParametersConverter: + public: false + prestashop.bundle.routing.converter.legacy_parameters_converter: - class: 'PrestaShopBundle\Routing\Converter\LegacyParametersConverter' + alias: 'PrestaShopBundle\Routing\Converter\LegacyParametersConverter' public: true - - prestashop.bundle.routing.converter.router_provider: - alias: PrestaShopBundle\Routing\Converter\RouterProvider - deprecated: ~ + deprecated: '%alias_id% service alias is deprecated and will be removed in 10.0.' PrestaShopBundle\Routing\Converter\RouterProvider: autowire: true @@ -26,7 +26,7 @@ services: PrestaShopBundle\Routing\Converter\LegacyRouteFactory: autowire: true arguments: - - '@PrestaShopBundle\Entity\Repository\FeatureFlagRepository' + - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface' # We set this alias so that we can override it in test environment (to avoid memory limit crashes) prestashop.bundle.routing.converter.cache: @@ -35,7 +35,7 @@ services: prestashop.bundle.routing.converter.cache_provider: class: 'PrestaShopBundle\Routing\Converter\CacheProvider' arguments: - - '@prestashop.bundle.routing.converter.router_provider' + - '@PrestaShopBundle\Routing\Converter\RouterProvider' - '@prestashop.bundle.routing.converter.cache' - '@prestashop.bundle.routing.converter.routing_cache_key_generator' diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/services.yml b/src/PrestaShopBundle/Resources/config/services/bundle/services.yml index be793c4fee10d..f66c099583e2c 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/services.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/services.yml @@ -122,3 +122,16 @@ services: arguments: $storage: "@security.csrf.token_storage" autowire: true + + PrestaShopBundle\Service\Database\TransactionManager: + public: false + autowire: true + arguments: + - '@doctrine.orm.entity_manager' + + PrestaShop\PrestaShop\Core\Repository\TransactionManagerInterface: '@PrestaShopBundle\Service\Database\TransactionManager' + + PrestaShopBundle\ApiPlatform\DomainSerializer $apiPlatformSerializer: + class: PrestaShopBundle\ApiPlatform\DomainSerializer + arguments: + [ !tagged prestashop.api.denormalizers ] diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/twig.yml b/src/PrestaShopBundle/Resources/config/services/bundle/twig.yml index 91f4c846d40a3..9046098519e83 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/twig.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/twig.yml @@ -3,6 +3,8 @@ services: public: false autowire: true autoconfigure: true + bind: + $psVersion: !php/const _PS_VERSION_ Twig\Extension\StringLoaderExtension: ~ @@ -40,7 +42,7 @@ services: arguments: - "@prestashop.core.hook.dispatcher" - "@prestashop.adapter.data_provider.module" - - "@=service('prestashop.adapter.legacy.context').getContext().employee?service('prestashop.core.admin.module.repository'):null" + - "@=service('prestashop.adapter.legacy.context').getContext().employee?service('PrestaShop\\\\PrestaShop\\\\Core\\\\Module\\\\ModuleRepository'):null" PrestaShopBundle\Twig\Extension\GridExtension: arguments: diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/utils.yml b/src/PrestaShopBundle/Resources/config/services/bundle/utils.yml index bd3f15f940dbd..915e439681bec 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/utils.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/utils.yml @@ -7,7 +7,3 @@ services: PrestaShopBundle\Utils\FloatParser: autowire: true - - prestashop.utils.float_parser: - alias: PrestaShopBundle\Utils\FloatParser - deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/core/addon.yml b/src/PrestaShopBundle/Resources/config/services/core/addon.yml index 5bd71dffea16f..bd5fec39af528 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/addon.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/addon.yml @@ -34,10 +34,12 @@ services: prestashop.core.addon.theme.theme_manager: class: PrestaShop\PrestaShop\Core\Addon\Theme\ThemeManager + lazy: true factory: [ '@prestashop.core.addon.theme.theme_manager_builder', 'build' ] prestashop.core.addon.theme.theme.page_layouts_customizer: class: PrestaShop\PrestaShop\Core\Addon\Theme\ThemePageLayoutsCustomizer + lazy: true arguments: - '@=service("prestashop.adapter.legacy.context").getContext().shop.theme' - '@prestashop.core.addon.theme.theme_manager' diff --git a/src/PrestaShopBundle/Resources/config/services/core/cache.yml b/src/PrestaShopBundle/Resources/config/services/core/cache.yml index e1a60197942e5..1202143718ea1 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/cache.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/cache.yml @@ -19,6 +19,7 @@ services: - '@prestashop.adapter.cache.clearer.xml_cache_clearer' - '@prestashop.adapter.cache.clearer.media_cache_clearer' - '@prestashop.adapter.cache.clearer.class_index_cache_clearer' + - '@PrestaShop\PrestaShop\Adapter\Cache\Clearer\DoctrineCacheClearer' prestashop.core.cache.clearer.product_cache_clearer_chain: class: 'PrestaShop\PrestaShop\Core\Cache\Clearer\CacheClearerChain' diff --git a/src/PrestaShopBundle/Resources/config/services/core/category.yml b/src/PrestaShopBundle/Resources/config/services/core/category.yml index 04e6ce0a49af5..d150d5baab4f4 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/category.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/category.yml @@ -11,10 +11,6 @@ services: alias: PrestaShop\PrestaShop\Core\Category\NameBuilder\CategoryDisplayNameBuilder deprecated: ~ - PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider: - autowire: true - public: false - PrestaShop\PrestaShop\Core\Category\Provider\CategoryImageFinder: autowire: true public: false diff --git a/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml b/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml index 5b3cead8fdd53..a1bf215949387 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml @@ -6,11 +6,9 @@ services: alias: PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface: - class: PrestaShop\PrestaShop\Core\CommandBus\TacticianCommandBusAdapter + class: PrestaShopBundle\CommandBus\MessengerCommandBus autowire: true public: false - arguments: - - '@tactician.commandbus.default' prestashop.core.query_bus: parent: 'prestashop.core.command_bus' @@ -19,15 +17,13 @@ services: prestashop.core.provider.command_definition_provider: class: 'PrestaShop\PrestaShop\Core\CommandBus\Parser\CommandDefinitionParser' - prestashop.core.command_bus.middleware.command_register_middleware: - class: PrestaShop\PrestaShop\Core\CommandBus\Middleware\CommandRegisterMiddleware + PrestaShopBundle\CommandBus\Middleware\CommandRegisterMiddleware: + autowire: true + public: false arguments: - - '@tactician.handler.locator.symfony' - - '@tactician.handler.command_name_extractor.class_name' - - '@prestashop.core.command_bus.executed_command_registry' + - '@messenger.bus.default.messenger.handlers_locator' - prestashop.core.command_bus.executed_command_registry: - class: PrestaShop\PrestaShop\Core\CommandBus\ExecutedCommandRegistry + PrestaShop\PrestaShop\Core\CommandBus\ExecutedCommandRegistry: arguments: - '@prestashop.core.command_bus.parser.command_type_parser' diff --git a/src/PrestaShopBundle/Resources/config/services/core/common.yml b/src/PrestaShopBundle/Resources/config/services/core/common.yml index be57c3ee5c02b..161ee4c4365f5 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/common.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/common.yml @@ -1,2 +1,6 @@ imports: - { resource: ./circuit_breaker.yml } + +services: + PrestaShop\PrestaShop\Core\EnvironmentInterface: + alias: prestashop.adapter.environment diff --git a/src/PrestaShopBundle/Resources/config/services/core/context.yml b/src/PrestaShopBundle/Resources/config/services/core/context.yml new file mode 100644 index 0000000000000..1f8a92af7ba06 --- /dev/null +++ b/src/PrestaShopBundle/Resources/config/services/core/context.yml @@ -0,0 +1,20 @@ +services: + _defaults: + public: false + autowire: true + autoconfigure: true + + PrestaShop\PrestaShop\Core\Context\CookieContextBuilder: ~ + PrestaShop\PrestaShop\Core\Context\CookieContext: + lazy: true + factory: [ '@PrestaShop\PrestaShop\Core\Context\CookieContextBuilder', 'build' ] + + PrestaShop\PrestaShop\Core\Context\EmployeeContextBuilder: ~ + PrestaShop\PrestaShop\Core\Context\EmployeeContext: + lazy: true + factory: [ '@PrestaShop\PrestaShop\Core\Context\EmployeeContextBuilder', 'build' ] + + PrestaShop\PrestaShop\Core\Context\ShopContextBuilder: ~ + PrestaShop\PrestaShop\Core\Context\ShopContext: + lazy: true + factory: [ '@PrestaShop\PrestaShop\Core\Context\ShopContextBuilder', 'build' ] diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml index 8f1f939403820..973a9e565953a 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml @@ -4,22 +4,27 @@ services: autowire: true PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationRepositoryInterface: '@PrestaShopBundle\Entity\Repository\AuthorizedApplicationRepository' + PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\ApiAccessRepositoryInterface: '@PrestaShopBundle\Entity\Repository\ApiAccessRepository' PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler\AddApplicationHandler: - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\AddApplicationCommand' + autoconfigure: true PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler\EditApplicationHandler: - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\EditApplicationCommand' + autoconfigure: true PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryHandler\GetApplicationForEditingHandler: - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForEditing' + autoconfigure: true + + PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler\DeleteApplicationHandler: + autoconfigure: true PrestaShopBundle\Model\AuthorizationServer\AuthorizedApplicationFactory: ~ PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationFactoryInterface: '@PrestaShopBundle\Model\AuthorizationServer\AuthorizedApplicationFactory' + + PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryHandler\GetApplicationForViewingHandler: + autoconfigure: true + + PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder\ApiAccessFiltersBuilder: + class: 'PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder\ApiAccessFiltersBuilder' + tags: [ 'core.typed_filters_builder' ] diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/country.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/country.yml index 31c0f0b8f1420..08aac8dfb829d 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/domain/country.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/domain/country.yml @@ -5,8 +5,3 @@ services: PrestaShop\PrestaShop\Core\Domain\Country\ZipCodePatternResolverInterface: '@PrestaShop\PrestaShop\Core\Domain\Country\ZipCodePatternResolver' PrestaShop\PrestaShop\Core\Domain\Country\ZipCodePatternResolver: - - prestashop.core.domain.country.zip_code_format_resolver: - alias: 'PrestaShop\PrestaShop\Core\Domain\Country\ZipCodePatternResolver' - public: true - deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml index b2fbdb4ad6504..468bd5d78a38f 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml @@ -4,73 +4,58 @@ services: prestashop.core.domain.customer_service.command_handler.delete_customer_thread_handler: class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\DeleteCustomerThreadHandler' + autoconfigure: true arguments: - '@prestashop.core.domain.customer_service.repository.customer_thread_repository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\DeleteCustomerThreadCommand prestashop.core.domain.customer_service.command_handler.bulk_delete_customer_thread_handler: class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\BulkDeleteCustomerThreadHandler' + autoconfigure: true arguments: - '@prestashop.core.domain.customer_service.repository.customer_thread_repository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\BulkDeleteCustomerThreadCommand prestashop.core.domain.customer_service.command_handler.add_order_customer_message: class: PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\AddOrderCustomerMessageHandler + autoconfigure: true arguments: - '@translator' - '@validator' - '@=service("prestashop.adapter.legacy.context").getContext().shop.id' - '@=service("prestashop.adapter.legacy.context").getContext().language.id' - '@=service("prestashop.adapter.legacy.context").getContext().employee.id' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CustomerMessage\Command\AddOrderCustomerMessageCommand prestashop.core.domain.customer_service.query_handler.get_customer_thread_for_viewing_handler: class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\QueryHandler\GetCustomerThreadForViewingHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.context").getContext()' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Query\GetCustomerThreadForViewing' + - '@prestashop.core.localization.locale.context_locale' prestashop.core.domain.customer_service.query_handler.get_customer_service_signature_handler: class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\QueryHandler\GetCustomerServiceSignatureHandler' + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Query\GetCustomerServiceSignature' prestashop.core.domain.customer_service.command_handler.forward_customer_thread_handler: class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\ForwardCustomerThreadHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.context").getContext()' - '@prestashop.adapter.legacy.configuration' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\ForwardCustomerThreadCommand' prestashop.core.domain.customer_service.command_handler.reply_to_customer_thread_handler: class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\ReplyToCustomerThreadHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.context").getContext()' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\ReplyToCustomerThreadCommand' prestashop.core.domain.customer_service.command_handler.update_customer_thread_status_handler: class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\UpdateCustomerThreadStatusHandler' + autoconfigure: true arguments: $connection: '@doctrine.dbal.default_connection' $dbPrefix: '%database_prefix%' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\UpdateCustomerThreadStatusCommand prestashop.core.domain.customer_service.repository.customer_thread_repository: class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Repository\CustomerThreadRepository' diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/showcase_card.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/showcase_card.yml index dba0f6db4caba..8d0161a49f1c2 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/domain/showcase_card.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/domain/showcase_card.yml @@ -9,20 +9,16 @@ services: prestashop.core.showcase_card.command_handler.close_showcase_card: class: 'PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\CommandHandler\CloseShowcaseCardHandler' + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - '@prestashop.core.showcase_card.configuration_map' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Command\CloseShowcaseCardCommand' # Query handlers prestashop.core.domain.showcase_card.query_handler.get_showcase_card_is_closed_handler: class: PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\QueryHandler\GetShowcaseCardIsClosedHandler + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - '@prestashop.core.showcase_card.configuration_map' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Query\GetShowcaseCardIsClosed' diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/sql_management.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/sql_management.yml index 5bd6a897e5a25..349617703dfce 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/domain/sql_management.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/domain/sql_management.yml @@ -6,18 +6,14 @@ services: prestashop.core.domain.sql_management.command_handler.save_settings: class: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\CommandHandler\SaveSqlRequestSettingsHandler' + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\SaveSqlRequestSettingsCommand' # QUERY HANDLERS prestashop.core.domain.sql_management.query_handler.get_sql_request_settings: class: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\QueryHandler\GetSqlRequestSettingsHandler' + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestSettings' diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/theme.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/theme.yml index 21e57d91e318d..b6f9fd1dc3212 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/domain/theme.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/domain/theme.yml @@ -6,41 +6,34 @@ services: prestashop.core.domain.theme.command_handler.import_theme_handler: class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\ImportThemeHandler' + autoconfigure: true arguments: - '@prestashop.core.addon.theme.theme_zip_uploader' - '@prestashop.core.addon.theme.theme_manager' - '@prestashop.adapter.legacy.configuration' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\ImportThemeCommand } prestashop.core.domain.theme.command_handler.enable_theme_handler: class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\EnableThemeHandler' + autoconfigure: true arguments: - '@prestashop.core.addon.theme.theme_manager' - '@prestashop.adapter.cache.clearer.smarty_cache_clearer' - '@=service("prestashop.adapter.shop.context").isSingleShopContext()' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\EnableThemeCommand } prestashop.core.domain.theme.command_handler.delete_theme_handler: class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\DeleteThemeHandler' + autoconfigure: true arguments: - '@prestashop.core.addon.theme.theme_manager' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\DeleteThemeCommand } prestashop.core.domain.theme.command_handler.adapt_theme_to_rtl_languages_handler: class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\AdaptThemeToRTLLanguagesHandler' + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Core\Localization\RTL\StyleSheetProcessorFactory' - tags: - - name: 'tactician.handler' - command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\AdaptThemeToRTLLanguagesCommand prestashop.core.domain.theme.command_handler.reset_theme_layouts_handler: class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\ResetThemeLayoutsHandler' + autoconfigure: true arguments: - '@prestashop.core.addon.theme.theme_manager' - tags: - - name: 'tactician.handler' - command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\ResetThemeLayoutsCommand diff --git a/src/PrestaShopBundle/Resources/config/services/core/feature_flag.yml b/src/PrestaShopBundle/Resources/config/services/core/feature_flag.yml new file mode 100644 index 0000000000000..990ab7346c0c2 --- /dev/null +++ b/src/PrestaShopBundle/Resources/config/services/core/feature_flag.yml @@ -0,0 +1,16 @@ +services: + _defaults: + autowire: true + autoconfigure: true + + PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface: + alias: PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager + public: true + + PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager: ~ + PrestaShop\PrestaShop\Core\FeatureFlag\Layer\EnvLayer: ~ + PrestaShop\PrestaShop\Core\FeatureFlag\Layer\DbLayer: ~ + PrestaShop\PrestaShop\Core\FeatureFlag\Layer\DotEnvLayer: + arguments: + $rootDir: !php/const _PS_ROOT_DIR_ + PrestaShop\PrestaShop\Core\FeatureFlag\Layer\QueryLayer: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/choice_provider.yml b/src/PrestaShopBundle/Resources/config/services/core/form/choice_provider.yml index 80c951b16d313..e31d411f249bd 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/form/choice_provider.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/form/choice_provider.yml @@ -63,7 +63,7 @@ services: PrestaShop\PrestaShop\Core\Form\ChoiceProvider\ModuleByNameChoiceProvider: arguments: - - '@=service("prestashop.core.admin.module.repository").getInstalledModules()' + - '@=service("PrestaShop\\PrestaShop\\Core\\Module\\ModuleRepository").getInstalledModules()' PrestaShop\PrestaShop\Core\Form\ChoiceProvider\ImportMatchConfigurationChoiceProvider: arguments: @@ -108,7 +108,7 @@ services: PrestaShop\PrestaShop\Core\Form\ChoiceProvider\TabChoiceProvider: arguments: - - '@=service("prestashop.adapter.data_provider.tab").getViewableTabsForContextEmployee(service("prestashop.adapter.legacy.context").getLanguage().id)' + - '@=service("PrestaShop\\PrestaShop\\Adapter\\Tab\\TabDataProvider").getViewableTabsForContextEmployee(service("prestashop.adapter.legacy.context").getLanguage().id)' PrestaShop\PrestaShop\Core\Form\ChoiceProvider\ProfileChoiceProvider: arguments: diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_builder.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_builder.yml index e70ef65c0c7ae..01978722c1018 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/form/form_builder.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/form/form_builder.yml @@ -135,6 +135,21 @@ services: - 'PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureType' - '@prestashop.core.form.identifiable_object.data_provider.feature_form_data_provider' + prestashop.core.form.identifiable_object.builder.feature_value_form_builder: + class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilder' + factory: [ '@prestashop.core.form.builder.form_builder_factory', 'create' ] + arguments: + - 'PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureValueType' + - '@PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\FeatureValueFormDataProvider' + + PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\AttributeGroupFormBuilder: + autowire: true + class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilder' + factory: [ '@prestashop.core.form.builder.form_builder_factory', 'create' ] + arguments: + - 'PrestaShopBundle\Form\Admin\Sell\Catalog\AttributeGroupType' + - '@PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\AttributeGroupFormDataProvider' + prestashop.core.form.identifiable_object.builder.order_message_form_builder: class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilder' factory: [ '@prestashop.core.form.builder.form_builder_factory', 'create' ] diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml index 48bee65d92dcf..e6e44e14ed871 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml @@ -46,8 +46,6 @@ services: - '@prestashop.core.command_bus' - '@prestashop.adapter.image.uploader.category_cover_image_uploader' - '@prestashop.adapter.image.uploader.category_thumbnail_image_uploader' - - '@prestashop.adapter.image.uploader.category_menu_thumbnail_image_uploader' - - '@PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider' prestashop.core.form.identifiable_object.data_handler.root_category_form_data_handler: class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\RootCategoryFormDataHandler' @@ -55,8 +53,6 @@ services: - '@prestashop.core.command_bus' - '@prestashop.adapter.image.uploader.category_cover_image_uploader' - '@prestashop.adapter.image.uploader.category_thumbnail_image_uploader' - - '@prestashop.adapter.image.uploader.category_menu_thumbnail_image_uploader' - - '@PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider' prestashop.core.form.identifiable_object.data_handler.contact_form_data_handler: class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\ContactFormDataHandler' @@ -115,10 +111,17 @@ services: - '@prestashop.core.command_bus' - '@prestashop.adapter.image.uploader.supplier_image_uploader' + PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\AttributeGroupFormDataHandler: + autowire: true + PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\FeatureFormDataHandler: autowire: true public: false + PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\FeatureValueFormDataHandler: + autowire: true + public: false + prestashop.core.form.identifiable_object.data_handler.order_message_form_data_handler: class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\OrderMessageFormDataHandler' arguments: @@ -261,6 +264,7 @@ services: PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\ApplicationFormDataHandler: arguments: - '@prestashop.core.command_bus' + autowire: true PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\TaxRulesGroupFormDataHandler: arguments: diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml index 19db8f728725b..3018a40177071 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml @@ -4,7 +4,6 @@ services: bind: $queryBus: '@prestashop.core.query_bus' - prestashop.core.form.identifiable_object.data_provider.sql_request_form_data_provider: class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\SqlRequestFormDataProvider' arguments: @@ -111,6 +110,12 @@ services: - '@=service("prestashop.adapter.shop.context").getShops(true, true)' - '@=service("prestashop.adapter.legacy.context").getContext().country.id' + PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\AttributeGroupFormDataProvider: + autowire: true + public: false + arguments: + - '@prestashop.core.query_bus' + prestashop.core.form.identifiable_object.data_provider.feature_form_data_provider: class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\FeatureFormDataProvider' arguments: @@ -118,6 +123,10 @@ services: - '@=service("prestashop.adapter.multistore_feature").isActive()' - '@=service("prestashop.adapter.shop.context").getShops(true, true)' + PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\FeatureValueFormDataProvider: + autowire: true + public: false + prestashop.core.form.identifiable_object.data_provider.order_message_form_data_provider: class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\OrderMessageFormDataProvider' arguments: @@ -230,6 +239,7 @@ services: PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\ApplicationFormDataProvider: arguments: - '@prestashop.core.command_bus' + autowire: true PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\TaxRulesGroupFormDataProvider: arguments: diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_handler.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_handler.yml index 4ef9a07702486..c982fe3cd3619 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/form/form_handler.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/form/form_handler.yml @@ -118,6 +118,18 @@ services: arguments: - '@PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\FeatureFormDataHandler' + prestashop.core.form.identifiable_object.handler.feature_value_form_handler: + class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandler' + factory: [ '@prestashop.core.form.identifiable_object.handler.form_handler_factory', 'create' ] + arguments: + - '@PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\FeatureValueFormDataHandler' + + PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\AttributeGroupFormHandler: + class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandler' + factory: [ '@prestashop.core.form.identifiable_object.handler.form_handler_factory', 'create' ] + arguments: + - '@PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\AttributeGroupFormDataHandler' + prestashop.core.form.identifiable_object.handler.order_message_form_handler: class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandler' factory: [ '@prestashop.core.form.identifiable_object.handler.form_handler_factory', 'create' ] diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid.yml b/src/PrestaShopBundle/Resources/config/services/core/grid.yml index 51eb746f74b3e..14af950d0abfc 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/grid.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/grid.yml @@ -38,10 +38,6 @@ services: PrestaShop\PrestaShop\Core\Grid\Position\PositionUpdateFactoryInterface: '@PrestaShop\PrestaShop\Core\Grid\Position\PositionUpdateFactory' - prestashop.core.grid.position.position_update_factory: - alias: 'PrestaShop\PrestaShop\Core\Grid\Position\PositionUpdateFactory' - deprecated: ~ - prestashop.core.grid.position.update_handler.doctrine_position_update_handler: class: 'PrestaShop\PrestaShop\Core\Grid\Position\UpdateHandler\DoctrinePositionUpdateHandler' arguments: @@ -55,9 +51,5 @@ services: PrestaShop\PrestaShop\Core\Grid\Position\GridPositionUpdaterInterface: '@PrestaShop\PrestaShop\Core\Grid\Position\GridPositionUpdater' - prestashop.core.grid.position.doctrine_grid_position_updater: - alias: PrestaShop\PrestaShop\Core\Grid\Position\GridPositionUpdater - deprecated: ~ - prestashop.core.grid.query.filter.doctrine_filter_applicator: class: 'PrestaShop\PrestaShop\Core\Grid\Query\Filter\DoctrineFilterApplicator' diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/doctrine_query_builder.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/doctrine_query_builder.yml index c50628ba6fd16..f7bf7d23689f3 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/grid/doctrine_query_builder.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/grid/doctrine_query_builder.yml @@ -486,7 +486,13 @@ services: public: true PrestaShop\PrestaShop\Core\Grid\Query\AuthorizedApplicationQueryBuilder: - class: 'PrestaShop\PrestaShop\Core\Grid\Query\AuthorizedApplicationQueryBuilder' + parent: 'prestashop.core.grid.abstract_query_builder' + public: false + autowire: true + arguments: + - '@prestashop.core.query.doctrine_search_criteria_applicator' + + PrestaShop\PrestaShop\Core\Grid\Query\ApiAccessQueryBuilder: parent: 'prestashop.core.grid.abstract_query_builder' public: false autowire: true @@ -522,6 +528,13 @@ services: $searchCriteriaApplicator: '@prestashop.core.query.doctrine_search_criteria_applicator' $contextLangId: "@=service('prestashop.adapter.legacy.context').getContext().language.id" + PrestaShop\PrestaShop\Core\Grid\Query\FeatureValueQueryBuilder: + parent: 'prestashop.core.grid.abstract_query_builder' + autowire: true + public: false + arguments: + $searchCriteriaApplicator: '@prestashop.core.query.doctrine_search_criteria_applicator' + PrestaShop\PrestaShop\Core\Grid\Query\StoreQueryBuilder: autowire: true public: false diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml index a4c70065bca73..1fd8826a7417f 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml @@ -202,6 +202,12 @@ services: - '@prestashop.core.grid.query.doctrine_query_parser' - 'profile' + PrestaShop\PrestaShop\Core\Grid\Data\Factory\ProfileGridDataFactoryDecorator: + autowire: true + public: false + arguments: + $profileGridDataFactory: '@prestashop.core.grid.data_factory.profiles' + prestashop.core.grid.data_provider.cms_page_category: class: '%prestashop.core.grid.data.factory.doctrine_grid_data_factory%' arguments: @@ -635,6 +641,14 @@ services: - '@prestashop.core.grid.query.doctrine_query_parser' - 'feature' + prestashop.core.grid.data.factory.feature_value: + class: '%prestashop.core.grid.data.factory.doctrine_grid_data_factory%' + arguments: + - '@PrestaShop\PrestaShop\Core\Grid\Query\FeatureValueQueryBuilder' + - '@prestashop.core.hook.dispatcher' + - '@prestashop.core.grid.query.doctrine_query_parser' + - 'feature_value' + prestashop.core.grid.data.factory.store: class: '%prestashop.core.grid.data.factory.doctrine_grid_data_factory%' arguments: @@ -648,3 +662,12 @@ services: public: false arguments: - '@prestashop.core.grid.data.factory.store' + + prestashop.core.grid.data_factory.api_access: + class: '%prestashop.core.grid.data.factory.doctrine_grid_data_factory%' + public: false + arguments: + - '@PrestaShop\PrestaShop\Core\Grid\Query\ApiAccessQueryBuilder' + - '@prestashop.core.hook.dispatcher' + - '@prestashop.core.grid.query.doctrine_query_parser' + - 'api_access' diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml index 8dd32e8327f65..a3ff2d4fd2c85 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml @@ -2,8 +2,7 @@ services: _defaults: public: true - prestashop.core.grid.definition.factory.abstract_grid_definition: - class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory' + PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory: abstract: true arguments: - '@prestashop.core.hook.dispatcher' @@ -12,41 +11,41 @@ services: prestashop.core.grid.definition.factory.logs: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\LogGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full' prestashop.core.grid.definition.factory.email_logs: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\EmailLogsDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true arguments: - '@prestashop.core.form.choice_provider.language_by_id' prestashop.core.grid.definition.factory.request_sql: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\RequestSqlGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.backup: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\BackupDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.webservice_key: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\WebserviceKeyDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.meta: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\MetaGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.category: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CategoryGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.adapter.shop.context' - '@prestashop.adapter.grid.action.row.accessibility_checker.category_for_view' @@ -54,17 +53,17 @@ services: prestashop.core.grid.definition.factory.employee: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\EmployeeGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.contacts: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ContactGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.customer: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@=service("prestashop.core.b2b.b2b_feature").isActive()' - '@=service("prestashop.adapter.multistore_feature").isActive()' @@ -74,67 +73,67 @@ services: prestashop.core.grid.definition.factory.customer.discount: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerDiscountGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.customer.address: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerAddressGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@=service("request_stack").getCurrentRequest()' public: true prestashop.core.grid.definition.factory.customer.cart: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerCartGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full' public: true prestashop.core.grid.definition.factory.customer.order: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerOrderGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full' public: true prestashop.core.grid.definition.factory.customer.bought_product: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerBoughtProductGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full' public: true prestashop.core.grid.definition.factory.customer.viewed_product: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerViewedProductGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full' public: true prestashop.core.grid.definition.factory.language: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\LanguageGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.currency: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CurrencyGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.supplier: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\SupplierGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.profile: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ProfileGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.cms_page_category: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CmsPageCategoryDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@request_stack' - '@prestashop.adapter.shop.context' @@ -143,22 +142,22 @@ services: prestashop.core.grid.definition.factory.tax: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\TaxGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.manufacturer: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ManufacturerGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.manufacturer_address: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ManufacturerAddressGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.cms_page: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CmsPageDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.core.query_bus' - '@request_stack' @@ -168,44 +167,44 @@ services: prestashop.core.grid.definition.factory.monitoring.empty_category: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Monitoring\EmptyCategoryGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.adapter.grid.action.row.accessibility_checker.category_for_view' public: true prestashop.core.grid.definition.factory.monitoring.no_qty_product_with_combination: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Monitoring\NoQtyProductWithCombinationGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.monitoring.no_qty_product_without_combination: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Monitoring\NoQtyProductWithoutCombinationGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.monitoring.disabled_product: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Monitoring\DisabledProductGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.monitoring.product_without_image: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Monitoring\ProductWithoutImageGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.monitoring.product_without_description: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Monitoring\ProductWithoutDescriptionGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.monitoring.product_without_price: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Monitoring\ProductWithoutPriceGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.order: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\OrderGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.adapter.legacy.configuration' - '@prestashop.adapter.form.choice_provider.order_countries' @@ -219,14 +218,14 @@ services: prestashop.core.grid.definition.factory.cart_rule: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CartRuleGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full' prestashop.core.grid.definition.factory.catalog_price_rule: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CatalogPriceRuleGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@request_stack' - '@prestashop.adapter.shop.context' @@ -235,17 +234,17 @@ services: prestashop.core.grid.definition.factory.order_message: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\OrderMessageGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.attachment: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AttachmentGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.attribute: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AttributeGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@=service("request_stack").getCurrentRequest().attributes.getInt("attributeGroupId")' - '@PrestaShop\PrestaShop\Adapter\AttributeGroup\AttributeGroupViewDataProvider' @@ -253,48 +252,48 @@ services: prestashop.core.grid.definition.factory.attribute_group: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AttributeGroupGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.merchandise_return: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\MerchandiseReturnGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.tax_rules_group: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\TaxRulesGroupGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.address: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AddressGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.credit_slip: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CreditSlipGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@=service("prestashop.adapter.legacy.context").getLanguage().date_format_lite' public: true prestashop.core.grid.definition.factory.order_states: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\OrderStatesGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.core.grid.action.row.accessibility_checker.delete_order_states' public: true prestashop.core.grid.definition.factory.order_return_states: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\OrderReturnStatesGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.core.grid.action.row.accessibility_checker.delete_order_return_states' public: true prestashop.core.grid.definition.factory.outstanding: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\OutstandingGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.adapter.legacy.configuration' - "@=service('prestashop.adapter.legacy.context').getContext().language.id" @@ -303,27 +302,27 @@ services: prestashop.core.grid.definition.factory.carrier: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CarrierGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.zone: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ZoneGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.country: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CountryGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.search_engines: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\SearchEngineGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.product: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ProductGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.adapter.legacy.configuration' - '@PrestaShop\PrestaShop\Adapter\Feature\MultistoreFeature' @@ -340,28 +339,28 @@ services: prestashop.core.grid.definition.factory.product_light: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ProductLightGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.adapter.legacy.configuration' public: true prestashop.core.grid.definition.factory.security.session.employee: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Security\Session\EmployeeGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full' public: true prestashop.core.grid.definition.factory.security.session.customer: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Security\Session\CustomerGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full' public: true prestashop.core.grid.definition.factory.state: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\StateGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - "@=service('router').generate('admin_common_reset_search', {'controller': 'state', 'action': 'index'})" - "@=service('router').generate('admin_states_index')" @@ -369,14 +368,14 @@ services: prestashop.core.grid.definition.factory.title: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\TitleGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.core.form.choice_provider.gender_choice_provider' public: true prestashop.core.grid.definition.factory.customer_thread: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerThreadGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.core.form.choice_provider.contact_type_choice_provider' - '@prestashop.adapter.form.choice_provider.shop_name_by_id' @@ -385,32 +384,53 @@ services: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AuthorizedApplicationGridDefinitionFactory: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AuthorizedApplicationGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: false autowire: true prestashop.core.grid.definition.factory.customer_groups: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerGroupsGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true PrestaShop\PrestaShop\Core\Grid\Definition\Factory\TaxRuleGridDefinitionFactory: - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: false autowire: true PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AliasGridDefinitionFactory: - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: false autowire: true PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureGridDefinitionFactory: - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory autowire: true # must remain public to be accessed by CommonController:searchGridAction public: true PrestaShop\PrestaShop\Core\Grid\Definition\Factory\StoreGridDefinitionFactory: - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory + public: true + autowire: true + + PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureValueGridDefinitionFactory: + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory + autowire: true public: true + + PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ApiAccessGridDefinitionFactory: + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory autowire: true + public: true + + # deprecated services + # Alias for this abstract definition causes tests in vendor fail for some reason, so we stick to full definition instead + prestashop.core.grid.definition.factory.abstract_grid_definition: + class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory' + abstract: true + arguments: + - '@prestashop.core.hook.dispatcher' + calls: + - [ setTranslator, [ '@translator' ] ] + deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml index 35f5b0a3b422b..2993eb29458d2 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml @@ -164,7 +164,7 @@ services: class: 'PrestaShop\PrestaShop\Core\Grid\GridFactory' arguments: - '@prestashop.core.grid.definition.factory.profile' - - '@prestashop.core.grid.data_factory.profiles' + - '@PrestaShop\PrestaShop\Core\Grid\Data\Factory\ProfileGridDataFactoryDecorator' - '@prestashop.core.grid.filter.form_factory' - '@prestashop.core.hook.dispatcher' @@ -512,6 +512,13 @@ services: - '@prestashop.core.grid.filter.form_factory' - '@prestashop.core.hook.dispatcher' + PrestaShop\PrestaShop\Core\Grid\Factory\FeatureValueGridFactory: + autowire: true + arguments: + $definitionFactory: '@PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureValueGridDefinitionFactory' + $dataFactory: '@prestashop.core.grid.data.factory.feature_value' + $filterFormFactory: '@prestashop.core.grid.filter.form_factory' + prestashop.core.grid.grid_factory.store: class: 'PrestaShop\PrestaShop\Core\Grid\GridFactory' arguments: @@ -519,3 +526,11 @@ services: - '@PrestaShop\PrestaShop\Core\Grid\Data\Factory\StoreGridDataFactory' - '@prestashop.core.grid.filter.form_factory' - '@prestashop.core.hook.dispatcher' + + prestashop.core.grid.factory.api_access: + class: 'PrestaShop\PrestaShop\Core\Grid\GridFactory' + arguments: + - '@PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ApiAccessGridDefinitionFactory' + - '@prestashop.core.grid.data_factory.api_access' + - '@prestashop.core.grid.filter.form_factory' + - '@prestashop.core.hook.dispatcher' diff --git a/src/PrestaShopBundle/Resources/config/services/core/help.yml b/src/PrestaShopBundle/Resources/config/services/core/help.yml index e9bab11993bd6..48f8e385a425c 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/help.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/help.yml @@ -9,8 +9,3 @@ services: autowire: true arguments: $host: "https://help.prestashop-project.org/" - - prestashop.core.help.documentation: - alias: PrestaShop\PrestaShop\Core\Help\Documentation - public: true - deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/core/language.yml b/src/PrestaShopBundle/Resources/config/services/core/language.yml index b79dccebafdaa..987cf40927847 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/language.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/language.yml @@ -11,3 +11,5 @@ services: arguments: - 'fa': 'Tahoma' 'ar': 'Tahoma' + + PrestaShop\PrestaShop\Core\Language\ContextLanguageProviderInterface: '@PrestaShop\PrestaShop\Adapter\Language\ContextLanguageProvider' diff --git a/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml b/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml index ae0ed197bf6c3..f2e56baa7728c 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml @@ -35,7 +35,7 @@ services: class: 'PrestaShop\PrestaShop\Core\MailTemplate\Transformation\HTMLToTextTransformation' prestashop.core.mail_template.command_handler.generate_theme_mails_handler: - class: 'PrestaShop\PrestaShop\Core\Domain\MailTemplate\CommandHandler\GenerateThemeMailTemplatesCommandHandler' + class: 'PrestaShop\PrestaShop\Core\Domain\MailTemplate\CommandHandler\GenerateThemeMailTemplatesHandler' arguments: - '@prestashop.core.admin.lang.repository' - '@prestashop.core.mail_template.theme_catalog' @@ -43,6 +43,4 @@ services: - '%kernel.project_dir%/mails' - "@=service('prestashop.adapter.legacy.configuration').get('_PS_MODULE_DIR_')" public: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\MailTemplate\Command\GenerateThemeMailTemplatesCommand + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/core/module.yml b/src/PrestaShopBundle/Resources/config/services/core/module.yml index 0fb7ddc088db9..90c3f973ac6b5 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/module.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/module.yml @@ -11,24 +11,24 @@ services: - '@prestashop.adapter.module.payment_module_provider' PrestaShop\PrestaShop\Core\Module\ModuleRepository: - public: false + lazy: true arguments: - '@prestashop.adapter.data_provider.module' - '@prestashop.adapter.admin.data_provider.module' - '@doctrine.cache.provider' - '@PrestaShop\PrestaShop\Adapter\HookManager' - "@=service('prestashop.adapter.legacy.configuration').get('_PS_MODULE_DIR_')" + - '@=service("prestashop.adapter.legacy.context").getContext().language.id' prestashop.core.admin.module.repository.eventsubscriber: class: PrestaShop\PrestaShop\Core\Module\EventSubscriber arguments: - - '@prestashop.core.admin.module.repository' + - '@PrestaShop\PrestaShop\Core\Module\ModuleRepository' - '@prestashop.adapter.cache.clearer.symfony_cache_clearer' tags: - { name: kernel.event_subscriber } PrestaShop\PrestaShop\Core\Module\ModuleManager: - public: false autowire: true arguments: $moduleDataProvider: '@prestashop.adapter.data_provider.module' @@ -37,7 +37,6 @@ services: PrestaShop\PrestaShop\Core\Module\SourceHandler\ZipSourceHandler: autowire: true - public: false arguments: $modulePath: '%modules_dir%' tags: [ core.module.source_handler ] @@ -53,22 +52,8 @@ services: arguments: - !tagged core.module.source_handler - prestashop.core.admin.module.repository: - alias: PrestaShop\PrestaShop\Core\Module\ModuleRepository - public: true - deprecated: ~ - + # Deprecated in 8.1.0 prestashop.module.factory.sourcehandler: alias: PrestaShop\PrestaShop\Core\Module\SourceHandler\SourceHandlerFactory public: true deprecated: ~ - - prestashop.module.sourcehandler.zip: - alias: PrestaShop\PrestaShop\Core\Module\SourceHandler\ZipSourceHandler - public: true - deprecated: ~ - - prestashop.module.manager: - alias: PrestaShop\PrestaShop\Core\Module\ModuleManager - public: true - deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/core/product.yml b/src/PrestaShopBundle/Resources/config/services/core/product.yml index 8263590ba57ea..304f8bff077d1 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/product.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/product.yml @@ -9,10 +9,6 @@ services: - '@prestashop.core.admin.data_provider.product_interface' deprecated: ~ - prestashop.core.product.csv_exporter: - alias: PrestaShop\PrestaShop\Core\Product\ProductCsvExporter - deprecated: ~ - PrestaShop\PrestaShop\Core\Product\Combination\Generator\CombinationGenerator: ~ PrestaShop\PrestaShop\Core\Product\Combination\Generator\CombinationGeneratorInterface: '@PrestaShop\PrestaShop\Core\Product\Combination\Generator\CombinationGenerator' diff --git a/src/PrestaShopBundle/Resources/config/services/core/search.yml b/src/PrestaShopBundle/Resources/config/services/core/search.yml index afd457ef2e1b5..124bcceb1b061 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/search.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/search.yml @@ -54,3 +54,7 @@ services: prestashop.core.search.builder.typed_builder.product_combination_filters_builder: class: 'PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder\ProductCombinationFiltersBuilder' tags: [ 'core.typed_filters_builder' ] + + PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder\FeatureValueFiltersBuilder: + autowire: true + tags: [ 'core.typed_filters_builder' ] diff --git a/src/PrestaShopBundle/Resources/config/services/core/security.yml b/src/PrestaShopBundle/Resources/config/services/core/security.yml index 5b31004b51959..34bc512ebfa0a 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/security.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/security.yml @@ -3,7 +3,7 @@ services: public: true prestashop.core.crypto.hashing: - class: 'PrestaShop\PrestaShop\Core\Crypto\Hashing' + class: PrestaShop\PrestaShop\Core\Crypto\Hashing prestashop.core.security.folder_guard.vendor: class: 'PrestaShop\PrestaShop\Core\Security\HtaccessFolderGuard' @@ -22,3 +22,6 @@ services: arguments: - '@PrestaShop\PrestaShop\Core\OAuth2\OAuth2Interface' - '@Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory' + + PrestaShop\PrestaShop\Core\Security\OAuth2\ApiRequestMatcher: + public: false diff --git a/src/PrestaShopBundle/Resources/config/services/core/shop.yml b/src/PrestaShopBundle/Resources/config/services/core/shop.yml index 9749c457344e3..6e7e4697a2a4c 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/shop.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/shop.yml @@ -7,5 +7,5 @@ services: arguments: - '@=service("prestashop.adapter.legacy.context").getContext().shop' - '@PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration' - - '@prestashop.core.admin.feature_flag.repository' + - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface' - !php/const _PS_IMG_DIR_ diff --git a/src/PrestaShopBundle/Resources/config/services/core/util.yml b/src/PrestaShopBundle/Resources/config/services/core/util.yml index 9655ad93fb01b..5d8593ab5e96e 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/util.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/util.yml @@ -32,38 +32,3 @@ services: prestashop.core.util.color_brightness_calculator: alias: PrestaShop\PrestaShop\Core\Util\ColorBrightnessCalculator public: true - - prestashop.core.util.internationalized_domain_name_converter: - alias: PrestaShop\PrestaShop\Core\Util\InternationalizedDomainNameConverter - public: true - deprecated: ~ - - prestashop.core.uti.back_url_provider: - alias: PrestaShop\PrestaShop\Core\Util\Url\BackUrlProvider - public: true - deprecated: ~ - - prestashop.core.util.arabic_to_latin_digit_converter: - alias: PrestaShop\PrestaShop\Core\Util\ArabicToLatinDigitConverter - public: true - deprecated: ~ - - prestashop.core.util.url.url_file_checker: - alias: PrestaShop\PrestaShop\Core\Util\Url\UrlFileChecker - public: true - deprecated: ~ - - prestashop.core.util.string.string_validator: - alias: PrestaShop\PrestaShop\Core\Util\String\StringValidator - public: true - deprecated: ~ - - prestashop.core.util.string.string_modifier: - alias: PrestaShop\PrestaShop\Core\Util\String\StringModifier - deprecated: ~ - public: true - - prestashop.core.util.file_size.size_converter: - alias: PrestaShop\PrestaShop\Core\Util\File\FileSizeConverter - deprecated: ~ - public: true diff --git a/src/PrestaShopBundle/Resources/config/services/core/util/helper_card.yml b/src/PrestaShopBundle/Resources/config/services/core/util/helper_card.yml index 10233d2cd0a89..e5336cd624fe6 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/util/helper_card.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/util/helper_card.yml @@ -2,11 +2,6 @@ services: _defaults: public: false - prestashop.core.util.helper_card.documentation_link_provider: - alias: 'PrestaShop\PrestaShop\Core\Util\HelperCard\DocumentationLinkProvider' - public: true - deprecated: ~ - PrestaShop\PrestaShop\Core\Util\HelperCard\DocumentationLinkProviderInterface: alias: 'PrestaShop\PrestaShop\Core\Util\HelperCard\DocumentationLinkProvider' public: true diff --git a/src/PrestaShopBundle/Resources/config/services/front_legacy.yml b/src/PrestaShopBundle/Resources/config/services/front_legacy.yml new file mode 100644 index 0000000000000..cdaf5db3250d5 --- /dev/null +++ b/src/PrestaShopBundle/Resources/config/services/front_legacy.yml @@ -0,0 +1,57 @@ +services: + _defaults: + public: true + + prestashop.core.filter.front_end_object.main: + class: PrestaShop\PrestaShop\Core\Filter\FrontEndObject\MainFilter + autoconfigure: true + arguments: + - cart: '@prestashop.core.filter.front_end_object.cart' + customer: '@prestashop.core.filter.front_end_object.customer' + shop: '@prestashop.core.filter.front_end_object.shop' + configuration: '@prestashop.core.filter.front_end_object.configuration' + + prestashop.core.filter.front_end_object.product: + class: PrestaShop\PrestaShop\Core\Filter\FrontEndObject\ProductFilter + + prestashop.core.filter.front_end_object.cart: + class: PrestaShop\PrestaShop\Core\Filter\FrontEndObject\CartFilter + arguments: + - '@prestashop.core.filter.front_end_object.product_collection' + + prestashop.core.filter.front_end_object.search_result_product: + class: PrestaShop\PrestaShop\Core\Filter\FrontEndObject\SearchResultProductFilter + + prestashop.core.filter.front_end_object.customer: + class: PrestaShop\PrestaShop\Core\Filter\FrontEndObject\CustomerFilter + + prestashop.core.filter.front_end_object.shop: + class: PrestaShop\PrestaShop\Core\Filter\FrontEndObject\ShopFilter + + prestashop.core.filter.front_end_object.configuration: + class: PrestaShop\PrestaShop\Core\Filter\FrontEndObject\ConfigurationFilter + + prestashop.core.filter.front_end_object.product_collection: + class: PrestaShop\PrestaShop\Core\Filter\CollectionFilter + calls: + - method: queue + arguments: + - [ '@prestashop.core.filter.front_end_object.product' ] + + prestashop.core.filter.front_end_object.search_result_product_collection: + class: PrestaShop\PrestaShop\Core\Filter\CollectionFilter + calls: + - method: queue + arguments: + - [ '@prestashop.core.filter.front_end_object.search_result_product' ] + + prestashop.adapter.module.repository.module_repository: + class: 'PrestaShop\PrestaShop\Adapter\Module\Repository\ModuleRepository' + arguments: + - !php/const _PS_ROOT_DIR_ + - !php/const _PS_MODULE_DIR_ + + prestashop.translation.translator_language_loader: + class: PrestaShopBundle\Translation\TranslatorLanguageLoader + arguments: + - '@prestashop.adapter.module.repository.module_repository' diff --git a/src/PrestaShopBundle/Resources/config/services_dev/bundle/command.yml b/src/PrestaShopBundle/Resources/config/services_dev/bundle/command.yml index 29d1f97bfbf5e..9e3c93bdab85b 100644 --- a/src/PrestaShopBundle/Resources/config/services_dev/bundle/command.yml +++ b/src/PrestaShopBundle/Resources/config/services_dev/bundle/command.yml @@ -48,6 +48,8 @@ services: arguments: - '@prestashop.core.provider.command_definition_provider' - '%prestashop.commands_and_queries%' + - '@api_platform.metadata.resource.name_collection_factory.attributes' + - '@api_platform.metadata.resource.metadata_collection_factory.attributes' tags: - 'console.command' diff --git a/src/PrestaShopBundle/Resources/views/Admin/Common/Grid/Columns/Content/bulk_action.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Common/Grid/Columns/Content/bulk_action.html.twig index b4f43a30aefb3..ca82eb08a67b2 100644 --- a/src/PrestaShopBundle/Resources/views/Admin/Common/Grid/Columns/Content/bulk_action.html.twig +++ b/src/PrestaShopBundle/Resources/views/Admin/Common/Grid/Columns/Content/bulk_action.html.twig @@ -23,7 +23,7 @@ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) *#} -{% if column.options.disabled_field is empty or not record[column.options.disabled_field] %} +{% if (column.options.disabled_field is empty or not record[column.options.disabled_field]) and (record.disableBulkCheckbox is not defined or not record.disableBulkCheckbox) %}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/employee_dropdown.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/employee_dropdown.html.twig
new file mode 100644
index 0000000000000..ae0598106e806
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/employee_dropdown.html.twig
@@ -0,0 +1,25 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author PrestaShop SA and Contributors
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{{ component('EmployeeDropdown') }}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/footer.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/footer.html.twig
new file mode 100644
index 0000000000000..539dc092e31d8
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/footer.html.twig
@@ -0,0 +1,25 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author PrestaShop SA and Contributors
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{{ component('Footer') }}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/head.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/head.html.twig
new file mode 100644
index 0000000000000..90a4e019c649d
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/head.html.twig
@@ -0,0 +1,28 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author PrestaShop SA and Contributors
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{{ component('Head', {
+ display_header_javascript: display_header_javascript|default(false),
+ layoutTitle: meta_title|default,
+}) }}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/mobile_quick_access.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/mobile_quick_access.html.twig
new file mode 100644
index 0000000000000..8b32e7f18555a
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/mobile_quick_access.html.twig
@@ -0,0 +1,25 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author PrestaShop SA and Contributors
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{{ component('MobileQuickAccess') }}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/nav_bar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/nav_bar.html.twig
new file mode 100644
index 0000000000000..e777178190853
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/nav_bar.html.twig
@@ -0,0 +1,25 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author PrestaShop SA and Contributors
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{{ component('NavBar') }}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/notifications_center.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/notifications_center.html.twig
new file mode 100644
index 0000000000000..c3ddf63bd7579
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/notifications_center.html.twig
@@ -0,0 +1,25 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author PrestaShop SA and Contributors
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{{ component('NotificationsCenter') }}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/quick_access.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/quick_access.html.twig
new file mode 100644
index 0000000000000..e09cebaace954
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/quick_access.html.twig
@@ -0,0 +1,25 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author PrestaShop SA and Contributors
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{{ component('QuickAccess') }}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/search_form.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/search_form.html.twig
new file mode 100644
index 0000000000000..4981ed0d03b7a
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/search_form.html.twig
@@ -0,0 +1,25 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author PrestaShop SA and Contributors
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{{ component('SearchForm') }}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/shop_list.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/shop_list.html.twig
new file mode 100644
index 0000000000000..4b4f49a6d6b3e
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/shop_list.html.twig
@@ -0,0 +1,31 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author PrestaShop SA and Contributors
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{{ component('ShopList', {
+ baseUrl: base_url,
+ isMultishop: is_multishop,
+ shopList: shop_list,
+ multishopContext: multishop_context,
+ currentShopName: current_shop_name
+}) }}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig
new file mode 100644
index 0000000000000..81623fcb636ad
--- /dev/null
+++ b/src/PrestaShopBundle/Resources/views/Admin/Layout/toolbar.html.twig
@@ -0,0 +1,33 @@
+{#**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ * versions in the future. If you wish to customize PrestaShop for your
+ * needs please refer to https://devdocs.prestashop.com/ for more information.
+ *
+ * @author PrestaShop SA and Contributors
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
+ *#}
+{{ component('Toolbar', {
+ lockedToAllShopContext: locked_to_all_shop_context,
+ title: title,
+ toolbarBtn: toolbar_btn,
+ table: table,
+ helpLink: help_link,
+ enableSidebar: enableSidebar,
+ useRegularH1Structure: use_regular_h1_structure
+}) }}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Module/Includes/grid_manage_empty.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Module/Includes/grid_manage_empty.html.twig
index 045ca2e7521f7..626d6872c0b9d 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Module/Includes/grid_manage_empty.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Module/Includes/grid_manage_empty.html.twig
@@ -29,7 +29,7 @@
- hook_write ', + ], + ], + ], exceptionToStatus: [HookNotFoundException::class => 404], provider: QueryProvider::class, - extraProperties: ['query' => GetHookStatus::class] + extraProperties: [ + 'query' => GetHookStatus::class, + 'scopes' => ['hook_read'], + ] ), new Put( uriTemplate: '/hook-status', processor: CommandProcessor::class, - extraProperties: ['command' => UpdateHookStatusCommand::class] + extraProperties: [ + 'command' => UpdateHookStatusCommand::class, + 'scopes' => ['hook_write'], + ] ), - ] + new Get( + uriTemplate: '/hooks/{id}', + requirements: ['id' => '\d+'], + exceptionToStatus: [HookNotFoundException::class => 404], + provider: QueryProvider::class, + extraProperties: [ + 'query' => GetHook::class, + 'scopes' => ['hook_read'], + ] + ), + ], )] class Hook { - /** - * @var int - */ #[ApiProperty(identifier: true)] - public int $hookId; + public int $id; + + public bool $active; + + public string $name; + + public string $title; - /** - * @var bool - */ - public bool $status; + public string $description; } diff --git a/src/PrestaShopBundle/Bridge/AdminController/ControllerConfigurationFactory.php b/src/PrestaShopBundle/Bridge/AdminController/ControllerConfigurationFactory.php index 80e93511354dd..3be1821353bb2 100644 --- a/src/PrestaShopBundle/Bridge/AdminController/ControllerConfigurationFactory.php +++ b/src/PrestaShopBundle/Bridge/AdminController/ControllerConfigurationFactory.php @@ -81,7 +81,7 @@ public function create( sprintf( 'Unexpected user type. Expected "%s", got "%s', Employee::class, - get_class($employee)) + $employee::class) ); } diff --git a/src/PrestaShopBundle/Bridge/AdminController/Listener/InitFrameworkBridgeControllerListener.php b/src/PrestaShopBundle/Bridge/AdminController/Listener/InitFrameworkBridgeControllerListener.php index 559029b13c4b9..bd5c0211c320f 100644 --- a/src/PrestaShopBundle/Bridge/AdminController/Listener/InitFrameworkBridgeControllerListener.php +++ b/src/PrestaShopBundle/Bridge/AdminController/Listener/InitFrameworkBridgeControllerListener.php @@ -88,7 +88,7 @@ public function onKernelController(ControllerEvent $event): void /** @var FrameworkBridgeControllerInterface $controller */ $controller = $event->getController()[0]; - if (!is_string(get_class($controller))) { + if (!is_string($controller::class)) { return; } diff --git a/src/PrestaShopBundle/Bridge/Helper/AddFlashMessage.php b/src/PrestaShopBundle/Bridge/Helper/AddFlashMessage.php new file mode 100644 index 0000000000000..4dfee3d1cc4d2 --- /dev/null +++ b/src/PrestaShopBundle/Bridge/Helper/AddFlashMessage.php @@ -0,0 +1,74 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) + */ +declare(strict_types=1); + +namespace PrestaShopBundle\Bridge\Helper; + +use Symfony\Component\HttpFoundation\Exception\SessionNotFoundException; +use Symfony\Component\HttpFoundation\RequestStack; +use Symfony\Component\HttpFoundation\Session\Session; +use Symfony\Component\HttpFoundation\Session\SessionInterface; + +class AddFlashMessage +{ + private const TYPES = [ + 'errors' => 'error', + 'warnings' => 'warning', + 'informations' => 'info', + 'confirmations' => 'success', + ]; + + public function __construct(private readonly RequestStack $requestStack) + { + } + + public function addMessage(string $type, string $message): void + { + $type = self::TYPES[$type] ?? $type; + + try { + $session = $this->requestStack->getCurrentRequest()->getSession(); + + if (!$session instanceof Session) { + throw new \LogicException(sprintf( + 'You can use the flashbag only with the %s implementation of %s', + Session::class, + SessionInterface::class + )); + } + + $flashBag = $session->getFlashBag(); + + //This condition is to avoid duplicate messages + $messages = $flashBag->peekAll()[$type] ?? []; + if (!in_array($message, $messages, true)) { + $flashBag->add($type, $message); + } + } catch (SessionNotFoundException $e) { + throw new \LogicException('You cannot use the addFlash method if sessions are disabled. Enable them in "config/packages/framework.yaml".', 0, $e); + } + } +} diff --git a/src/PrestaShopBundle/Bridge/Smarty/HeaderConfigurator.php b/src/PrestaShopBundle/Bridge/Smarty/HeaderConfigurator.php index 7454c957c8965..b156ed872731d 100644 --- a/src/PrestaShopBundle/Bridge/Smarty/HeaderConfigurator.php +++ b/src/PrestaShopBundle/Bridge/Smarty/HeaderConfigurator.php @@ -283,7 +283,7 @@ private function getTabs(ControllerConfiguration $controllerConfiguration, $pare foreach ($tabs as $index => $tab) { if (!Tab::checkTabRights($tab['id_tab']) || !$tab['enabled'] - || ($tab['class_name'] == 'AdminStock' && $this->configuration->get('PS_ADVANCED_STOCK_MANAGEMENT') == 0) + || $tab['class_name'] == 'AdminStock' || $tab['class_name'] == 'AdminCarrierWizard') { unset($tabs[$index]); diff --git a/src/PrestaShopBundle/Command/FeatureFlagCommand.php b/src/PrestaShopBundle/Command/FeatureFlagCommand.php index 6f27d88bceb00..2ba2cf2190ef3 100644 --- a/src/PrestaShopBundle/Command/FeatureFlagCommand.php +++ b/src/PrestaShopBundle/Command/FeatureFlagCommand.php @@ -28,6 +28,7 @@ namespace PrestaShopBundle\Command; +use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager; use PrestaShopBundle\Entity\FeatureFlag; use PrestaShopBundle\Entity\Repository\FeatureFlagRepository; use Symfony\Component\Console\Command\Command; @@ -55,16 +56,11 @@ class FeatureFlagCommand extends Command 'list', ]; - /** - * @var FeatureFlagRepository - */ - private $featureFlagRepository; - public function __construct( - FeatureFlagRepository $featureFlagRepository + private readonly FeatureFlagRepository $featureFlagRepository, + private readonly FeatureFlagManager $featureFlagManager ) { parent::__construct(); - $this->featureFlagRepository = $featureFlagRepository; } protected function configure() @@ -99,16 +95,35 @@ private function listFeatureFlags(OutputInterface $output): int { $featureFlags = $this->featureFlagRepository->findAll(); $table = new Table($output); - $table->setHeaders(['Feature flag', 'State']); + $table->setHeaders(['Feature flag', 'Type', 'State']); /** @var FeatureFlag $featureFlag */ foreach ($featureFlags as $featureFlag) { - $table->addRow([$featureFlag->getName(), $featureFlag->isEnabled() ? 'Enabled' : 'Disabled']); + $table->addRow([ + $featureFlag->getName(), + $this->getTypeRow($featureFlag), + $this->featureFlagManager->isEnabled($featureFlag->getName()) ? 'Enabled' : 'Disabled', + ]); } $table->render(); return self::SUCCESS_RETURN_CODE; } + private function getTypeRow(FeatureFlag $featureFlag): string + { + $out = []; + + foreach ($featureFlag->getOrderedTypes() as $type) { + if ($this->featureFlagManager->getUsedType($featureFlag->getName()) === $type) { + $out[] = "[$type]"; + } else { + $out[] = $type; + } + } + + return implode(',', $out); + } + private function toggleFeatureFlag(bool $expectedState, InputInterface $input, OutputInterface $output): int { $featureFlagArgument = $input->getArgument('feature_flag'); @@ -129,13 +144,13 @@ private function toggleFeatureFlag(bool $expectedState, InputInterface $input, O } if ($expectedState) { - $this->featureFlagRepository->enable($featureFlagArgument); + $this->featureFlagManager->enable($featureFlagArgument); $output->writeln(sprintf( '
%s', $this->trans('Only letters, numbers and underscores ("_") are allowed.', 'Admin.Shopparameters.Help'), @@ -197,7 +232,15 @@ public function buildForm(FormBuilderInterface $builder, array $options) ), 'required' => false, 'choices' => $this->templates, - 'row_attr' => $this->templateAttributes, + 'row_attr' => $this->templateAttributes + [ + 'class' => 'order_state_template_select', + ], + 'button' => [ + 'label' => $this->trans('Preview', 'Admin.Actions'), + 'icon' => 'visibility', + 'class' => 'btn btn-primary', + 'id' => 'order_state_template_preview', + ], ]) ; } diff --git a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/ProductPreferences/GeneralType.php b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/ProductPreferences/GeneralType.php index 63cf6f6a4bc9b..96d462216e1af 100644 --- a/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/ProductPreferences/GeneralType.php +++ b/src/PrestaShopBundle/Form/Admin/Configure/ShopParameters/ProductPreferences/GeneralType.php @@ -135,7 +135,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'Admin.Shopparameters.Feature' ), 'help' => $this->trans( - 'When active, friendly URL will be updated on every save.', + 'When enabled, friendly URL will be updated on every name change for offline products only.', 'Admin.Shopparameters.Help' ), 'required' => false, diff --git a/src/PrestaShopBundle/Form/Admin/Improve/Design/Pages/CmsPageType.php b/src/PrestaShopBundle/Form/Admin/Improve/Design/Pages/CmsPageType.php index c0a174a2595db..afe5b8add6776 100644 --- a/src/PrestaShopBundle/Form/Admin/Improve/Design/Pages/CmsPageType.php +++ b/src/PrestaShopBundle/Form/Admin/Improve/Design/Pages/CmsPageType.php @@ -268,6 +268,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'type' => FormattedTextareaType::class, 'required' => false, 'options' => [ + 'limit' => FormattedTextareaType::LIMIT_LONGTEXT_UTF8, 'constraints' => [ new CleanHtml([ 'message' => $this->trans( diff --git a/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/ShopLogosType.php b/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/ShopLogosType.php index 3a23d5d3138a4..fdba689b69692 100644 --- a/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/ShopLogosType.php +++ b/src/PrestaShopBundle/Form/Admin/Improve/Design/Theme/ShopLogosType.php @@ -228,7 +228,7 @@ private function disableAllShopContextFields(FormBuilderInterface $builder, $suf $formType = $formField->getConfig()->getType()->getInnerType(); $options = $formField->getConfig()->getOptions(); $options['attr']['disabled'] = true; - $form->add($originalFieldName, get_class($formType), $options); + $form->add($originalFieldName, $formType::class, $options); } }); } @@ -258,7 +258,7 @@ private function setShopRestrictionSource(FormBuilderInterface $builder, $suffix $options = $formField->getConfig()->getOptions(); $options['attr']['data-shop-restriction-source'] = $fieldName; - $form->add($fieldName, get_class($formType), $options); + $form->add($fieldName, $formType::class, $options); } }); } @@ -296,7 +296,7 @@ private function stringEndsWith($haystack, $needle) { $diff = \strlen($haystack) - \strlen($needle); - return $diff >= 0 && strpos($haystack, $needle, $diff) !== false; + return $diff >= 0 && str_contains($haystack, $needle); } /** diff --git a/src/PrestaShopBundle/Form/Admin/Product/ProductOptions.php b/src/PrestaShopBundle/Form/Admin/Product/ProductOptions.php index 2d0c43d7f6792..e1066532698cc 100644 --- a/src/PrestaShopBundle/Form/Admin/Product/ProductOptions.php +++ b/src/PrestaShopBundle/Form/Admin/Product/ProductOptions.php @@ -200,9 +200,9 @@ public function buildForm(FormBuilderInterface $builder, array $options) ]) ->add('condition', FormType\ChoiceType::class, [ 'choices' => [ - $this->translator->trans('New', [], 'Admin.Global') => 'new', - $this->translator->trans('Used', [], 'Shop.Theme.Catalog') => 'used', - $this->translator->trans('Refurbished', [], 'Shop.Theme.Catalog') => 'refurbished', + $this->translator->trans('New', [], 'Admin.Catalog.Feature') => 'new', + $this->translator->trans('Used', [], 'Admin.Catalog.Feature') => 'used', + $this->translator->trans('Refurbished', [], 'Admin.Catalog.Feature') => 'refurbished', ], 'attr' => [ 'class' => 'custom-select', diff --git a/src/PrestaShopBundle/Form/Admin/Product/ProductQuantity.php b/src/PrestaShopBundle/Form/Admin/Product/ProductQuantity.php index ec79161227180..8562ef3f3c616 100644 --- a/src/PrestaShopBundle/Form/Admin/Product/ProductQuantity.php +++ b/src/PrestaShopBundle/Form/Admin/Product/ProductQuantity.php @@ -119,42 +119,9 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'empty_data' => '', ] ) - ->add( - 'advanced_stock_management', - FormType\CheckboxType::class, - [ - 'required' => false, - 'label' => $this->translator->trans( - 'I want to use the advanced stock management system for this product.', - [], - 'Admin.Catalog.Feature' - ), - ] - ) ->add( 'pack_stock_type', FormType\ChoiceType::class - )//see eventListener for details - ->add( - 'depends_on_stock', - FormType\ChoiceType::class, - [ - 'choices' => [ - $this->translator->trans( - 'The available quantities for the current product and its combinations are based on the stock in your warehouse (using the advanced stock management system). ', - [], - 'Admin.Catalog.Feature' - ) => 1, - $this->translator->trans( - 'I want to specify available quantities manually.', - [], - 'Admin.Catalog.Feature' - ) => 0, - ], - 'expanded' => true, - 'required' => true, - 'multiple' => false, - ] ); if ($is_stock_management) { diff --git a/src/PrestaShopBundle/Form/Admin/Product/ProductShipping.php b/src/PrestaShopBundle/Form/Admin/Product/ProductShipping.php index 9ea5c55bd579c..546c6b6d5c323 100644 --- a/src/PrestaShopBundle/Form/Admin/Product/ProductShipping.php +++ b/src/PrestaShopBundle/Form/Admin/Product/ProductShipping.php @@ -29,12 +29,10 @@ use Currency; use PrestaShop\PrestaShop\Adapter\Carrier\CarrierDataProvider; use PrestaShop\PrestaShop\Adapter\LegacyContext; -use PrestaShop\PrestaShop\Adapter\Warehouse\WarehouseDataProvider; use PrestaShopBundle\Form\Admin\Type\CommonAbstractType; use PrestaShopBundle\Form\Admin\Type\TranslateType; use PrestaShopBundle\Form\FormHelper; use Symfony\Component\Form\Extension\Core\Type as FormType; -use Symfony\Component\Form\Extension\Core\Type\CollectionType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Validator\Constraints as Assert; use Symfony\Contracts\Translation\TranslatorInterface; @@ -66,10 +64,6 @@ class ProductShipping extends CommonAbstractType * @var TranslatorInterface */ public $translator; - /** - * @var array - */ - private $warehouses; /** * @var string */ @@ -84,7 +78,6 @@ class ProductShipping extends CommonAbstractType * * @param TranslatorInterface $translator * @param LegacyContext $legacyContext - * @param WarehouseDataProvider $warehouseDataProvider * @param CarrierDataProvider $carrierDataProvider * @param string $dimensionUnit * @param string $weightUnit @@ -92,7 +85,6 @@ class ProductShipping extends CommonAbstractType public function __construct( TranslatorInterface $translator, LegacyContext $legacyContext, - WarehouseDataProvider $warehouseDataProvider, CarrierDataProvider $carrierDataProvider, string $dimensionUnit, string $weightUnit @@ -101,7 +93,6 @@ public function __construct( $this->legacyContext = $legacyContext; $this->currency = $legacyContext->getContext()->currency; $this->locales = $this->legacyContext->getLanguages(); - $this->warehouses = $warehouseDataProvider->getWarehouses(); $carriers = $carrierDataProvider->getCarriers( $this->locales[0]['id_lang'], @@ -261,23 +252,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'label' => $this->translator->trans('Delivery time of in-stock products:', [], 'Admin.Catalog.Feature'), ] ); - - foreach ($this->warehouses as $warehouse) { - $builder->add( - 'warehouse_combination_' . $warehouse['id_warehouse'], - CollectionType::class, - [ - 'entry_type' => 'PrestaShopBundle\Form\Admin\Product\ProductWarehouseCombination', - 'entry_options' => [ - 'id_warehouse' => $warehouse['id_warehouse'], - ], - 'prototype' => true, - 'allow_add' => true, - 'required' => false, - 'label' => $warehouse['name'], - ] - ); - } } /** diff --git a/src/PrestaShopBundle/Form/Admin/Product/ProductWarehouseCombination.php b/src/PrestaShopBundle/Form/Admin/Product/ProductWarehouseCombination.php deleted file mode 100644 index a39f45a31cc55..0000000000000 --- a/src/PrestaShopBundle/Form/Admin/Product/ProductWarehouseCombination.php +++ /dev/null @@ -1,102 +0,0 @@ - - * @copyright Since 2007 PrestaShop SA and Contributors - * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) - */ - -namespace PrestaShopBundle\Form\Admin\Product; - -use PrestaShopBundle\Form\Admin\Type\CommonAbstractType; -use Symfony\Component\Form\Extension\Core\Type\CheckboxType; -use Symfony\Component\Form\Extension\Core\Type\HiddenType; -use Symfony\Component\Form\Extension\Core\Type\TextType; -use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Contracts\Translation\TranslatorInterface; - -/** - * @deprecated since 8.1 and will be removed in next major. - * - * This form class is responsible to generate the basic product Warehouse combinations form. - */ -class ProductWarehouseCombination extends CommonAbstractType -{ - private $translator; - - /** - * Constructor. - * - * @param TranslatorInterface $translator - */ - public function __construct(TranslatorInterface $translator) - { - $this->translator = $translator; - } - - /** - * {@inheritdoc} - * - * Builds form - */ - public function buildForm(FormBuilderInterface $builder, array $options) - { - $builder->add('activated', CheckboxType::class, [ - 'required' => false, - 'label' => $this->translator->trans('Stored', [], 'Admin.Catalog.Feature'), - ]) - ->add('id_product_attribute', HiddenType::class) - ->add('product_id', HiddenType::class) - ->add('warehouse_id', HiddenType::class) - ->add('location', TextType::class, [ - 'required' => false, - 'label' => $this->translator->trans('Location (optional)', [], 'Admin.Catalog.Feature'), - 'empty_data' => '', - ]); - - //set default minimal values for collection prototype - $builder->setData([ - 'warehouse_id' => $options['id_warehouse'], - 'warehouse_activated' => false, - ]); - } - - /** - * {@inheritdoc} - */ - public function configureOptions(OptionsResolver $resolver) - { - $resolver->setDefaults([ - 'id_warehouse' => null, - ]); - } - - /** - * Returns the block prefix of this type. - * - * @return string The prefix name - */ - public function getBlockPrefix() - { - return 'product_warehouse_combination'; - } -} diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php new file mode 100644 index 0000000000000..4a10f9e2488ea --- /dev/null +++ b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/AttributeGroupType.php @@ -0,0 +1,121 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) + */ + +declare(strict_types=1); + +namespace PrestaShopBundle\Form\Admin\Sell\Catalog; + +use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex; +use PrestaShop\PrestaShop\Core\ConstraintValidator\TypedRegexValidator; +use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\ValueObject\AttributeGroupType as GroupType; +use PrestaShopBundle\Form\Admin\Type\ShopChoiceTreeType; +use PrestaShopBundle\Form\Admin\Type\TranslatableType; +use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; +use Symfony\Component\Form\Extension\Core\Type\TextType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; +use Symfony\Component\Validator\Constraints\NotBlank; +use Symfony\Contracts\Translation\TranslatorInterface; + +/** + * Form type for attribute add/edit + */ +class AttributeGroupType extends TranslatorAwareType +{ + /** + * @param TranslatorInterface $translator + * @param array $locales + */ + public function __construct( + TranslatorInterface $translator, + array $locales + ) { + parent::__construct($translator, $locales); + } + + /** + * {@inheritdoc} + */ + public function buildForm(FormBuilderInterface $builder, array $options) + { + $builder + ->add('name', TranslatableType::class, [ + 'type' => TextType::class, + 'label' => $this->trans('Name', 'Admin.Global'), + 'options' => [ + 'constraints' => [ + new TypedRegex([ + 'type' => TypedRegex::TYPE_CATALOG_NAME, + ]), + ], + ], + 'help' => $this->trans('Your internal name for this attribute.', 'Admin.Catalog.Help') + . ' ' . $this->trans('Invalid characters:', 'Admin.Notifications.Info') + . ' ' . TypedRegexValidator::CATALOG_CHARS, + ]) + ->add('public_name', TranslatableType::class, [ + 'type' => TextType::class, + 'label' => $this->trans('Public name', 'Admin.Catalog.Feature'), + 'options' => [ + 'constraints' => [ + new TypedRegex([ + 'type' => TypedRegex::TYPE_CATALOG_NAME, + ]), + ], + ], + 'help' => $this->trans('Your internal name for this attribute.', 'Admin.Catalog.Help') + . ' ' . $this->trans('Invalid characters:', 'Admin.Notifications.Info') + . ' ' . TypedRegexValidator::CATALOG_CHARS, + ]) + ->add('group_type', ChoiceType::class, [ + 'label' => $this->trans('Attribute type', 'Admin.Catalog.Feature'), + 'help' => $this->trans('The way the attribute\'s values will be presented to the customers in the product\'s page.', 'Admin.Catalog.Help'), + 'choices' => [ + $this->trans('Drop-down list', 'Admin.Global') => GroupType::ATTRIBUTE_GROUP_TYPE_SELECT, + $this->trans('Radio buttons', 'Admin.Global') => GroupType::ATTRIBUTE_GROUP_TYPE_RADIO, + $this->trans('Color or texture', 'Admin.Catalog.Feature') => GroupType::ATTRIBUTE_GROUP_TYPE_COLOR, + ], + ])->add('shop_association', ShopChoiceTreeType::class, [ + 'label' => $this->trans('Shop association', 'Admin.Global'), + 'required' => false, + 'constraints' => [ + new NotBlank([ + 'message' => $this->trans( + 'This field cannot be empty.', 'Admin.Notifications.Error' + ), + ]), + ], + ]); + } + + public function configureOptions(OptionsResolver $resolver): void + { + $resolver->setDefaults([ + 'requiredFields' => [], + ]); + } +} diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php new file mode 100644 index 0000000000000..88af6c4048f18 --- /dev/null +++ b/src/PrestaShopBundle/Form/Admin/Sell/Catalog/FeatureValueType.php @@ -0,0 +1,81 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) + */ + +declare(strict_types=1); + +namespace PrestaShopBundle\Form\Admin\Sell\Catalog; + +use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\DefaultLanguage; +use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex; +use PrestaShop\PrestaShop\Core\Domain\Feature\FeatureValueSettings; +use PrestaShopBundle\Form\Admin\Type\FeatureChoiceType; +use PrestaShopBundle\Form\Admin\Type\TranslatableType; +use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; +use Symfony\Component\Validator\Constraints\Length; + +class FeatureValueType extends TranslatorAwareType +{ + /** + * {@inheritdoc} + */ + public function buildForm(FormBuilderInterface $builder, array $options) + { + $builder + ->add('feature_value_id', HiddenType::class) + ->add('feature_id', FeatureChoiceType::class, [ + 'attr' => [ + // disable feature id choices when editing feature value and only allow changing them when creating new one + 'disabled' => !empty($builder->getData()['feature_value_id']), + ], + ]) + ->add('value', TranslatableType::class, [ + 'label' => $this->trans('Value', 'Admin.Global'), + 'constraints' => [ + new DefaultLanguage(), + ], + 'options' => [ + 'constraints' => [ + new TypedRegex([ + 'type' => 'generic_name', + ]), + new Length(['max' => FeatureValueSettings::VALUE_MAX_LENGTH]), + ], + ], + 'help' => $this->trans('Invalid characters: %chars%', 'Admin.Notifications.Info', ['%chars%' => '<>={}']), + ]) + ; + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'form_theme' => '@PrestaShop/Admin/TwigTemplateForm/prestashop_ui_kit.html.twig', + ]); + } +} diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Order/Delivery/SlipOptionsType.php b/src/PrestaShopBundle/Form/Admin/Sell/Order/Delivery/SlipOptionsType.php index 5f623ab910e53..c02dc6364f82c 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Order/Delivery/SlipOptionsType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Order/Delivery/SlipOptionsType.php @@ -50,7 +50,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) [ 'type' => TextType::class, 'label' => $this->trans('Delivery prefix', 'Admin.Orderscustomers.Feature'), - 'help' => $this->trans('Prefix used for delivery slips.', 'Admin.Orderscustomers.Help'), + 'label_help_box' => $this->trans('Prefix used for delivery slips.', 'Admin.Orderscustomers.Help'), ] ) ->add( @@ -58,7 +58,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) NumberType::class, [ 'label' => $this->trans('Delivery number', 'Admin.Orderscustomers.Feature'), - 'help' => $this->trans( + 'label_help_box' => $this->trans( 'The next delivery slip will begin with this number and then increase with each additional slip.', 'Admin.Orderscustomers.Help' ), @@ -69,7 +69,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) SwitchType::class, [ 'label' => $this->trans('Enable product image', 'Admin.Orderscustomers.Feature'), - 'help' => $this->trans( + 'label_help_box' => $this->trans( 'Add an image before the product name on delivery slips.', 'Admin.Orderscustomers.Help' ), diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Combination/CombinationImagesChoiceType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Combination/CombinationImagesChoiceType.php index 590627c22423a..faae3e458d9c2 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Product/Combination/CombinationImagesChoiceType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/Combination/CombinationImagesChoiceType.php @@ -67,6 +67,7 @@ public function configureOptions(OptionsResolver $resolver) ->setAllowedTypes('product_id', 'int') ->setDefaults([ 'label' => $this->trans('Images', 'Admin.Global'), + 'label_subtitle' => $this->trans('You can specify which images should be displayed when customer selects this combination. If you don\'t select any image, all will be displayed. The default image of the combination will be the first one selected from the list.', 'Admin.Catalog.Feature'), 'choice_attr' => function (string $choice, string $key): array { return ['data-image-url' => $key]; }, diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Details/FeatureValueType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Details/FeatureValueType.php index 99eb1b910ce5d..feba2a53fac12 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Product/Details/FeatureValueType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/Details/FeatureValueType.php @@ -28,7 +28,7 @@ namespace PrestaShopBundle\Form\Admin\Sell\Product\Details; -use PrestaShop\PrestaShop\Core\Form\FormChoiceProviderInterface; +use PrestaShopBundle\Form\Admin\Type\FeatureChoiceType; use PrestaShopBundle\Form\Admin\Type\IconButtonType; use PrestaShopBundle\Form\Admin\Type\TranslatableType; use PrestaShopBundle\Form\Admin\Type\TranslatorAwareType; @@ -42,25 +42,12 @@ class FeatureValueType extends TranslatorAwareType { - /** - * @var FormChoiceProviderInterface - */ - private $featuresChoiceProvider; - - /** - * @var EventSubscriberInterface - */ - private $featureValueListener; - public function __construct( TranslatorInterface $translator, array $locales, - FormChoiceProviderInterface $featuresChoiceProvider, - EventSubscriberInterface $featureValueListener + protected readonly EventSubscriberInterface $featureValueListener ) { parent::__construct($translator, $locales); - $this->featuresChoiceProvider = $featuresChoiceProvider; - $this->featureValueListener = $featureValueListener; } /** @@ -68,19 +55,11 @@ public function __construct( */ public function buildForm(FormBuilderInterface $builder, array $options) { - $features = $this->featuresChoiceProvider->getChoices(); - $builder - ->add('feature_id', ChoiceType::class, [ + ->add('feature_id', FeatureChoiceType::class, [ 'empty_data' => null, - 'choices' => $features, 'required' => false, 'placeholder' => $this->trans('Choose a feature', 'Admin.Catalog.Feature'), - 'label' => $this->trans('Feature', 'Admin.Catalog.Feature'), - 'attr' => [ - 'data-toggle' => 'select2', - 'class' => 'feature-selector', - ], 'constraints' => [ new NotBlank([ 'message' => $this->trans('Choose a feature', 'Admin.Catalog.Feature'), diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/EditProductFormType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/EditProductFormType.php index b613f8563d4a2..c7758b6e3be67 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Product/EditProductFormType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/EditProductFormType.php @@ -90,6 +90,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add('header', HeaderType::class, [ 'active' => $options['active'], + 'force_default_active' => $options['force_default_active'], 'product_id' => $productId, ]) ->add('description', DescriptionType::class, [ @@ -111,6 +112,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ]) ->add('seo', SEOType::class, [ 'product_id' => $productId, + 'active' => $options['active'], ]) ->add('options', OptionsType::class) ->add('extra_modules', ExtraModulesType::class, [ @@ -138,6 +140,7 @@ public function buildView(FormView $view, FormInterface $form, array $options) 'product_type' => $options['product_type'], 'product_id' => $options['product_id'], 'shop_id' => $options['shop_id'], + 'force_default_active' => $options['force_default_active'] ? 1 : 0, ]; $view->vars = array_replace($view->vars, $formVars); @@ -155,6 +158,7 @@ public function configureOptions(OptionsResolver $resolver) ->setDefaults([ 'virtual_product_file_id' => null, 'active' => false, + 'force_default_active' => false, 'allow_extra_fields' => true, 'form_theme' => '@PrestaShop/Admin/Sell/Catalog/Product/FormTheme/product.html.twig', 'use_default_themes' => false, diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/HeaderType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/HeaderType.php index b4d06f778afb3..909e3f84ed141 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Product/HeaderType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/HeaderType.php @@ -141,6 +141,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $this->trans('Online', 'Admin.Global') => true, ], 'modify_all_shops' => true, + 'default_empty_data' => $options['force_default_active'], ]) ->add('mobile_toolbar', ButtonCollectionType::class, [ 'buttons' => $this->toolbarButtonsProvider->getToolbarButtonsOptions(['productId' => $options['product_id']]), @@ -163,6 +164,7 @@ public function configureOptions(OptionsResolver $resolver) $resolver ->setDefaults([ 'active' => false, + 'force_default_active' => false, 'required' => false, 'label' => false, 'form_theme' => '@PrestaShop/Admin/Sell/Catalog/Product/FormTheme/header.html.twig', diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Options/CustomizationFieldType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Options/CustomizationFieldType.php index c055b9a43a973..ea3b9c0b2f5a0 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Product/Options/CustomizationFieldType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/Options/CustomizationFieldType.php @@ -81,6 +81,10 @@ public function buildForm(FormBuilderInterface $builder, array $options) ]) ->add('required', SwitchType::class, [ 'label' => $this->trans('Required', 'Admin.Global'), + 'choices' => [ + $this->trans('Not Required', 'Admin.Global') => false, + $this->trans('Required', 'Admin.Global') => true, + ], 'default_empty_data' => false, ]) ->add('remove', IconButtonType::class, [ diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/RetailPriceType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/RetailPriceType.php index a1628bc022335..dd6aba85dd6ee 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/RetailPriceType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/RetailPriceType.php @@ -167,6 +167,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ]) ->add('tax_rules_group_id', ChoiceType::class, [ 'choices' => $this->taxRuleGroupChoicesProvider->getChoices(), + 'disabled' => !$this->isTaxEnabled, 'required' => false, // placeholder false is important to avoid empty option in select input despite required being false 'placeholder' => false, @@ -188,11 +189,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'data-place-holder-with-state' => $taxRateHelpPlaceholderWithState, 'data-is-tax-enabled' => $this->isTaxEnabled, ], - 'external_link' => [ - 'text' => $this->trans('[1]Manage tax rules[/1]', 'Admin.Catalog.Feature'), - 'href' => $this->router->generate('admin_taxes_index'), - 'align' => 'right', - ], 'modify_all_shops' => true, ]); @@ -231,6 +227,11 @@ public function buildForm(FormBuilderInterface $builder, array $options) new Type(['type' => 'float']), new PositiveOrZero(), ], + 'external_link' => [ + 'text' => $this->trans('[1]Manage tax rules[/1]', 'Admin.Catalog.Feature'), + 'href' => $this->router->generate('admin_taxes_index'), + 'align' => 'right', + ], 'default_empty_data' => 0.0, 'modify_all_shops' => true, ]); diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/SpecificPriceImpactType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/SpecificPriceImpactType.php index 944ddd5c50e56..ca0c3905ba452 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/SpecificPriceImpactType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/Pricing/SpecificPriceImpactType.php @@ -71,7 +71,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder ->add('reduction', PriceReductionType::class, [ 'label' => $this->trans('Apply a discount to the initial price', 'Admin.Catalog.Feature'), - 'label_subtitle' => $this->trans('For customers meeting the conditions, the initial price will be crossed out and the discount will be highlighted.', 'Admin.Catalog.Feature'), + 'alert_message' => $this->trans('For customers meeting the conditions, the initial price will be crossed out and the discount will be highlighted.', 'Admin.Catalog.Feature'), 'required' => false, 'constraints' => [ new Reduction([ diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/RedirectOptionType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/RedirectOptionType.php index 5d12a1f05fbb7..6d66bcebf41f5 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/RedirectOptionType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/RedirectOptionType.php @@ -189,8 +189,9 @@ public function configureOptions(OptionsResolver $resolver) 'label_help_box' => $this->trans('When your product is disabled, choose to which page you’d like to redirect the customers visiting its page by typing the product or category name.', 'Admin.Catalog.Help'), 'columns_number' => 2, 'row_attr' => [ - 'class' => 'redirect-option-widget', + 'class' => 'redirect-option-widget typeahead-product-collection-type', ], + 'alert_title' => $this->trans('Default behavior is specified in the Shop Parameters > Product settings page.', 'Admin.Catalog.Help'), 'alert_message' => $this->getRedirectionAlertMessages(), ]) ->setRequired([ @@ -205,15 +206,20 @@ public function configureOptions(OptionsResolver $resolver) */ private function getRedirectionAlertMessages(): array { + $formatParameters = [ + '[1]' => '', + '[/1]' => '', + '[2]' => '
', + ]; + return [ - $this->trans('Default behavior is specified in the Shop Parameters > Product settings page.', 'Admin.Catalog.Help'), - $this->trans('No redirection (200), display product = Do not redirect anywhere, display product as discontinued and return normal 200 response.', 'Admin.Catalog.Help'), - $this->trans('No redirection (404), display product = Do not redirect anywhere, display product as discontinued and return 404 "Not Found" response.', 'Admin.Catalog.Help'), - $this->trans('No redirection (410), display product = Do not redirect anywhere, display product as discontinued and return 410 "Gone" response.', 'Admin.Catalog.Help'), - $this->trans('No redirection (404), display error page = Do not redirect anywhere and display a 404 "Not Found" page.', 'Admin.Catalog.Help'), - $this->trans('No redirection (410), display error page = Do not redirect anywhere and display a 410 "Gone" page.', 'Admin.Catalog.Help'), - $this->trans('Permanent redirection (301) = Permanently display another product or category instead.', 'Admin.Catalog.Help'), - $this->trans('Temporary redirection (302) = Temporarily display another product or category instead.', 'Admin.Catalog.Help'), + $this->trans('[1]No redirection (200), display product[/1] [2] Do not redirect anywhere, display product as discontinued and return normal 200 response.', 'Admin.Catalog.Help', $formatParameters), + $this->trans('[1]No redirection (404), display product[/1] [2] Do not redirect anywhere, display product as discontinued and return 404 "Not Found" response.', 'Admin.Catalog.Help', $formatParameters), + $this->trans('[1]No redirection (410), display product[/1] [2] Do not redirect anywhere, display product as discontinued and return 410 "Gone" response.', 'Admin.Catalog.Help', $formatParameters), + $this->trans('[1]No redirection (404), display error page[/1] [2] Do not redirect anywhere and display a 404 "Not Found" page.', 'Admin.Catalog.Help', $formatParameters), + $this->trans('[1]No redirection (410), display error page[/1] [2] Do not redirect anywhere and display a 410 "Gone" page.', 'Admin.Catalog.Help', $formatParameters), + $this->trans('[1]Permanent redirection (301)[/1] [2] Permanently display another product or category instead.', 'Admin.Catalog.Help', $formatParameters), + $this->trans('[1]Temporary redirection (302)[/1] [2] Temporarily display another product or category instead.', 'Admin.Catalog.Help', $formatParameters), ]; } } diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/SEOType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/SEOType.php index b5930261c992f..4f3bd4322e30f 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/SEOType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/SEO/SEOType.php @@ -29,6 +29,7 @@ namespace PrestaShopBundle\Form\Admin\Sell\Product\SEO; use PrestaShop\PrestaShop\Adapter\LegacyContext; +use PrestaShop\PrestaShop\Core\ConfigurationInterface; use PrestaShop\PrestaShop\Core\ConstraintValidator\Constraints\TypedRegex; use PrestaShop\PrestaShop\Core\ConstraintValidator\TypedRegexValidator; use PrestaShop\PrestaShop\Core\Domain\Product\ProductSettings; @@ -64,6 +65,11 @@ class SEOType extends TranslatorAwareType */ private $legacyContext; + /** + * @var ConfigurationInterface + */ + private $configuration; + /** * @param TranslatorInterface $translator * @param array $locales @@ -78,13 +84,15 @@ public function __construct( RouterInterface $router, bool $friendlyUrlEnabled, bool $forceFriendlyUrl, - LegacyContext $legacyContext + LegacyContext $legacyContext, + ConfigurationInterface $configuration ) { parent::__construct($translator, $locales); $this->router = $router; $this->friendlyUrlEnabled = $friendlyUrlEnabled; $this->forceFriendlyUrl = $forceFriendlyUrl; $this->legacyContext = $legacyContext; + $this->configuration = $configuration; } /** @@ -92,6 +100,12 @@ public function __construct( */ public function buildForm(FormBuilderInterface $builder, array $options) { + // Automatic update is only enabled when product is offline and the configuration is enabled + $automaticUrlUpdate = false; + if (!$options['active'] && (bool) $this->configuration->get('PS_FORCE_FRIENDLY_PRODUCT')) { + $automaticUrlUpdate = true; + } + $builder ->add('serp', SerpType::class) ->add('meta_title', TranslatableType::class, [ @@ -169,6 +183,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ], 'attr' => [ 'class' => 'serp-watched-url', + 'data-automatic-update' => (int) $automaticUrlUpdate, ], ], 'modify_all_shops' => true, @@ -259,11 +274,13 @@ public function configureOptions(OptionsResolver $resolver) 'label_subtitle' => $this->trans('Improve your ranking and how your product page will appear in search engines results.', 'Admin.Catalog.Feature'), 'required' => false, 'form_theme' => '@PrestaShop/Admin/Sell/Catalog/Product/FormTheme/product_seo.html.twig', + 'active' => false, ]) ->setRequired([ 'product_id', ]) ->setAllowedTypes('product_id', 'int') + ->setAllowedTypes('active', ['bool']) ; } } diff --git a/src/PrestaShopBundle/Form/Admin/Sell/Product/Stock/StockOptionsType.php b/src/PrestaShopBundle/Form/Admin/Sell/Product/Stock/StockOptionsType.php index b2eef5eac6738..858c7b3c2f84b 100644 --- a/src/PrestaShopBundle/Form/Admin/Sell/Product/Stock/StockOptionsType.php +++ b/src/PrestaShopBundle/Form/Admin/Sell/Product/Stock/StockOptionsType.php @@ -96,7 +96,9 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'modify_all_shops' => true, // @todo: need to trigger opening allShopscheckbox on "disabling_switch" change too. 'disabling_switch' => true, + 'html5' => true, 'attr' => [ + 'placeholder' => $this->trans('Enter threshold value', 'Admin.Catalog.Feature'), 'class' => 'small-input', ], ]) diff --git a/src/PrestaShopBundle/Form/Admin/Type/FeatureChoiceType.php b/src/PrestaShopBundle/Form/Admin/Type/FeatureChoiceType.php new file mode 100644 index 0000000000000..a81b51ba01afe --- /dev/null +++ b/src/PrestaShopBundle/Form/Admin/Type/FeatureChoiceType.php @@ -0,0 +1,62 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) + */ + +declare(strict_types=1); + +namespace PrestaShopBundle\Form\Admin\Type; + +use PrestaShop\PrestaShop\Core\Form\FormChoiceProviderInterface; +use Symfony\Component\Form\Extension\Core\Type\ChoiceType; +use Symfony\Component\OptionsResolver\OptionsResolver; +use Symfony\Contracts\Translation\TranslatorInterface; + +class FeatureChoiceType extends TranslatorAwareType +{ + public function __construct( + TranslatorInterface $translator, + array $locales, + protected readonly FormChoiceProviderInterface $featureChoiceProvider + ) { + parent::__construct($translator, $locales); + } + + public function configureOptions(OptionsResolver $resolver): void + { + $resolver->setDefaults([ + 'choices' => $this->featureChoiceProvider->getChoices(), + 'label' => $this->trans('Feature', 'Admin.Catalog.Feature'), + 'autocomplete' => true, + 'attr' => [ + 'class' => 'feature-selector', + ], + ]); + } + + public function getParent(): string + { + return ChoiceType::class; + } +} diff --git a/src/PrestaShopBundle/Form/Admin/Type/FeatureFlagSwitchType.php b/src/PrestaShopBundle/Form/Admin/Type/FeatureFlagSwitchType.php new file mode 100644 index 0000000000000..0ff690389276a --- /dev/null +++ b/src/PrestaShopBundle/Form/Admin/Type/FeatureFlagSwitchType.php @@ -0,0 +1,77 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) + */ + +declare(strict_types=1); + +namespace PrestaShopBundle\Form\Admin\Type; + +use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\FormInterface; +use Symfony\Component\Form\FormView; +use Symfony\Component\OptionsResolver\OptionsResolver; + +/** + * Displays a switch (ON / OFF by default) for feature flags. + */ +class FeatureFlagSwitchType extends AbstractType +{ + public const TRANS_DOMAIN = 'Admin.Global'; + + /** + * {@inheritdoc} + */ + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults([ + 'block_prefix' => 'feature_flag', + 'form_theme' => '@PrestaShop/Admin/Configure/AdvancedParameters/FeatureFlag/FormTheme/feature_flag_form.html.twig', + 'types' => [], + 'used_type' => null, + 'forced_by_env' => false, + ]); + $resolver->setAllowedTypes('types', 'array'); + $resolver->setAllowedTypes('used_type', ['null', 'string']); + $resolver->setAllowedTypes('forced_by_env', 'bool'); + } + + /** + * {@inheritdoc} + */ + public function buildView(FormView $view, FormInterface $form, array $options) + { + $view->vars['types'] = $options['types']; + $view->vars['used_type'] = $options['used_type']; + $view->vars['forced_by_env'] = $options['forced_by_env']; + } + + /** + * {@inheritdoc} + */ + public function getParent() + { + return SwitchType::class; + } +} diff --git a/src/PrestaShopBundle/Form/Admin/Type/FormattedTextareaType.php b/src/PrestaShopBundle/Form/Admin/Type/FormattedTextareaType.php index 782df42d42771..43cdc36d0d94e 100644 --- a/src/PrestaShopBundle/Form/Admin/Type/FormattedTextareaType.php +++ b/src/PrestaShopBundle/Form/Admin/Type/FormattedTextareaType.php @@ -39,9 +39,12 @@ class FormattedTextareaType extends TranslatorAwareType { /** - * Max size of UTF-8 content in MySQL text column + * Max size of UTF-8 content in MySQL text columns */ + public const LIMIT_TINYTEXT_UTF8 = 84; public const LIMIT_TEXT_UTF8 = 21844; + public const LIMIT_MEDIUMTEXT_UTF8 = 5592414; + public const LIMIT_LONGTEXT_UTF8 = 1431655764; /** * {@inheritdoc} diff --git a/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php b/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php new file mode 100644 index 0000000000000..2f4cde44efcf0 --- /dev/null +++ b/src/PrestaShopBundle/Form/Admin/Type/GeoCoordinatesType.php @@ -0,0 +1,98 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) + */ +declare(strict_types=1); + +namespace PrestaShopBundle\Form\Admin\Type; + +use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\Extension\Core\Type\NumberType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; +use Symfony\Contracts\Translation\TranslatorInterface; + +/** + * This form class is responsible to create a geolocation latitude/longitude coordinates field. + */ +class GeoCoordinatesType extends AbstractType +{ + /** + * @param TranslatorInterface $translator + */ + public function __construct( + private readonly TranslatorInterface $translator + ) { + } + + /** + * {@inheritdoc} + */ + public function buildForm(FormBuilderInterface $builder, array $options): void + { + $builder + ->add('latitude', NumberType::class, [ + 'required' => false, + 'label' => $options['label_latitude'], + 'attr' => [ + 'placeholder' => $this->translator->trans('-0.12345', [], 'Admin.Global'), + 'class' => 'latitude', + ], + ]) + ->add('longitude', NumberType::class, [ + 'required' => false, + 'label' => $options['label_longitude'], + 'attr' => [ + 'placeholder' => $this->translator->trans('-0.12345', [], 'Admin.Global'), + 'class' => 'longitude', + ], + ]) + ; + } + + /** + * {@inheritdoc} + */ + public function configureOptions(OptionsResolver $resolver): void + { + $resolver->setDefaults([ + 'label_latitude' => $this->translator->trans('Latitude', [], 'Admin.Global'), + 'label_longitude' => $this->translator->trans('Longitude', [], 'Admin.Global'), + 'compound' => true, + 'inherit_data' => true, + ]); + $resolver + ->setAllowedTypes('label_latitude', 'string') + ->setAllowedTypes('label_longitude', 'string') + ; + } + + /** + * {@inheritdoc} + */ + public function getBlockPrefix(): string + { + return 'geo_coordinates'; + } +} diff --git a/src/PrestaShopBundle/Form/Admin/Type/ProductSearchType.php b/src/PrestaShopBundle/Form/Admin/Type/ProductSearchType.php index 279749544f42e..a2605ef7c7e5a 100644 --- a/src/PrestaShopBundle/Form/Admin/Type/ProductSearchType.php +++ b/src/PrestaShopBundle/Form/Admin/Type/ProductSearchType.php @@ -98,7 +98,7 @@ public function configureOptions(OptionsResolver $resolver): void 'filters' => $options['filters'], ]); } else { - return $router->generate('admin_products_v2_search_associations', [ + return $router->generate('admin_products_search_products_for_association', [ 'languageCode' => $languageIsoCode, 'query' => '__QUERY__', ]); diff --git a/src/PrestaShopBundle/Form/Admin/Type/ReorderPositionsButtonType.php b/src/PrestaShopBundle/Form/Admin/Type/ReorderPositionsButtonType.php new file mode 100644 index 0000000000000..37c3dbd8627d9 --- /dev/null +++ b/src/PrestaShopBundle/Form/Admin/Type/ReorderPositionsButtonType.php @@ -0,0 +1,52 @@ + + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) + */ + +namespace PrestaShopBundle\Form\Admin\Type; + +use Symfony\Component\Form\Extension\Core\Type\ButtonType; +use Symfony\Component\Form\FormBuilderInterface; + +/** + * Class ReorderPositionsButtonType. + */ +class ReorderPositionsButtonType extends TranslatorAwareType +{ + /** + * {@inheritdoc} + */ + public function buildForm(FormBuilderInterface $builder, array $options) + { + $builder->add('position', ButtonType::class, [ + 'label' => $this->trans('Rearrange', 'Admin.Actions'), + 'row_attr' => ['class' => 'mb-0'], + 'attr' => [ + 'class' => 'btn-default js-btn-reorder-positions', + 'data-label-reorder' => $this->trans('Rearrange', 'Admin.Actions'), + 'data-label-save' => $this->trans('Done', 'Admin.Actions'), + ], + ]); + } +} diff --git a/src/PrestaShopBundle/Form/Admin/Type/TranslatableChoiceType.php b/src/PrestaShopBundle/Form/Admin/Type/TranslatableChoiceType.php index 793cf3e50e355..127f04f16dff3 100644 --- a/src/PrestaShopBundle/Form/Admin/Type/TranslatableChoiceType.php +++ b/src/PrestaShopBundle/Form/Admin/Type/TranslatableChoiceType.php @@ -42,6 +42,7 @@ public function buildView(FormView $view, FormInterface $form, array $options) $view->vars['default_locale'] = reset($options['locales'])['iso_code']; $view->vars['choices'] = $options['choices']; + $view->vars['button'] = $options['button']; } /** @@ -50,11 +51,13 @@ public function buildView(FormView $view, FormInterface $form, array $options) public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ + 'button' => [], 'choices' => [], 'choice_translation_domain' => false, 'allow_extra_fields' => true, ]); + $resolver->setAllowedTypes('button', 'array'); $resolver->setAllowedTypes('choices', 'array'); parent::configureOptions($resolver); diff --git a/src/PrestaShopBundle/Form/Validator/Constraints/TinyMceMaxLength.php b/src/PrestaShopBundle/Form/Validator/Constraints/TinyMceMaxLength.php index af8c033e22140..44af4f7ef7a48 100644 --- a/src/PrestaShopBundle/Form/Validator/Constraints/TinyMceMaxLength.php +++ b/src/PrestaShopBundle/Form/Validator/Constraints/TinyMceMaxLength.php @@ -58,6 +58,6 @@ public function __construct($options = null) public function validatedBy(): string { - return get_class($this) . 'Validator'; + return static::class . 'Validator'; } } diff --git a/src/PrestaShopBundle/Install/Install.php b/src/PrestaShopBundle/Install/Install.php index 2c64b718984da..c15f133afb49f 100644 --- a/src/PrestaShopBundle/Install/Install.php +++ b/src/PrestaShopBundle/Install/Install.php @@ -751,7 +751,6 @@ public function configureShop(array $data = []) $default_data = [ 'shop_name' => 'My Shop', - 'shop_activity' => '', 'shop_country' => 'us', 'shop_timezone' => 'US/Eastern', // TODO : this timezone is deprecated 'use_smtp' => false, @@ -778,7 +777,6 @@ public function configureShop(array $data = []) Configuration::updateGlobalValue('PS_INSTALL_VERSION', _PS_INSTALL_VERSION_); Configuration::updateGlobalValue('PS_LOCALE_LANGUAGE', $this->language->getLanguageIso()); Configuration::updateGlobalValue('PS_SHOP_NAME', $data['shop_name']); - Configuration::updateGlobalValue('PS_SHOP_ACTIVITY', $data['shop_activity']); Configuration::updateGlobalValue('PS_COUNTRY_DEFAULT', $id_country); Configuration::updateGlobalValue('PS_LOCALE_COUNTRY', $data['shop_country']); Configuration::updateGlobalValue('PS_TIMEZONE', $data['shop_timezone']); @@ -835,7 +833,7 @@ public function configureShop(array $data = []) // Set logo configuration if (file_exists(_PS_IMG_DIR_ . 'logo.png')) { - list($width, $height) = getimagesize(_PS_IMG_DIR_ . 'logo.png'); + [$width, $height] = getimagesize(_PS_IMG_DIR_ . 'logo.png'); Configuration::updateGlobalValue('SHOP_LOGO_WIDTH', round($width)); Configuration::updateGlobalValue('SHOP_LOGO_HEIGHT', round($height)); } diff --git a/src/PrestaShopBundle/Install/XmlLoader.php b/src/PrestaShopBundle/Install/XmlLoader.php index 8dc1f9ee7b733..656ea2ec6bae7 100644 --- a/src/PrestaShopBundle/Install/XmlLoader.php +++ b/src/PrestaShopBundle/Install/XmlLoader.php @@ -266,7 +266,7 @@ public function populateEntity($entity) return; } - if (substr($entity, 0, 1) == '.' || substr($entity, 0, 1) == '_') { + if (str_starts_with($entity, '.') || str_starts_with($entity, '_')) { return; } @@ -537,7 +537,7 @@ public function createEntity($entity, $identifier, $classname, array $data, arra $entity_id = 0; if (!$xml->fields['primary']) { $primary = 'id_' . $entity; - } elseif (strpos((string) $xml->fields['primary'], ',') === false) { + } elseif (!str_contains((string) $xml->fields['primary'], ',')) { $primary = (string) $xml->fields['primary']; } unset($xml); @@ -662,7 +662,7 @@ public function createEntityTab($identifier, array $data, array $data_lang) // Generate primary key manually if (!$xml->fields['primary']) { $primary = 'id_' . $entity; - } elseif (strpos((string) $xml->fields['primary'], ',') === false) { + } elseif (!str_contains((string) $xml->fields['primary'], ',')) { $primary = (string) $xml->fields['primary']; } else { $primary = ''; @@ -1210,7 +1210,7 @@ public function getEntityContents($entity) // Check if current table is an association table (if multiple primary keys) $is_association = false; - if (strpos($primary, ',') !== false) { + if (str_contains($primary, ',')) { $is_association = true; $primary = array_map('trim', explode(',', $primary)); } diff --git a/src/PrestaShopBundle/Model/Product/AdminModelAdapter.php b/src/PrestaShopBundle/Model/Product/AdminModelAdapter.php index 6f1b14a5ab906..8b374c8300e7b 100644 --- a/src/PrestaShopBundle/Model/Product/AdminModelAdapter.php +++ b/src/PrestaShopBundle/Model/Product/AdminModelAdapter.php @@ -37,7 +37,6 @@ use PrestaShop\PrestaShop\Adapter\Supplier\SupplierDataProvider; use PrestaShop\PrestaShop\Adapter\Tax\TaxRuleDataProvider; use PrestaShop\PrestaShop\Adapter\Tools; -use PrestaShop\PrestaShop\Adapter\Warehouse\WarehouseDataProvider; use PrestaShop\PrestaShop\Core\Domain\Product\ValueObject\RedirectType; use PrestaShopBundle\Utils\FloatParser; use Product; @@ -75,8 +74,6 @@ class AdminModelAdapter extends \PrestaShopBundle\Model\AdminModelAdapter private $taxRuleDataProvider; /** @var array */ private $productPricePriority; - /** @var WarehouseDataProvider */ - private $warehouseAdapter; /** @var Configuration */ private $configuration; /** @var Router */ @@ -179,7 +176,6 @@ class AdminModelAdapter extends \PrestaShopBundle\Model\AdminModelAdapter * @param Tools $toolsAdapter * @param ProductDataProvider $productDataProvider * @param SupplierDataProvider $supplierDataProvider - * @param WarehouseDataProvider $warehouseDataProvider * @param FeatureDataProvider $featureDataProvider * @param PackDataProvider $packDataProvider * @param ShopContext $shopContext @@ -194,7 +190,6 @@ public function __construct( Tools $toolsAdapter, ProductDataProvider $productDataProvider, SupplierDataProvider $supplierDataProvider, - WarehouseDataProvider $warehouseDataProvider, FeatureDataProvider $featureDataProvider, PackDataProvider $packDataProvider, ShopContext $shopContext, @@ -210,7 +205,6 @@ public function __construct( $this->tools = $toolsAdapter; $this->productAdapter = $productDataProvider; $this->supplierAdapter = $supplierDataProvider; - $this->warehouseAdapter = $warehouseDataProvider; $this->featureAdapter = $featureDataProvider; $this->packAdapter = $packDataProvider; $this->shopContext = $shopContext; @@ -422,23 +416,6 @@ public function getModelData($form_data, $isMultiShopContext = false) $form_data['inputAccessories'] = $inputAccessories; } - //map warehouseProductLocations - $form_data['warehouse_loaded'] = 1; - $warehouses = $this->warehouseAdapter->getWarehouses(); - foreach ($warehouses as $warehouse) { - foreach ($form_data['warehouse_combination_' . $warehouse['id_warehouse']] as $combination) { - $key = $combination['warehouse_id'] - . '_' . $combination['product_id'] - . '_' . $combination['id_product_attribute']; - if ($combination['activated']) { - $form_data['check_warehouse_' . $key] = '1'; - } - $form_data['location_warehouse_' . $key] = $combination['location']; - - unset($form_data['warehouse_combination_' . $warehouse['id_warehouse']]); - } - } - //force customization fields values $form_data['uploadable_files'] = 0; $form_data['text_fields'] = 0; @@ -503,12 +480,6 @@ public function getFormData(Product $product) //Inject data form for supplier combinations $this->formData['step6'] = array_merge($this->formData['step6'], $this->getDataSuppliersCombinations($product)); - //Inject data form for warehouse combinations - $this->formData['step4'] = array_merge( - $this->formData['step4'], - $this->getDataWarehousesCombinations($product) - ); - return $this->formData; } @@ -616,8 +587,6 @@ private function mapStep2FormData(Product $product) private function mapStep3FormData(Product $product) { return [ - 'advanced_stock_management' => (bool) $product->advanced_stock_management, - 'depends_on_stock' => $product->depends_on_stock ? '1' : '0', 'qty_0' => $product::getQuantity($product->id), 'id_product_attributes' => $this->getProductAttributes($product), 'out_of_stock' => $product->out_of_stock, @@ -872,51 +841,6 @@ private function getDataSuppliersCombinations(Product $product) return $dataSuppliersCombinations; } - /** - * Generate form warehouses/combinations references. - * - * @param Product $product - * - * @return array filled data form references combinations - */ - private function getDataWarehousesCombinations(Product $product) - { - $combinations = $product->getAttributesResume($this->locales[0]['id_lang']) ?: []; - if (empty($combinations)) { - $combinations[] = [ - 'id_product' => $product->id, - 'id_product_attribute' => 0, - 'attribute_designation' => $product->name[$this->locales[0]['id_lang']], - ]; - } - - //for each warehouse, generate combinations list - $dataWarehousesCombinations = []; - - foreach ($this->warehouseAdapter->getWarehouses() as $warehouse) { - $warehouseId = $warehouse['id_warehouse']; - foreach ($combinations as $combination) { - $warehouseProductLocationData = $this->warehouseAdapter->getWarehouseProductLocationData( - $product->id, - $combination['id_product_attribute'], - $warehouseId - ); - $dataWarehousesCombinations['warehouse_combination_' . $warehouseId][] = [ - 'label' => $combination['attribute_designation'], - 'activated' => (bool) $warehouseProductLocationData['activated'], - 'warehouse_id' => $warehouseId, - 'product_id' => $product->id, - 'id_product_attribute' => $combination['id_product_attribute'], - 'location' => isset($warehouseProductLocationData['location']) - ? $warehouseProductLocationData['location'] - : '', - ]; - } - } - - return $dataWarehousesCombinations; - } - /** * get form product features. * diff --git a/src/PrestaShopBundle/PrestaShopBundle.php b/src/PrestaShopBundle/PrestaShopBundle.php index a9ee1d8fc55ac..70d74c405c7a3 100644 --- a/src/PrestaShopBundle/PrestaShopBundle.php +++ b/src/PrestaShopBundle/PrestaShopBundle.php @@ -27,7 +27,7 @@ namespace PrestaShopBundle; use PrestaShopBundle\DependencyInjection\Compiler\CommandAndQueryCollectorPass; -use PrestaShopBundle\DependencyInjection\Compiler\ContainerInjectionPass; +use PrestaShopBundle\DependencyInjection\Compiler\CommandAndQueryRegisterPass; use PrestaShopBundle\DependencyInjection\Compiler\DynamicRolePass; use PrestaShopBundle\DependencyInjection\Compiler\GridDefinitionServiceIdsCollectorPass; use PrestaShopBundle\DependencyInjection\Compiler\IdentifiableObjectFormTypesCollectorPass; @@ -57,6 +57,10 @@ class PrestaShopBundle extends Bundle */ public const LOAD_MODULE_SERVICES_PASS_PRIORITY = 200; + public function __construct(private \AppKernel $kernel) + { + } + /** * {@inheritdoc} */ @@ -73,15 +77,15 @@ public function build(ContainerBuilder $container) $container->addCompilerPass(new DynamicRolePass()); $container->addCompilerPass(new PopulateTranslationProvidersPass()); $container->addCompilerPass(new LoadServicesFromModulesPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, self::LOAD_MODULE_SERVICES_PASS_PRIORITY); - $container->addCompilerPass(new LoadServicesFromModulesPass('admin'), PassConfig::TYPE_BEFORE_OPTIMIZATION, self::LOAD_MODULE_SERVICES_PASS_PRIORITY); + $container->addCompilerPass(new LoadServicesFromModulesPass($this->kernel->getAppType()), PassConfig::TYPE_BEFORE_OPTIMIZATION, self::LOAD_MODULE_SERVICES_PASS_PRIORITY); $container->addCompilerPass(new RemoveXmlCompiledContainerPass(), PassConfig::TYPE_AFTER_REMOVING); $container->addCompilerPass(new RouterPass(), PassConfig::TYPE_AFTER_REMOVING); $container->addCompilerPass(new OverrideTranslatorServiceCompilerPass()); $container->addCompilerPass(new ModulesDoctrineCompilerPass()); + $container->addCompilerPass(new CommandAndQueryRegisterPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, self::LOAD_MODULE_SERVICES_PASS_PRIORITY); $container->addCompilerPass(new CommandAndQueryCollectorPass()); $container->addCompilerPass(new OptionsFormHookNameCollectorPass()); $container->addCompilerPass(new GridDefinitionServiceIdsCollectorPass()); $container->addCompilerPass(new IdentifiableObjectFormTypesCollectorPass()); - $container->addCompilerPass(new ContainerInjectionPass()); } } diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/configure/advanced_parameters/authorization_server.yml b/src/PrestaShopBundle/Resources/config/routing/admin/configure/advanced_parameters/authorization_server.yml index a568ccf2b2cec..db303a6ae8633 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/configure/advanced_parameters/authorization_server.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/configure/advanced_parameters/authorization_server.yml @@ -39,10 +39,30 @@ admin_authorized_applications_delete: _controller: PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters\AuthorizationServer\ApplicationController::deleteAction _legacy_controller: AdminAuthorizationServer - admin_api_accesses_create: path: /applications/api-accesses/create methods: [ GET, POST, PATCH ] defaults: _controller: PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters\AuthorizationServer\ApiAccessController::createAction _legacy_controller: AdminAuthorizationServer + +admin_api_accesses_edit: + path: /applications/api-accesses/{apiAccessId}/edit + methods: [ GET, POST, PATCH ] + defaults: + _controller: PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters\AuthorizationServer\ApiAccessController::editAction + _legacy_controller: ApiAccessController + +admin_api_accesses_delete: + path: /applications/api-accesses/{apiAccessId}/delete + methods: [ POST ] + defaults: + _controller: PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters\AuthorizationServer\ApiAccessController::deleteAction + _legacy_controller: ApiAccessController + +admin_api_accesses_toggle_active: + path: /applications/api-accesses/{apiAccessId}/toggle-active + methods: [ POST ] + defaults: + _controller: PrestaShopBundle\Controller\Admin\Configure\AdvancedParameters\AuthorizationServer\ApiAccessController::toggleActiveAction + _legacy_controller: ApiAccessController diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/order_states.yml b/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/order_states.yml index a4834cb1ff66c..e44d0aef47b05 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/order_states.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/order_states.yml @@ -5,7 +5,6 @@ admin_order_states: _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\OrderStateController::indexAction _legacy_controller: AdminStatuses _legacy_link: AdminStatuses - _legacy_feature_flag: order_state admin_order_states_filter: path: / @@ -16,7 +15,6 @@ admin_order_states_filter: gridDefinitionFactoryServiceId: prestashop.core.grid.definition.factory.order_states redirectRoute: admin_order_states _legacy_link: AdminStatuses:submitFilterstate - _legacy_feature_flag: order_state admin_order_states_create: path: /new diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/search_preferences.yml b/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/search_preferences.yml index 02ac7e8ec5cc5..e88c3f583149e 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/search_preferences.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/search_preferences.yml @@ -3,7 +3,7 @@ admin_search_index: path: / methods: [ GET ] defaults: - _controller: 'PrestaShopBundle\Controller\Admin\Configure\ShopParameters\SearchController::indexAction' + _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\SearchController::indexAction _legacy_controller: AdminSearchConf # _legacy_link: AdminSearchConf # _legacy_feature_flag: search @@ -15,5 +15,13 @@ admin_alias_search: _controller: PrestaShopBundle\Controller\Admin\CommonController::searchGridAction gridDefinitionFactoryServiceId: prestashop.core.grid.definition.factory.alias redirectRoute: admin_search_index - _legacy_controller: AdminSearchConf +# _legacy_controller: AdminSearchConf # _legacy_link: AdminSearchConf:submitFilteralias + +admin_alias_search_search_term_action: + path: / + methods: [ GET, POST ] + defaults: + _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\SearchController::searchAliasesForAssociationAction +# _legacy_controller: AdminSearchConf +# _legacy_link: AdminSearchConf diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/titles.yml b/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/titles.yml index 8b72c9e477c85..bb92b71a3a0c0 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/titles.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/configure/shop_parameters/titles.yml @@ -2,10 +2,9 @@ admin_title_index: path: / methods: [ GET ] defaults: - _controller: 'PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::indexAction' + _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::indexAction _legacy_controller: AdminGenders _legacy_link: AdminGenders - _legacy_feature_flag: title admin_title_search: path: / @@ -16,25 +15,22 @@ admin_title_search: redirectRoute: admin_title_index _legacy_controller: AdminGenders _legacy_link: AdminGenders:submitFiltergenders - _legacy_feature_flag: title admin_title_create: path: /new methods: [ GET, POST ] defaults: - _controller: 'PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::createAction' + _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::createAction _legacy_controller: AdminGenders _legacy_link: AdminGenders:addgender - _legacy_feature_flag: title admin_title_edit: path: /{titleId}/edit methods: [ GET, POST ] defaults: - _controller: 'PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::editAction' + _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::editAction _legacy_controller: AdminGenders _legacy_link: AdminGenders:updategender - _legacy_feature_flag: title requirements: titleId: \d+ @@ -42,10 +38,9 @@ admin_title_delete: path: /{titleId}/delete methods: [ POST, DELETE ] defaults: - _controller: 'PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::deleteAction' + _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::deleteAction _legacy_controller: AdminGenders _legacy_link: AdminGenders:deletegender - _legacy_feature_flag: title requirements: titleId: \d+ @@ -53,7 +48,6 @@ admin_title_bulk_delete: path: /bulk-delete methods: [ POST ] defaults: - _controller: 'PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::bulkDeleteAction' + _controller: PrestaShopBundle\Controller\Admin\Configure\ShopParameters\TitleController::bulkDeleteAction _legacy_controller: AdminGenders _legacy_link: AdminGenders:submitBulkdeletegender - _legacy_feature_flag: title diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute.yml index 064707d9c3cab..def5d62f8018c 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute.yml @@ -7,7 +7,8 @@ admin_attributes_index: _legacy_controller: AdminAttributesGroups redirectQueryParamsToKeep: - 'attributeGroupId' - # _legacy_link: AdminAttributesGroups:viewattribute_group + _legacy_link: AdminAttributesGroups:viewattribute_group + _legacy_feature_flag: attribute_group _legacy_parameters: id_attribute_group: attributeGroupId requirements: @@ -19,9 +20,10 @@ admin_attributes_search: defaults: _controller: PrestaShopBundle\Controller\Admin\CommonController::searchGridAction _legacy_controller: AdminAttributesGroups + _legacy_link: AdminAttributesGroups:submitFilterattribute + _legacy_feature_flag: attribute_group gridDefinitionFactoryServiceId: prestashop.core.grid.definition.factory.attribute redirectRoute: admin_attributes_index - # _legacy_link: AdminAttributesGroups:submitFilterattribute_values redirectQueryParamsToKeep: - 'attributeGroupId' @@ -31,9 +33,10 @@ admin_attributes_create: defaults: _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\AttributeController::createAction' _legacy_controller: AdminAttributesGroups + _legacy_link: AdminAttributesGroups:addattribute + _legacy_feature_flag: attribute_group redirectQueryParamsToKeep: - 'attributeGroupId' -# _legacy_link: AdminAttributesGroups:addattribute_group admin_attributes_edit: path: /{attributeId}/edit @@ -43,10 +46,10 @@ admin_attributes_edit: _legacy_controller: AdminAttributesGroups redirectQueryParamsToKeep: - 'attributeGroupId' - # _legacy_link: AdminAttributesGroups:updateattribute + _legacy_link: AdminAttributesGroups:updateattribute + _legacy_feature_flag: attribute_group _legacy_parameters: id_attribute_group: attributeGroupId - id_attribute: attributeId requirements: attributeId: \d+ @@ -58,7 +61,8 @@ admin_attributes_delete: _legacy_controller: AdminAttributesGroups redirectQueryParamsToKeep: - 'attributeGroupId' - # _legacy_link: AdminAttributesGroups:deleteattribute + _legacy_link: AdminAttributesGroups:deleteattribute + _legacy_feature_flag: attribute_group _legacy_parameters: id_attribute_group: attributeGroupId id_attribute: attributeId @@ -68,13 +72,11 @@ admin_attributes_bulk_delete: methods: POST defaults: _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\AttributeController::bulkDeleteAction' - _legacy_controller: AdminAttributesGroups redirectQueryParamsToKeep: - 'attributeGroupId' - # _legacy_link: AdminAttributesGroups:bulkdeleteattribute - _legacy_parameters: - id_attribute_group: attributeGroupId - id_attribute: attributeId + _legacy_link: AdminAttributesGroups:submitBulkdeleteattribute + _legacy_controller: AdminAttributesGroups + _legacy_feature_flag: attribute_group admin_attributes_update_position: path: /update-position @@ -82,4 +84,3 @@ admin_attributes_update_position: defaults: _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\AttributeController::updatePositionAction' _legacy_controller: AdminAttributesGroups -# _legacy_link: AdminAttributesGroups:updateAttributesPositions diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute_group.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute_group.yml index aef6cfc7ec38b..8834471c9ed62 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute_group.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/attribute_group.yml @@ -1,4 +1,3 @@ -# @todo: uncomment legacy links after page migration admin_attribute_groups_index: path: / methods: GET @@ -23,8 +22,7 @@ admin_attribute_groups_create: path: /new methods: [ GET, POST ] defaults: - # todo: implement create - _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\AttributeGroupController::indexAction' + _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\AttributeGroupController::createAction' _legacy_controller: AdminAttributesGroups _legacy_link: AdminAttributeGroups:addattribute_group _legacy_feature_flag: attribute_group @@ -92,5 +90,3 @@ admin_attribute_groups_update_position: defaults: _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\AttributeGroupController::updatePositionAction' _legacy_controller: AdminAttributesGroups - _legacy_link: AdminAttributesGroups:updateGroupsPositions - _legacy_feature_flag: attribute_group diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/cart_rule.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/cart_rule.yml index dbbeb7fdf0c5b..9f072344c4467 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/cart_rule.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/cart_rule.yml @@ -13,8 +13,8 @@ admin_cart_rules_create: defaults: _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\CartRuleController::createAction' _legacy_controller: AdminCartRules - # _legacy_link: AdminCartRules:addcartrule - # _legacy_feature_flag: cart_rule + _legacy_link: AdminCartRules:addcartrule + _legacy_feature_flag: cart_rule admin_cart_rules_search: path: /search diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/categories.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/categories.yml index a3ca66e3fb237..ce433f89b5cc2 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/categories.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/categories.yml @@ -127,19 +127,6 @@ admin_categories_delete_cover_image: requirements: categoryId: \d+ -admin_categories_delete_menu_thumbnail: - path: /{categoryId}/menu-thumbnails/{menuThumbnailId}/delete - methods: [ POST ] - defaults: - _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\CategoryController::deleteMenuThumbnailAction - _legacy_controller: AdminCategories - _legacy_link: AdminCategories:forceDeleteThumb - _legacy_parameters: - id_category: categoryId - requirements: - categoryId: \d+ - menuThumbnailId: 0|1|2 - admin_categories_update_position: path: /update-positions methods: [ POST ] diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml index 301f9b7433eeb..2838d2f584e41 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/features.yml @@ -1,4 +1,3 @@ -# @todo: legacy links can be uncommented when page is fully migrated. admin_features_index: path: / methods: [ GET ] @@ -6,7 +5,6 @@ admin_features_index: _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureController::indexAction _legacy_controller: AdminFeatures _legacy_link: AdminFeatures - _legacy_feature_flag: feature admin_features_horizontal_index: path: /horizontal @@ -21,7 +19,7 @@ admin_features_search: defaults: _controller: PrestaShopBundle\Controller\Admin\CommonController::searchGridAction _legacy_controller: AdminFeatures - # _legacy_link: AdminFeatures + _legacy_link: AdminTracking:submitFilterfeature gridDefinitionFactoryServiceId: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureGridDefinitionFactory redirectRoute: admin_features_index @@ -32,7 +30,6 @@ admin_features_add: _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureController::createAction _legacy_controller: AdminFeatures _legacy_link: AdminFeatures:addfeature - _legacy_feature_flag: feature admin_features_edit: path: /{featureId}/edit @@ -41,7 +38,6 @@ admin_features_edit: _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureController::editAction _legacy_controller: AdminFeatures _legacy_link: AdminFeatures:updatefeature - _legacy_feature_flag: feature _legacy_parameters: id_feature: featureId requirements: @@ -51,8 +47,9 @@ admin_features_export: path: /export methods: GET defaults: - _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureController::exportAction' + _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureController::exportAction _legacy_controller: AdminFeatures + _legacy_link: AdminThemes:exportfeature admin_features_update_position: path: /update-position @@ -60,6 +57,7 @@ admin_features_update_position: defaults: _controller: PrestaShopBundle\Controller\Admin\CommonController::updatePositionAction _legacy_controller: AdminFeatures + _legacy_link: AdminFeatures:updateFeaturesPositions position_definition: prestashop.core.grid.feature.position_definition redirect_route: admin_features_index @@ -80,3 +78,77 @@ admin_features_bulk_delete: _legacy_controller: AdminFeatures requirements: featureId: \d+ + +admin_feature_values_index: + path: /{featureId}/values + methods: [ GET ] + defaults: + _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::indexAction + _legacy_controller: AdminFeatures + _legacy_link: AdminFeatures:viewfeature + _legacy_parameters: + id_feature: featureId + requirements: + featureId: \d+ + +admin_feature_values_search: + path: /{featureId}/values + methods: [ POST ] + defaults: + _controller: PrestaShopBundle\Controller\Admin\CommonController::searchGridAction + gridDefinitionFactoryServiceId: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureValueGridDefinitionFactory + redirectRoute: admin_feature_values_index + _legacy_controller: AdminFeatures + _legacy_link: AdminFeatures + redirectQueryParamsToKeep: + - 'featureId' + requirements: + featureId: \d+ + +admin_feature_values_add: + path: /new-value + methods: [ GET, POST ] + defaults: + _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::createAction + _legacy_controller: AdminFeatures + _legacy_link: AdminFeatures:addfeature_value + +admin_feature_values_edit: + path: /{featureId}/values/{featureValueId}/edit + methods: [ GET, POST ] + defaults: + _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::editAction + _legacy_controller: AdminFeatures + _legacy_link: AdminFeatures:updatefeature_value + _legacy_parameters: + id_feature: featureId + id_feature_value: featureValueId + redirectQueryParamsToKeep: + - 'featureId' + +admin_feature_values_export: + path: /{featureId}/values/export + methods: GET + defaults: + _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::exportAction + _legacy_controller: AdminFeatures + +admin_feature_values_delete: + path: /{featureId}/values/{featureValueId}/delete + methods: [ POST, DELETE ] + defaults: + _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::deleteAction + _legacy_controller: AdminFeatures + requirements: + featureId: \d+ + featureValueId: \d+ + +admin_feature_values_bulk_delete: + path: /{featureId}/values/bulk-delete + methods: [ POST, DELETE ] + defaults: + _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\FeatureValueController::bulkDeleteAction + _legacy_controller: AdminFeatures + requirements: + featureId: \d+ + featureValueId: \d+ diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/monitoring.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/monitoring.yml index bb414fef0441f..7e449002f17f1 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/monitoring.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/monitoring.yml @@ -12,6 +12,7 @@ admin_monitorings_search: defaults: _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\MonitoringController::searchAction' _legacy_controller: AdminTracking + _legacy_link: AdminTracking:submitFiltermonitoring admin_monitoring_products_bulk_delete: path: /delete-bulk @@ -19,3 +20,4 @@ admin_monitoring_products_bulk_delete: defaults: _controller: 'PrestaShopBundle\Controller\Admin\Sell\Catalog\MonitoringController::deleteBulkAction' _legacy_controller: AdminTracking + _legacy_link: AdminTracking:submitBulkdeletemonitoring diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/products.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/products.yml index 79b166876e496..d3f0258c3264b 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/products.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/products.yml @@ -25,10 +25,6 @@ _product_suppliers: resource: "suppliers.yml" prefix: /suppliers/ -_product_warehouses: - resource: "warehouses.yml" - prefix: /warehouses/ - # Product List admin_product_catalog: path: /{offset}/{limit}/{orderBy}/{sortOrder} diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/warehouses.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/warehouses.yml deleted file mode 100644 index ad4aa218d7b72..0000000000000 --- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products/warehouses.yml +++ /dev/null @@ -1,9 +0,0 @@ -admin_warehouse_refresh_product_warehouse_combination_form: - path: /refresh-product-warehouse-combination-form/{idProduct} - methods: [ GET ] - defaults: - _controller: PrestaShopBundle\Controller\Admin\WarehouseController::refreshProductWarehouseCombinationFormAction - _legacy_controller: AdminProducts - idProduct: 0 - requirements: - idProduct: \d+ diff --git a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products_v2/product.yml b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products_v2/product.yml index 1c02df32f3c19..8c417497d013b 100644 --- a/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products_v2/product.yml +++ b/src/PrestaShopBundle/Resources/config/routing/admin/sell/catalog/products_v2/product.yml @@ -13,6 +13,7 @@ admin_products_index: defaults: _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\Product\ProductController::indexAction _legacy_controller: AdminProducts + _legacy_link: AdminProducts admin_products_light_list: path: /light-list @@ -330,8 +331,7 @@ admin_products_bulk_disable_shop_group: defaults: _controller: PrestaShopBundle\Controller\Admin\Sell\Catalog\Product\ProductController::bulkDisableShopGroupAction _legacy_controller: AdminProducts - _legacy_link: - - AdminProducts:submitBulkenableSelectionproduct + _legacy_link: AdminProducts:submitBulkdisableSelectionproduct requirements: productId: \d+ shopGroupId: \d+ diff --git a/src/PrestaShopBundle/Resources/config/services.yml b/src/PrestaShopBundle/Resources/config/services.yml index 2dd1a2a0dfea4..93acdc58941c2 100644 --- a/src/PrestaShopBundle/Resources/config/services.yml +++ b/src/PrestaShopBundle/Resources/config/services.yml @@ -7,3 +7,4 @@ imports: - { resource: services/adapter/*.yml } - { resource: services/legacy.yml } - { resource: services/alias.yml } + - { resource: services/front_legacy.yml } diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/address.yml b/src/PrestaShopBundle/Resources/config/services/adapter/address.yml index d351c2a681550..34910b8166726 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/address.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/address.yml @@ -6,79 +6,57 @@ services: prestashop.adapter.address.command_handler.delete_address_handler: class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\DeleteAddressHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\DeleteAddressCommand' } + autoconfigure: true prestashop.adapter.address.command_handler.bulk_delete_address_handler: class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\BulkDeleteAddressHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\BulkDeleteAddressCommand' } + autoconfigure: true prestashop.adapter.address.command_handler.add_manufacturer_address_handler: class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\AddManufacturerAddressHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\AddManufacturerAddressCommand' + autoconfigure: true prestashop.adapter.address.command_handler.edit_manufacturer_address_handler: class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\EditManufacturerAddressHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditManufacturerAddressCommand' + autoconfigure: true prestashop.adapter.address.query_handler.get_manufacturer_address_for_editing_handler: class: 'PrestaShop\PrestaShop\Adapter\Address\QueryHandler\GetManufacturerAddressForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Address\Query\GetManufacturerAddressForEditing' + autoconfigure: true prestashop.adapter.address.query_handler.get_required_fields_for_address: class: 'PrestaShop\PrestaShop\Adapter\Address\QueryHandler\GetRequiredFieldsForAddressHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Address\Query\GetRequiredFieldsForAddress' + autoconfigure: true prestashop.adapter.address.command_handler.set_required_fields_for_address: class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\SetRequiredFieldsForAddressHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\SetRequiredFieldsForAddressCommand' + autoconfigure: true prestashop.adapter.address.command_handler.add_customer_address_handler: class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\AddCustomerAddressHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\AddCustomerAddressCommand' + autoconfigure: true prestashop.adapter.address.query_handler.get_customer_address_for_editing_handler: class: 'PrestaShop\PrestaShop\Adapter\Address\QueryHandler\GetCustomerAddressForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Address\Query\GetCustomerAddressForEditing' + autoconfigure: true prestashop.adapter.address.command_handler.edit_customer_address_handler: class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\EditCustomerAddressHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCustomerAddressCommand' + autoconfigure: true prestashop.adapter.address.command_handler.edit_order_address_handler: class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\EditOrderAddressHandler' + autoconfigure: true arguments: - '@prestashop.adapter.address.command_handler.edit_customer_address_handler' - '@prestashop.adapter.order.command_handler.change_order_delivery_address_handler' - '@prestashop.adapter.order.command_handler.change_order_invoice_address_handler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditOrderAddressCommand' prestashop.adapter.address.command_handler.edit_cart_address_handler: class: 'PrestaShop\PrestaShop\Adapter\Address\CommandHandler\EditCartAddressHandler' + autoconfigure: true arguments: - '@prestashop.adapter.address.command_handler.edit_customer_address_handler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Address\Command\EditCartAddressCommand' prestashop.adapter.address.formatter: class: 'PrestaShop\PrestaShop\Adapter\Address\AddressFormatter' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/admin.yml b/src/PrestaShopBundle/Resources/config/services/adapter/admin.yml index 2b80824f01641..3171686212270 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/admin.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/admin.yml @@ -8,10 +8,6 @@ services: - !php/const _PS_MODE_DEV_ decorates: prestashop.core.admin.page_preference_interface - prestashop.adapter.admin.page_preference: - alias: PrestaShop\PrestaShop\Adapter\Admin\PagePreference - deprecated: ~ - prestashop.adapter.legacy_db: public: true class: 'Db' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml index cbe94e78f1f81..e15ee34c8c6ac 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/alias.yml @@ -11,21 +11,25 @@ services: $dbPrefix: '%database_prefix%' PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\AddAliasHandler: - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\AddAliasCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Alias\QueryHandler\GetAliasForEditingHandler: - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Alias\Query\GetAliasForEditing + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\DeleteAliasHandler: + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\BulkDeleteAliasHandler: + autoconfigure: true PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\UpdateAliasStatusHandler: - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\UpdateAliasStatusCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\BulkUpdateAliasStatusHandler: - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Alias\Command\BulkUpdateAliasStatusCommand + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\Alias\CommandHandler\UpdateAliasHandler: + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\Alias\QueryHandler\SearchForSearchTermHandler: + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml b/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml index 684557a660c6b..6492ec62301f1 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/attachment.yml @@ -4,29 +4,25 @@ services: prestashop.adapter.attachment.command_handler.delete_attachment_handler: public: true + autoconfigure: true class: 'PrestaShop\PrestaShop\Adapter\Attachment\CommandHandler\DeleteAttachmentHandler' parent: 'prestashop.adapter.attachment.command_handler.abstract_attachment_handler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\DeleteAttachmentCommand' } prestashop.adapter.attachment.command_handler.bulk_delete_attachment_handler: public: true + autoconfigure: true class: 'PrestaShop\PrestaShop\Adapter\Attachment\CommandHandler\BulkDeleteAttachmentsHandler' parent: 'prestashop.adapter.attachment.command_handler.abstract_attachment_handler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\BulkDeleteAttachmentsCommand' } prestashop.adapter.attachment.query_handler.get_attachment_handler: class: 'PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler\GetAttachmentHandler' + autoconfigure: true arguments: - !php/const _PS_DOWNLOAD_DIR_ - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachment' } prestashop.adapter.contact.query_handler.get_attachment_handler: class: 'PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler\GetAttachmentForEditingHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachmentForEditing' } + autoconfigure: true prestashop.adapter.attachment.uploader.attachment_file_uploader: class: 'PrestaShop\PrestaShop\Adapter\File\Uploader\AttachmentFileUploader' @@ -42,43 +38,33 @@ services: prestashop.adapter.attachment.command_handler.edit_attachment_handler: public: true + autoconfigure: true class: 'PrestaShop\PrestaShop\Adapter\Attachment\CommandHandler\EditAttachmentHandler' parent: 'prestashop.adapter.attachment.command_handler.abstract_attachment_handler' arguments: - '@prestashop.adapter.attachment.uploader.attachment_file_uploader' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\EditAttachmentCommand' } prestashop.adapter.attachment.command_handler.create_attachment_handler: public: true + autoconfigure: true class: 'PrestaShop\PrestaShop\Adapter\Attachment\CommandHandler\AddAttachmentHandler' parent: 'prestashop.adapter.attachment.command_handler.abstract_attachment_handler' arguments: - '@prestashop.adapter.attachment.uploader.attachment_file_uploader' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Attachment\Command\AddAttachmentCommand' } PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository: arguments: - '@doctrine.dbal.default_connection' - '%database_prefix%' - prestashop.adapter.attachment.attachment_repository: - alias: PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository - deprecated: ~ - prestashop.adapter.attachment.query_handler.get_attachment_information_handler: class: PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler\GetAttachmentInformationHandler + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Attachment\Query\GetAttachmentInformation prestashop.adapter.attachment.query_handler.search_attachment_handler: class: PrestaShop\PrestaShop\Adapter\Attachment\QueryHandler\SearchAttachmentHandler + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Attachment\AttachmentRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Attachment\Query\SearchAttachment diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/attribute.yml b/src/PrestaShopBundle/Resources/config/services/adapter/attribute.yml index d2f64172939e1..1b8c7ca4cf143 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/attribute.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/attribute.yml @@ -3,14 +3,10 @@ services: public: true PrestaShop\PrestaShop\Adapter\Attribute\CommandHandler\DeleteAttributeHandler: - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\DeleteAttributeCommand' + autoconfigure: true PrestaShop\PrestaShop\Adapter\Attribute\CommandHandler\BulkDeleteAttributeHandler: - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\BulkDeleteAttributeCommand' + autoconfigure: true PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository: arguments: diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml b/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml index eecc159e7d5c8..32af69438a75f 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/attribute_group.yml @@ -2,41 +2,44 @@ services: _defaults: public: true + PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler\AddAttributeGroupHandler: + autowire: true + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler\EditAttributeGroupHandler: + autowire: true + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\AttributeGroup\QueryHandler\GetAttributeGroupForEditingHandler: + autowire: true + autoconfigure: true + PrestaShop\PrestaShop\Adapter\AttributeGroup\AttributeGroupViewDataProvider: arguments: - "@=service('prestashop.adapter.legacy.context').getContext().language.id" - '@PrestaShop\PrestaShop\Core\ConfigurationInterface' - prestashop.adapter.product.attribute_group.attribute_group_view_data_provider: - alias: PrestaShop\PrestaShop\Adapter\AttributeGroup\AttributeGroupViewDataProvider - deprecated: ~ - PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler\DeleteAttributeGroupHandler: - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\DeleteAttributeGroupCommand' + autoconfigure: true PrestaShop\PrestaShop\Adapter\AttributeGroup\CommandHandler\BulkDeleteAttributeGroupHandler: - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Command\BulkDeleteAttributeGroupCommand' + autoconfigure: true PrestaShop\PrestaShop\Adapter\AttributeGroup\QueryHandler\GetAttributeGroupListHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository' - '@PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Query\GetAttributeGroupList' PrestaShop\PrestaShop\Adapter\Product\AttributeGroup\QueryHandler\GetProductAttributeGroupsHandler: autowire: true public: false - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Product\AttributeGroup\Query\GetProductAttributeGroups' + autoconfigure: true PrestaShop\PrestaShop\Adapter\AttributeGroup\Repository\AttributeGroupRepository: + autowire: true arguments: - '@doctrine.dbal.default_connection' - '%database_prefix%' + + PrestaShop\PrestaShop\Adapter\AttributeGroup\Validate\AttributeGroupValidator: diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/backup.yml b/src/PrestaShopBundle/Resources/config/services/adapter/backup.yml index be70904bc8a4c..3019101f3df5b 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/backup.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/backup.yml @@ -12,18 +12,3 @@ services: PrestaShop\PrestaShop\Core\Backup\Manager\BackupRemoverInterface: class: PrestaShop\PrestaShop\Adapter\Backup\BackupRemover public: true - - prestashop.adapter.backup.database_creator: - alias: PrestaShop\PrestaShop\Core\Backup\BackupInterface - public: true - deprecated: ~ - - prestashop.adapter.backup.backup_provider: - alias: PrestaShop\PrestaShop\Core\Backup\Repository\BackupRepositoryInterface - public: true - deprecated: ~ - - prestashop.adapter.backup.backup_remover: - alias: PrestaShop\PrestaShop\Core\Backup\Manager\BackupRemoverInterface - public: true - deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cache.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cache.yml index ae571d917cca4..dc488cbd9bc8d 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/cache.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/cache.yml @@ -16,3 +16,7 @@ services: prestashop.adapter.cache.clearer.xml_cache_clearer: class: 'PrestaShop\PrestaShop\Adapter\Cache\Clearer\XmlCacheClearer' + + PrestaShop\PrestaShop\Adapter\Cache\Clearer\DoctrineCacheClearer: + arguments: + - '@doctrine.cache.provider' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/carrier.yml b/src/PrestaShopBundle/Resources/config/services/adapter/carrier.yml index 11ae6131bdb92..c2bfaacb6622b 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/carrier.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/carrier.yml @@ -9,28 +9,23 @@ services: prestashop.adapter.carrier.command_handler.toggle_carrier_status: class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\ToggleCarrierStatusHandler' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\ToggleCarrierStatusCommand } + autoconfigure: true prestashop.adapter.carrier.command_handler.toggle_carrier_is_free_status: class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\ToggleCarrierIsFreeHandler' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\ToggleCarrierIsFreeCommand } + autoconfigure: true prestashop.adapter.carrier.command_handler.delete_carrier: class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\DeleteCarrierHandler' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\DeleteCarrierCommand } + autoconfigure: true prestashop.adapter.carrier.command_handler.bulk_delete_carrier: class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\BulkDeleteCarrierHandler' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\BulkDeleteCarrierCommand } + autoconfigure: true prestashop.adapter.carrier.command_handler.bulk_toggle_carrier_status: class: 'PrestaShop\PrestaShop\Adapter\Carrier\CommandHandler\BulkToggleCarrierStatusHandler' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Carrier\Command\BulkToggleCarrierStatusCommand } + autoconfigure: true prestashop.adapter.carrier.carrier_module_advice_alert_checker: class: 'PrestaShop\PrestaShop\Adapter\Carrier\CarrierModuleAdviceAlertChecker' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml index 54a8255738874..840ab61d208f9 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/cart.yml @@ -4,127 +4,94 @@ services: prestashop.adapter.cart.command_handler.create_empty_customer_cart_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\CreateEmptyCustomerCartHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\CreateEmptyCustomerCartCommand' + autoconfigure: true prestashop.adapter.cart.command_handler.update_cart_currency_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartCurrencyHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartCurrencyCommand' + autoconfigure: true prestashop.adapter.cart.command_handler.update_cart_language_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartLanguageHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartLanguageCommand' + autoconfigure: true prestashop.adapter.cart.command_handler.update_cart_addresses_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartAddressesHandler' + autoconfigure: true arguments: - '@prestashop.adapter.command_handler.update_cart_carrier_handler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartAddressesCommand' prestashop.adapter.cart.command_handler.update_delivery_options_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartDeliverySettingsHandler' + autoconfigure: true arguments: - '@translator' - '@prestashop.adapter.legacy.configuration' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartDeliverySettingsCommand' prestashop.adapter.command_handler.update_product_quantity_in_cart_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateProductQuantityInCartHandler' + autoconfigure: true arguments: - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateProductQuantityInCartCommand' prestashop.adapter.command_handler.update_cart_carrier_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateCartCarrierHandler' + autoconfigure: true arguments: - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateCartCarrierCommand' prestashop.adapter.command_handler.add_cart_rule_to_cart_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\AddCartRuleToCartHandler' + autoconfigure: true arguments: - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddCartRuleToCartCommand' prestashop.adapter.command_handler.remove_cart_rule_from_cart_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\RemoveCartRuleFromCartHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\RemoveCartRuleFromCartCommand' + autoconfigure: true prestashop.adapter.command_handler.remove_product_from_cart_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\RemoveProductFromCartHandler' + autoconfigure: true arguments: - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\RemoveProductFromCartCommand' prestashop.adapter.command_handler.update_product_price_in_cart_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\UpdateProductPriceInCartHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\UpdateProductPriceInCartCommand' + autoconfigure: true prestashop.adapter.command_handler.send_cart_to_customer_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\SendCartToCustomerHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\SendCartToCustomerCommand' + deprecated: 'The "%service_id%" service is deprecated since 9.0 and will be removed in next major.' + autoconfigure: true prestashop.adapter.query_handler.get_cart_for_viewing_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\QueryHandler\GetCartForViewingHandler' + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\ImageManager' - "@prestashop.core.localization.locale.context_locale" - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetCartForViewing' prestashop.adapter.cart.query_handler.get_last_empty_customer_cart_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\QueryHandler\GetLastEmptyCustomerCartHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetLastEmptyCustomerCart' + autoconfigure: true prestashop.adapter.query_handler.get_cart_information_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\QueryHandler\GetCartForOrderCreationHandler' + autoconfigure: true arguments: - "@prestashop.core.localization.locale.context_locale" - '@=service("prestashop.adapter.legacy.context").getContext().language.id' - '@=service("prestashop.adapter.legacy.context").getContext().link' - '@prestashop.adapter.context_state_manager' - '@=service("prestashop.adapter.legacy.configuration").getInt("PS_CARRIER_DEFAULT")' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Query\GetCartForOrderCreation' prestashop.adapter.command_handler.add_customization_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\AddCustomizationHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddCustomizationCommand' + autoconfigure: true prestashop.adapter.command_handler.add_product_to_cart_handler: class: 'PrestaShop\PrestaShop\Adapter\Cart\CommandHandler\AddProductToCartHandler' + autoconfigure: true arguments: - '@prestashop.adapter.command_handler.add_customization_handler' - '@prestashop.adapter.command_handler.update_product_quantity_in_cart_handler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Cart\Command\AddProductToCartCommand' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml index 45b197926a799..f32173a3fc13b 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/cart_rule.yml @@ -5,46 +5,34 @@ services: PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\AddCartRuleHandler: autowire: true public: false - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\AddCartRuleCommand } + autoconfigure: true - prestashop.adapter.cart_rule.query_handler.get_cart_rule_for_editing: - class: 'PrestaShop\PrestaShop\Adapter\CartRule\QueryHandler\GetCartRuleForEditingHandler' - arguments: - - '@prestashop.core.image.parser.image_tag_source_parser' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Query\GetCartRuleForEditing' + PrestaShop\PrestaShop\Adapter\CartRule\QueryHandler\GetCartRuleForEditingHandler: + autowire: true + public: false + autoconfigure: true prestashop.adapter.cart_rule.query_handler.search_cart_rules_handler: class: PrestaShop\PrestaShop\Adapter\CartRule\QueryHandler\SearchCartRulesHandler + autoconfigure: true arguments: - "@=service('prestashop.adapter.legacy.context').getContext().language.id" - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Query\SearchCartRules } prestashop.adapter.cart_rule.command_handler.delete_cart_rule_handler: class: 'PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\DeleteCartRuleHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\DeleteCartRuleCommand' + autoconfigure: true prestashop.adapter.cart_rule.command_handler.bulk_delete_cart_rule_handler: class: 'PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\BulkDeleteCartRuleHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkDeleteCartRuleCommand' + autoconfigure: true prestashop.adapter.cart_rule.command_handler.toggle_cart_rule_status_handler: class: 'PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\ToggleCartRuleStatusHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\ToggleCartRuleStatusCommand' + autoconfigure: true prestashop.adapter.cart_rule.command_handler.bulk_toggle_cart_rule_status_handler: class: 'PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\BulkToggleCartRuleStatusHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\CartRule\Command\BulkToggleCartRuleStatusCommand' } + autoconfigure: true PrestaShop\PrestaShop\Adapter\CartRule\Validate\CartRuleValidator: autowire: true @@ -53,13 +41,20 @@ services: PrestaShop\PrestaShop\Adapter\CartRule\Repository\CartRuleRepository: autowire: true public: false + arguments: + $connection: '@doctrine.dbal.default_connection' + $dbPrefix: '%database_prefix%' PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\EditCartRuleHandler: autowire: true public: false - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\CartRule\Command\EditCartRuleCommand } + autoconfigure: true PrestaShop\PrestaShop\Adapter\CartRule\CartRuleActionFiller: autowire: true public: false + + PrestaShop\PrestaShop\Adapter\CartRule\CommandHandler\SetCartRuleRestrictionsHandler: + autowire: true + public: false + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/catalog_price_rule.yml b/src/PrestaShopBundle/Resources/config/services/adapter/catalog_price_rule.yml index 01947881d413c..e01531b99bb2a 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/catalog_price_rule.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/catalog_price_rule.yml @@ -4,41 +4,29 @@ services: prestashop.adapter.catalog_price_rule.command_handler.delete_catalog_price_rule_handler: class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler\DeleteCatalogPriceRuleHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\DeleteCatalogPriceRuleCommand' + autoconfigure: true prestashop.adapter.catalog_price_rule.command_handler.bulk_delete_catalog_price_rule_handler: class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler\BulkDeleteCatalogPriceRuleHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\BulkDeleteCatalogPriceRuleCommand' + autoconfigure: true prestashop.adapter.catalog_price_rule.command_handler.add_catalog_price_rule_handler: class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler\AddCatalogPriceRuleHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\AddCatalogPriceRuleCommand' + autoconfigure: true prestashop.adapter.catalog_price_rule.command_handler.edit_catalog_price_rule_handler: class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\CommandHandler\EditCatalogPriceRuleHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Command\EditCatalogPriceRuleCommand' + autoconfigure: true prestashop.adapter.catalog_price_rule.command_handler.get_catalog_price_rule_for_editing_handler: class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\QueryHandler\GetCatalogPriceRuleForEditingHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Query\GetCatalogPriceRuleForEditing' + autoconfigure: true prestashop.adapter.catalog_price_rule.query_handler.get_catalog_price_rule_list_for_product_handler: class: 'PrestaShop\PrestaShop\Adapter\CatalogPriceRule\QueryHandler\GetCatalogPriceRuleListForProductHandler' + autoconfigure: true arguments: - '@prestashop.adapter.catalog_price_rule.repository.catalog_price_rule_repository' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\CatalogPriceRule\Query\GetCatalogPriceRuleListForProduct' prestashop.adapter.catalog_price_rule.repository.catalog_price_rule_repository: class: PrestaShop\PrestaShop\Adapter\CatalogPriceRule\Repository\CatalogPriceRuleRepository diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/category.yml b/src/PrestaShopBundle/Resources/config/services/adapter/category.yml index 9af97e74fa899..cdc99466414fb 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/category.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/category.yml @@ -12,27 +12,19 @@ services: prestashop.adapter.category.command_handler.bulk_update_categories_status_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\BulkUpdateCategoriesStatusHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkUpdateCategoriesStatusCommand + autoconfigure: true prestashop.adapter.category.command_handler.bulk_enable_categories_status_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\BulkUpdateCategoriesStatusHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkEnableCategoriesCommand + autoconfigure: true prestashop.adapter.category.command_handler.bulk_disable_categories_status_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\BulkUpdateCategoriesStatusHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkDisableCategoriesCommand + autoconfigure: true prestashop.adapter.category.command_handler.set_category_is_enabled_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\SetCategoryIsEnabledHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\SetCategoryIsEnabledCommand + autoconfigure: true prestashop.adapter.category.command_handler.abstract_delete_category_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\AbstractDeleteCategoryHandler @@ -46,24 +38,19 @@ services: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\DeleteCategoryHandler parent: prestashop.adapter.category.command_handler.abstract_delete_category_handler public: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCommand + autoconfigure: true prestashop.adapter.category.command_handler.bulk_delete_categories_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\BulkDeleteCategoriesHandler parent: prestashop.adapter.category.command_handler.abstract_delete_category_handler public: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\BulkDeleteCategoriesCommand + autoconfigure: true prestashop.adapter.category.command_handler.add_category_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\AddCategoryHandler public: true autowire: true - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Category\Command\AddCategoryCommand } + autoconfigure: true prestashop.adapter.category.command_handler.add_root_category_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\AddRootCategoryHandler @@ -71,72 +58,46 @@ services: - '@prestashop.adapter.legacy.configuration' public: true autowire: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\AddRootCategoryCommand + autoconfigure: true prestashop.adapter.category.command_handler.edit_root_category_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\EditRootCategoryHandler public: true autowire: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\EditRootCategoryCommand + autoconfigure: true prestashop.adapter.category.command_handler.edit_category_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\EditCategoryHandler public: true autowire: true - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Category\Command\EditCategoryCommand } + autoconfigure: true prestashop.adapter.category.query_handler.get_category_for_editing: class: PrestaShop\PrestaShop\Adapter\Category\QueryHandler\GetCategoryForEditingHandler + autoconfigure: true arguments: - '@prestashop.core.image.parser.image_tag_source_parser' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryForEditing } prestashop.adapter.category.command_handler.delete_category_cover_image_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\DeleteCategoryCoverImageHandler + autoconfigure: true arguments: - '@filesystem' - '@prestashop.adapter.legacy.configuration' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryCoverImageCommand - - prestashop.adapter.category.command_handler.delete_category_menu_thumbnail_image_handler: - class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\DeleteCategoryMenuThumbnailImageHandler - arguments: - - '@filesystem' - - '@prestashop.adapter.legacy.configuration' - - '@prestashop.adapter.cache.clearer.smarty_cache_clearer' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\DeleteCategoryMenuThumbnailImageCommand prestashop.adapter.category.command_handler.update_category_position_handler: class: PrestaShop\PrestaShop\Adapter\Category\CommandHandler\UpdateCategoryPositionHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Command\UpdateCategoryPositionCommand + autoconfigure: true prestashop.adapter.category.command_handler.get_category_status_handler: class: PrestaShop\PrestaShop\Adapter\Category\QueryHandler\GetCategoryIsEnabledHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoryIsEnabled + autoconfigure: true PrestaShop\PrestaShop\Adapter\Category\Repository\CategoryRepository: arguments: - '@doctrine.dbal.default_connection' - '%database_prefix%' - prestashop.adapter.category.repository.category_repository: - alias: PrestaShop\PrestaShop\Adapter\Category\Repository\CategoryRepository - deprecated: ~ - PrestaShop\PrestaShop\Adapter\Category\Repository\CategoryPreviewRepository: arguments: - '@PrestaShop\PrestaShop\Adapter\Category\Repository\CategoryRepository' @@ -144,11 +105,9 @@ services: prestashop.adapter.category.query_handler.get_categories_tree_handler: class: PrestaShop\PrestaShop\Adapter\Category\QueryHandler\GetCategoriesTreeHandler + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Core\Category\NameBuilder\CategoryDisplayNameBuilder' - '@prestashop.adapter.context_state_manager' - '@PrestaShop\PrestaShop\Adapter\Shop\Repository\ShopRepository' - "@=service('prestashop.adapter.legacy.configuration').get('PS_ROOT_CATEGORY')" - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Category\Query\GetCategoriesTree diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cms_page.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cms_page.yml index ad15bb12b6544..61d090dc92b27 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/cms_page.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/cms_page.yml @@ -4,57 +4,39 @@ services: prestashop.adapter.cms_page.command_handler.bulk_disable_cms_page: class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\BulkDisableCmsPageHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkDisableCmsPageCommand + autoconfigure: true prestashop.adapter.cms_page.command_handler.bulk_enable_cms_page: class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\BulkEnableCmsPageHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkEnableCmsPageCommand + autoconfigure: true prestashop.adapter.cms_page.command_handler.toggle_cms_page_status: class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\ToggleCmsPageStatusHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\ToggleCmsPageStatusCommand + autoconfigure: true prestashop.adapter.cms_page.query_handler.get_cms_category_id_for_redirection: class: PrestaShop\PrestaShop\Adapter\CMS\Page\QueryHandler\GetCmsCategoryIdForRedirectionHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Query\GetCmsCategoryIdForRedirection + autoconfigure: true prestashop.adapter.cms_page.command_handler.delete_cms_page: class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\DeleteCmsPageHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\DeleteCmsPageCommand + autoconfigure: true prestashop.adapter.cms_page.command_handler.bulk_delete_cms_page: class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\BulkDeleteCmsPageHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\BulkDeleteCmsPageCommand + autoconfigure: true prestashop.adapter.cms_page.command_handler.add_cms_page_handler: class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\AddCmsPageHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\AddCmsPageCommand + autoconfigure: true prestashop.adapter.cms_page.command_handler.edit_cms_page_handler: class: PrestaShop\PrestaShop\Adapter\CMS\Page\CommandHandler\EditCmsPageHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Command\EditCmsPageCommand + autoconfigure: true prestashop.adapter.cms_page.query_handler.get_cms_page_for_editing_handler: class: PrestaShop\PrestaShop\Adapter\CMS\Page\QueryHandler\GetCmsPageForEditingHandler + autoconfigure: true arguments: - "@=service('prestashop.adapter.legacy.context').getContext().link" - "@=service('prestashop.adapter.legacy.context').getContext().language.id" - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPage\Query\GetCmsPageForEditing diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/cms_page_category.yml b/src/PrestaShopBundle/Resources/config/services/adapter/cms_page_category.yml index 055ceea1bb90c..db2cff2547582 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/cms_page_category.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/cms_page_category.yml @@ -12,71 +12,51 @@ services: prestashop.adapter.cms_page_category.command_handler.delete_cms_page_category_handler: class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\DeleteCmsPageCategoryHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\DeleteCmsPageCategoryCommand + autoconfigure: true prestashop.adapter.cms_page_category.command_handler.toggle_cms_page_category_status_handler: class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\ToggleCmsPageCategoryStatusHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\ToggleCmsPageCategoryStatusCommand + autoconfigure: true prestashop.adapter.cms_page_category.command_handler.bulk_delete_cms_page_category_handler: class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\BulkDeleteCmsPageCategoryHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkDeleteCmsPageCategoryCommand + autoconfigure: true prestashop.adapter.cms_page.command_handler.bulk_enable_cms_page_category_handler: class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\BulkEnableCmsPageCategoryHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkEnableCmsPageCategoryCommand + autoconfigure: true prestashop.adapter.cms_page.command_handler.bulk_disable_cms_page_category_handler: class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\BulkDisableCmsPageCategoryHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\BulkDisableCmsPageCategoryCommand + autoconfigure: true prestashop.adapter.cms_page.command_handler.add_cms_page_category_handler: class: 'PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\AddCmsPageCategoryHandler' parent: 'prestashop.adapter.cms_page_category.command_handler.abstract_cms_page_category_handler' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\AddCmsPageCategoryCommand + autoconfigure: true public: true prestashop.adapter.cms_page.command_handler.edit_cms_page_category_handler: class: 'PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CommandHandler\EditCmsPageCategoryHandler' parent: 'prestashop.adapter.cms_page_category.command_handler.abstract_cms_page_category_handler' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Command\EditCmsPageCategoryCommand + autoconfigure: true public: true # Query handlers prestashop.adapter.cms_page.query_handler.get_cms_page_categories_for_breadcrumbs: class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler\GetCmsPageCategoriesForBreadcrumbHandler + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.id' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoriesForBreadcrumb prestashop.adapter.cms_page.query_handler.get_cms_page_categories_for_redirection: class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler\GetCmsPageParentCategoryIdForRedirectionHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageParentCategoryIdForRedirection + autoconfigure: true prestashop.adapter.cms_page.query_handler.get_cms_page_category_for_editing: class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler\GetCmsPageCategoryForEditingHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoryForEditing + autoconfigure: true prestashop.adapter.cms_page.categories_provider: class: 'PrestaShop\PrestaShop\Adapter\CMS\PageCategory\CategoriesProvider' @@ -86,9 +66,7 @@ services: prestashop.adapter.cms_page.query_handler.get_cms_page_category_name_for_listing: class: PrestaShop\PrestaShop\Adapter\CMS\PageCategory\QueryHandler\GetCmsPageCategoryNameForListingHandler + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.id' - '@request_stack' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CmsPageCategory\Query\GetCmsPageCategoryNameForListing diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/common.yml b/src/PrestaShopBundle/Resources/config/services/adapter/common.yml index f912eac496874..cd7a8ad833dc7 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/common.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/common.yml @@ -9,6 +9,7 @@ services: PrestaShop\PrestaShop\Adapter\Tools: ~ + # Deprecated in 8.1 prestashop.adapter.tools: alias: PrestaShop\PrestaShop\Adapter\Tools deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/configuration.yml b/src/PrestaShopBundle/Resources/config/services/adapter/configuration.yml index e9576c231416e..071425b1c57ee 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/configuration.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/configuration.yml @@ -4,7 +4,6 @@ services: prestashop.adapter.configuration.command_handler.switch_debug_mode_handler: class: 'PrestaShop\PrestaShop\Adapter\Configuration\CommandHandler\SwitchDebugModeHandler' + autoconfigure: true arguments: - '@prestashop.adapter.debug_mode' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Configuration\Command\SwitchDebugModeCommand } diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/contact.yml b/src/PrestaShopBundle/Resources/config/services/adapter/contact.yml index 009814f0c3d92..35d144e02008a 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/contact.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/contact.yml @@ -10,21 +10,18 @@ services: prestashop.adapter.contact.query_handler.get_contact_for_editing: class: 'PrestaShop\PrestaShop\Adapter\Contact\QueryHandler\GetContactForEditingHandler' + autoconfigure: true arguments: - '@PrestaShopBundle\Form\DataTransformer\StringArrayToIntegerArrayDataTransformer' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Contact\Query\GetContactForEditing' } prestashop.adapter.contact.command_handler.edit_contact: class: 'PrestaShop\PrestaShop\Adapter\Contact\CommandHandler\EditContactHandler' + autoconfigure: true arguments: - '@validator' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Contact\Command\EditContactCommand' } prestashop.adapter.contact.command_handler.add_contact: class: 'PrestaShop\PrestaShop\Adapter\Contact\CommandHandler\AddContactHandler' + autoconfigure: true arguments: - '@validator' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Contact\Command\AddContactCommand' } diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/country.yml b/src/PrestaShopBundle/Resources/config/services/adapter/country.yml index d6e76e945d882..bd7be5588ae8b 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/country.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/country.yml @@ -4,11 +4,9 @@ services: prestashop.adapter.country.query_handler.get_country_required_fields: class: 'PrestaShop\PrestaShop\Adapter\Country\QueryHandler\GetCountryRequiredFieldsHandler' + autoconfigure: true arguments: - '@prestashop.adapter.country.country_required_fields_provider' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Country\Query\GetCountryRequiredFields' prestashop.adapter.country.country_zip_code_requirements_provider: class: 'PrestaShop\PrestaShop\Adapter\Country\CountryZipCodeRequirementsProvider' @@ -27,25 +25,21 @@ services: PrestaShop\PrestaShop\Adapter\Country\CommandHandler\AddCountryHandler: public: true autowire: true - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Country\Command\AddCountryCommand' } + autoconfigure: true PrestaShop\PrestaShop\Adapter\Country\CommandHandler\DeleteCountryHandler: public: false autowire: true - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Country\Command\DeleteCountryCommand' } + autoconfigure: true PrestaShop\PrestaShop\Adapter\Country\CommandHandler\EditCountryHandler: public: false autowire: true - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Country\Command\EditCountryCommand' } + autoconfigure: true PrestaShop\PrestaShop\Adapter\Country\QueryHandler\GetCountryForEditingHandler: public: false autowire: true - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Country\Query\GetCountryForEditing' } + autoconfigure: true PrestaShop\PrestaShop\Adapter\Country\Validate\CountryValidator: diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/credit_slip.yml b/src/PrestaShopBundle/Resources/config/services/adapter/credit_slip.yml index 14fa44bda7c9a..4d74fa5ff0631 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/credit_slip.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/credit_slip.yml @@ -4,6 +4,4 @@ services: prestashop.adapter.credit_slip.query_handler.get_credit_slip_ids_by_date_range_handler: class: 'PrestaShop\PrestaShop\Adapter\CreditSlip\QueryHandler\GetCreditSlipIdsByDateRangeHandler' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CreditSlip\Query\GetCreditSlipIdsByDateRange + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml b/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml index 5643cf03faf09..9065d5d161599 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/currency.yml @@ -14,107 +14,90 @@ services: prestashop.adapter.currency.command_handler.toggle_currency_status: class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\ToggleCurrencyStatusHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\ToggleCurrencyStatusCommand' } prestashop.adapter.currency.command_handler.delete_currency: class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\DeleteCurrencyHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\DeleteCurrencyCommand' } prestashop.adapter.currency.command_handler.create_currency: class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\AddOfficialCurrencyHandler' + autoconfigure: true arguments: - '@prestashop.core.localization.cldr.locale_repository' - "@=service('prestashop.core.admin.lang.repository').findAll()" - "@prestashop.adapter.currency.command_handler.command_validator" - '@prestashop.adapter.data_provider.currency' - '@prestashop.core.localization.currency.pattern_transformer' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddCurrencyCommand' } prestashop.adapter.currency.command_handler.create_unofficial_currency: class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\AddUnofficialCurrencyHandler' + autoconfigure: true arguments: - '@prestashop.core.localization.cldr.locale_repository' - "@=service('prestashop.core.admin.lang.repository').findAll()" - "@prestashop.adapter.currency.command_handler.command_validator" - '@prestashop.adapter.data_provider.currency' - '@prestashop.core.localization.currency.pattern_transformer' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\AddUnofficialCurrencyCommand' } prestashop.adapter.currency.command_handler.update_official_currency: class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\EditOfficialCurrencyHandler' + autoconfigure: true arguments: - '@prestashop.core.localization.cldr.locale_repository' - "@=service('prestashop.core.admin.lang.repository').findAll()" - "@prestashop.adapter.currency.command_handler.command_validator" - "@prestashop.core.localization.currency.pattern_transformer" - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditCurrencyCommand' } prestashop.adapter.currency.command_handler.update_unofficial_currency: class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\EditUnofficialCurrencyHandler' + autoconfigure: true arguments: - '@prestashop.core.localization.cldr.locale_repository' - "@=service('prestashop.core.admin.lang.repository').findAll()" - "@prestashop.adapter.currency.command_handler.command_validator" - "@prestashop.core.localization.currency.pattern_transformer" - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\EditUnofficialCurrencyCommand' } prestashop.adapter.currency.command_handler.update_exchange_rates: class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\RefreshExchangeRatesHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\RefreshExchangeRatesCommand' } + autoconfigure: true prestashop.adapter.currency.command_handler.bulk_toggle_currencies_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\BulkToggleCurrenciesStatusHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")' - tags: - - { name: tactician.handler, command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\BulkToggleCurrenciesStatusCommand' } prestashop.adapter.currency.command_handler.bulk_delete_currencies_handler: class: 'PrestaShop\PrestaShop\Adapter\Currency\CommandHandler\BulkDeleteCurrenciesHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")' - tags: - - { name: tactician.handler, command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Command\BulkDeleteCurrenciesCommand' } - # Query handlers prestashop.adapter.currency.query_handler.get_currency_for_editing: class: 'PrestaShop\PrestaShop\Adapter\Currency\QueryHandler\GetCurrencyForEditingHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.context").getContext().shop.id' - '@prestashop.core.localization.currency.pattern_transformer' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetCurrencyForEditing' } prestashop.adapter.currency.query_handler.get_currency_exchange_rate: class: 'PrestaShop\PrestaShop\Adapter\Currency\QueryHandler\GetCurrencyExchangeRateHandler' + autoconfigure: true arguments: - '@prestashop.core.exchange_rate.provider' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetCurrencyExchangeRate' } prestashop.adapter.currency.query_handler.get_reference_currency: class: 'PrestaShop\PrestaShop\Adapter\Currency\QueryHandler\GetReferenceCurrencyHandler' + autoconfigure: true arguments: - '@prestashop.core.localization.cldr.locale_repository' - '@=service("prestashop.core.admin.lang.repository").findAll()' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Currency\Query\GetReferenceCurrency' } PrestaShop\PrestaShop\Adapter\Currency\Repository\CurrencyRepository: ~ - - prestashop.adapter.currency.repository.currency_repository: - alias: PrestaShop\PrestaShop\Adapter\Currency\Repository\CurrencyRepository - deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/customer.yml b/src/PrestaShopBundle/Resources/config/services/adapter/customer.yml index 4b936239c50b6..4e4f86535a2bf 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/customer.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/customer.yml @@ -4,114 +4,86 @@ services: prestashop.adapter.customer.query_handler.get_customer_for_viewing: class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerForViewingHandler' + autoconfigure: true arguments: - '@translator' - "@=service('prestashop.adapter.legacy.context').getContext().language.id" - "@prestashop.core.localization.locale.context_locale" - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForViewing' prestashop.adapter.customer.command_handler.set_private_note_about_customer_handler: class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\SetPrivateNoteAboutCustomerHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\SetPrivateNoteAboutCustomerCommand' + autoconfigure: true prestashop.adapter.customer.command_handler.transform_guest_to_customer: class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\TransformGuestToCustomerHandler' + autoconfigure: true arguments: - "@=service('prestashop.adapter.legacy.context').getContext().language.id" - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\TransformGuestToCustomerCommand' prestashop.adapter.customer.command_handler.set_required_fields_for_customer: class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\SetRequiredFieldsForCustomerHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\SetRequiredFieldsForCustomerCommand' + autoconfigure: true prestashop.adapter.customer.query_handler.get_required_fields_for_customer: class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetRequiredFieldsForCustomerHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetRequiredFieldsForCustomer' + autoconfigure: true prestashop.adapter.customer.command_handler.add_customer: class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\AddCustomerHandler' + autoconfigure: true arguments: - '@prestashop.core.crypto.hashing' - '@=service("prestashop.adapter.legacy.configuration").get("_COOKIE_KEY_")' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\AddCustomerCommand' prestashop.adapter.customer.query_handler.get_customer_for_editing: class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForEditing' + autoconfigure: true prestashop.adapter.customer.command_handler.edit_customer_handler: class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\EditCustomerHandler' + autoconfigure: true arguments: - '@prestashop.core.crypto.hashing' - '@=service("prestashop.adapter.legacy.configuration").get("_COOKIE_KEY_")' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\EditCustomerCommand' prestashop.adapter.customer.command_handler.bulk_enable_customer_handler: class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\BulkEnableCustomerHandler' - tags: - - { name: tactician.handler, command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkEnableCustomerCommand' } + autoconfigure: true prestashop.adapter.customer.command_handler.bulk_disable_customer_handler: class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\BulkDisableCustomerHandler' - tags: - - { name: tactician.handler, command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkDisableCustomerCommand' } + autoconfigure: true prestashop.adapter.customer.command_handler.delete_customer_handler: class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\DeleteCustomerHandler' - tags: - - { name: tactician.handler, command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\DeleteCustomerCommand' } + autoconfigure: true prestashop.adapter.customer.command_handler.bulk_delete_customer_handler: class: 'PrestaShop\PrestaShop\Adapter\Customer\CommandHandler\BulkDeleteCustomerHandler' - tags: - - { name: tactician.handler, command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Command\BulkDeleteCustomerCommand' } + autoconfigure: true prestashop.adapter.customer.query_handler.search_customers: class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\SearchCustomersHandler' + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - "@=service('prestashop.adapter.legacy.context').getContext().language.id" - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\SearchCustomers' prestashop.adapter.customer.query_handler.get_customer_carts_handler: class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerCartsHandler' + autoconfigure: true arguments: - "@prestashop.core.localization.locale.context_locale" - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerCarts' prestashop.adapter.customer.query_handler.get_customer_orders_handler: class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerOrdersHandler' + autoconfigure: true arguments: - "@prestashop.core.localization.locale.context_locale" - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerOrders' prestashop.adapter.customer.query_handler.get_customer_for_address_creation: class: 'PrestaShop\PrestaShop\Adapter\Customer\QueryHandler\GetCustomerForAddressCreationHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Query\GetCustomerForAddressCreation' + autoconfigure: true prestashop.adapter.customer.customer_data_source: class: 'PrestaShop\PrestaShop\Adapter\Customer\CustomerDataSource' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml index 90c44d6409ea7..c439a37995c8c 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/data_provider.yml @@ -20,10 +20,6 @@ services: class: PrestaShop\PrestaShop\Adapter\Supplier\SupplierDataProvider deprecated: ~ - prestashop.adapter.data_provider.warehouse: - class: PrestaShop\PrestaShop\Adapter\Warehouse\WarehouseDataProvider - deprecated: ~ - prestashop.adapter.data_provider.category: class: PrestaShop\PrestaShop\Adapter\Category\CategoryDataProvider arguments: [ "@=service('prestashop.adapter.legacy.context')" ] @@ -82,11 +78,6 @@ services: class: PrestaShop\PrestaShop\Adapter\Pack\PackDataProvider deprecated: ~ - prestashop.adapter.data_provider.tab: - alias: PrestaShop\PrestaShop\Adapter\Tab\TabDataProvider - deprecated: ~ - public: true - PrestaShop\PrestaShop\Adapter\Tab\TabDataProvider: class: PrestaShop\PrestaShop\Adapter\Tab\TabDataProvider public: false @@ -107,11 +98,18 @@ services: calls: - [ "setEmployeeId", [ "@=service('prestashop.adapter.legacy.context').getContext().employee?service('prestashop.adapter.legacy.context').getContext().employee.id:0" ] ] + PrestaShop\PrestaShop\Adapter\Category\CategoriesProviderBuilder: + arguments: + - '@prestashop.adapter.legacy.context' + - '@prestashop.core.addon.theme.repository' + - !php/const _PS_CACHE_DIR_ + - !php/const _PS_ROOT_DIR_ + - '/app/config/addons/categories.yml' + prestashop.categories_provider: + lazy: true class: PrestaShopBundle\Service\DataProvider\Admin\CategoriesProvider - arguments: - - "%prestashop.addons.categories%" - - "@=service('prestashop.adapter.legacy.context').getContext().shop.theme_name?service('prestashop.core.addon.theme.repository').getInstanceByName(service('prestashop.adapter.legacy.context').getContext().shop.theme_name).getModulesToEnable():[]" + factory: [ '@PrestaShop\PrestaShop\Adapter\Category\CategoriesProviderBuilder', 'build' ] prestashop.adapter.data_provider.default_route: class: PrestaShop\PrestaShop\Adapter\Routes\DefaultRouteProvider diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml b/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml index e710c3461df5d..f23f0eee3f1f0 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/employee.yml @@ -4,30 +4,25 @@ services: prestashop.adapter.profile.employee.command_handler.toggle_employee_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\ToggleEmployeeStatusHandler' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\ToggleEmployeeStatusCommand } + autoconfigure: true prestashop.adapter.profile.employee.command_handler.bulk_update_employee_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\BulkUpdateEmployeeStatusHandler' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkUpdateEmployeeStatusCommand } + autoconfigure: true prestashop.adapter.profile.employee.command_handler.delete_employee_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\DeleteEmployeeHandler' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\DeleteEmployeeCommand } + autoconfigure: true prestashop.adapter.profile.employee.command_handler.bulk_delete_employee_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\BulkDeleteEmployeeHandler' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\BulkDeleteEmployeeCommand } + autoconfigure: true prestashop.adapter.employee.query_handler.get_employee_for_editing: class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\QueryHandler\GetEmployeeForEditingHandler' + autoconfigure: true arguments: - '@prestashop.core.image.parser.image_tag_source_parser' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Query\GetEmployeeForEditing } prestashop.adapter.employee.form_access_checker: class: 'PrestaShop\PrestaShop\Adapter\Employee\EmployeeFormAccessChecker' @@ -37,22 +32,20 @@ services: prestashop.adapter.employee.command_handler.add_employee_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\AddEmployeeHandler' + autoconfigure: true arguments: - '@prestashop.core.crypto.hashing' - '@prestashop.core.employee.profile_access_checker' - '@prestashop.adapter.data_provider.employee' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\AddEmployeeCommand } prestashop.adapter.employee.command_handler.edit_employee_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\Employee\CommandHandler\EditEmployeeHandler' + autoconfigure: true arguments: - '@prestashop.core.crypto.hashing' - '@prestashop.core.employee.profile_access_checker' - '@prestashop.adapter.data_provider.employee' - '@prestashop.adapter.legacy.context' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Command\EditEmployeeCommand } prestashop.adapter.employee.avatar_provider: class: 'PrestaShop\PrestaShop\Adapter\Employee\AvatarProvider' @@ -74,5 +67,4 @@ services: prestashop.adapter.employee.query_handler.get_employee_email_by_id_handler: class: PrestaShop\PrestaShop\Adapter\Profile\Employee\QueryHandler\GetEmployeeEmailByIdHandler - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Employee\Query\GetEmployeeEmailById } + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml b/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml index 5184bb2ba5cd0..a9c779812343a 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/feature.yml @@ -8,57 +8,51 @@ services: PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\AddFeatureHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\AddFeatureCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\EditFeatureHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\EditFeatureCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Feature\QueryHandler\GetFeatureForEditingHandler: - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureForEditing + autoconfigure: true PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\AddFeatureValueHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository' - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\AddFeatureValueCommand PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\EditFeatureValueHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\EditFeatureValueCommand PrestaShop\PrestaShop\Adapter\Feature\QueryHandler\GetFeatureValueForEditingHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Feature\Query\GetFeatureValueForEditing PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\DeleteFeatureHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\DeleteFeatureCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\BulkDeleteFeatureHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Feature\Command\BulkDeleteFeatureCommand + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\DeleteFeatureValueHandler: + autowire: true + public: false + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\Feature\CommandHandler\BulkDeleteFeatureValueHandler: + autowire: true + public: false + autoconfigure: true PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository: autowire: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/form.yml b/src/PrestaShopBundle/Resources/config/services/adapter/form.yml index 350e99b46d11b..6d8511e9a8183 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/form.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/form.yml @@ -71,13 +71,6 @@ services: arguments: - '@=service("prestashop.adapter.legacy.context").getLanguage().id' - prestashop.adapter.form.choice_provider.features_choice_provider: - class: 'PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\FeaturesChoiceProvider' - arguments: - - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureRepository' - - '@prestashop.adapter.legacy.context' - - "@=service('prestashop.adapter.legacy.configuration').getInt('PS_LANG_DEFAULT')" - prestashop.adapter.form.choice_provider.feature_values_choice_provider: class: 'PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\FeatureValuesChoiceProvider' arguments: @@ -105,12 +98,19 @@ services: - '@PrestaShop\PrestaShop\Core\Product\Combination\NameBuilder\CombinationNameBuilderInterface' - '@=service("prestashop.adapter.legacy.context").getLanguage().id' - PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\ShopTreeChoiceProvider: autowire: true public: false + PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\FeaturesChoiceProvider: + public: false + autowire: true + # deprecated prestashop.adapter.form.choice_provider.shop_tree_choice_provider: alias: PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\ShopTreeChoiceProvider deprecated: ~ + + prestashop.adapter.form.choice_provider.features_choice_provider: + alias: PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\FeaturesChoiceProvider + deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/group.yml b/src/PrestaShopBundle/Resources/config/services/adapter/group.yml index 739be9702fe2a..5561adb28a62d 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/group.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/group.yml @@ -21,16 +21,12 @@ services: PrestaShop\PrestaShop\Adapter\Customer\Group\CommandHandler\AddCustomerGroupHandler: public: false autowire: true - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Group\Command\AddCustomerGroupCommand' + autoconfigure: true PrestaShop\PrestaShop\Adapter\Customer\Group\QueryHandler\GetCustomerGroupForEditingHandler: public: false autowire: true - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Customer\Group\Query\GetCustomerGroupForEditing' + autoconfigure: true PrestaShop\PrestaShop\Adapter\Customer\Group\Validate\CustomerGroupValidator: public: false diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml b/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml index 278d5adcd350d..59067b2ab410f 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/hook.yml @@ -4,17 +4,22 @@ services: prestashop.adapter.hook.command_handler.update_hook_status_handler: class: PrestaShop\PrestaShop\Adapter\Hook\CommandHandler\UpdateHookStatusCommandHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Hook\Command\UpdateHookStatusCommand + autoconfigure: true prestashop.adapter.hook.command_handler.get_hook_status_handler: class: PrestaShop\PrestaShop\Adapter\Hook\QueryHandler\GetHookStatusHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Hook\Query\GetHookStatus + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\Hook\QueryHandler\GetHookHandler: + autoconfigure: true PrestaShop\PrestaShop\Adapter\HookManager: ~ prestashop.adapter.hook.manager: alias: PrestaShop\PrestaShop\Adapter\HookManager + + prestashop.attributes.ressource.metadata.collection.factory: + class: PrestaShopBundle\ApiPlatform\Decorator\AttributesResourceMetadataCollectionFactoryDecorator + decorates: api_platform.metadata.resource.metadata_collection_factory + arguments: + $innerFactory: '@prestashop.attributes.ressource.metadata.collection.factory.inner' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/image.yml b/src/PrestaShopBundle/Resources/config/services/adapter/image.yml index c85cfc524c24d..155c257792d3d 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/image.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/image.yml @@ -8,18 +8,11 @@ services: prestashop.adapter.image.uploader.category_thumbnail_image_uploader: class: 'PrestaShop\PrestaShop\Adapter\Image\Uploader\CategoryThumbnailImageUploader' - prestashop.adapter.image.uploader.category_menu_thumbnail_image_uploader: - class: 'PrestaShop\PrestaShop\Adapter\Image\Uploader\CategoryMenuThumbnailUploader' - arguments: - - '@prestashop.adapter.cache.clearer.smarty_cache_clearer' - - '@PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider' - PrestaShop\PrestaShop\Adapter\Image\Uploader\CategoryImageUploader: autowire: true arguments: - '@prestashop.adapter.image.uploader.category_cover_image_uploader' - '@prestashop.adapter.image.uploader.category_thumbnail_image_uploader' - - '@prestashop.adapter.image.uploader.category_menu_thumbnail_image_uploader' prestashop.adapter.image.uploader.employee_image_uploader: class: 'PrestaShop\PrestaShop\Adapter\Image\Uploader\EmployeeImageUploader' @@ -41,7 +34,7 @@ services: PrestaShop\PrestaShop\Adapter\Image\ImageGenerator: arguments: - - '@prestashop.core.admin.feature_flag.repository' + - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager' - '@PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration' PrestaShop\PrestaShop\Adapter\Image\ImageValidator: @@ -53,10 +46,6 @@ services: - '@=service("prestashop.core.configuration.upload_size_configuration").getMaxUploadSizeInBytes()' - '@prestashop.adapter.upload_quota.configuration' - prestashop.adapter.image.image_validator: - alias: PrestaShop\PrestaShop\Adapter\Image\ImageValidator - deprecated: ~ - prestashop.adapter.image.category_image_path_factory: class: 'PrestaShop\PrestaShop\Adapter\Image\ImagePathFactory' arguments: diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/language.yml b/src/PrestaShopBundle/Resources/config/services/adapter/language.yml index eaf6a34ef6a9e..e8a3f1878b966 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/language.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/language.yml @@ -21,55 +21,47 @@ services: prestashop.adapter.language.command_handler.add_language_handler: class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\AddLanguageHandler' + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Image\ImageValidator' - '@prestashop.adapter.file.robots_text_file_generator' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\AddLanguageCommand' prestashop.adapter.language.command_handler.edit_language_handler: class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\EditLanguageHandler' + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Image\ImageValidator' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\EditLanguageCommand' prestashop.adapter.language.query_handler.get_language_for_editing: class: 'PrestaShop\PrestaShop\Adapter\Language\QueryHandler\GetLanguageForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Language\Query\GetLanguageForEditing' + autoconfigure: true prestashop.adapter.language.command_handler.toggle_language_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\ToggleLanguageStatusHandler' + autoconfigure: true arguments: - '@prestashop.adapter.file.robots_text_file_generator' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\ToggleLanguageStatusCommand' prestashop.adapter.language.command_handler.bulk_toggle_languages_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\BulkToggleLanguagesStatusHandler' + autoconfigure: true arguments: - '@prestashop.adapter.file.robots_text_file_generator' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\BulkToggleLanguagesStatusCommand' prestashop.adapter.language.command_handler.bulk_delete_languages_handler: class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\BulkDeleteLanguagesHandler' + autoconfigure: true arguments: - '@prestashop.adapter.file.robots_text_file_generator' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\BulkDeleteLanguagesCommand' prestashop.adapter.language.command_handler.delete_language_handler: class: 'PrestaShop\PrestaShop\Adapter\Language\CommandHandler\DeleteLanguageHandler' + autoconfigure: true arguments: - '@prestashop.adapter.file.robots_text_file_generator' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Language\Command\DeleteLanguageCommand' + + PrestaShop\PrestaShop\Adapter\Language\ContextLanguageProvider: + autowire: true + public: false + arguments: + $context: '@prestashop.adapter.legacy.context' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/manufacturer.yml b/src/PrestaShopBundle/Resources/config/services/adapter/manufacturer.yml index 92e52d0b5eff8..1be890cdb0f23 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/manufacturer.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/manufacturer.yml @@ -11,57 +11,43 @@ services: prestashop.adapter.manufacturer.command_handler.toggle_manufacturer_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\ToggleManufacturerStatusHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\ToggleManufacturerStatusCommand' } + autoconfigure: true prestashop.adapter.manufacturer.command_handler.bulk_toggle_manufacturer_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\BulkToggleManufacturerStatusHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\BulkToggleManufacturerStatusCommand' } + autoconfigure: true prestashop.adapter.manufacturer.command_handler.delete_manufacturer_handler: class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\DeleteManufacturerHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\DeleteManufacturerCommand' } + autoconfigure: true prestashop.adapter.manufacturer.command_handler.delete_manufacturer_logo_image_handler: class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\DeleteManufacturerLogoImageHandler' + autoconfigure: true arguments: - !php/const _PS_MANU_IMG_DIR_ - !php/const _PS_TMP_IMG_DIR_ - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\DeleteManufacturerLogoImageCommand' prestashop.adapter.manufacturer.command_handler.bulk_delete_manufacturer_handler: class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\BulkDeleteManufacturerHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\BulkDeleteManufacturerCommand' } + autoconfigure: true prestashop.adapter.manufacturer.query_handler.get_manufacturer_for_editing: class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\QueryHandler\GetManufacturerForEditingHandler' + autoconfigure: true arguments: - '@prestashop.core.image.parser.image_tag_source_parser' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Query\GetManufacturerForEditing' prestashop.adapter.manufacturer.command_handler.edit_manufacturer_handler: class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\EditManufacturerHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\EditManufacturerCommand' + autoconfigure: true prestashop.adapter.manufacturer.command_handler.add_manufacturer_handler: class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\CommandHandler\AddManufacturerHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Manufacturer\Command\AddManufacturerCommand' + autoconfigure: true prestashop.adapter.manufacturer.query_handler.get_manufacturer_for_viewing_handler: class: 'PrestaShop\PrestaShop\Adapter\Manufacturer\QueryHandler\GetManufacturerForViewingHandler' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Manufacturer\Query\GetManufacturerForViewing + autoconfigure: true PrestaShop\PrestaShop\Adapter\Manufacturer\Repository\ManufacturerRepository: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/meta.yml b/src/PrestaShopBundle/Resources/config/services/adapter/meta.yml index 5094f1b53a687..5fe20bf161c61 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/meta.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/meta.yml @@ -12,37 +12,29 @@ services: prestashop.adapter.meta.command_handler.save_meta: class: 'PrestaShop\PrestaShop\Adapter\Meta\CommandHandler\AddMetaHandler' + autoconfigure: true arguments: - '@prestashop.core.hook.dispatcher' - '@validator' - '@=service("prestashop.adapter.legacy.configuration").get("PS_LANG_DEFAULT")' - '@prestashop.adapter.meta.data_provider' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Meta\Command\AddMetaCommand' prestashop.adapter.meta.command_handler.edit_meta: class: 'PrestaShop\PrestaShop\Adapter\Meta\CommandHandler\EditMetaHandler' + autoconfigure: true arguments: - '@validator' - '@prestashop.adapter.meta.data_provider' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Meta\Command\EditMetaCommand' # QUERY HANDLERS prestashop.adapter.meta.query_handler.get_meta_for_editing: class: 'PrestaShop\PrestaShop\Adapter\Meta\QueryHandler\GetMetaForEditingHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Meta\Query\GetMetaForEditing' + autoconfigure: true prestashop.adapter.meta.query_handler.get_pages_for_layout_customization_handler: class: 'PrestaShop\PrestaShop\Adapter\Meta\QueryHandler\GetPagesForLayoutCustomizationHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.id' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Meta\Query\GetPagesForLayoutCustomization' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/module.yml b/src/PrestaShopBundle/Resources/config/services/adapter/module.yml index 9f5753377620f..ae55ff9b142d2 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/module.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/module.yml @@ -4,18 +4,16 @@ services: prestashop.adapter.module.command_handler.bulk_toggle_module_status_handler: class: PrestaShop\PrestaShop\Adapter\Module\CommandHandler\BulkToggleModuleStatusHandler + autoconfigure: true arguments: - - '@prestashop.module.manager' + - '@PrestaShop\PrestaShop\Core\Module\ModuleManager' - '@prestashop.adapter.legacy.logger' - '@prestashop.core.cache.clearer.cache_clearer_chain' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Module\Command\BulkToggleModuleStatusCommand' prestashop.adapter.module.self_configurator: class: PrestaShop\PrestaShop\Adapter\Module\Configuration\ModuleSelfConfigurator arguments: - - "@prestashop.core.admin.module.repository" + - '@PrestaShop\PrestaShop\Core\Module\ModuleRepository' - "@prestashop.adapter.legacy.configuration" - "@doctrine.dbal.default_connection" - "@filesystem" @@ -61,7 +59,7 @@ services: prestashop.adapter.module.payment_module_provider: class: PrestaShop\PrestaShop\Adapter\Module\PaymentModuleListProvider arguments: - - '@prestashop.core.admin.module.repository' + - '@PrestaShop\PrestaShop\Core\Module\ModuleRepository' - '@prestashop.bundle.repository.module' - '@=service("prestashop.adapter.legacy.context").getContext().shop.id' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/notification.yml b/src/PrestaShopBundle/Resources/config/services/adapter/notification.yml index 1000612dbfba7..667da21dc97c9 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/notification.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/notification.yml @@ -5,14 +5,10 @@ services: prestashop.adapter.notification.command_handler.update_employee_notification_last_element_handler: class: 'PrestaShop\PrestaShop\Adapter\Notification\CommandHandler\UpdateEmployeeNotificationLastElementHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Notification\Command\UpdateEmployeeNotificationLastElementCommand' + autoconfigure: true prestashop.adapter.notification.query_handler.get_notification_last_elements_handler: class: 'PrestaShop\PrestaShop\Adapter\Notification\QueryHandler\GetNotificationLastElementsHandler' + autoconfigure: true arguments: - '@prestashop.adapter.notifications.configuration' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Notification\Query\GetNotificationLastElements' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order.yml index faa5b37caa72d..904b39ac01908 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/order.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/order.yml @@ -4,122 +4,95 @@ services: prestashop.adapter.order.command_handler.duplicate_order_cart_handler: class: 'PrestaShop\PrestaShop\Adapter\Order\CommandHandler\DuplicateOrderCartHandler' + autoconfigure: true arguments: - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Order\Command\DuplicateOrderCartCommand' prestashop.adapter.order.command_handler.add_order_from_back_office_handler: class: 'PrestaShop\PrestaShop\Adapter\Order\CommandHandler\AddOrderFromBackOfficeHandler' + autoconfigure: true arguments: - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Order\Command\AddOrderFromBackOfficeCommand' prestashop.adapter.order.command_handler.add_product_to_order_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\AddProductToOrderHandler + autoconfigure: true arguments: - '@translator' - '@prestashop.adapter.context_state_manager' - '@prestashop.adapter.order.amount.updater' - '@prestashop.adapter.order.product_quantity.updater' - '@prestashop.adapter.order.order_detail.updater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\AddProductToOrderCommand prestashop.adapter.order.command_handler.update_order_status_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\UpdateOrderStatusHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\UpdateOrderStatusCommand + autoconfigure: true prestashop.adapter.order.command_handler.update_product_in_order_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\UpdateProductInOrderHandler + autoconfigure: true arguments: - '@prestashop.adapter.order.product_quantity.updater' - '@prestashop.adapter.order.order_detail.updater' - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\UpdateProductInOrderCommand prestashop.adapter.order.command_handler.change_order_delivery_address_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\ChangeOrderDeliveryAddressHandler + autoconfigure: true arguments: - '@prestashop.adapter.order.amount.updater' - '@prestashop.adapter.order.order_detail.updater' - '@prestashop.adapter.context_state_manager' - '@prestashop.adapter.order.product_quantity.updater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderDeliveryAddressCommand prestashop.adapter.order.command_handler.change_order_invoice_address_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\ChangeOrderInvoiceAddressHandler + autoconfigure: true arguments: - '@prestashop.adapter.order.amount.updater' - '@prestashop.adapter.order.order_detail.updater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderInvoiceAddressCommand prestashop.adapter.order.command_handler.change_order_currency_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\ChangeOrderCurrencyHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\ChangeOrderCurrencyCommand + autoconfigure: true prestashop.adapter.order.command_handler.add_payment_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\AddPaymentHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Payment\Command\AddPaymentCommand + autoconfigure: true prestashop.adapter.order.command_handler.generate_invoice_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\GenerateInvoiceHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Invoice\Command\GenerateInvoiceCommand + autoconfigure: true prestashop.adapter.order.command_handler.update_order_shipping_details_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\UpdateOrderShippingDetailsHandler + autoconfigure: true arguments: - '@prestashop.adapter.order.amount.updater' - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\UpdateOrderShippingDetailsCommand prestashop.adapter.order.command_handler.delete_cart_rule_from_order_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\DeleteCartRuleFromOrderHandler + autoconfigure: true arguments: - '@prestashop.adapter.order.amount.updater' - '@prestashop.adapter.order.product_quantity.updater' - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\DeleteCartRuleFromOrderCommand prestashop.adapter.order.command_handler.add_cart_rule_to_order_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\AddCartRuleToOrderHandler + autoconfigure: true arguments: - '@prestashop.adapter.order.amount.updater' - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\AddCartRuleToOrderCommand prestashop.adapter.order.command_handler.update_invoice_note_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\UpdateInvoiceNoteHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Invoice\Command\UpdateInvoiceNoteCommand + autoconfigure: true prestashop.adapter.order.command_handler.issue_partial_refund_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\IssuePartialRefundHandler + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - '@prestashop.adapter.order.refund.order_refund_calculator' @@ -127,12 +100,10 @@ services: - '@prestashop.adapter.order.refund.voucher_generator' - '@prestashop.adapter.order.refund.updater' - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\IssuePartialRefundCommand prestashop.adapter.order.command_handler.issue_standard_refund_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\IssueStandardRefundHandler + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - '@prestashop.adapter.order.refund.order_refund_calculator' @@ -140,12 +111,10 @@ services: - '@prestashop.adapter.order.refund.voucher_generator' - '@prestashop.adapter.order.refund.updater' - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\IssueStandardRefundCommand prestashop.adapter.order.command_handler.issue_return_product_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\IssueReturnProductHandler + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - '@prestashop.adapter.order.refund.order_refund_calculator' @@ -153,9 +122,6 @@ services: - '@prestashop.adapter.order.refund.voucher_generator' - '@prestashop.adapter.order.refund.updater' - '@prestashop.adapter.context_state_manager' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\IssueReturnProductCommand prestashop.adapter.order.refund.order_refund_calculator: class: PrestaShop\PrestaShop\Adapter\Order\Refund\OrderRefundCalculator @@ -180,21 +146,18 @@ services: prestashop.adapter.order.command_handler.delete_product_from_order_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\DeleteProductFromOrderHandler + autoconfigure: true arguments: - '@prestashop.adapter.context_state_manager' - '@prestashop.adapter.order.product_quantity.updater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Product\Command\DeleteProductFromOrderCommand prestashop.adapter.order.command_handler.bulk_change_order_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Order\CommandHandler\BulkChangeOrderStatusHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Order\Command\BulkChangeOrderStatusCommand' + autoconfigure: true prestashop.adapter.order.query_handler.get_order_for_viewing_handler: class: PrestaShop\PrestaShop\Adapter\Order\QueryHandler\GetOrderForViewingHandler + autoconfigure: true arguments: - '@translator' - '@=service("prestashop.adapter.legacy.context").getContext().language.id' @@ -204,55 +167,41 @@ services: - '@prestashop.adapter.order.query_handler.get_order_products_for_viewing_handler' - '@prestashop.adapter.legacy.configuration' - '@prestashop.adapter.address.formatter' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderForViewing prestashop.adapter.order.query_handler.get_order_products_for_viewing_handler: class: PrestaShop\PrestaShop\Adapter\Order\QueryHandler\GetOrderProductsForViewingHandler + autoconfigure: true arguments: - '@prestashop.core.image.parser.image_tag_source_parser' - '@=service("prestashop.adapter.legacy.context").getContext().language.id' - "@prestashop.core.localization.locale.context_locale" - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderProductsForViewing - prestashop.adapter.order.command_handler.resend_order_email_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\ResendOrderEmailHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\ResendOrderEmailCommand + autoconfigure: true prestashop.adapter.order.query_handler.get_order_preview_handler: class: 'PrestaShop\PrestaShop\Adapter\Order\QueryHandler\GetOrderPreviewHandler' + autoconfigure: true arguments: - '@prestashop.core.localization.locale.repository' - "@=service('prestashop.adapter.legacy.context').getContext().language.getLocale()" - '@prestashop.adapter.address.formatter' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Order\Query\GetOrderPreview' prestashop.adapter.order.command_handler.send_process_order_email_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\SendProcessOrderEmailHandler + autoconfigure: true arguments: - '@translator' - '@=service("prestashop.adapter.legacy.context").getContext().link' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\SendProcessOrderEmailCommand prestashop.adapter.order.command_handler.cancel_order_product_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\CancelOrderProductHandler + autoconfigure: true arguments: - '@prestashop.adapter.order.product_quantity.updater' - '@logger' - '@translator' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\CancelOrderProductCommand prestashop.adapter.order.order_sibling_provider: class: PrestaShop\PrestaShop\Adapter\Order\OrderSiblingProvider @@ -280,9 +229,7 @@ services: prestashop.adapter.order.command_handler.set_internal_order_note_handler: class: PrestaShop\PrestaShop\Adapter\Order\CommandHandler\SetInternalOrderNoteHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Order\Command\SetInternalOrderNoteCommand + autoconfigure: true prestashop.adapter.order.repository.order_repository: class: PrestaShop\PrestaShop\Adapter\Order\Repository\OrderRepository diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order_message.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order_message.yml index 8a958836bda53..4e5fec11330ab 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/order_message.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/order_message.yml @@ -4,33 +4,23 @@ services: prestashop.adapter.order_message.command_handler.add_order_message_handler: class: PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler\AddOrderMessageHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\AddOrderMessageCommand + autoconfigure: true prestashop.adapter.order_message.command_handler.edit_order_message_handler: class: PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler\EditOrderMessageHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\EditOrderMessageCommand + autoconfigure: true prestashop.adapter.order_message.query_handler.get_order_message_for_editing_handler: class: PrestaShop\PrestaShop\Adapter\OrderMessage\QueryHandler\GetOrderMessageForEditingHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Query\GetOrderMessageForEditing + autoconfigure: true prestashop.adapter.order_message.command_handler.delete_order_message_handler: class: PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler\DeleteOrderMessageHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\DeleteOrderMessageCommand + autoconfigure: true prestashop.adapter.order_message.command_handler.bulk_delete_order_message_handler: class: PrestaShop\PrestaShop\Adapter\OrderMessage\CommandHandler\BulkDeleteOrderMessageHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\OrderMessage\Command\BulkDeleteOrderMessageCommand + autoconfigure: true prestashop.adapter.order_message.order_message_provider: class: 'PrestaShop\PrestaShop\Adapter\OrderMessage\OrderMessageProvider' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order_return.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order_return.yml index 6d679c03643fd..b3335b105e1b9 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/order_return.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/order_return.yml @@ -4,9 +4,7 @@ services: prestashop.adapter.order_return.query_handler.get_order_return_for_editing_handler: class: 'PrestaShop\PrestaShop\Adapter\OrderReturn\QueryHandler\GetOrderReturnForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturn\Query\GetOrderReturnForEditing' + autoconfigure: true arguments: - '@prestashop.adapter.order_return.repository.order_return_repository' - '@PrestaShop\PrestaShop\Adapter\Customer\Repository\CustomerRepository' @@ -14,9 +12,7 @@ services: prestashop.adapter.order_return.command_handler.update_order_return_state_handler: class: 'PrestaShop\PrestaShop\Adapter\OrderReturn\CommandHandler\UpdateOrderReturnStateHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturn\Command\UpdateOrderReturnStateCommand' + autoconfigure: true arguments: - '@prestashop.adapter.order_return.repository.order_return_repository' - '@prestashop.adapter.order_return_state.repository.order_return_state_repository' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order_return_state.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order_return_state.yml index ca7adcbe44089..7d53f660562b0 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/order_return_state.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/order_return_state.yml @@ -4,33 +4,23 @@ services: prestashop.adapter.order_return_state.command_handler.add_order_return_state: class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler\AddOrderReturnStateHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\AddOrderReturnStateCommand' + autoconfigure: true prestashop.adapter.order_return_state.query_handler.get_order_return_state_for_editing: class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\QueryHandler\GetOrderReturnStateForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Query\GetOrderReturnStateForEditing' + autoconfigure: true prestashop.adapter.order_return_state.command_handler.edit_order_return_state_handler: class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler\EditOrderReturnStateHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\EditOrderReturnStateCommand' + autoconfigure: true prestashop.adapter.order_return_state.repository.order_return_state_repository: class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\Repository\OrderReturnStateRepository' prestashop.adapter.order_return_state.command_handler.delete_order_return_state_handler: class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler\DeleteOrderReturnStateHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\DeleteOrderReturnStateCommand' + autoconfigure: true prestashop.adapter.order_return_state.command_handler.bulk_delete_order_return_state_handler: class: 'PrestaShop\PrestaShop\Adapter\OrderReturnState\CommandHandler\BulkDeleteOrderReturnStateHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\OrderReturnState\Command\BulkDeleteOrderReturnStateCommand' + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml b/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml index afcf58137f047..4a5cd8c111350 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/order_state.yml @@ -4,28 +4,28 @@ services: prestashop.adapter.order_state.command_handler.add_order_state: class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\AddOrderStateHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\AddOrderStateCommand' + autoconfigure: true + arguments: + - '@PrestaShop\PrestaShop\Adapter\File\Uploader\OrderStateFileUploader' prestashop.adapter.order_state.query_handler.get_order_state_for_editing: class: 'PrestaShop\PrestaShop\Adapter\OrderState\QueryHandler\GetOrderStateForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Query\GetOrderStateForEditing' + autoconfigure: true prestashop.adapter.order_state.command_handler.edit_order_state_handler: class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\EditOrderStateHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\EditOrderStateCommand' + autoconfigure: true + arguments: + - '@PrestaShop\PrestaShop\Adapter\File\Uploader\OrderStateFileUploader' prestashop.adapter.order_state.command_handler.delete_order_state_handler: class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\DeleteOrderStateHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\DeleteOrderStateCommand' } + autoconfigure: true prestashop.adapter.order_state.command_handler.bulk_delete_order_state_handler: class: 'PrestaShop\PrestaShop\Adapter\OrderState\CommandHandler\BulkDeleteOrderStateHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\OrderState\Command\BulkDeleteOrderStateCommand' } + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\File\Uploader\OrderStateFileUploader: + arguments: + - '@prestashop.core.configuration.upload_size_configuration' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product.yml index 80dbbf45ad95d..2e7021bb8727c 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/product.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/product.yml @@ -5,6 +5,20 @@ services: _defaults: public: true + PrestaShop\PrestaShop\Adapter\Product\CommandHandler\AssignProductToCategoryHandler: + autowire: true + autoconfigure: true + + PrestaShop\PrestaShop\Adapter\Product\QueryHandler\SearchProductsHandler: + autoconfigure: true + arguments: + - '@=service("PrestaShop\\PrestaShop\\Adapter\\LegacyContext").getContext().language.id' + - '@PrestaShop\PrestaShop\Core\Localization\LocaleInterface' + - '@PrestaShop\PrestaShop\Adapter\Tools' + - '@PrestaShop\PrestaShop\Core\Currency\CurrencyDataProviderInterface' + - '@PrestaShop\PrestaShop\Adapter\ContextStateManager' + + # Deprecated in 8.1 PrestaShop\PrestaShop\Adapter\Product\AdminProductDataProvider: decorates: prestashop.core.admin.data_provider.product_interface arguments: @@ -14,23 +28,6 @@ services: public: false deprecated: ~ - prestashop.adapter.admin.data_provider.product: - alias: PrestaShop\PrestaShop\Adapter\Product\AdminProductDataProvider - deprecated: ~ - - PrestaShop\PrestaShop\Adapter\Product\AdminProductDataUpdater: - class: PrestaShop\PrestaShop\Adapter\Product\AdminProductDataUpdater - decorates: prestashop.core.admin.data_updater.product_interface - public: false - arguments: - - '@PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface' - - "@prestashop.static_cache.adapter" - deprecated: ~ - - prestashop.adapter.admin.data_updater.product: - alias: PrestaShop\PrestaShop\Adapter\Product\AdminProductDataUpdater - deprecated: ~ - PrestaShop\PrestaShop\Adapter\Product\AdminProductWrapper: arguments: - "@translator" @@ -39,59 +36,31 @@ services: - '@PrestaShopBundle\Utils\FloatParser' deprecated: ~ - prestashop.adapter.admin.wrapper.product: - alias: PrestaShop\PrestaShop\Adapter\Product\AdminProductWrapper - deprecated: ~ - PrestaShop\PrestaShop\Adapter\Attribute\AdminAttributeGeneratorControllerWrapper: deprecated: ~ - prestashop.adapter.admin.controller.attribute_generator: - alias: PrestaShop\PrestaShop\Adapter\Attribute\AdminAttributeGeneratorControllerWrapper - deprecated: ~ - PrestaShop\PrestaShop\Adapter\Product\FilterCategoriesRequestPurifier: deprecated: ~ - prestashop.adapter.product.filter_categories_request_purifier: - alias: PrestaShop\PrestaShop\Adapter\Product\FilterCategoriesRequestPurifier - deprecated: ~ - PrestaShop\PrestaShop\Adapter\Product\ListParametersUpdater: deprecated: ~ - prestashop.adapter.product.list_parameters_updater: - alias: PrestaShop\PrestaShop\Adapter\Product\ListParametersUpdater - deprecated: ~ - - PrestaShop\PrestaShop\Adapter\Product\CommandHandler\AssignProductToCategoryHandler: - autowire: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\AssignProductToCategoryCommand - - PrestaShop\PrestaShop\Adapter\Product\QueryHandler\SearchProductsHandler: + PrestaShop\PrestaShop\Adapter\Product\AdminProductDataUpdater: + class: PrestaShop\PrestaShop\Adapter\Product\AdminProductDataUpdater + decorates: prestashop.core.admin.data_updater.product_interface + public: false arguments: - - '@=service("PrestaShop\\PrestaShop\\Adapter\\LegacyContext").getContext().language.id' - - '@PrestaShop\PrestaShop\Core\Localization\LocaleInterface' - - '@PrestaShop\PrestaShop\Adapter\Tools' - - '@PrestaShop\PrestaShop\Core\Currency\CurrencyDataProviderInterface' - - '@PrestaShop\PrestaShop\Adapter\ContextStateManager' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProducts + - '@PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface' + - "@prestashop.static_cache.adapter" + deprecated: ~ PrestaShop\PrestaShop\Adapter\Product\QueryHandler\SearchProductsForAssociationHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Query\SearchProductsForAssociation + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\QueryHandler\GetProductIsEnabledHandler: - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Query\GetProductIsEnabled + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Grid\Data\Factory\ProductGridDataFactoryDecorator: arguments: @@ -126,104 +95,76 @@ services: PrestaShop\PrestaShop\Adapter\Product\QueryHandler\GetProductForEditingHandler: autowire: true public: false + autoconfigure: true arguments: $countryId: '@=service("PrestaShop\\PrestaShop\\Adapter\\Configuration").getInt("PS_COUNTRY_DEFAULT")' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Query\GetProductForEditing PrestaShop\PrestaShop\Adapter\Product\CommandHandler\AddProductHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\AddProductCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\CommandHandler\SetProductTagsHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetProductTagsCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\CommandHandler\UpdateProductsPositionsHandler: + autoconfigure: true arguments: - '@prestashop.core.grid.product.position_definition' - '@PrestaShop\PrestaShop\Core\Grid\Position\PositionUpdateFactoryInterface' - '@PrestaShop\PrestaShop\Core\Grid\Position\GridPositionUpdaterInterface' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductsPositionsCommand PrestaShop\PrestaShop\Adapter\Product\CommandHandler\RemoveAllProductTagsHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllProductTagsCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\CommandHandler\SetAssociatedProductCategoriesHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductCategoryUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetAssociatedProductCategoriesCommand PrestaShop\PrestaShop\Adapter\Product\CommandHandler\RemoveAllAssociatedProductCategoriesHandler: autowire: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllAssociatedProductCategoriesCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\CommandHandler\SetCarriersHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetCarriersCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\QueryHandler\GetProductSupplierOptionsHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Query\GetProductSupplierOptions + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Supplier\QueryHandler\GetAssociatedSuppliersHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Query\GetAssociatedSuppliers PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler\SetSuppliersHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\SetSuppliersCommand PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler\SetProductDefaultSupplierHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\SetProductDefaultSupplierCommand PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler\UpdateProductSuppliersHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater' - '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\UpdateProductSuppliersCommand PrestaShop\PrestaShop\Adapter\Product\Supplier\CommandHandler\RemoveAllAssociatedProductSuppliersHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Supplier\Command\RemoveAllAssociatedProductSuppliersCommand PrestaShop\PrestaShop\Adapter\Product\Update\ProductAttachmentUpdater: autowire: true @@ -246,43 +187,31 @@ services: PrestaShop\PrestaShop\Adapter\Product\CommandHandler\DeleteProductHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\DeleteProductCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\CommandHandler\BulkDeleteProductHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkDeleteProductCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\CommandHandler\BulkDuplicateProductHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductDuplicator' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkDuplicateProductCommand PrestaShop\PrestaShop\Adapter\Product\CommandHandler\BulkUpdateProductStatusHandler: autowire: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\BulkUpdateProductStatusCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Attachment\CommandHandler\SetAssociatedProductAttachmentsHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductAttachmentUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Attachment\Command\SetAssociatedProductAttachmentsCommand PrestaShop\PrestaShop\Adapter\Product\Attachment\CommandHandler\RemoveAllAssociatedProductAttachmentsHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductAttachmentUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Attachment\Command\RemoveAllAssociatedProductAttachmentsCommand PrestaShop\PrestaShop\Adapter\Product\Validate\ProductSupplierValidator: autowire: true @@ -305,25 +234,19 @@ services: public: false PrestaShop\PrestaShop\Adapter\Product\CommandHandler\SetRelatedProductsHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\RelatedProductsUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\SetRelatedProductsCommand PrestaShop\PrestaShop\Adapter\Product\QueryHandler\GetRelatedProductsHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Query\GetRelatedProducts + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\CommandHandler\RemoveAllRelatedProductsHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\RelatedProductsUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\RemoveAllRelatedProductsCommand PrestaShop\PrestaShop\Adapter\Product\Repository\TagRepository: arguments: @@ -340,11 +263,9 @@ services: public: false PrestaShop\PrestaShop\Adapter\Product\CommandHandler\DuplicateProductHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductDuplicator' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\DuplicateProductCommand PrestaShop\PrestaShop\Adapter\Product\Update\ProductDuplicator: autowire: true @@ -354,11 +275,9 @@ services: $productImageSystemPathFactory: '@prestashop.adapter.product.image.product_image_filesystem_path_factory' PrestaShop\PrestaShop\Adapter\Product\CommandHandler\UpdateProductTypeHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductTypeUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductTypeCommand PrestaShop\PrestaShop\Adapter\Product\Update\ProductIndexationUpdater: arguments: @@ -376,25 +295,19 @@ services: PrestaShop\PrestaShop\Adapter\Product\Shop\CommandHandler\SetProductShopsHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Shop\Command\SetProductShopsCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\CommandHandler\UpdateProductHandler: autowire: true public: false + autoconfigure: true arguments: $productUpdatablePropertyFiller: '@PrestaShop\PrestaShop\Adapter\Product\Update\Filler\ProductFiller' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Command\UpdateProductCommand PrestaShop\PrestaShop\Adapter\Product\Stock\CommandHandler\UpdateProductStockAvailableHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Stock\Command\UpdateProductStockAvailableCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Update\Filler\ProductFiller: arguments: diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_combination.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_combination.yml index a756081305e9f..88cc9cf54de30 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_combination.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_combination.yml @@ -3,49 +3,37 @@ services: public: true PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\GenerateProductCombinationsHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Create\CombinationCreator' - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\GenerateProductCombinationsCommand PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\UpdateCombinationHandler: autowire: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\UpdateCombinationStockAvailableHandler: autowire: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationStockAvailableCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Combination\QueryHandler\GetCombinationForEditingHandler: autowire: true public: false + autoconfigure: true arguments: $contextLanguageId: "@=service('prestashop.adapter.legacy.context').getContext().language.id" - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationForEditing PrestaShop\PrestaShop\Adapter\Product\Combination\QueryHandler\GetEditableCombinationsListHandler: autowire: true public: false + autoconfigure: true arguments: $combinationQueryBuilder: '@PrestaShop\PrestaShop\Core\Grid\Query\ProductCombinationQueryBuilder' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetEditableCombinationsList PrestaShop\PrestaShop\Adapter\Product\Combination\QueryHandler\SearchCombinationsForAssociationHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\SearchCombinationsForAssociation + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Combination\Validate\CombinationValidator: ~ @@ -82,61 +70,45 @@ services: - '%database_prefix%' PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\UpdateCombinationSuppliersHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Repository\CombinationRepository' - '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository' - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\UpdateCombinationSuppliersCommand PrestaShop\PrestaShop\Adapter\Product\Combination\QueryHandler\GetCombinationSuppliersHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductSupplierRepository' - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Repository\CombinationRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationSuppliers PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\SetCombinationImagesHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationImagesUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\SetCombinationImagesCommand PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\RemoveAllCombinationImagesHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationImagesUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\RemoveAllCombinationImagesCommand PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\DeleteCombinationHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationDeleter' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\DeleteCombinationCommand PrestaShop\PrestaShop\Adapter\Product\Combination\CommandHandler\BulkDeleteCombinationHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Combination\Update\CombinationDeleter' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Command\BulkDeleteCombinationCommand PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryHandler\SearchProductCombinationsHandler: autowire: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\SearchProductCombinations + autoconfigure: true PrestaShop\PrestaShop\Core\Domain\Product\Combination\QueryHandler\GetCombinationIdsHandler: autowire: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Combination\Query\GetCombinationIds + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Combination\Update\Filler\CombinationFiller: arguments: diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_customization.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_customization.yml index bd92cab05b0c6..63357e4c4ae2a 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_customization.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_customization.yml @@ -19,23 +19,17 @@ services: public: false PrestaShop\PrestaShop\Adapter\Product\Customization\QueryHandler\GetProductCustomizationFieldsHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Customization\Repository\CustomizationFieldRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Customization\Query\GetProductCustomizationFields PrestaShop\PrestaShop\Adapter\Product\Customization\CommandHandler\SetProductCustomizationFieldsHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Customization\Repository\CustomizationFieldRepository' - '@PrestaShop\PrestaShop\Adapter\Product\Customization\Update\ProductCustomizationFieldUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Customization\Command\SetProductCustomizationFieldsCommand PrestaShop\PrestaShop\Adapter\Product\Customization\CommandHandler\RemoveAllCustomizationFieldsFromProductHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Customization\Command\RemoveAllCustomizationFieldsFromProductCommand + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_feature_value.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_feature_value.yml index 72abbecfd26a2..b2f8e621ecfe6 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_feature_value.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_feature_value.yml @@ -3,25 +3,19 @@ services: public: true PrestaShop\PrestaShop\Adapter\Product\FeatureValue\CommandHandler\SetProductFeatureValuesHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\FeatureValue\Update\ProductFeatureValueUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Command\SetProductFeatureValuesCommand PrestaShop\PrestaShop\Adapter\Product\FeatureValue\CommandHandler\RemoveAllFeatureValuesFromProductHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\FeatureValue\Update\ProductFeatureValueUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Command\RemoveAllFeatureValuesFromProductCommand PrestaShop\PrestaShop\Adapter\Product\FeatureValue\QueryHandler\GetProductFeatureValuesHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\FeatureValue\Query\GetProductFeatureValues PrestaShop\PrestaShop\Adapter\Product\FeatureValue\Update\ProductFeatureValueUpdater: autowire: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_image.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_image.yml index 8fd704e727e1a..f9cf25c76dc0c 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_image.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_image.yml @@ -5,54 +5,40 @@ services: PrestaShop\PrestaShop\Adapter\Product\Image\CommandHandler\AddProductImageHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\AddProductImageCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Image\CommandHandler\UpdateProductImageHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Image\Repository\ProductImageRepository' - '@PrestaShop\PrestaShop\Adapter\Product\Image\Update\ProductImageUpdater' - '@PrestaShop\PrestaShop\Adapter\Product\Image\Uploader\ProductImageUploader' - '@PrestaShop\PrestaShop\Adapter\Image\ProductImageFileValidator' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\UpdateProductImageCommand PrestaShop\PrestaShop\Adapter\Product\Image\CommandHandler\DeleteProductImageHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Image\Update\ProductImageUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\DeleteProductImageCommand PrestaShop\PrestaShop\Adapter\Product\Image\CommandHandler\SetProductImagesForAllShopHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Command\SetProductImagesForAllShopCommand + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Image\QueryHandler\GetProductImagesHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetProductImages + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Image\QueryHandler\GetShopProductImagesHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetShopProductImages + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Image\QueryHandler\GetProductImageHandler: autowire: true public: false - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Image\Query\GetProductImage + autoconfigure: true PrestaShop\PrestaShop\Adapter\Product\Image\Validate\ProductImageValidator: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_pack.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_pack.yml index 6620d43b7b762..75a637081d597 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_pack.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_pack.yml @@ -12,25 +12,19 @@ services: public: false PrestaShop\PrestaShop\Adapter\Product\Pack\CommandHandler\SetPackProductsHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Pack\Update\ProductPackUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Pack\Command\SetPackProductsCommand PrestaShop\PrestaShop\Adapter\Product\Pack\CommandHandler\RemoveAllProductsFromPackHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Pack\Update\ProductPackUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Pack\Command\RemoveAllProductsFromPackCommand PrestaShop\PrestaShop\Adapter\Product\Pack\QueryHandler\GetPackedProductsHandler: autowire: true public: false + autoconfigure: true arguments: $defaultLangId: '@=service("prestashop.adapter.legacy.context").getContext().language.id' $translator: '@translator' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Pack\Query\GetPackedProducts diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_specific_prices.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_specific_prices.yml index 3b4a92122d60d..c1e461dd94947 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_specific_prices.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_specific_prices.yml @@ -3,56 +3,42 @@ services: public: true PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\QueryHandler\GetSpecificPriceListHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository' - '@PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository' - '@PrestaShop\PrestaShop\Core\Product\Combination\NameBuilder\CombinationNameBuilderInterface' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Query\GetSpecificPriceList PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\QueryHandler\GetSpecificPriceForEditingHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository' - '@PrestaShop\PrestaShop\Adapter\Customer\Repository\CustomerRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Query\GetSpecificPriceForEditing PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\AddSpecificPriceHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\AddSpecificPriceCommand PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\EditSpecificPriceHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\EditSpecificPriceCommand PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\DeleteSpecificPriceHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Repository\SpecificPriceRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\DeleteSpecificPriceCommand PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\SetSpecificPricePriorityForProductHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\SetSpecificPricePriorityForProductCommand PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\CommandHandler\RemoveSpecificPricePriorityForProductHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\SpecificPrice\Command\RemoveSpecificPricePriorityForProductCommand PrestaShop\PrestaShop\Adapter\Product\SpecificPrice\Update\SpecificPricePriorityUpdater: public: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_stock.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_stock.yml index 886f026e61c76..e8abef4d9ecd7 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_stock.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_stock.yml @@ -21,22 +21,18 @@ services: - '@PrestaShop\PrestaShop\Core\ConfigurationInterface' PrestaShop\PrestaShop\Adapter\Product\Stock\QueryHandler\GetProductStockMovementsHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Stock\Repository\StockAvailableRepository' - '@PrestaShop\PrestaShop\Adapter\Product\Stock\Repository\StockMovementRepository' - '@translator' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Stock\Query\GetProductStockMovements PrestaShop\PrestaShop\Adapter\Product\Stock\QueryHandler\GetCombinationStockMovementsHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\Stock\Repository\StockAvailableRepository' - '@PrestaShop\PrestaShop\Adapter\Product\Stock\Repository\StockMovementRepository' - '@translator' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\Stock\Query\GetCombinationStockMovements PrestaShop\PrestaShop\Adapter\Product\Stock\Update\ProductStockUpdater: autowire: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/product/_virtual_product.yml b/src/PrestaShopBundle/Resources/config/services/adapter/product/_virtual_product.yml index 24a32ebd09961..8468854cf0054 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/product/_virtual_product.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/product/_virtual_product.yml @@ -3,19 +3,15 @@ services: public: true PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\CommandHandler\AddVirtualProductFileHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\AddVirtualProductFileCommand PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\CommandHandler\UpdateVirtualProductFileHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater' - '@PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Repository\VirtualProductFileRepository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\UpdateVirtualProductFileCommand PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater: autowire: true @@ -37,8 +33,6 @@ services: - !php/const _PS_DOWNLOAD_DIR_ PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\CommandHandler\DeleteVirtualProductFileHandler: + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Adapter\Product\VirtualProduct\Update\VirtualProductUpdater' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\Product\VirtualProductFile\Command\DeleteVirtualProductFileCommand diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/profile.yml b/src/PrestaShopBundle/Resources/config/services/adapter/profile.yml index db16e18a38193..7d2b6c68c1905 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/profile.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/profile.yml @@ -5,52 +5,41 @@ services: prestashop.adapter.profile.command_handler.delete_profile: class: 'PrestaShop\PrestaShop\Adapter\Profile\CommandHandler\DeleteProfileHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.configuration").get("_PS_ADMIN_PROFILE_")' - '@prestashop.adapter.data_provider.employee' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\DeleteProfileCommand' prestashop.adapter.profile.command_handler.bulk_delete_profile: class: 'PrestaShop\PrestaShop\Adapter\Profile\CommandHandler\BulkDeleteProfileHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.configuration").get("_PS_ADMIN_PROFILE_")' - '@prestashop.adapter.data_provider.employee' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\BulkDeleteProfileCommand' prestashop.adapter.profile.command_handler.add_profile_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\CommandHandler\AddProfileHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\AddProfileCommand' + autoconfigure: true prestashop.adapter.profile.command_handler.edit_profile_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\CommandHandler\EditProfileHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Command\EditProfileCommand' + autoconfigure: true prestashop.adapter.profile.query_handler.get_profile_for_editing_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\QueryHandler\GetProfileForEditingHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.employee.avatar_provider").getDefaultAvatarUrl()' - '@prestashop.core.image.parser.image_tag_source_parser' - !php/const _PS_PROFILE_IMG_DIR_ - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Query\GetProfileForEditing' prestashop.adapter.profile.permission.command_handler.update_tab_permissions_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\Permission\CommandHandler\UpdateTabPermissionsHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Command\UpdateTabPermissionsCommand' + autoconfigure: true prestashop.adapter.profile.permission.query_handler.get_permissions_for_configuration_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\Permission\QueryHandler\GetPermissionsForConfigurationHandler' + autoconfigure: true arguments: - '@security.authorization_checker' - '@=service("prestashop.adapter.legacy.context").getContext().language.id' @@ -58,12 +47,7 @@ services: - 'AdminLogin' - 'AdminQuickAccesses' - 'AdminTabs' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Query\GetPermissionsForConfiguration' prestashop.adapter.profile.permission.command_handler.update_module_permissions_handler: class: 'PrestaShop\PrestaShop\Adapter\Profile\Permission\CommandHandler\UpdateModulePermissionsHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Profile\Permission\Command\UpdateModulePermissionsCommand' + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/quick_access.yml b/src/PrestaShopBundle/Resources/config/services/adapter/quick_access.yml new file mode 100644 index 0000000000000..55b1fd57e46c9 --- /dev/null +++ b/src/PrestaShopBundle/Resources/config/services/adapter/quick_access.yml @@ -0,0 +1,11 @@ +services: + _defaults: + public: false + autowire: true + bind: + $dbPrefix: '%database_prefix%' + + PrestaShop\PrestaShop\Core\QuickAccess\QuickAccessRepositoryInterface: + alias: PrestaShop\PrestaShop\Adapter\QuickAccess\Repository\QuickAccessRepository + + PrestaShop\PrestaShop\Adapter\QuickAccess\Repository\QuickAccessRepository: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/search_engine.yml b/src/PrestaShopBundle/Resources/config/services/adapter/search_engine.yml index 001ed1ce3d2a6..bfc6e8ecf1916 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/search_engine.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/search_engine.yml @@ -5,31 +5,21 @@ services: # Command Handlers prestashop.adapter.search_engine.command_handler.add_search_engine_handler: class: PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler\AddSearchEngineHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\AddSearchEngineCommand + autoconfigure: true prestashop.adapter.search_engine.command_handler.bulk_delete_search_engine_handler: class: PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler\BulkDeleteSearchEngineHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\BulkDeleteSearchEngineCommand + autoconfigure: true prestashop.adapter.search_engine.command_handler.delete_search_engine_handler: class: PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler\DeleteSearchEngineHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\DeleteSearchEngineCommand + autoconfigure: true prestashop.adapter.search_engine.command_handler.edit_search_engine_handler: class: PrestaShop\PrestaShop\Adapter\SearchEngine\CommandHandler\EditSearchEngineHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Command\EditSearchEngineCommand + autoconfigure: true # Query Handlers prestashop.adapter.search_engine.query_handler.get_search_engine_for_editing_handler: class: PrestaShop\PrestaShop\Adapter\SearchEngine\QueryHandler\GetSearchEngineForEditingHandler - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\SearchEngine\Query\GetSearchEngineForEditing + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/security.yml b/src/PrestaShopBundle/Resources/config/services/adapter/security.yml index 5df6c5eec6bb2..1b64152380aa4 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/security.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/security.yml @@ -4,51 +4,39 @@ services: prestashop.adapter.security.command_handler.delete_customer_session_handler: class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\DeleteCustomerSessionHandler' + autoconfigure: true arguments: - '@prestashop.adapter.security.repository.customer_session_repository' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\DeleteCustomerSessionCommand' prestashop.adapter.security.command_handler.clear_customer_session_handler: class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\ClearOutdatedCustomerSessionHandler' + autoconfigure: true arguments: - '@prestashop.adapter.security.repository.customer_session_repository' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\ClearOutdatedCustomerSessionCommand' prestashop.adapter.security.command_handler.delete_employee_session_handler: class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\DeleteEmployeeSessionHandler' + autoconfigure: true arguments: - '@prestashop.adapter.security.repository.employee_session_repository' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\DeleteEmployeeSessionCommand' prestashop.adapter.security.command_handler.clear_employee_session_handler: class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\ClearOutdatedEmployeeSessionHandler' + autoconfigure: true arguments: - '@prestashop.adapter.security.repository.employee_session_repository' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\ClearOutdatedEmployeeSessionCommand' prestashop.adapter.security.command_handler.bulk_delete_employees_sessions_handler: class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\BulkDeleteEmployeeSessionsHandler' + autoconfigure: true arguments: - '@prestashop.adapter.security.repository.employee_session_repository' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\BulkDeleteEmployeeSessionsCommand' prestashop.adapter.security.command_handler.bulk_delete_customers_sessions_handler: class: 'PrestaShop\PrestaShop\Adapter\Security\CommandHandler\BulkDeleteCustomerSessionsHandler' + autoconfigure: true arguments: - '@prestashop.adapter.security.repository.customer_session_repository' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Security\Command\BulkDeleteCustomerSessionsCommand' prestashop.adapter.security.repository.customer_session_repository: class: 'PrestaShop\PrestaShop\Adapter\Session\Repository\CustomerSessionRepository' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/services.yml b/src/PrestaShopBundle/Resources/config/services/adapter/services.yml index 5757b327fc17e..f69fb0c4ed789 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/services.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/services.yml @@ -75,8 +75,13 @@ services: class: PrestaShop\PrestaShop\Adapter\Product\PriceFormatter # Other adapters + PrestaShop\PrestaShop\Adapter\Shop\Context: + public: false + prestashop.adapter.shop.context: - class: PrestaShop\PrestaShop\Adapter\Shop\Context + alias: PrestaShop\PrestaShop\Adapter\Shop\Context + public: true + deprecated: ~ PrestaShop\PrestaShop\Core\Multistore\MultistoreContextCheckerInterface: '@prestashop.adapter.shop.context' PrestaShop\PrestaShop\Core\Shop\ShopContextInterface: '@prestashop.adapter.shop.context' @@ -85,10 +90,6 @@ services: PrestaShop\PrestaShop\Adapter\ImageManager: arguments: [ '@PrestaShop\PrestaShop\Adapter\LegacyContext' ] - prestashop.adapter.image_manager: - alias: PrestaShop\PrestaShop\Adapter\ImageManager - deprecated: ~ - prestashop.core.module.updater: class: PrestaShop\PrestaShop\Adapter\Module\ModuleDataUpdater @@ -100,7 +101,6 @@ services: - '@PrestaShop\PrestaShop\Adapter\Tools' - "@prestashop.adapter.data_provider.product" - "@prestashop.adapter.data_provider.supplier" - - "@prestashop.adapter.data_provider.warehouse" - "@prestashop.adapter.data_provider.feature" - "@prestashop.adapter.data_provider.pack" - "@prestashop.adapter.shop.context" @@ -115,7 +115,7 @@ services: arguments: - '@prestashop.service.translation' - '@=service("PrestaShop\\PrestaShop\\Adapter\\LegacyContext").getContext().link' - - '@prestashop.core.admin.module.repository' + - '@PrestaShop\PrestaShop\Core\Module\ModuleRepository' prestashop.adapter.shop.shop_url: class: 'PrestaShop\PrestaShop\Adapter\Shop\ShopUrlDataProvider' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/shop.yml b/src/PrestaShopBundle/Resources/config/services/adapter/shop.yml index 2d5c0186cc130..68e7ba04e3cb4 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/shop.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/shop.yml @@ -4,12 +4,11 @@ services: prestashop.adapter.shop.command_handler.upload_logos_handler: class: 'PrestaShop\PrestaShop\Adapter\Shop\CommandHandler\UploadLogosHandler' + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - '@prestashop.core.shop.logo_uploader' - '@prestashop.core.hook.dispatcher' - tags: - - { name: tactician.handler, command: 'PrestaShop\PrestaShop\Core\Domain\Shop\Command\UploadLogosCommand' } prestashop.adapter.shop.url.base_url_provider: class: 'PrestaShop\PrestaShop\Adapter\Shop\Url\BaseUrlProvider' @@ -48,21 +47,17 @@ services: prestashop.adapter.shop.query_handler.get_logos_paths_handler: class: 'PrestaShop\PrestaShop\Adapter\Shop\QueryHandler\GetLogosPathsHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.configuration").get("_PS_IMG_")' - '@=service("prestashop.adapter.legacy.configuration").get("_PS_IMG_DIR_")' - tags: - - name: 'tactician.handler' - command: PrestaShop\PrestaShop\Core\Domain\Shop\Query\GetLogosPaths prestashop.adapter.shop.query_handler.search_shops_handler: class: 'PrestaShop\PrestaShop\Adapter\Shop\QueryHandler\SearchShopsHandler' + autoconfigure: true arguments: - '@prestashop.core.admin.shop.repository' - '@prestashop.core.admin.shop_group.repository' - tags: - - name: 'tactician.handler' - command: PrestaShop\PrestaShop\Core\Domain\Shop\Query\SearchShops prestashop.adapter.shop.url.product_image_folder_provider: class: 'PrestaShop\PrestaShop\Adapter\Shop\Url\ImageFolderProvider' diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/sql_manager.yml b/src/PrestaShopBundle/Resources/config/services/adapter/sql_manager.yml index e6d77133de820..1b359991a4603 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/sql_manager.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/sql_manager.yml @@ -8,49 +8,41 @@ services: # Command handlers prestashop.adapter.sql_manager.command_handler.add_request_sql: class: 'PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler\AddSqlRequestHandler' + autoconfigure: true arguments: - '@prestashop.adapter.sql_manager.sql_query_validator' - '@translator' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\AddSqlRequestCommand' } prestashop.adapter.sql_manager.command_handler.edit_request_sql: class: 'PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler\EditSqlRequestHandler' + autoconfigure: true arguments: - '@prestashop.adapter.sql_manager.sql_query_validator' - '@translator' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\EditSqlRequestCommand' } prestashop.adapter.sql_manager.command_handler.delete_request_sql: class: 'PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler\DeleteSqlRequestHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\DeleteSqlRequestCommand' } + autoconfigure: true prestashop.adapter.sql_manager.command_handler.bulk_delete_request_sql: class: 'PrestaShop\PrestaShop\Adapter\SqlManager\CommandHandler\BulkDeleteSqlRequestHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\BulkDeleteSqlRequestCommand' } + autoconfigure: true # Query handlers prestashop.adapter.sql_manager.query_handler.get_request_sql_for_editing: class: 'PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler\GetSqlRequestForEditingHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestForEditing' } + autoconfigure: true prestashop.adapter.sql_manager.query_handler.get_request_sql_execution_result: class: 'PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler\GetSqlRequestExecutionResultHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestExecutionResult' } + autoconfigure: true prestashop.adapter.sql_manager.query_handler.get_database_tables_list: class: 'PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler\GetDatabaseTablesListHandler' + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetDatabaseTablesList' } prestashop.adapter.sql_manager.query_handler.get_database_table_fields_list: class: 'PrestaShop\PrestaShop\Adapter\SqlManager\QueryHandler\GetDatabaseTableFieldsListHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetDatabaseTableFieldsList' } + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/state.yml b/src/PrestaShopBundle/Resources/config/services/adapter/state.yml index 39ad090a40587..63311e7be8b86 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/state.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/state.yml @@ -4,42 +4,28 @@ services: prestashop.adapter.state.command_handler.create_state_handler: class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\AddStateHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\AddStateCommand' + autoconfigure: true prestashop.adapter.state.command_handler.edit_state_handler: class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\EditStateHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\EditStateCommand' + autoconfigure: true prestashop.adapter.state.command_handler.toggle_state_status_handler: class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\ToggleStateStatusHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\ToggleStateStatusCommand' + autoconfigure: true prestashop.adapter.state.query_handler.get_state_for_editing_handler: class: 'PrestaShop\PrestaShop\Adapter\State\QueryHandler\GetStateForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\State\Query\GetStateForEditing' + autoconfigure: true prestashop.adapter.state.command_handler.delete_state_handler: class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\DeleteStateHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\DeleteStateCommand' + autoconfigure: true prestashop.adapter.state.command_handler.bulk_delete_state_handler: class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\BulkDeleteStateHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\BulkDeleteStateCommand' + autoconfigure: true prestashop.adapter.state.command_handler.bulk_toggle_state_status_handler: class: 'PrestaShop\PrestaShop\Adapter\State\CommandHandler\BulkToggleStateStatusHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\State\Command\BulkToggleStateStatusCommand' + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/store.yml b/src/PrestaShopBundle/Resources/config/services/adapter/store.yml index 661eb9da1b6ad..ffcd1ac7b5d4e 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/store.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/store.yml @@ -11,38 +11,33 @@ services: prestashop.adapter.store.query_handler.get_store_for_editing: class: 'PrestaShop\PrestaShop\Adapter\Store\QueryHandler\GetStoreForEditingHandler' + autoconfigure: true arguments: - '@prestashop.core.domain.store.repository.store_repository' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Store\Query\GetStoreForEditing' } prestashop.adapter.store.command_handler.toggle_store_status: class: 'PrestaShop\PrestaShop\Adapter\Store\CommandHandler\ToggleStoreStatusHandler' + autoconfigure: true arguments: - '@prestashop.core.domain.store.repository.store_repository' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Command\ToggleStoreStatusCommand } prestashop.adapter.store.command_handler.bulk_toggle_store_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Store\CommandHandler\BulkUpdateStoreStatusHandler' + autoconfigure: true arguments: - '@prestashop.core.domain.store.repository.store_repository' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Command\BulkUpdateStoreStatusCommand } prestashop.adapter.store.command_handler.delete_store: class: 'PrestaShop\PrestaShop\Adapter\Store\CommandHandler\DeleteStoreHandler' + autoconfigure: true arguments: - '@prestashop.core.domain.store.repository.store_repository' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Command\DeleteStoreCommand } prestashop.adapter.store.command_handler.bulk_delete_store_handler: class: 'PrestaShop\PrestaShop\Adapter\Store\CommandHandler\BulkDeleteStoreHandler' + autoconfigure: true arguments: - '@prestashop.core.domain.store.repository.store_repository' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Store\Command\BulkDeleteStoreCommand } # deprecated prestashop.core.domain.store.repository.store_repository: diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml b/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml index 48e29eb47a986..e14ee787a8ca2 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/supplier.yml @@ -13,6 +13,7 @@ services: prestashop.adapter.supplier.supplier_order_validator: class: 'PrestaShop\PrestaShop\Adapter\Supplier\SupplierOrderValidator' + deprecated: ~ # Command handlers @@ -20,7 +21,6 @@ services: class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\AbstractDeleteSupplierHandler' abstract: true arguments: - - '@prestashop.adapter.supplier.supplier_order_validator' - '@prestashop.adapter.supplier.provider.supplier_address' - '@PrestaShop\PrestaShop\Adapter\Product\Update\ProductSupplierUpdater' - '%database_prefix%' @@ -28,74 +28,54 @@ services: prestashop.adapter.supplier.command_handler.toggle_supplier_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\ToggleSupplierStatusHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\ToggleSupplierStatusCommand' + autoconfigure: true prestashop.adapter.supplier.command_handler.delete_supplier_handler: class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\DeleteSupplierHandler' parent: 'prestashop.adapter.supplier.command_handler.abstract_delete_supplier_handler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\DeleteSupplierCommand' + autoconfigure: true public: true prestashop.adapter.supplier.command_handler.delete_supplier_logo_image_handler: class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\DeleteSupplierLogoImageHandler' + autoconfigure: true arguments: - !php/const _PS_SUPP_IMG_DIR_ - !php/const _PS_TMP_IMG_DIR_ - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\DeleteSupplierLogoImageCommand' prestashop.adapter.supplier.command_handler.bulk_delete_supplier_handler: class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\BulkDeleteSupplierHandler' parent: 'prestashop.adapter.supplier.command_handler.abstract_delete_supplier_handler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkDeleteSupplierCommand' + autoconfigure: true public: true prestashop.adapter.supplier.command_handler.bulk_disable_supplier_handler: class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\BulkDisableSupplierHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkDisableSupplierCommand' + autoconfigure: true prestashop.adapter.supplier.command_handler.bulk_enable_supplier_handler: class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\BulkEnableSupplierHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\BulkEnableSupplierCommand' + autoconfigure: true prestashop.adapter.supplier.query_handler.get_supplier_for_viewing_handler: class: 'PrestaShop\PrestaShop\Adapter\Supplier\QueryHandler\GetSupplierForViewingHandler' + autoconfigure: true arguments: - '@prestashop.core.localization.locale.context_locale' - '@=service("prestashop.adapter.legacy.configuration").get("PS_CURRENCY_DEFAULT")' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Query\GetSupplierForViewing' prestashop.adapter.supplier.command_handler.add_supplier_handler: class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\AddSupplierHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\AddSupplierCommand' + autoconfigure: true prestashop.adapter.supplier.query_handler.get_supplier_for_editing: class: 'PrestaShop\PrestaShop\Adapter\Supplier\QueryHandler\GetSupplierForEditingHandler' + autoconfigure: true arguments: - '@prestashop.core.image.parser.image_tag_source_parser' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Query\GetSupplierForEditing' prestashop.adapter.supplier.command_handler.edit_supplier_handler: class: 'PrestaShop\PrestaShop\Adapter\Supplier\CommandHandler\EditSupplierHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Supplier\Command\EditSupplierCommand' + autoconfigure: true PrestaShop\PrestaShop\Adapter\Supplier\Repository\SupplierRepository: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/tab.yml b/src/PrestaShopBundle/Resources/config/services/adapter/tab.yml index 086cafad801ef..2c79a2c7f562d 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/tab.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/tab.yml @@ -4,7 +4,6 @@ services: prestashop.adapter.tab.command_handler.update_tab_status_by_class_name_command_handler: class: PrestaShop\PrestaShop\Adapter\Tab\CommandHandler\UpdateTabStatusByClassNameHandler + autoconfigure: true arguments: - '@doctrine.orm.entity_manager' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tab\Command\UpdateTabStatusByClassNameCommand' } diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml b/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml index da64cc9f2b05a..4b4a4828c974e 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/tax.yml @@ -9,45 +9,31 @@ services: arguments: - '@PrestaShop\PrestaShop\Adapter\TaxRulesGroup\Repository\TaxRulesGroupRepository' - prestashop.adapter.tax.tax_computer: - alias: PrestaShop\PrestaShop\Adapter\Tax\TaxComputer - deprecated: ~ - # Command handlers prestashop.adapter.tax.command_handler.delete_tax_handler: class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\DeleteTaxHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\DeleteTaxCommand' } + autoconfigure: true prestashop.adapter.tax.command_handler.toggle_tax_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\ToggleTaxStatusHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\ToggleTaxStatusCommand' } + autoconfigure: true prestashop.adapter.tax.command_handler.bulk_toggle_tax_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\BulkToggleTaxStatusHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\BulkToggleTaxStatusCommand' } + autoconfigure: true prestashop.adapter.tax.command_handler.bulk_delete_tax_handler: class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\BulkDeleteTaxHandler' - tags: - - { name: 'tactician.handler', command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\BulkDeleteTaxCommand' } + autoconfigure: true prestashop.adapter.tax.query_handler.get_tax_for_editing_handler: class: 'PrestaShop\PrestaShop\Adapter\Tax\QueryHandler\GetTaxForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Query\GetTaxForEditing' + autoconfigure: true prestashop.adapter.tax.command_handler.edit_tax_handler: class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\EditTaxHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\EditTaxCommand' + autoconfigure: true prestashop.adapter.tax.command_handler.add_tax_handler: class: 'PrestaShop\PrestaShop\Adapter\Tax\CommandHandler\AddTaxHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Tax\Command\AddTaxCommand' + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml b/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml index 4681ec56f5ac0..88a218eebb042 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/tax_rules_group.yml @@ -4,45 +4,31 @@ services: PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\AddTaxRulesGroupHandler: autowire: true - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\AddTaxRulesGroupCommand' + autoconfigure: true PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\EditTaxRulesGroupHandler: autowire: true - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\EditTaxRulesGroupCommand' + autoconfigure: true prestashop.adapter.tax_rules_group.command_handler.delete_tax_rules_group_handler: class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\DeleteTaxRulesGroupHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\DeleteTaxRulesGroupCommand' + autoconfigure: true prestashop.adapter.tax_rules_group.command_handler.bulk_delete_tax_rules_group_handler: class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\BulkDeleteTaxRulesGroupHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\BulkDeleteTaxRulesGroupCommand' + autoconfigure: true prestashop.adapter.tax_rules_group.command_handler.bulk_set_tax_rules_group_status_handler: class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\BulkSetTaxRulesGroupStatusHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\BulkSetTaxRulesGroupStatusCommand' + autoconfigure: true prestashop.adapter.tax_rules_group.query_handler.get_tax_rules_group_for_editing: class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\QueryHandler\GetTaxRulesGroupForEditingHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Query\GetTaxRulesGroupForEditing' + autoconfigure: true prestashop.adapter.tax_rules_group.command_handler.set_tax_rules_group_status_handler: class: 'PrestaShop\PrestaShop\Adapter\TaxRulesGroup\CommandHandler\SetTaxRulesGroupStatusHandler' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\TaxRulesGroup\Command\SetTaxRulesGroupStatusCommand' + autoconfigure: true PrestaShop\PrestaShop\Adapter\TaxRulesGroup\Repository\TaxRulesGroupRepository: arguments: @@ -51,7 +37,3 @@ services: - '@PrestaShop\PrestaShop\Adapter\TaxRulesGroup\Validate\TaxRulesGroupValidator' PrestaShop\PrestaShop\Adapter\TaxRulesGroup\Validate\TaxRulesGroupValidator: ~ - - prestashop.adapter.tax_rules_group.repository.tax_rules_group_repository: - alias: PrestaShop\PrestaShop\Adapter\TaxRulesGroup\Repository\TaxRulesGroupRepository - deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/title.yml b/src/PrestaShopBundle/Resources/config/services/adapter/title.yml index 1aa157cddd615..afcb28f58b840 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/title.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/title.yml @@ -4,15 +4,11 @@ services: PrestaShop\PrestaShop\Adapter\Title\CommandHandler\AddTitleHandler: autowire: true - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\AddTitleCommand' + autoconfigure: true PrestaShop\PrestaShop\Adapter\Title\CommandHandler\EditTitleHandler: autowire: true - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\EditTitleCommand' + autoconfigure: true prestashop.adapter.title.title_image_thumbnail_provider: class: 'PrestaShop\PrestaShop\Adapter\Title\TitleImageThumbnailProvider' @@ -24,22 +20,16 @@ services: prestashop.adapter.title.command_handler.delete_title_handler: class: 'PrestaShop\PrestaShop\Adapter\Title\CommandHandler\DeleteTitleHandler' autowire: true - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\DeleteTitleCommand' + autoconfigure: true prestashop.adapter.title.command_handler.bulk_delete_title_handler: class: 'PrestaShop\PrestaShop\Adapter\Title\CommandHandler\BulkDeleteTitleHandler' autowire: true - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Title\Command\BulkDeleteTitleCommand' + autoconfigure: true PrestaShop\PrestaShop\Adapter\Title\QueryHandler\GetTitleForEditingHandler: autowire: true - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Title\Query\GetTitleForEditing' + autoconfigure: true PrestaShop\PrestaShop\Adapter\Title\Repository\TitleRepository: autowire: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml b/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml index 14ad8b58e51cb..607730bfa5906 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/webservice.yml @@ -12,18 +12,12 @@ services: prestashop.adapter.webservice.query_handler.get_webservice_key_for_editing_handler: class: 'PrestaShop\PrestaShop\Adapter\Webservice\QueryHandler\GetWebserviceKeyForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Webservice\Query\GetWebserviceKeyForEditing' + autoconfigure: true prestashop.adapter.webservice.command_handler.add_webservice_key_handler: class: 'PrestaShop\PrestaShop\Adapter\Webservice\CommandHandler\AddWebserviceKeyHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Webservice\Command\AddWebserviceKeyCommand' + autoconfigure: true prestashop.adapter.webservice.command_handler.edit_webservice_key_handler: class: 'PrestaShop\PrestaShop\Adapter\Webservice\CommandHandler\EditWebserviceKeyHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Webservice\Command\EditWebserviceKeyCommand' + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/zone.yml b/src/PrestaShopBundle/Resources/config/services/adapter/zone.yml index 4481644edaa4d..dd1e485e047c6 100644 --- a/src/PrestaShopBundle/Resources/config/services/adapter/zone.yml +++ b/src/PrestaShopBundle/Resources/config/services/adapter/zone.yml @@ -4,42 +4,28 @@ services: prestashop.adapter.zone.command_handler.add_zone_handler: class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\AddZoneHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\AddZoneCommand' + autoconfigure: true prestashop.adapter.zone.command_handler.toggle_zone_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\ToggleZoneStatusHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\ToggleZoneStatusCommand' + autoconfigure: true prestashop.adapter.zone.command_handler.edit_zone_handler: class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\EditZoneHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\EditZoneCommand' + autoconfigure: true prestashop.adapter.zone.query_handler.get_zone_for_editing_handler: class: 'PrestaShop\PrestaShop\Adapter\Zone\QueryHandler\GetZoneForEditingHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Query\GetZoneForEditing' + autoconfigure: true prestashop.adapter.zone.command_handler.delete_zone_handler: class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\DeleteZoneHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\DeleteZoneCommand' + autoconfigure: true prestashop.adapter.zone.command_handler.bulk_delete_zone_handler: class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\BulkDeleteZoneHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\BulkDeleteZoneCommand' + autoconfigure: true prestashop.adapter.zone.command_handler.bulk_toggle_zone_status_handler: class: 'PrestaShop\PrestaShop\Adapter\Zone\CommandHandler\BulkToggleZoneStatusHandler' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\Zone\Command\BulkToggleZoneStatusCommand' + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/bridge/_admin_controller.yml b/src/PrestaShopBundle/Resources/config/services/bundle/bridge/_admin_controller.yml index ec7e5c9c87fa5..1a6e59453441f 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/bridge/_admin_controller.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/bridge/_admin_controller.yml @@ -22,3 +22,6 @@ services: arguments: - '@prestashop.adapter.legacy.context' - '@prestashop.core.localization.locale.repository' + + PrestaShopBundle\Bridge\Helper\AddFlashMessage: + autowire: true diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/command.yml b/src/PrestaShopBundle/Resources/config/services/bundle/command.yml index 7ffeb67d4adf4..2be85d2386206 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/command.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/command.yml @@ -42,7 +42,7 @@ services: - '@translator' - '@prestashop.adapter.legacy.context' - '@prestashop.adapter.module.self_configurator' - - '@prestashop.module.manager' + - '@PrestaShop\PrestaShop\Core\Module\ModuleManager' tags: - 'console.command' diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/context.yml b/src/PrestaShopBundle/Resources/config/services/bundle/context.yml new file mode 100644 index 0000000000000..27c6bde54dd89 --- /dev/null +++ b/src/PrestaShopBundle/Resources/config/services/bundle/context.yml @@ -0,0 +1,13 @@ +services: + _defaults: + public: false + autowire: true + autoconfigure: true + + PrestaShopBundle\EventListener\Context\Admin\EmployeeContextListener: + tags: + - { name: kernel.event_listener, method: onKernelRequest } + + PrestaShopBundle\EventListener\Context\Admin\ShopContextListener: + tags: + - { name: kernel.event_listener, method: onKernelRequest } diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/controller.yml b/src/PrestaShopBundle/Resources/config/services/bundle/controller.yml index 924e918458ab4..43513a2e92238 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/controller.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/controller.yml @@ -2,29 +2,22 @@ services: _defaults: public: true + # Legacy controllers don't extend the base controller, so we need to inject the container manually. PrestaShopBundle\Controller\Api\ApiController: class: PrestaShopBundle\Controller\Api\ApiController calls: - [ setLogger, [ '@logger' ] ] - [ setContainer, [ '@service_container' ] ] - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } + # Every single controller should be loaded here, except the legacy ones, and some misplaced files are also excluded. PrestaShopBundle\Controller\: resource: "%kernel.project_dir%/src/PrestaShopBundle/Controller/*" exclude: - "%kernel.project_dir%/src/PrestaShopBundle/Controller/Api" - - "%kernel.project_dir%/../src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product" - public: true - tags: - - !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG - - PrestaShopBundle\Controller\Admin\Sell\Catalog\Product\: - resource: "%kernel.project_dir%/src/PrestaShopBundle/Controller/Admin/Sell/Catalog/Product/*" + - "%kernel.project_dir%/src/PrestaShopBundle/Controller/ArgumentResolver" + - "%kernel.project_dir%/src/PrestaShopBundle/Controller/Exception" autoconfigure: true autowire: true - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.controller: alias: PrestaShopBundle\Controller\Api\ApiController @@ -37,8 +30,6 @@ services: movements: "@prestashop.core.api.stock.movements_collection" stockRepository: "@prestashop.core.api.stock.repository" queryParams: "@prestashop.core.api.query_stock_params_collection" - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.stock.controller: alias: PrestaShopBundle\Controller\Api\StockController @@ -50,8 +41,6 @@ services: properties: stockMovementRepository: "@prestashop.core.api.stock_movement.repository" queryParams: "@prestashop.core.api.query_stock_movement_params_collection" - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.stock_movement.controller: alias: PrestaShopBundle\Controller\Api\StockMovementController @@ -62,8 +51,6 @@ services: public: true properties: supplierRepository: "@prestashop.core.api.supplier.repository" - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.supplier.controller: alias: PrestaShopBundle\Controller\Api\SupplierController @@ -74,8 +61,6 @@ services: public: true properties: manufacturerRepository: "@prestashop.core.api.manufacturer.repository" - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.manufacturer.controller: alias: PrestaShopBundle\Controller\Api\ManufacturerController @@ -86,8 +71,6 @@ services: public: true properties: categoryRepository: "@prestashop.core.api.category.repository" - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.category.controller: alias: PrestaShopBundle\Controller\Api\CategoryController @@ -98,8 +81,6 @@ services: public: true properties: featureAttributeRepository: "@prestashop.core.api.feature_attribute.repository" - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.attribute.controller: alias: PrestaShopBundle\Controller\Api\AttributeController @@ -110,8 +91,6 @@ services: public: true properties: featureAttributeRepository: "@prestashop.core.api.feature_attribute.repository" - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.feature.controller: alias: PrestaShopBundle\Controller\Api\FeatureController @@ -120,8 +99,6 @@ services: class: PrestaShopBundle\Controller\Api\I18nController parent: PrestaShopBundle\Controller\Api\ApiController public: true - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.i18n.controller: alias: PrestaShopBundle\Controller\Api\I18nController @@ -133,8 +110,6 @@ services: properties: translationService: "@prestashop.service.translation" queryParams: "@prestashop.core.api.query_translation_params_collection" - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.translation.controller: alias: PrestaShopBundle\Controller\Api\TranslationController @@ -143,8 +118,6 @@ services: class: PrestaShopBundle\Controller\Api\Improve\Design\PositionsController parent: PrestaShopBundle\Controller\Api\ApiController public: true - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } prestashop.core.api.improve.design.postions.controller: alias: PrestaShopBundle\Controller\Api\Improve\Design\PositionsController @@ -158,5 +131,5 @@ services: multiStoreContext: "@prestashop.adapter.shop.context" entityManager: "@doctrine.orm.entity_manager" productRepository: '@PrestaShop\PrestaShop\Adapter\Product\Repository\ProductRepository' - tags: - - { name: !php/const PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController::PRESTASHOP_CORE_CONTROLLERS_TAG } + calls: + - [ setContainer, [ '@service_container' ] ] diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/data_collector.yml b/src/PrestaShopBundle/Resources/config/services/bundle/data_collector.yml index 634840ea86b9b..c2228e16710fb 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/data_collector.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/data_collector.yml @@ -12,10 +12,9 @@ services: tags: - { name: data_collector, template: '@PrestaShop/Admin/WebProfiler/hooks_collector.html.twig', id: 'ps.hooks_collector' } - prestashop.bundle.data_collector.commands_and_queries_collector: - class: PrestaShopBundle\DataCollector\CommandsAndQueriesDataCollector - arguments: - - '@prestashop.core.command_bus.executed_command_registry' + PrestaShopBundle\DataCollector\CommandsAndQueriesDataCollector: + autowire: true + public: false tags: - name: data_collector id: ps.commands_and_queries_collector diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml b/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml index 95e10e7de9849..a4ad6ce312414 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/event_listener.yml @@ -56,16 +56,11 @@ services: tags: - { name: kernel.event_listener, event: kernel.exception, method: onKernelException } - prestashop.demo_mode_enabled.listener: - class: PrestaShopBundle\EventListener\DemoModeEnabledListener + PrestaShopBundle\EventListener\DemoModeEnabledListener: + autowire: true + autoconfigure: true arguments: - - "@router" - - "@translator" - - "@session" - - "@annotation_reader" - - "@=service('prestashop.adapter.legacy.configuration').getBoolean('_PS_MODE_DEMO_')" - tags: - - { name: kernel.event_listener, event: kernel.controller, method: onKernelController } + $session: "@session" prestashop.module_activated.listener: class: PrestaShopBundle\EventListener\ModuleActivatedListener @@ -74,7 +69,7 @@ services: - "@translator" - "@session" - "@annotation_reader" - - "@prestashop.core.admin.module.repository" + - '@PrestaShop\PrestaShop\Core\Module\ModuleRepository' tags: - { name: kernel.event_listener, event: kernel.controller, method: onKernelController } @@ -109,12 +104,6 @@ services: tags: - { name: kernel.event_subscriber } - PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\FeatureFlag\EventListener\FeatureFlagTypeListener: - class: PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\FeatureFlag\EventListener\FeatureFlagTypeListener - autowire: true - tags: - - { name: core.legacy.hook.subscriber } - PrestaShopBundle\EventListener\ShopConstraintListener: public: false arguments: diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form.yml index 3ff7d437a2e8a..e55d8e70bf6f5 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/form.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/form.yml @@ -42,3 +42,7 @@ services: PrestaShopBundle\Form\Admin\Type\CustomMoneyType: alias: 'PrestaShopBundle\Form\Extension\CustomMoneyTypeExtension' deprecated: ~ + + PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\FeatureFlag\EventListener\FeatureFlagTypeListener: + tags: + - { name: core.legacy.hook.subscriber } diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form.yml index a5e6e312167cb..ef7b5e26bda80 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form.yml @@ -1,15 +1,12 @@ # This file will be removed in next version, do not add any service here services: - form.form_cloner: - alias: PrestaShopBundle\Form\FormCloner - deprecated: ~ - public: true - + # Deprecated in 9.0.0 form.form_builder_modifier: alias: PrestaShopBundle\Form\FormBuilderModifier deprecated: ~ public: true + # Deprecated in 9.0.0 prestashop.multistore_checkbox_enabler: alias: 'PrestaShopBundle\Service\Form\MultistoreCheckboxEnabler' deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_provider.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_provider.yml index c3ae0aacb32a8..e040a9faaf51d 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_provider.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_provider.yml @@ -274,6 +274,7 @@ services: - '@doctrine.orm.entity_manager' - 'stable' - '@prestashop.bundle.routing.converter.cache_provider' + - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager' prestashop.admin.configure.advanced_parameters.beta_feature_flags_form_data_provider: class: 'PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\FeatureFlag\FeatureFlagsFormDataProvider' @@ -281,6 +282,7 @@ services: - '@doctrine.orm.entity_manager' - 'beta' - '@prestashop.bundle.routing.converter.cache_provider' + - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager' prestashop.adapter.security.general.form_provider: class: 'PrestaShopBundle\Form\Admin\Configure\AdvancedParameters\Security\FormDataProvider' diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_transformer.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_transformer.yml index 9ac50d022d392..075334a3a7146 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_transformer.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_data_transformer.yml @@ -1,20 +1,24 @@ # This file will be removed in next version, do not add any service here services: + # Deprecated in 9.0.0 prestashop.bundle.form.data_transformer.string_array_to_integer_array: alias: 'PrestaShopBundle\Form\DataTransformer\StringArrayToIntegerArrayDataTransformer' deprecated: ~ public: true + # Deprecated in 9.0.0 prestashop.bundle.form.data_transformer.default_language_to_filled_array: alias: 'PrestaShopBundle\Form\DataTransformer\DefaultLanguageToFilledArrayDataTransformer' deprecated: ~ public: true + # Deprecated in 9.0.0 prestashop.bundle.form.data_transformer.arabic_to_latin_digit: alias: 'PrestaShopBundle\Form\DataTransformer\ArabicToLatinDigitDataTransformer' deprecated: ~ public: true + # Deprecated in 9.0.0 prestashop.bundle.form.data_transformer.idn_converter: alias: 'PrestaShopBundle\Form\DataTransformer\IDNConverterDataTransformer' deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_extension.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_extension.yml index cb5d1c481bd60..a09cdda5a535c 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_extension.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_extension.yml @@ -1,81 +1,101 @@ # This file will be removed in next version, do not add any service here services: + # Deprecated in 9.0.0 form.extension.comma_transformer: alias: 'PrestaShopBundle\Form\Extension\CommaTransformerExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.type.extension.money: alias: 'PrestaShopBundle\Form\Extension\CustomMoneyTypeExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.type.extension.resizable_text: alias: 'PrestaShopBundle\Form\Extension\ResizableTextTypeExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.help_text: alias: 'PrestaShopBundle\Form\Extension\HelpTextExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.hint_text: alias: 'PrestaShopBundle\Form\Extension\HintTextExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.default_empty_data: alias: 'PrestaShopBundle\Form\Extension\DefaultEmptyDataExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.data_list: alias: 'PrestaShopBundle\Form\Extension\DataListExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.row_attributes: alias: 'PrestaShopBundle\Form\Extension\RowAttributesExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.external_link: alias: 'PrestaShopBundle\Form\Extension\ExternalLinkExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.alert: alias: 'PrestaShopBundle\Form\Extension\AlertExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.label_options: alias: 'PrestaShopBundle\Form\Extension\LabelOptionsExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.form_theme: alias: 'PrestaShopBundle\Form\Extension\FormThemeExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.columns_number: alias: 'PrestaShopBundle\Form\Extension\ColumnsNumberExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.multistore_configuration: alias: 'PrestaShopBundle\Form\Extension\MultistoreConfigurationTypeExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.unit: alias: 'PrestaShopBundle\Form\Extension\UnitTypeExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.multistore_dropdown: alias: 'PrestaShopBundle\Form\Extension\MultistoreExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.downloadable_file: alias: 'PrestaShopBundle\Form\Extension\DownloadFileExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.alerts_tracking_extension: alias: 'PrestaShopBundle\Form\Extension\AlertsTrackingExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.modify_all_shops_extension: alias: 'PrestaShopBundle\Form\Extension\ModifyAllShopsExtension' deprecated: ~ public: true + # Deprecated in 9.0.0 form.extension.disabling_switch_extension: alias: 'PrestaShopBundle\Form\Extension\DisablingSwitchExtension' deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_factory.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_factory.yml index 6cbab988a7069..c2aa04dd8aed3 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_factory.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_factory.yml @@ -1,5 +1,6 @@ # This file will be removed in next version, do not add any service here services: + # Deprecated in 9.0.0 prestashop.bundle.form.admin.improve.design.theme.page_layout_customization_form_factory: alias: 'PrestaShopBundle\Form\Admin\Improve\Design\Theme\PageLayoutCustomizationFormFactory' deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml index 03d9fcd6a5696..456b77847ec68 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_type.yml @@ -69,6 +69,9 @@ services: arguments: - '@prestashop.bundle.form.data_transformer.idn_converter' + PrestaShopBundle\Form\Admin\Type\GeoCoordinatesType: + + PrestaShopBundle\Form\Admin\Type\LocaleChoiceType: PrestaShopBundle\Form\Admin\Type\DateRangeType: PrestaShopBundle\Form\Admin\Category\SimpleCategory: deprecated: ~ @@ -126,7 +129,6 @@ services: deprecated: ~ PrestaShopBundle\Form\Admin\Product\ProductShipping: arguments: - $warehouseDataProvider: "@prestashop.adapter.data_provider.warehouse" $carrierDataProvider: "@prestashop.adapter.data_provider.carrier" deprecated: ~ PrestaShopBundle\Form\Admin\Product\ProductSpecificPrice: @@ -145,8 +147,6 @@ services: deprecated: ~ PrestaShopBundle\Form\Admin\Product\ProductVirtual: deprecated: ~ - PrestaShopBundle\Form\Admin\Product\ProductWarehouseCombination: - deprecated: ~ PrestaShopBundle\Form\Admin\Type\TypeaheadProductCollectionType: arguments: - "@prestashop.adapter.data_provider.product" @@ -430,7 +430,9 @@ services: $orderInvoiceChoiceProvider: '@prestashop.adapter.form.choice_provider.order_invoice_by_id' $installedPaymentModulesChoiceProvider: '@prestashop.adapter.form.choice_provider.installed_payment_modules' - PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureType: + PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureType: ~ + PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureValueType: ~ + PrestaShopBundle\Form\Admin\Sell\Catalog\AttributeGroupType: ~ PrestaShopBundle\Form\Admin\Sell\Order\ChangeOrderCurrencyType: arguments: @@ -504,7 +506,6 @@ services: PrestaShopBundle\Form\Admin\Sell\Product\Details\FeatureValueType: arguments: - $featuresChoiceProvider: '@prestashop.adapter.form.choice_provider.features_choice_provider' $featureValueListener: '@PrestaShopBundle\Form\Admin\Sell\Product\EventListener\FeatureValueListener' PrestaShopBundle\Form\Admin\Sell\Product\Stock\StockType: @@ -516,8 +517,6 @@ services: $maxFileSizeInMegabytes: "@=service('prestashop.adapter.legacy.configuration').getInt('PS_ATTACHMENT_MAXIMUM_SIZE')" $virtualProductFileListener: '@PrestaShopBundle\Form\Admin\Sell\Product\EventListener\VirtualProductFileListener' - PrestaShopBundle\Form\Admin\Sell\Product\EventListener\VirtualProductFileListener: - PrestaShopBundle\Form\Admin\Sell\Product\Stock\AvailabilityType: arguments: $outOfStockTypeChoiceProvider: '@prestashop.core.form.choice_provider.out_of_stock_type_choice_provider' @@ -579,7 +578,7 @@ services: PrestaShopBundle\Form\Admin\Sell\Product\ExtraModulesType: arguments: $moduleDataProvider: '@prestashop.adapter.data_provider.module' - $moduleRepository: '@prestashop.core.admin.module.repository' + $moduleRepository: '@PrestaShop\PrestaShop\Core\Module\ModuleRepository' PrestaShopBundle\Form\Admin\Sell\Product\FooterType: arguments: @@ -657,38 +656,59 @@ services: $permissionChoices: '@=service("prestashop.core.form.choice_provider.permissions_choice_provider").getChoices()' PrestaShopBundle\Form\Admin\Improve\International\Tax\TaxRulesGroupType: + PrestaShopBundle\Form\Admin\Type\FeatureChoiceType: + arguments: + $featureChoiceProvider: '@PrestaShop\PrestaShop\Adapter\Form\ChoiceProvider\FeaturesChoiceProvider' - - # Deprecated + # Deprecated in 9.0.0 form.type.sell.product.event_listener.categories_listener: alias: 'PrestaShopBundle\Form\Admin\Sell\Product\EventListener\CategoriesListener' public: true deprecated: ~ + # Deprecated in 9.0.0 form.type.sell.product.event_listener.feature_value_listener: alias: 'PrestaShopBundle\Form\Admin\Sell\Product\EventListener\FeatureValueListener' public: true deprecated: ~ + # Deprecated in 9.0.0 form.event_listener.add_disabling_switch_listener: alias: 'PrestaShopBundle\Form\Admin\Type\EventListener\AddDisablingSwitchListener' public: true deprecated: ~ + # Deprecated in 9.0.0 form.type.sell.product.event_listener.product_type_listener: alias: 'PrestaShopBundle\Form\Admin\Sell\Product\EventListener\ProductTypeListener' public: true deprecated: ~ + # Deprecated in 9.0.0 form.event_listener.price_reduction: alias: 'PrestaShopBundle\Form\Admin\Type\EventListener\PriceReductionListener' public: true deprecated: ~ + # Deprecated in 9.0.0 form.type.sell.product.toolbar_buttons_provider: alias: 'PrestaShopBundle\Form\Toolbar\ToolbarButtonsProviderInterface' public: true deprecated: ~ + # Deprecated in 9.0.0 form.type.sell.product.event_listener.redirect_option_listener: alias: 'PrestaShopBundle\Form\Admin\Sell\Product\EventListener\RedirectOptionListener' public: true deprecated: ~ + # Deprecated in 9.0.0 form.type.sell.product.event_listener.combination_listener: alias: 'PrestaShopBundle\Form\Admin\Sell\Product\EventListener\CombinationListener' public: true deprecated: ~ + + PrestaShopBundle\Form\Admin\Sell\Product\EventListener\VirtualProductFileListener: + autowire: true + autoconfigure: true + public: false + + PrestaShopBundle\Form\Admin\Type\ReorderPositionsButtonType: + autowire: true + autoconfigure: true + public: false + arguments: + $locales: "@=service('prestashop.adapter.legacy.context').getLanguages()" diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_validator.yml b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_validator.yml index 74491a2b9f9e0..19229eb11f022 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/form/form_validator.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/form/form_validator.yml @@ -1,5 +1,6 @@ # This file will be removed in next version, do not add any service here services: + # Deprecated in 9.0.0 validator.unique.tinymce_max_length_validator: alias: PrestaShopBundle\Form\Validator\Constraints\TinyMceMaxLengthValidator deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml b/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml index 46b2648140809..73e66b6d5a060 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/new_api.yml @@ -5,7 +5,7 @@ services: PrestaShopBundle\Security\OAuth2\Repository\ClientRepository: arguments: - '@security.user.provider.concrete.oauth2' - - '@security.user_password_encoder.generic' + - '@security.user_password_hasher' PrestaShopBundle\Security\OAuth2\Repository\AccessTokenRepository: @@ -50,3 +50,7 @@ services: PrestaShopBundle\Controller\Api\OAuth2\AccessTokenController: autowire: true autoconfigure: true + + PrestaShopBundle\ApiPlatform\Normalizer\: + resource: "../../../../ApiPlatform/Normalizer/*" + tags: [ 'prestashop.api.denormalizers' ] diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml b/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml index 9060ab6b50483..58b6537287268 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/repository.yml @@ -2,12 +2,16 @@ services: _defaults: public: true - prestashop.core.admin.tab.repository: - class: PrestaShopBundle\Entity\Repository\TabRepository + PrestaShopBundle\Entity\Repository\TabRepository: factory: [ '@doctrine.orm.default_entity_manager', getRepository ] + public: false arguments: - PrestaShopBundle\Entity\Tab + prestashop.core.admin.tab.repository: + alias: PrestaShopBundle\Entity\Repository\TabRepository + deprecated: ~ + prestashop.core.admin.shop.repository: class: 'PrestaShopBundle\Entity\Repository\ShopRepository' factory: [ '@doctrine.orm.default_entity_manager', getRepository ] @@ -129,12 +133,13 @@ services: arguments: - PrestaShopBundle\Entity\FeatureFlag - prestashop.core.admin.feature_flag.repository: - alias: PrestaShopBundle\Entity\Repository\FeatureFlagRepository - deprecated: ~ - PrestaShopBundle\Entity\Repository\AuthorizedApplicationRepository: factory: [ '@doctrine.orm.default_entity_manager', getRepository ] arguments: - PrestaShopBundle\Entity\AuthorizedApplication public: true + + PrestaShopBundle\Entity\Repository\ApiAccessRepository: + factory: [ '@doctrine.orm.default_entity_manager', getRepository ] + arguments: + - PrestaShopBundle\Entity\ApiAccess diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml b/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml index c3e706ed01444..3f9801b621432 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/routing.yml @@ -12,13 +12,13 @@ services: - '@router' - '@prestashop.bundle.routing.converter.cache_provider' + PrestaShopBundle\Routing\Converter\LegacyParametersConverter: + public: false + prestashop.bundle.routing.converter.legacy_parameters_converter: - class: 'PrestaShopBundle\Routing\Converter\LegacyParametersConverter' + alias: 'PrestaShopBundle\Routing\Converter\LegacyParametersConverter' public: true - - prestashop.bundle.routing.converter.router_provider: - alias: PrestaShopBundle\Routing\Converter\RouterProvider - deprecated: ~ + deprecated: '%alias_id% service alias is deprecated and will be removed in 10.0.' PrestaShopBundle\Routing\Converter\RouterProvider: autowire: true @@ -26,7 +26,7 @@ services: PrestaShopBundle\Routing\Converter\LegacyRouteFactory: autowire: true arguments: - - '@PrestaShopBundle\Entity\Repository\FeatureFlagRepository' + - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface' # We set this alias so that we can override it in test environment (to avoid memory limit crashes) prestashop.bundle.routing.converter.cache: @@ -35,7 +35,7 @@ services: prestashop.bundle.routing.converter.cache_provider: class: 'PrestaShopBundle\Routing\Converter\CacheProvider' arguments: - - '@prestashop.bundle.routing.converter.router_provider' + - '@PrestaShopBundle\Routing\Converter\RouterProvider' - '@prestashop.bundle.routing.converter.cache' - '@prestashop.bundle.routing.converter.routing_cache_key_generator' diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/services.yml b/src/PrestaShopBundle/Resources/config/services/bundle/services.yml index be793c4fee10d..f66c099583e2c 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/services.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/services.yml @@ -122,3 +122,16 @@ services: arguments: $storage: "@security.csrf.token_storage" autowire: true + + PrestaShopBundle\Service\Database\TransactionManager: + public: false + autowire: true + arguments: + - '@doctrine.orm.entity_manager' + + PrestaShop\PrestaShop\Core\Repository\TransactionManagerInterface: '@PrestaShopBundle\Service\Database\TransactionManager' + + PrestaShopBundle\ApiPlatform\DomainSerializer $apiPlatformSerializer: + class: PrestaShopBundle\ApiPlatform\DomainSerializer + arguments: + [ !tagged prestashop.api.denormalizers ] diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/twig.yml b/src/PrestaShopBundle/Resources/config/services/bundle/twig.yml index 91f4c846d40a3..9046098519e83 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/twig.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/twig.yml @@ -3,6 +3,8 @@ services: public: false autowire: true autoconfigure: true + bind: + $psVersion: !php/const _PS_VERSION_ Twig\Extension\StringLoaderExtension: ~ @@ -40,7 +42,7 @@ services: arguments: - "@prestashop.core.hook.dispatcher" - "@prestashop.adapter.data_provider.module" - - "@=service('prestashop.adapter.legacy.context').getContext().employee?service('prestashop.core.admin.module.repository'):null" + - "@=service('prestashop.adapter.legacy.context').getContext().employee?service('PrestaShop\\\\PrestaShop\\\\Core\\\\Module\\\\ModuleRepository'):null" PrestaShopBundle\Twig\Extension\GridExtension: arguments: diff --git a/src/PrestaShopBundle/Resources/config/services/bundle/utils.yml b/src/PrestaShopBundle/Resources/config/services/bundle/utils.yml index bd3f15f940dbd..915e439681bec 100644 --- a/src/PrestaShopBundle/Resources/config/services/bundle/utils.yml +++ b/src/PrestaShopBundle/Resources/config/services/bundle/utils.yml @@ -7,7 +7,3 @@ services: PrestaShopBundle\Utils\FloatParser: autowire: true - - prestashop.utils.float_parser: - alias: PrestaShopBundle\Utils\FloatParser - deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/core/addon.yml b/src/PrestaShopBundle/Resources/config/services/core/addon.yml index 5bd71dffea16f..bd5fec39af528 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/addon.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/addon.yml @@ -34,10 +34,12 @@ services: prestashop.core.addon.theme.theme_manager: class: PrestaShop\PrestaShop\Core\Addon\Theme\ThemeManager + lazy: true factory: [ '@prestashop.core.addon.theme.theme_manager_builder', 'build' ] prestashop.core.addon.theme.theme.page_layouts_customizer: class: PrestaShop\PrestaShop\Core\Addon\Theme\ThemePageLayoutsCustomizer + lazy: true arguments: - '@=service("prestashop.adapter.legacy.context").getContext().shop.theme' - '@prestashop.core.addon.theme.theme_manager' diff --git a/src/PrestaShopBundle/Resources/config/services/core/cache.yml b/src/PrestaShopBundle/Resources/config/services/core/cache.yml index e1a60197942e5..1202143718ea1 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/cache.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/cache.yml @@ -19,6 +19,7 @@ services: - '@prestashop.adapter.cache.clearer.xml_cache_clearer' - '@prestashop.adapter.cache.clearer.media_cache_clearer' - '@prestashop.adapter.cache.clearer.class_index_cache_clearer' + - '@PrestaShop\PrestaShop\Adapter\Cache\Clearer\DoctrineCacheClearer' prestashop.core.cache.clearer.product_cache_clearer_chain: class: 'PrestaShop\PrestaShop\Core\Cache\Clearer\CacheClearerChain' diff --git a/src/PrestaShopBundle/Resources/config/services/core/category.yml b/src/PrestaShopBundle/Resources/config/services/core/category.yml index 04e6ce0a49af5..d150d5baab4f4 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/category.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/category.yml @@ -11,10 +11,6 @@ services: alias: PrestaShop\PrestaShop\Core\Category\NameBuilder\CategoryDisplayNameBuilder deprecated: ~ - PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider: - autowire: true - public: false - PrestaShop\PrestaShop\Core\Category\Provider\CategoryImageFinder: autowire: true public: false diff --git a/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml b/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml index 5b3cead8fdd53..a1bf215949387 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/command_bus.yml @@ -6,11 +6,9 @@ services: alias: PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface: - class: PrestaShop\PrestaShop\Core\CommandBus\TacticianCommandBusAdapter + class: PrestaShopBundle\CommandBus\MessengerCommandBus autowire: true public: false - arguments: - - '@tactician.commandbus.default' prestashop.core.query_bus: parent: 'prestashop.core.command_bus' @@ -19,15 +17,13 @@ services: prestashop.core.provider.command_definition_provider: class: 'PrestaShop\PrestaShop\Core\CommandBus\Parser\CommandDefinitionParser' - prestashop.core.command_bus.middleware.command_register_middleware: - class: PrestaShop\PrestaShop\Core\CommandBus\Middleware\CommandRegisterMiddleware + PrestaShopBundle\CommandBus\Middleware\CommandRegisterMiddleware: + autowire: true + public: false arguments: - - '@tactician.handler.locator.symfony' - - '@tactician.handler.command_name_extractor.class_name' - - '@prestashop.core.command_bus.executed_command_registry' + - '@messenger.bus.default.messenger.handlers_locator' - prestashop.core.command_bus.executed_command_registry: - class: PrestaShop\PrestaShop\Core\CommandBus\ExecutedCommandRegistry + PrestaShop\PrestaShop\Core\CommandBus\ExecutedCommandRegistry: arguments: - '@prestashop.core.command_bus.parser.command_type_parser' diff --git a/src/PrestaShopBundle/Resources/config/services/core/common.yml b/src/PrestaShopBundle/Resources/config/services/core/common.yml index be57c3ee5c02b..161ee4c4365f5 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/common.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/common.yml @@ -1,2 +1,6 @@ imports: - { resource: ./circuit_breaker.yml } + +services: + PrestaShop\PrestaShop\Core\EnvironmentInterface: + alias: prestashop.adapter.environment diff --git a/src/PrestaShopBundle/Resources/config/services/core/context.yml b/src/PrestaShopBundle/Resources/config/services/core/context.yml new file mode 100644 index 0000000000000..1f8a92af7ba06 --- /dev/null +++ b/src/PrestaShopBundle/Resources/config/services/core/context.yml @@ -0,0 +1,20 @@ +services: + _defaults: + public: false + autowire: true + autoconfigure: true + + PrestaShop\PrestaShop\Core\Context\CookieContextBuilder: ~ + PrestaShop\PrestaShop\Core\Context\CookieContext: + lazy: true + factory: [ '@PrestaShop\PrestaShop\Core\Context\CookieContextBuilder', 'build' ] + + PrestaShop\PrestaShop\Core\Context\EmployeeContextBuilder: ~ + PrestaShop\PrestaShop\Core\Context\EmployeeContext: + lazy: true + factory: [ '@PrestaShop\PrestaShop\Core\Context\EmployeeContextBuilder', 'build' ] + + PrestaShop\PrestaShop\Core\Context\ShopContextBuilder: ~ + PrestaShop\PrestaShop\Core\Context\ShopContext: + lazy: true + factory: [ '@PrestaShop\PrestaShop\Core\Context\ShopContextBuilder', 'build' ] diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml index 8f1f939403820..973a9e565953a 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/domain/authorization_server.yml @@ -4,22 +4,27 @@ services: autowire: true PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationRepositoryInterface: '@PrestaShopBundle\Entity\Repository\AuthorizedApplicationRepository' + PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\ApiAccessRepositoryInterface: '@PrestaShopBundle\Entity\Repository\ApiAccessRepository' PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler\AddApplicationHandler: - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\AddApplicationCommand' + autoconfigure: true PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler\EditApplicationHandler: - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Command\EditApplicationCommand' + autoconfigure: true PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryHandler\GetApplicationForEditingHandler: - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Query\GetApplicationForEditing' + autoconfigure: true + + PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\CommandHandler\DeleteApplicationHandler: + autoconfigure: true PrestaShopBundle\Model\AuthorizationServer\AuthorizedApplicationFactory: ~ PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\Model\AuthorizedApplicationFactoryInterface: '@PrestaShopBundle\Model\AuthorizationServer\AuthorizedApplicationFactory' + + PrestaShop\PrestaShop\Core\Domain\AuthorizationServer\QueryHandler\GetApplicationForViewingHandler: + autoconfigure: true + + PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder\ApiAccessFiltersBuilder: + class: 'PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder\ApiAccessFiltersBuilder' + tags: [ 'core.typed_filters_builder' ] diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/country.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/country.yml index 31c0f0b8f1420..08aac8dfb829d 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/domain/country.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/domain/country.yml @@ -5,8 +5,3 @@ services: PrestaShop\PrestaShop\Core\Domain\Country\ZipCodePatternResolverInterface: '@PrestaShop\PrestaShop\Core\Domain\Country\ZipCodePatternResolver' PrestaShop\PrestaShop\Core\Domain\Country\ZipCodePatternResolver: - - prestashop.core.domain.country.zip_code_format_resolver: - alias: 'PrestaShop\PrestaShop\Core\Domain\Country\ZipCodePatternResolver' - public: true - deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml index b2fbdb4ad6504..468bd5d78a38f 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/domain/customer_service.yml @@ -4,73 +4,58 @@ services: prestashop.core.domain.customer_service.command_handler.delete_customer_thread_handler: class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\DeleteCustomerThreadHandler' + autoconfigure: true arguments: - '@prestashop.core.domain.customer_service.repository.customer_thread_repository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\DeleteCustomerThreadCommand prestashop.core.domain.customer_service.command_handler.bulk_delete_customer_thread_handler: class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\BulkDeleteCustomerThreadHandler' + autoconfigure: true arguments: - '@prestashop.core.domain.customer_service.repository.customer_thread_repository' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\BulkDeleteCustomerThreadCommand prestashop.core.domain.customer_service.command_handler.add_order_customer_message: class: PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\AddOrderCustomerMessageHandler + autoconfigure: true arguments: - '@translator' - '@validator' - '@=service("prestashop.adapter.legacy.context").getContext().shop.id' - '@=service("prestashop.adapter.legacy.context").getContext().language.id' - '@=service("prestashop.adapter.legacy.context").getContext().employee.id' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CustomerMessage\Command\AddOrderCustomerMessageCommand prestashop.core.domain.customer_service.query_handler.get_customer_thread_for_viewing_handler: class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\QueryHandler\GetCustomerThreadForViewingHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.context").getContext()' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Query\GetCustomerThreadForViewing' + - '@prestashop.core.localization.locale.context_locale' prestashop.core.domain.customer_service.query_handler.get_customer_service_signature_handler: class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\QueryHandler\GetCustomerServiceSignatureHandler' + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Query\GetCustomerServiceSignature' prestashop.core.domain.customer_service.command_handler.forward_customer_thread_handler: class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\ForwardCustomerThreadHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.context").getContext()' - '@prestashop.adapter.legacy.configuration' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\ForwardCustomerThreadCommand' prestashop.core.domain.customer_service.command_handler.reply_to_customer_thread_handler: class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\ReplyToCustomerThreadHandler' + autoconfigure: true arguments: - '@=service("prestashop.adapter.legacy.context").getContext()' - tags: - - name: tactician.handler - command: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\ReplyToCustomerThreadCommand' prestashop.core.domain.customer_service.command_handler.update_customer_thread_status_handler: class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\CommandHandler\UpdateCustomerThreadStatusHandler' + autoconfigure: true arguments: $connection: '@doctrine.dbal.default_connection' $dbPrefix: '%database_prefix%' - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\CustomerService\Command\UpdateCustomerThreadStatusCommand prestashop.core.domain.customer_service.repository.customer_thread_repository: class: 'PrestaShop\PrestaShop\Core\Domain\CustomerService\Repository\CustomerThreadRepository' diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/showcase_card.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/showcase_card.yml index dba0f6db4caba..8d0161a49f1c2 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/domain/showcase_card.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/domain/showcase_card.yml @@ -9,20 +9,16 @@ services: prestashop.core.showcase_card.command_handler.close_showcase_card: class: 'PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\CommandHandler\CloseShowcaseCardHandler' + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - '@prestashop.core.showcase_card.configuration_map' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Command\CloseShowcaseCardCommand' # Query handlers prestashop.core.domain.showcase_card.query_handler.get_showcase_card_is_closed_handler: class: PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\QueryHandler\GetShowcaseCardIsClosedHandler + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - '@prestashop.core.showcase_card.configuration_map' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\ShowcaseCard\Query\GetShowcaseCardIsClosed' diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/sql_management.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/sql_management.yml index 5bd6a897e5a25..349617703dfce 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/domain/sql_management.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/domain/sql_management.yml @@ -6,18 +6,14 @@ services: prestashop.core.domain.sql_management.command_handler.save_settings: class: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\CommandHandler\SaveSqlRequestSettingsHandler' + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Command\SaveSqlRequestSettingsCommand' # QUERY HANDLERS prestashop.core.domain.sql_management.query_handler.get_sql_request_settings: class: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\QueryHandler\GetSqlRequestSettingsHandler' + autoconfigure: true arguments: - '@prestashop.adapter.legacy.configuration' - tags: - - name: 'tactician.handler' - command: 'PrestaShop\PrestaShop\Core\Domain\SqlManagement\Query\GetSqlRequestSettings' diff --git a/src/PrestaShopBundle/Resources/config/services/core/domain/theme.yml b/src/PrestaShopBundle/Resources/config/services/core/domain/theme.yml index 21e57d91e318d..b6f9fd1dc3212 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/domain/theme.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/domain/theme.yml @@ -6,41 +6,34 @@ services: prestashop.core.domain.theme.command_handler.import_theme_handler: class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\ImportThemeHandler' + autoconfigure: true arguments: - '@prestashop.core.addon.theme.theme_zip_uploader' - '@prestashop.core.addon.theme.theme_manager' - '@prestashop.adapter.legacy.configuration' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\ImportThemeCommand } prestashop.core.domain.theme.command_handler.enable_theme_handler: class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\EnableThemeHandler' + autoconfigure: true arguments: - '@prestashop.core.addon.theme.theme_manager' - '@prestashop.adapter.cache.clearer.smarty_cache_clearer' - '@=service("prestashop.adapter.shop.context").isSingleShopContext()' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\EnableThemeCommand } prestashop.core.domain.theme.command_handler.delete_theme_handler: class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\DeleteThemeHandler' + autoconfigure: true arguments: - '@prestashop.core.addon.theme.theme_manager' - tags: - - { name: tactician.handler, command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\DeleteThemeCommand } prestashop.core.domain.theme.command_handler.adapt_theme_to_rtl_languages_handler: class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\AdaptThemeToRTLLanguagesHandler' + autoconfigure: true arguments: - '@PrestaShop\PrestaShop\Core\Localization\RTL\StyleSheetProcessorFactory' - tags: - - name: 'tactician.handler' - command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\AdaptThemeToRTLLanguagesCommand prestashop.core.domain.theme.command_handler.reset_theme_layouts_handler: class: 'PrestaShop\PrestaShop\Core\Domain\Theme\CommandHandler\ResetThemeLayoutsHandler' + autoconfigure: true arguments: - '@prestashop.core.addon.theme.theme_manager' - tags: - - name: 'tactician.handler' - command: PrestaShop\PrestaShop\Core\Domain\Theme\Command\ResetThemeLayoutsCommand diff --git a/src/PrestaShopBundle/Resources/config/services/core/feature_flag.yml b/src/PrestaShopBundle/Resources/config/services/core/feature_flag.yml new file mode 100644 index 0000000000000..990ab7346c0c2 --- /dev/null +++ b/src/PrestaShopBundle/Resources/config/services/core/feature_flag.yml @@ -0,0 +1,16 @@ +services: + _defaults: + autowire: true + autoconfigure: true + + PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface: + alias: PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager + public: true + + PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagManager: ~ + PrestaShop\PrestaShop\Core\FeatureFlag\Layer\EnvLayer: ~ + PrestaShop\PrestaShop\Core\FeatureFlag\Layer\DbLayer: ~ + PrestaShop\PrestaShop\Core\FeatureFlag\Layer\DotEnvLayer: + arguments: + $rootDir: !php/const _PS_ROOT_DIR_ + PrestaShop\PrestaShop\Core\FeatureFlag\Layer\QueryLayer: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/choice_provider.yml b/src/PrestaShopBundle/Resources/config/services/core/form/choice_provider.yml index 80c951b16d313..e31d411f249bd 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/form/choice_provider.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/form/choice_provider.yml @@ -63,7 +63,7 @@ services: PrestaShop\PrestaShop\Core\Form\ChoiceProvider\ModuleByNameChoiceProvider: arguments: - - '@=service("prestashop.core.admin.module.repository").getInstalledModules()' + - '@=service("PrestaShop\\PrestaShop\\Core\\Module\\ModuleRepository").getInstalledModules()' PrestaShop\PrestaShop\Core\Form\ChoiceProvider\ImportMatchConfigurationChoiceProvider: arguments: @@ -108,7 +108,7 @@ services: PrestaShop\PrestaShop\Core\Form\ChoiceProvider\TabChoiceProvider: arguments: - - '@=service("prestashop.adapter.data_provider.tab").getViewableTabsForContextEmployee(service("prestashop.adapter.legacy.context").getLanguage().id)' + - '@=service("PrestaShop\\PrestaShop\\Adapter\\Tab\\TabDataProvider").getViewableTabsForContextEmployee(service("prestashop.adapter.legacy.context").getLanguage().id)' PrestaShop\PrestaShop\Core\Form\ChoiceProvider\ProfileChoiceProvider: arguments: diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_builder.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_builder.yml index e70ef65c0c7ae..01978722c1018 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/form/form_builder.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/form/form_builder.yml @@ -135,6 +135,21 @@ services: - 'PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureType' - '@prestashop.core.form.identifiable_object.data_provider.feature_form_data_provider' + prestashop.core.form.identifiable_object.builder.feature_value_form_builder: + class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilder' + factory: [ '@prestashop.core.form.builder.form_builder_factory', 'create' ] + arguments: + - 'PrestaShopBundle\Form\Admin\Sell\Catalog\FeatureValueType' + - '@PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\FeatureValueFormDataProvider' + + PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\AttributeGroupFormBuilder: + autowire: true + class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilder' + factory: [ '@prestashop.core.form.builder.form_builder_factory', 'create' ] + arguments: + - 'PrestaShopBundle\Form\Admin\Sell\Catalog\AttributeGroupType' + - '@PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\AttributeGroupFormDataProvider' + prestashop.core.form.identifiable_object.builder.order_message_form_builder: class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Builder\FormBuilder' factory: [ '@prestashop.core.form.builder.form_builder_factory', 'create' ] diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml index 48bee65d92dcf..e6e44e14ed871 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_handler.yml @@ -46,8 +46,6 @@ services: - '@prestashop.core.command_bus' - '@prestashop.adapter.image.uploader.category_cover_image_uploader' - '@prestashop.adapter.image.uploader.category_thumbnail_image_uploader' - - '@prestashop.adapter.image.uploader.category_menu_thumbnail_image_uploader' - - '@PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider' prestashop.core.form.identifiable_object.data_handler.root_category_form_data_handler: class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\RootCategoryFormDataHandler' @@ -55,8 +53,6 @@ services: - '@prestashop.core.command_bus' - '@prestashop.adapter.image.uploader.category_cover_image_uploader' - '@prestashop.adapter.image.uploader.category_thumbnail_image_uploader' - - '@prestashop.adapter.image.uploader.category_menu_thumbnail_image_uploader' - - '@PrestaShop\PrestaShop\Core\Category\Provider\MenuThumbnailAvailableKeyProvider' prestashop.core.form.identifiable_object.data_handler.contact_form_data_handler: class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\ContactFormDataHandler' @@ -115,10 +111,17 @@ services: - '@prestashop.core.command_bus' - '@prestashop.adapter.image.uploader.supplier_image_uploader' + PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\AttributeGroupFormDataHandler: + autowire: true + PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\FeatureFormDataHandler: autowire: true public: false + PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\FeatureValueFormDataHandler: + autowire: true + public: false + prestashop.core.form.identifiable_object.data_handler.order_message_form_data_handler: class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\OrderMessageFormDataHandler' arguments: @@ -261,6 +264,7 @@ services: PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\ApplicationFormDataHandler: arguments: - '@prestashop.core.command_bus' + autowire: true PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\TaxRulesGroupFormDataHandler: arguments: diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml index 19db8f728725b..3018a40177071 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/form/form_data_provider.yml @@ -4,7 +4,6 @@ services: bind: $queryBus: '@prestashop.core.query_bus' - prestashop.core.form.identifiable_object.data_provider.sql_request_form_data_provider: class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\SqlRequestFormDataProvider' arguments: @@ -111,6 +110,12 @@ services: - '@=service("prestashop.adapter.shop.context").getShops(true, true)' - '@=service("prestashop.adapter.legacy.context").getContext().country.id' + PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\AttributeGroupFormDataProvider: + autowire: true + public: false + arguments: + - '@prestashop.core.query_bus' + prestashop.core.form.identifiable_object.data_provider.feature_form_data_provider: class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\FeatureFormDataProvider' arguments: @@ -118,6 +123,10 @@ services: - '@=service("prestashop.adapter.multistore_feature").isActive()' - '@=service("prestashop.adapter.shop.context").getShops(true, true)' + PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\FeatureValueFormDataProvider: + autowire: true + public: false + prestashop.core.form.identifiable_object.data_provider.order_message_form_data_provider: class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\OrderMessageFormDataProvider' arguments: @@ -230,6 +239,7 @@ services: PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\ApplicationFormDataProvider: arguments: - '@prestashop.core.command_bus' + autowire: true PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider\TaxRulesGroupFormDataProvider: arguments: diff --git a/src/PrestaShopBundle/Resources/config/services/core/form/form_handler.yml b/src/PrestaShopBundle/Resources/config/services/core/form/form_handler.yml index 4ef9a07702486..c982fe3cd3619 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/form/form_handler.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/form/form_handler.yml @@ -118,6 +118,18 @@ services: arguments: - '@PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\FeatureFormDataHandler' + prestashop.core.form.identifiable_object.handler.feature_value_form_handler: + class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandler' + factory: [ '@prestashop.core.form.identifiable_object.handler.form_handler_factory', 'create' ] + arguments: + - '@PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\FeatureValueFormDataHandler' + + PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\AttributeGroupFormHandler: + class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandler' + factory: [ '@prestashop.core.form.identifiable_object.handler.form_handler_factory', 'create' ] + arguments: + - '@PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataHandler\AttributeGroupFormDataHandler' + prestashop.core.form.identifiable_object.handler.order_message_form_handler: class: 'PrestaShop\PrestaShop\Core\Form\IdentifiableObject\Handler\FormHandler' factory: [ '@prestashop.core.form.identifiable_object.handler.form_handler_factory', 'create' ] diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid.yml b/src/PrestaShopBundle/Resources/config/services/core/grid.yml index 51eb746f74b3e..14af950d0abfc 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/grid.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/grid.yml @@ -38,10 +38,6 @@ services: PrestaShop\PrestaShop\Core\Grid\Position\PositionUpdateFactoryInterface: '@PrestaShop\PrestaShop\Core\Grid\Position\PositionUpdateFactory' - prestashop.core.grid.position.position_update_factory: - alias: 'PrestaShop\PrestaShop\Core\Grid\Position\PositionUpdateFactory' - deprecated: ~ - prestashop.core.grid.position.update_handler.doctrine_position_update_handler: class: 'PrestaShop\PrestaShop\Core\Grid\Position\UpdateHandler\DoctrinePositionUpdateHandler' arguments: @@ -55,9 +51,5 @@ services: PrestaShop\PrestaShop\Core\Grid\Position\GridPositionUpdaterInterface: '@PrestaShop\PrestaShop\Core\Grid\Position\GridPositionUpdater' - prestashop.core.grid.position.doctrine_grid_position_updater: - alias: PrestaShop\PrestaShop\Core\Grid\Position\GridPositionUpdater - deprecated: ~ - prestashop.core.grid.query.filter.doctrine_filter_applicator: class: 'PrestaShop\PrestaShop\Core\Grid\Query\Filter\DoctrineFilterApplicator' diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/doctrine_query_builder.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/doctrine_query_builder.yml index c50628ba6fd16..f7bf7d23689f3 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/grid/doctrine_query_builder.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/grid/doctrine_query_builder.yml @@ -486,7 +486,13 @@ services: public: true PrestaShop\PrestaShop\Core\Grid\Query\AuthorizedApplicationQueryBuilder: - class: 'PrestaShop\PrestaShop\Core\Grid\Query\AuthorizedApplicationQueryBuilder' + parent: 'prestashop.core.grid.abstract_query_builder' + public: false + autowire: true + arguments: + - '@prestashop.core.query.doctrine_search_criteria_applicator' + + PrestaShop\PrestaShop\Core\Grid\Query\ApiAccessQueryBuilder: parent: 'prestashop.core.grid.abstract_query_builder' public: false autowire: true @@ -522,6 +528,13 @@ services: $searchCriteriaApplicator: '@prestashop.core.query.doctrine_search_criteria_applicator' $contextLangId: "@=service('prestashop.adapter.legacy.context').getContext().language.id" + PrestaShop\PrestaShop\Core\Grid\Query\FeatureValueQueryBuilder: + parent: 'prestashop.core.grid.abstract_query_builder' + autowire: true + public: false + arguments: + $searchCriteriaApplicator: '@prestashop.core.query.doctrine_search_criteria_applicator' + PrestaShop\PrestaShop\Core\Grid\Query\StoreQueryBuilder: autowire: true public: false diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml index a4c70065bca73..1fd8826a7417f 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml @@ -202,6 +202,12 @@ services: - '@prestashop.core.grid.query.doctrine_query_parser' - 'profile' + PrestaShop\PrestaShop\Core\Grid\Data\Factory\ProfileGridDataFactoryDecorator: + autowire: true + public: false + arguments: + $profileGridDataFactory: '@prestashop.core.grid.data_factory.profiles' + prestashop.core.grid.data_provider.cms_page_category: class: '%prestashop.core.grid.data.factory.doctrine_grid_data_factory%' arguments: @@ -635,6 +641,14 @@ services: - '@prestashop.core.grid.query.doctrine_query_parser' - 'feature' + prestashop.core.grid.data.factory.feature_value: + class: '%prestashop.core.grid.data.factory.doctrine_grid_data_factory%' + arguments: + - '@PrestaShop\PrestaShop\Core\Grid\Query\FeatureValueQueryBuilder' + - '@prestashop.core.hook.dispatcher' + - '@prestashop.core.grid.query.doctrine_query_parser' + - 'feature_value' + prestashop.core.grid.data.factory.store: class: '%prestashop.core.grid.data.factory.doctrine_grid_data_factory%' arguments: @@ -648,3 +662,12 @@ services: public: false arguments: - '@prestashop.core.grid.data.factory.store' + + prestashop.core.grid.data_factory.api_access: + class: '%prestashop.core.grid.data.factory.doctrine_grid_data_factory%' + public: false + arguments: + - '@PrestaShop\PrestaShop\Core\Grid\Query\ApiAccessQueryBuilder' + - '@prestashop.core.hook.dispatcher' + - '@prestashop.core.grid.query.doctrine_query_parser' + - 'api_access' diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml index 8dd32e8327f65..a3ff2d4fd2c85 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_definition_factory.yml @@ -2,8 +2,7 @@ services: _defaults: public: true - prestashop.core.grid.definition.factory.abstract_grid_definition: - class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory' + PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory: abstract: true arguments: - '@prestashop.core.hook.dispatcher' @@ -12,41 +11,41 @@ services: prestashop.core.grid.definition.factory.logs: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\LogGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full' prestashop.core.grid.definition.factory.email_logs: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\EmailLogsDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true arguments: - '@prestashop.core.form.choice_provider.language_by_id' prestashop.core.grid.definition.factory.request_sql: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\RequestSqlGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.backup: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\BackupDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.webservice_key: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\WebserviceKeyDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.meta: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\MetaGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.category: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CategoryGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.adapter.shop.context' - '@prestashop.adapter.grid.action.row.accessibility_checker.category_for_view' @@ -54,17 +53,17 @@ services: prestashop.core.grid.definition.factory.employee: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\EmployeeGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.contacts: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ContactGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.customer: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@=service("prestashop.core.b2b.b2b_feature").isActive()' - '@=service("prestashop.adapter.multistore_feature").isActive()' @@ -74,67 +73,67 @@ services: prestashop.core.grid.definition.factory.customer.discount: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerDiscountGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.customer.address: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerAddressGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@=service("request_stack").getCurrentRequest()' public: true prestashop.core.grid.definition.factory.customer.cart: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerCartGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full' public: true prestashop.core.grid.definition.factory.customer.order: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerOrderGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full' public: true prestashop.core.grid.definition.factory.customer.bought_product: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerBoughtProductGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full' public: true prestashop.core.grid.definition.factory.customer.viewed_product: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerViewedProductGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full' public: true prestashop.core.grid.definition.factory.language: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\LanguageGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.currency: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CurrencyGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.supplier: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\SupplierGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.profile: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ProfileGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.cms_page_category: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CmsPageCategoryDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@request_stack' - '@prestashop.adapter.shop.context' @@ -143,22 +142,22 @@ services: prestashop.core.grid.definition.factory.tax: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\TaxGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.manufacturer: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ManufacturerGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.manufacturer_address: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ManufacturerAddressGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.cms_page: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CmsPageDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.core.query_bus' - '@request_stack' @@ -168,44 +167,44 @@ services: prestashop.core.grid.definition.factory.monitoring.empty_category: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Monitoring\EmptyCategoryGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.adapter.grid.action.row.accessibility_checker.category_for_view' public: true prestashop.core.grid.definition.factory.monitoring.no_qty_product_with_combination: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Monitoring\NoQtyProductWithCombinationGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.monitoring.no_qty_product_without_combination: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Monitoring\NoQtyProductWithoutCombinationGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.monitoring.disabled_product: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Monitoring\DisabledProductGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.monitoring.product_without_image: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Monitoring\ProductWithoutImageGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.monitoring.product_without_description: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Monitoring\ProductWithoutDescriptionGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.monitoring.product_without_price: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Monitoring\ProductWithoutPriceGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.order: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\OrderGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.adapter.legacy.configuration' - '@prestashop.adapter.form.choice_provider.order_countries' @@ -219,14 +218,14 @@ services: prestashop.core.grid.definition.factory.cart_rule: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CartRuleGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full' prestashop.core.grid.definition.factory.catalog_price_rule: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CatalogPriceRuleGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@request_stack' - '@prestashop.adapter.shop.context' @@ -235,17 +234,17 @@ services: prestashop.core.grid.definition.factory.order_message: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\OrderMessageGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.attachment: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AttachmentGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.attribute: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AttributeGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@=service("request_stack").getCurrentRequest().attributes.getInt("attributeGroupId")' - '@PrestaShop\PrestaShop\Adapter\AttributeGroup\AttributeGroupViewDataProvider' @@ -253,48 +252,48 @@ services: prestashop.core.grid.definition.factory.attribute_group: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AttributeGroupGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.merchandise_return: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\MerchandiseReturnGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.tax_rules_group: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\TaxRulesGroupGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.address: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AddressGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.credit_slip: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CreditSlipGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@=service("prestashop.adapter.legacy.context").getLanguage().date_format_lite' public: true prestashop.core.grid.definition.factory.order_states: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\OrderStatesGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.core.grid.action.row.accessibility_checker.delete_order_states' public: true prestashop.core.grid.definition.factory.order_return_states: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\OrderReturnStatesGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.core.grid.action.row.accessibility_checker.delete_order_return_states' public: true prestashop.core.grid.definition.factory.outstanding: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\OutstandingGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.adapter.legacy.configuration' - "@=service('prestashop.adapter.legacy.context').getContext().language.id" @@ -303,27 +302,27 @@ services: prestashop.core.grid.definition.factory.carrier: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CarrierGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.zone: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ZoneGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.country: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CountryGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.search_engines: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\SearchEngineGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true prestashop.core.grid.definition.factory.product: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ProductGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.adapter.legacy.configuration' - '@PrestaShop\PrestaShop\Adapter\Feature\MultistoreFeature' @@ -340,28 +339,28 @@ services: prestashop.core.grid.definition.factory.product_light: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ProductLightGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.adapter.legacy.configuration' public: true prestashop.core.grid.definition.factory.security.session.employee: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Security\Session\EmployeeGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full' public: true prestashop.core.grid.definition.factory.security.session.customer: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\Security\Session\CustomerGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@=service("prestashop.adapter.legacy.context").getContext().language.date_format_full' public: true prestashop.core.grid.definition.factory.state: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\StateGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - "@=service('router').generate('admin_common_reset_search', {'controller': 'state', 'action': 'index'})" - "@=service('router').generate('admin_states_index')" @@ -369,14 +368,14 @@ services: prestashop.core.grid.definition.factory.title: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\TitleGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.core.form.choice_provider.gender_choice_provider' public: true prestashop.core.grid.definition.factory.customer_thread: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerThreadGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory arguments: - '@prestashop.core.form.choice_provider.contact_type_choice_provider' - '@prestashop.adapter.form.choice_provider.shop_name_by_id' @@ -385,32 +384,53 @@ services: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AuthorizedApplicationGridDefinitionFactory: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AuthorizedApplicationGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: false autowire: true prestashop.core.grid.definition.factory.customer_groups: class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\CustomerGroupsGridDefinitionFactory' - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: true PrestaShop\PrestaShop\Core\Grid\Definition\Factory\TaxRuleGridDefinitionFactory: - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: false autowire: true PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AliasGridDefinitionFactory: - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory public: false autowire: true PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureGridDefinitionFactory: - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory autowire: true # must remain public to be accessed by CommonController:searchGridAction public: true PrestaShop\PrestaShop\Core\Grid\Definition\Factory\StoreGridDefinitionFactory: - parent: 'prestashop.core.grid.definition.factory.abstract_grid_definition' + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory + public: true + autowire: true + + PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureValueGridDefinitionFactory: + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory + autowire: true public: true + + PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ApiAccessGridDefinitionFactory: + parent: PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory autowire: true + public: true + + # deprecated services + # Alias for this abstract definition causes tests in vendor fail for some reason, so we stick to full definition instead + prestashop.core.grid.definition.factory.abstract_grid_definition: + class: 'PrestaShop\PrestaShop\Core\Grid\Definition\Factory\AbstractGridDefinitionFactory' + abstract: true + arguments: + - '@prestashop.core.hook.dispatcher' + calls: + - [ setTranslator, [ '@translator' ] ] + deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml index 35f5b0a3b422b..2993eb29458d2 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml @@ -164,7 +164,7 @@ services: class: 'PrestaShop\PrestaShop\Core\Grid\GridFactory' arguments: - '@prestashop.core.grid.definition.factory.profile' - - '@prestashop.core.grid.data_factory.profiles' + - '@PrestaShop\PrestaShop\Core\Grid\Data\Factory\ProfileGridDataFactoryDecorator' - '@prestashop.core.grid.filter.form_factory' - '@prestashop.core.hook.dispatcher' @@ -512,6 +512,13 @@ services: - '@prestashop.core.grid.filter.form_factory' - '@prestashop.core.hook.dispatcher' + PrestaShop\PrestaShop\Core\Grid\Factory\FeatureValueGridFactory: + autowire: true + arguments: + $definitionFactory: '@PrestaShop\PrestaShop\Core\Grid\Definition\Factory\FeatureValueGridDefinitionFactory' + $dataFactory: '@prestashop.core.grid.data.factory.feature_value' + $filterFormFactory: '@prestashop.core.grid.filter.form_factory' + prestashop.core.grid.grid_factory.store: class: 'PrestaShop\PrestaShop\Core\Grid\GridFactory' arguments: @@ -519,3 +526,11 @@ services: - '@PrestaShop\PrestaShop\Core\Grid\Data\Factory\StoreGridDataFactory' - '@prestashop.core.grid.filter.form_factory' - '@prestashop.core.hook.dispatcher' + + prestashop.core.grid.factory.api_access: + class: 'PrestaShop\PrestaShop\Core\Grid\GridFactory' + arguments: + - '@PrestaShop\PrestaShop\Core\Grid\Definition\Factory\ApiAccessGridDefinitionFactory' + - '@prestashop.core.grid.data_factory.api_access' + - '@prestashop.core.grid.filter.form_factory' + - '@prestashop.core.hook.dispatcher' diff --git a/src/PrestaShopBundle/Resources/config/services/core/help.yml b/src/PrestaShopBundle/Resources/config/services/core/help.yml index e9bab11993bd6..48f8e385a425c 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/help.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/help.yml @@ -9,8 +9,3 @@ services: autowire: true arguments: $host: "https://help.prestashop-project.org/" - - prestashop.core.help.documentation: - alias: PrestaShop\PrestaShop\Core\Help\Documentation - public: true - deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/core/language.yml b/src/PrestaShopBundle/Resources/config/services/core/language.yml index b79dccebafdaa..987cf40927847 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/language.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/language.yml @@ -11,3 +11,5 @@ services: arguments: - 'fa': 'Tahoma' 'ar': 'Tahoma' + + PrestaShop\PrestaShop\Core\Language\ContextLanguageProviderInterface: '@PrestaShop\PrestaShop\Adapter\Language\ContextLanguageProvider' diff --git a/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml b/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml index ae0ed197bf6c3..f2e56baa7728c 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/mail_template.yml @@ -35,7 +35,7 @@ services: class: 'PrestaShop\PrestaShop\Core\MailTemplate\Transformation\HTMLToTextTransformation' prestashop.core.mail_template.command_handler.generate_theme_mails_handler: - class: 'PrestaShop\PrestaShop\Core\Domain\MailTemplate\CommandHandler\GenerateThemeMailTemplatesCommandHandler' + class: 'PrestaShop\PrestaShop\Core\Domain\MailTemplate\CommandHandler\GenerateThemeMailTemplatesHandler' arguments: - '@prestashop.core.admin.lang.repository' - '@prestashop.core.mail_template.theme_catalog' @@ -43,6 +43,4 @@ services: - '%kernel.project_dir%/mails' - "@=service('prestashop.adapter.legacy.configuration').get('_PS_MODULE_DIR_')" public: true - tags: - - name: tactician.handler - command: PrestaShop\PrestaShop\Core\Domain\MailTemplate\Command\GenerateThemeMailTemplatesCommand + autoconfigure: true diff --git a/src/PrestaShopBundle/Resources/config/services/core/module.yml b/src/PrestaShopBundle/Resources/config/services/core/module.yml index 0fb7ddc088db9..90c3f973ac6b5 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/module.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/module.yml @@ -11,24 +11,24 @@ services: - '@prestashop.adapter.module.payment_module_provider' PrestaShop\PrestaShop\Core\Module\ModuleRepository: - public: false + lazy: true arguments: - '@prestashop.adapter.data_provider.module' - '@prestashop.adapter.admin.data_provider.module' - '@doctrine.cache.provider' - '@PrestaShop\PrestaShop\Adapter\HookManager' - "@=service('prestashop.adapter.legacy.configuration').get('_PS_MODULE_DIR_')" + - '@=service("prestashop.adapter.legacy.context").getContext().language.id' prestashop.core.admin.module.repository.eventsubscriber: class: PrestaShop\PrestaShop\Core\Module\EventSubscriber arguments: - - '@prestashop.core.admin.module.repository' + - '@PrestaShop\PrestaShop\Core\Module\ModuleRepository' - '@prestashop.adapter.cache.clearer.symfony_cache_clearer' tags: - { name: kernel.event_subscriber } PrestaShop\PrestaShop\Core\Module\ModuleManager: - public: false autowire: true arguments: $moduleDataProvider: '@prestashop.adapter.data_provider.module' @@ -37,7 +37,6 @@ services: PrestaShop\PrestaShop\Core\Module\SourceHandler\ZipSourceHandler: autowire: true - public: false arguments: $modulePath: '%modules_dir%' tags: [ core.module.source_handler ] @@ -53,22 +52,8 @@ services: arguments: - !tagged core.module.source_handler - prestashop.core.admin.module.repository: - alias: PrestaShop\PrestaShop\Core\Module\ModuleRepository - public: true - deprecated: ~ - + # Deprecated in 8.1.0 prestashop.module.factory.sourcehandler: alias: PrestaShop\PrestaShop\Core\Module\SourceHandler\SourceHandlerFactory public: true deprecated: ~ - - prestashop.module.sourcehandler.zip: - alias: PrestaShop\PrestaShop\Core\Module\SourceHandler\ZipSourceHandler - public: true - deprecated: ~ - - prestashop.module.manager: - alias: PrestaShop\PrestaShop\Core\Module\ModuleManager - public: true - deprecated: ~ diff --git a/src/PrestaShopBundle/Resources/config/services/core/product.yml b/src/PrestaShopBundle/Resources/config/services/core/product.yml index 8263590ba57ea..304f8bff077d1 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/product.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/product.yml @@ -9,10 +9,6 @@ services: - '@prestashop.core.admin.data_provider.product_interface' deprecated: ~ - prestashop.core.product.csv_exporter: - alias: PrestaShop\PrestaShop\Core\Product\ProductCsvExporter - deprecated: ~ - PrestaShop\PrestaShop\Core\Product\Combination\Generator\CombinationGenerator: ~ PrestaShop\PrestaShop\Core\Product\Combination\Generator\CombinationGeneratorInterface: '@PrestaShop\PrestaShop\Core\Product\Combination\Generator\CombinationGenerator' diff --git a/src/PrestaShopBundle/Resources/config/services/core/search.yml b/src/PrestaShopBundle/Resources/config/services/core/search.yml index afd457ef2e1b5..124bcceb1b061 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/search.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/search.yml @@ -54,3 +54,7 @@ services: prestashop.core.search.builder.typed_builder.product_combination_filters_builder: class: 'PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder\ProductCombinationFiltersBuilder' tags: [ 'core.typed_filters_builder' ] + + PrestaShop\PrestaShop\Core\Search\Builder\TypedBuilder\FeatureValueFiltersBuilder: + autowire: true + tags: [ 'core.typed_filters_builder' ] diff --git a/src/PrestaShopBundle/Resources/config/services/core/security.yml b/src/PrestaShopBundle/Resources/config/services/core/security.yml index 5b31004b51959..34bc512ebfa0a 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/security.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/security.yml @@ -3,7 +3,7 @@ services: public: true prestashop.core.crypto.hashing: - class: 'PrestaShop\PrestaShop\Core\Crypto\Hashing' + class: PrestaShop\PrestaShop\Core\Crypto\Hashing prestashop.core.security.folder_guard.vendor: class: 'PrestaShop\PrestaShop\Core\Security\HtaccessFolderGuard' @@ -22,3 +22,6 @@ services: arguments: - '@PrestaShop\PrestaShop\Core\OAuth2\OAuth2Interface' - '@Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory' + + PrestaShop\PrestaShop\Core\Security\OAuth2\ApiRequestMatcher: + public: false diff --git a/src/PrestaShopBundle/Resources/config/services/core/shop.yml b/src/PrestaShopBundle/Resources/config/services/core/shop.yml index 9749c457344e3..6e7e4697a2a4c 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/shop.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/shop.yml @@ -7,5 +7,5 @@ services: arguments: - '@=service("prestashop.adapter.legacy.context").getContext().shop' - '@PrestaShop\PrestaShop\Core\Image\ImageFormatConfiguration' - - '@prestashop.core.admin.feature_flag.repository' + - '@PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface' - !php/const _PS_IMG_DIR_ diff --git a/src/PrestaShopBundle/Resources/config/services/core/util.yml b/src/PrestaShopBundle/Resources/config/services/core/util.yml index 9655ad93fb01b..5d8593ab5e96e 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/util.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/util.yml @@ -32,38 +32,3 @@ services: prestashop.core.util.color_brightness_calculator: alias: PrestaShop\PrestaShop\Core\Util\ColorBrightnessCalculator public: true - - prestashop.core.util.internationalized_domain_name_converter: - alias: PrestaShop\PrestaShop\Core\Util\InternationalizedDomainNameConverter - public: true - deprecated: ~ - - prestashop.core.uti.back_url_provider: - alias: PrestaShop\PrestaShop\Core\Util\Url\BackUrlProvider - public: true - deprecated: ~ - - prestashop.core.util.arabic_to_latin_digit_converter: - alias: PrestaShop\PrestaShop\Core\Util\ArabicToLatinDigitConverter - public: true - deprecated: ~ - - prestashop.core.util.url.url_file_checker: - alias: PrestaShop\PrestaShop\Core\Util\Url\UrlFileChecker - public: true - deprecated: ~ - - prestashop.core.util.string.string_validator: - alias: PrestaShop\PrestaShop\Core\Util\String\StringValidator - public: true - deprecated: ~ - - prestashop.core.util.string.string_modifier: - alias: PrestaShop\PrestaShop\Core\Util\String\StringModifier - deprecated: ~ - public: true - - prestashop.core.util.file_size.size_converter: - alias: PrestaShop\PrestaShop\Core\Util\File\FileSizeConverter - deprecated: ~ - public: true diff --git a/src/PrestaShopBundle/Resources/config/services/core/util/helper_card.yml b/src/PrestaShopBundle/Resources/config/services/core/util/helper_card.yml index 10233d2cd0a89..e5336cd624fe6 100644 --- a/src/PrestaShopBundle/Resources/config/services/core/util/helper_card.yml +++ b/src/PrestaShopBundle/Resources/config/services/core/util/helper_card.yml @@ -2,11 +2,6 @@ services: _defaults: public: false - prestashop.core.util.helper_card.documentation_link_provider: - alias: 'PrestaShop\PrestaShop\Core\Util\HelperCard\DocumentationLinkProvider' - public: true - deprecated: ~ - PrestaShop\PrestaShop\Core\Util\HelperCard\DocumentationLinkProviderInterface: alias: 'PrestaShop\PrestaShop\Core\Util\HelperCard\DocumentationLinkProvider' public: true diff --git a/src/PrestaShopBundle/Resources/config/services/front_legacy.yml b/src/PrestaShopBundle/Resources/config/services/front_legacy.yml new file mode 100644 index 0000000000000..cdaf5db3250d5 --- /dev/null +++ b/src/PrestaShopBundle/Resources/config/services/front_legacy.yml @@ -0,0 +1,57 @@ +services: + _defaults: + public: true + + prestashop.core.filter.front_end_object.main: + class: PrestaShop\PrestaShop\Core\Filter\FrontEndObject\MainFilter + autoconfigure: true + arguments: + - cart: '@prestashop.core.filter.front_end_object.cart' + customer: '@prestashop.core.filter.front_end_object.customer' + shop: '@prestashop.core.filter.front_end_object.shop' + configuration: '@prestashop.core.filter.front_end_object.configuration' + + prestashop.core.filter.front_end_object.product: + class: PrestaShop\PrestaShop\Core\Filter\FrontEndObject\ProductFilter + + prestashop.core.filter.front_end_object.cart: + class: PrestaShop\PrestaShop\Core\Filter\FrontEndObject\CartFilter + arguments: + - '@prestashop.core.filter.front_end_object.product_collection' + + prestashop.core.filter.front_end_object.search_result_product: + class: PrestaShop\PrestaShop\Core\Filter\FrontEndObject\SearchResultProductFilter + + prestashop.core.filter.front_end_object.customer: + class: PrestaShop\PrestaShop\Core\Filter\FrontEndObject\CustomerFilter + + prestashop.core.filter.front_end_object.shop: + class: PrestaShop\PrestaShop\Core\Filter\FrontEndObject\ShopFilter + + prestashop.core.filter.front_end_object.configuration: + class: PrestaShop\PrestaShop\Core\Filter\FrontEndObject\ConfigurationFilter + + prestashop.core.filter.front_end_object.product_collection: + class: PrestaShop\PrestaShop\Core\Filter\CollectionFilter + calls: + - method: queue + arguments: + - [ '@prestashop.core.filter.front_end_object.product' ] + + prestashop.core.filter.front_end_object.search_result_product_collection: + class: PrestaShop\PrestaShop\Core\Filter\CollectionFilter + calls: + - method: queue + arguments: + - [ '@prestashop.core.filter.front_end_object.search_result_product' ] + + prestashop.adapter.module.repository.module_repository: + class: 'PrestaShop\PrestaShop\Adapter\Module\Repository\ModuleRepository' + arguments: + - !php/const _PS_ROOT_DIR_ + - !php/const _PS_MODULE_DIR_ + + prestashop.translation.translator_language_loader: + class: PrestaShopBundle\Translation\TranslatorLanguageLoader + arguments: + - '@prestashop.adapter.module.repository.module_repository' diff --git a/src/PrestaShopBundle/Resources/config/services_dev/bundle/command.yml b/src/PrestaShopBundle/Resources/config/services_dev/bundle/command.yml index 29d1f97bfbf5e..9e3c93bdab85b 100644 --- a/src/PrestaShopBundle/Resources/config/services_dev/bundle/command.yml +++ b/src/PrestaShopBundle/Resources/config/services_dev/bundle/command.yml @@ -48,6 +48,8 @@ services: arguments: - '@prestashop.core.provider.command_definition_provider' - '%prestashop.commands_and_queries%' + - '@api_platform.metadata.resource.name_collection_factory.attributes' + - '@api_platform.metadata.resource.metadata_collection_factory.attributes' tags: - 'console.command' diff --git a/src/PrestaShopBundle/Resources/views/Admin/Common/Grid/Columns/Content/bulk_action.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Common/Grid/Columns/Content/bulk_action.html.twig index b4f43a30aefb3..ca82eb08a67b2 100644 --- a/src/PrestaShopBundle/Resources/views/Admin/Common/Grid/Columns/Content/bulk_action.html.twig +++ b/src/PrestaShopBundle/Resources/views/Admin/Common/Grid/Columns/Content/bulk_action.html.twig @@ -23,7 +23,7 @@ * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) *#} -{% if column.options.disabled_field is empty or not record[column.options.disabled_field] %} +{% if (column.options.disabled_field is empty or not record[column.options.disabled_field]) and (record.disableBulkCheckbox is not defined or not record.disableBulkCheckbox) %}
{{ category.name | trans({}, 'Admin.Modules.Feature') }}
{% endif %}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_seo.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_seo.html.twig
index 1624e68e5383f..6abb4009175ff 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_seo.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_seo.html.twig
@@ -111,7 +111,7 @@
- {{ hookData }}
+ {{ hookData|raw }}
+
-
-
-
{{ renderhook('displayAdminProductsShippingStepBottom', { 'id_product': id_product }) }}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_supplier_choice.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_supplier_choice.html.twig
index 3d6678b80e095..c81a1f7e28a1b 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_supplier_choice.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_supplier_choice.html.twig
@@ -26,19 +26,11 @@
- {% if asm_globally_activated and isNotVirtual and isChecked %}
- {{ include('@PrestaShop/Admin/Product/ProductPage/Forms/form_warehouse_combination.html.twig', { 'warehouses': warehouses, 'form': form }) }}
- {% endif %}
-
-{{ form.suppliers.vars.label }}
-
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_warehouse_combination.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_warehouse_combination.html.twig
deleted file mode 100644
index e485ed9d6e321..0000000000000
--- a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Forms/form_warehouse_combination.html.twig
+++ /dev/null
@@ -1,67 +0,0 @@
-{#**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to https://devdocs.prestashop.com/ for more information.
- *
- * @author PrestaShop SA and Contributors
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- *#}
-{% if warehouses|length > 0 %}
-
{{ 'Product location in warehouses'|trans({}, 'Admin.Catalog.Feature') }}
- -
-
-
-
- {{ 'This interface allows you to specify the warehouse in which the product is stocked.'|trans({}, 'Admin.Catalog.Help') }}
-{{ 'It is also possible to specify the location within the warehouse for each product or combination.'|trans({}, 'Admin.Catalog.Help') }}
-{{ 'Please choose the warehouses associated with this product.'|trans({}, 'Admin.Catalog.Feature') }}
- - {% for warehouse in warehouses %} -
- {% set collectionName = 'warehouse_combination_' ~ warehouse.id_warehouse %}
-
- {% endfor %}
-{% endif %}
diff --git a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Panels/combinations.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Panels/combinations.html.twig
index 504289679b640..f0b7fdb7387a5 100644
--- a/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Panels/combinations.html.twig
+++ b/src/PrestaShopBundle/Resources/views/Admin/Product/ProductPage/Panels/combinations.html.twig
@@ -25,7 +25,7 @@
-
-
-
- {{ form_errors(form[collectionName]) }}
- {% for warehouse_combination in form[collectionName] %}
-
-
-
-
- {% endfor %}
-
-
- {{ form_widget(warehouse_combination.activated) }}
- {{ form_label(warehouse_combination.location) }}
- {{ form_widget(warehouse_combination.location) }}
- {{ form_widget(warehouse_combination.id_product_attribute) }}
- {{ form_widget(warehouse_combination.warehouse_id) }}
- {{ form_widget(warehouse_combination.product_id) }}
-
-
+