Various fixes in Magento 2 core to support MSI #13434
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace Magento\Backend\Ui\Component\Control; | ||
|
|
||
| use Magento\Framework\App\RequestInterface; | ||
| use Magento\Framework\Escaper; | ||
| use Magento\Framework\UrlInterface; | ||
| use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface; | ||
|
|
||
| /** | ||
| * Represents delete button with pre-configured options | ||
| * Provide an ability to show confirmation message on click on the "Delete" button | ||
| * | ||
| * @api | ||
| */ | ||
| class DeleteButton implements ButtonProviderInterface | ||
| { | ||
| /** | ||
| * @var RequestInterface | ||
| */ | ||
| private $request; | ||
|
|
||
| /** | ||
| * @var UrlInterface | ||
| */ | ||
| private $urlBuilder; | ||
|
|
||
| /** | ||
| * @var Escaper | ||
| */ | ||
| private $escaper; | ||
|
|
||
| /** | ||
| * @var string | ||
| */ | ||
| private $confirmationMessage; | ||
|
|
||
| /** | ||
| * @var string | ||
| */ | ||
| private $idFieldName; | ||
|
|
||
| /** | ||
| * @var string | ||
| */ | ||
| private $deleteRoutePath; | ||
|
|
||
| /** | ||
| * @var int | ||
| */ | ||
| private $sortOrder; | ||
|
|
||
| /** | ||
| * @param RequestInterface $request | ||
| * @param UrlInterface $urlBuilder | ||
| * @param string $confirmationMessage | ||
| * @param string $idFieldName | ||
| * @param string $deleteRoutePath | ||
| * @param int $sortOrder | ||
| */ | ||
| public function __construct( | ||
| RequestInterface $request, | ||
| UrlInterface $urlBuilder, | ||
| Escaper $escaper, | ||
| string $confirmationMessage, | ||
| string $idFieldName, | ||
| string $deleteRoutePath, | ||
| int $sortOrder | ||
| ) { | ||
| $this->request = $request; | ||
| $this->urlBuilder = $urlBuilder; | ||
| $this->escaper = $escaper; | ||
| $this->confirmationMessage = $confirmationMessage; | ||
| $this->idFieldName = $idFieldName; | ||
| $this->deleteRoutePath = $deleteRoutePath; | ||
| $this->sortOrder = $sortOrder; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function getButtonData() | ||
| { | ||
| $data = []; | ||
| $fieldId = $this->request->getParam($this->idFieldName); | ||
|
There was a problem hiding this comment. First of all, we need to escape |
||
| if (null !== $fieldId) { | ||
| $url = $this->urlBuilder->getUrl($this->deleteRoutePath); | ||
| $escapedMessage = $this->escaper->escapeJs($this->escaper->escapeHtml($this->confirmationMessage)); | ||
| $data = [ | ||
| 'label' => __('Delete'), | ||
| 'class' => 'delete', | ||
| 'on_click' => "deleteConfirm('{$escapedMessage}', '{$url}', {data:{{$this->idFieldName}:{$fieldId}}})", | ||
|
|
||
| 'sort_order' => $this->sortOrder, | ||
| ]; | ||
| } | ||
| return $data; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace Magento\CatalogImportExport\Model; | ||
|
|
||
| use Magento\CatalogInventory\Model\ResourceModel\Stock\Item; | ||
| use Magento\CatalogInventory\Model\ResourceModel\Stock\ItemFactory; | ||
| use Magento\Framework\Exception\CouldNotSaveException; | ||
| use Psr\Log\LoggerInterface; | ||
|
|
||
| class StockItemImporter implements StockItemImporterInterface | ||
| { | ||
| /** | ||
| * Stock Item Resource Factory | ||
| * | ||
| * @var ItemFactory $stockResourceItemFactory | ||
| */ | ||
| private $stockResourceItemFactory; | ||
|
|
||
| /** | ||
| * @var LoggerInterface | ||
| */ | ||
| private $logger; | ||
|
|
||
| /** | ||
| * StockItemImporter constructor | ||
| * | ||
| * @param ItemFactory $stockResourceItemFactory | ||
| * @param LoggerInterface $logger | ||
| */ | ||
| public function __construct( | ||
| ItemFactory $stockResourceItemFactory, | ||
| LoggerInterface $logger | ||
| ) { | ||
| $this->stockResourceItemFactory = $stockResourceItemFactory; | ||
| $this->logger = $logger; | ||
| } | ||
|
|
||
| /** | ||
| * Handle Import of Stock Item Data | ||
|
There was a problem hiding this comment. Looks like |
||
| * | ||
| * @param array $stockData | ||
| * @return void | ||
| * @throws CouldNotSaveException | ||
| */ | ||
| public function import(array $stockData) | ||
| { | ||
| /** @var $stockItemResource Item */ | ||
| $stockItemResource = $this->stockResourceItemFactory->create(); | ||
| $entityTable = $stockItemResource->getMainTable(); | ||
| try { | ||
| $stockImportData = array_map( | ||
| function ($stockItemData) { | ||
| unset($stockItemData['sku']); | ||
| return $stockItemData; | ||
| }, | ||
| array_values($stockData) | ||
| ); | ||
| $stockItemResource->getConnection()->insertOnDuplicate($entityTable, $stockImportData); | ||
| } catch (\Exception $e) { | ||
| $this->logger->error($e->getMessage()); | ||
| throw new CouldNotSaveException(__('Invalid Stock data for insert'), $e); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace Magento\CatalogImportExport\Model; | ||
|
|
||
| /** | ||
| * Interface StockItemImporterInterface | ||
| * | ||
| * @api | ||
| */ | ||
| interface StockItemImporterInterface | ||
|
There was a problem hiding this comment. there is no default implementation of this interface in CE, just in MSI that will lead to Fatal Error |
||
| { | ||
| /** | ||
| * Handle Import of Stock Item Data | ||
| * | ||
| * @param array $stockData | ||
| * @return void | ||
| * @throws \Magento\Framework\Exception\CouldNotSaveException | ||
| * @throws \Magento\Framework\Exception\InputException | ||
| * @throws \Magento\Framework\Validation\ValidationException | ||
| */ | ||
| public function import(array $stockData); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace Magento\CatalogInventory\Api; | ||
|
|
||
| use Magento\CatalogInventory\Api\Data\StockItemInterface; | ||
| use Magento\Framework\Exception\LocalizedException; | ||
|
|
||
| /** | ||
| * @api | ||
| */ | ||
| interface RegisterProductSaleInterface | ||
| { | ||
| /** | ||
| * Subtract product qtys from stock | ||
| * Return array of items that require full save | ||
| * | ||
| * Method signature is unchanged for backward compatibility | ||
| * | ||
| * @param float[] $items | ||
| * @param int $websiteId | ||
| * @return StockItemInterface[] | ||
| * @throws LocalizedException | ||
| */ | ||
| public function registerProductsSale($items, $websiteId = null); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace Magento\CatalogInventory\Api; | ||
|
|
||
| /** | ||
| * @api | ||
| */ | ||
| interface RevertProductSaleInterface | ||
| { | ||
| /** | ||
| * Revert register product sale | ||
| * | ||
| * Method signature is unchanged for backward compatibility | ||
| * | ||
| * @param string[] $items | ||
| * @param int $websiteId | ||
| * @return bool | ||
| */ | ||
| public function revertProductsSale($items, $websiteId = null); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This class seems to be unused in the current implementation.
I would suggest delivering it with the code which actually uses it and provides functional test coverage or with unit/integration test which would ensure that it is not broken in the future.