Add texture in attribute color

admin-dev/themes/new-theme/scss/pages/_attribute.scss

@@ -4,3 +4,11 @@
  height: 25px;
  border: solid 1px $black;
 }
+
+.image-container {
+ width: auto;
+ max-width: 100%;
+ height: auto;
+ max-height: 100%;
+ margin: auto;
+}

src/Adapter/Attribute/CommandHandler/AddAttributeHandler.php

@@ -30,6 +30,7 @@
 
 use PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository;
 use PrestaShop\PrestaShop\Adapter\Attribute\Validate\AttributeValidator;
+use PrestaShop\PrestaShop\Adapter\File\Uploader\AttributeFileUploader;
 use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\AddAttributeCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\CommandHandler\AddAttributeHandlerInterface;
@@ -45,6 +46,7 @@ class AddAttributeHandler implements AddAttributeHandlerInterface
  public function __construct(
  private readonly AttributeRepository $attributeRepository,
  private readonly AttributeValidator $attributeValidator,
+ private readonly AttributeFileUploader $attributeFileUploader
  ) {
  }
 
@@ -68,6 +70,13 @@ public function handle(AddAttributeCommand $command): AttributeId
 
  $id = $this->attributeRepository->add($attribute);
 
+ if (null !== $command->getTextureFilePath()) {
+ $this->attributeFileUploader->upload(
+ $command->getTextureFilePath(),
+ $id->getValue()
+ );
+ }
+
  return $id;
  }
 }

src/Adapter/Attribute/CommandHandler/EditAttributeHandler.php

@@ -31,6 +31,7 @@
 use PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository;
 use PrestaShop\PrestaShop\Adapter\Attribute\Validate\AttributeValidator;
 use PrestaShop\PrestaShop\Adapter\Domain\LocalizedObjectModelTrait;
+use PrestaShop\PrestaShop\Adapter\File\Uploader\AttributeFileUploader;
 use PrestaShop\PrestaShop\Core\CommandBus\Attributes\AsCommandHandler;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\EditAttributeCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\CommandHandler\EditAttributeHandlerInterface;
@@ -45,7 +46,8 @@ class EditAttributeHandler implements EditAttributeHandlerInterface
 
  public function __construct(
  private AttributeRepository $attributeRepository,
- private AttributeValidator $attributeValidator
+ private AttributeValidator $attributeValidator,
+ private AttributeFileUploader $attributeFileUploader
  ) {
  }
 
@@ -76,6 +78,11 @@ public function handle(EditAttributeCommand $command): void
  $propertiesToUpdate[] = 'id_shop_list';
  }
 
+ if (null !== $command->getTextureFilePath()) {
+ $this->attributeFileUploader->deleteOldFile($command->getAttributeId()->getValue());
+ $this->attributeFileUploader->upload($command->getTextureFilePath(), $command->getAttributeId()->getValue());
+ }
+
  $this->attributeValidator->validate($attribute);
  $this->attributeRepository->partialUpdate($attribute, $propertiesToUpdate);
  }

src/Adapter/File/Uploader/AttributeFileUploader.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * 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 [email protected] 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 <[email protected]>
+ * @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\File\Uploader;
+
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\AttributeFileUploaderInterface;
+use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Exception\AttributeUploadFailedException;
+use PrestaShop\PrestaShop\Core\File\Exception\FileException;
+
+class AttributeFileUploader implements AttributeFileUploaderInterface
+{
+ public function upload(string $filePath, int $id): void
+ {
+ try {
+ if (file_exists($filePath)) {
+ move_uploaded_file($filePath, _PS_IMG_DIR_ . 'co/' . $id . '.jpg');
+ }
+ } catch (FileException $e) {
+ throw new AttributeUploadFailedException(sprintf('Failed to copy the file %s.', $filePath));
+ }
+ }
+
+ public function deleteOldFile(int $id): void
+ {
+ if (file_exists(_PS_IMG_DIR_ . 'co/' . $id . '.jpg')) {
+ unlink(_PS_IMG_DIR_ . 'co/' . $id . '.jpg');
+ }
+ }
+}

src/Core/Domain/AttributeGroup/Attribute/AttributeFileUploaderInterface.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * 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 [email protected] 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 <[email protected]>
+ * @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\Attribute;
+
+interface AttributeFileUploaderInterface
+{
+ /**
+ * @param string $filePath
+ * @param int $id
+ */
+ public function upload(string $filePath, int $id): void;
+}

src/Core/Domain/AttributeGroup/Attribute/Command/AddAttributeCommand.php

@@ -56,6 +56,11 @@ class AddAttributeCommand
  */
  private $associatedShopIds;
 
+ /**
+ * @var string|null
+ */
+ private $pathName;
+
  /**
  * @param int $attributeGroupId
  * @param array $localizedValue
@@ -105,6 +110,20 @@ public function getAssociatedShopIds(): array
  return $this->associatedShopIds;
  }
 
+ /**
+ * @param string $pathName
+ */
+ public function setTextureFilePath(
+ string $pathName,
+ ): void {
+ $this->pathName = $pathName;
+ }
+
+ public function getTextureFilePath(): ?string
+ {
+ return $this->pathName;
+ }
+
  /**
  * Asserts that attribute group's names are valid.
  *

src/Core/Domain/AttributeGroup/Attribute/Command/EditAttributeCommand.php

@@ -46,6 +46,8 @@ class EditAttributeCommand
 
  private ?string $color;
 
+ private ?string $pathName;
+
  /**
  * @var int[]
  */
@@ -125,6 +127,20 @@ public function setAssociatedShopIds(array $associatedShopIds): self
  return $this;
  }
 
+ /**
+ * @param string $pathName
+ */
+ public function setTextureFilePath(
+ string $pathName,
+ ): void {
+ $this->pathName = $pathName;
+ }
+
+ public function getTextureFilePath(): ?string
+ {
+ return $this->pathName ?? null;
+ }
+
  /**
  * Asserts that attribute group's names are valid.
  *

src/Core/Domain/AttributeGroup/Attribute/Exception/AttributeUploadFailedException.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * 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 [email protected] 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 <[email protected]>
+ * @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\Attribute\Exception;
+
+class AttributeUploadFailedException extends AttributeException
+{
+}

src/Core/Form/IdentifiableObject/DataHandler/AttributeFormDataHandler.php

@@ -32,6 +32,7 @@
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\AddAttributeCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\Command\EditAttributeCommand;
 use PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\ValueObject\AttributeId;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 /**
  * Handles data of submitted Attribute Group form.
@@ -56,13 +57,24 @@ public function __construct(CommandBusInterface $commandBus)
  */
  public function create(array $data)
  {
- /** @var AttributeId $attributeId */
- $attributeId = $this->commandBus->handle(new AddAttributeCommand(
+ $addAttributeCommand = new AddAttributeCommand(
  $data['attribute_group'],
  $data['name'],
  $data['color'] ?? '',
- $data['shop_association']
- ));
+ $data['shop_association'],
+ );
+
+ if (isset($data['texture'])) {
+ /** @var UploadedFile $file */
+ $file = $data['texture'];
+
+ $addAttributeCommand->setTextureFilePath(
+ $file->getPathname()
+ );
+ }
+
+ /** @var AttributeId $attributeId */
+ $attributeId = $this->commandBus->handle($addAttributeCommand);
 
  return $attributeId->getValue();
  }
@@ -78,6 +90,15 @@ public function update($id, array $data)
  ->setColor($data['color'])
  ->setAssociatedShopIds($data['shop_association']);
 
+ if (isset($data['texture'])) {
+ /** @var UploadedFile $file */
+ $file = $data['texture'];
+
+ $updateCommand->setTextureFilePath(
+ $file->getPathname()
+ );
+ }
+
  $this->commandBus->handle($updateCommand);
  }
 }

src/Core/Grid/Data/Factory/AttributeGridDataFactory.php

@@ -0,0 +1,78 @@
+<?php
+/**
+ * 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 [email protected] 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 <[email protected]>
+ * @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\Data\Factory;
+
+use PrestaShop\PrestaShop\Adapter\Shop\Url\ImageFolderProvider;
+use PrestaShop\PrestaShop\Core\Grid\Data\GridData;
+use PrestaShop\PrestaShop\Core\Grid\Record\RecordCollection;
+use PrestaShop\PrestaShop\Core\Grid\Search\SearchCriteriaInterface;
+
+/**
+ * Decorates database records for grid presentation
+ */
+final class AttributeGridDataFactory implements GridDataFactoryInterface
+{
+ /**
+ * @param GridDataFactoryInterface $attributeDataFactory
+ */
+ public function __construct(
+ private readonly GridDataFactoryInterface $attributeDataFactory,
+ private readonly ImageFolderProvider $imageFolderProvider
+ ) {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getData(SearchCriteriaInterface $searchCriteria)
+ {
+ $records = $this->attributeDataFactory->getData($searchCriteria);
+ $modifiedRecords = $this->modifyRecords($records->getRecords()->all());
+
+ return new GridData(
+ new RecordCollection($modifiedRecords),
+ $records->getRecordsTotal(),
+ $records->getQuery()
+ );
+ }
+
+ /**
+ * @param array $records
+ *
+ * @return array
+ */
+ private function modifyRecords(array $records): array
+ {
+ foreach ($records as &$record) {
+ if (file_exists(_PS_IMG_DIR_ . 'co/' . (int) $record['id_attribute'] . '.jpg')) {
+ $record['texture'] = $this->imageFolderProvider->getUrl() . '/' . (int) $record['id_attribute'] . '.jpg';
+ }
+ }
+
+ return $records;
+ }
+}

src/PrestaShopBundle/Resources/config/services/adapter/attribute.yml

@@ -15,3 +15,5 @@ services:
  PrestaShop\PrestaShop\Adapter\Attribute\CommandHandler\EditAttributeHandler: ~
  PrestaShop\PrestaShop\Adapter\Attribute\QueryHandler\GetAttributeForEditingHandler: ~
  PrestaShop\PrestaShop\Adapter\Attribute\Validate\AttributeValidator: ~
+ PrestaShop\PrestaShop\Adapter\File\Uploader\AttributeFileUploader: ~
+ PrestaShop\PrestaShop\Core\Domain\AttributeGroup\Attribute\AttributeFileUploaderInterface: ~