diff --git a/vendor/magento/module-company/Controller/Customer/Get.php b/vendor/magento/module-company/Controller/Customer/Get.php
index b2d24ff7004..1ba65aeb3a1 100755
--- a/vendor/magento/module-company/Controller/Customer/Get.php
+++ b/vendor/magento/module-company/Controller/Customer/Get.php
@@ -10,6 +10,7 @@
use Magento\Company\Model\Company\Structure;
use Magento\Company\Model\CompanyContext;
use Magento\Company\Model\CompanyContextInterface;
+use Magento\Company\Model\Customer\CustomAttributeHandler;
use Magento\Customer\Api\CustomerRepositoryInterface;
use Magento\Customer\Api\Data\CustomerInterface;
use Magento\Customer\Model\Customer;
@@ -65,6 +66,7 @@ class Get extends AbstractAction implements HttpGetActionInterface
* @param AclInterface $acl
* @param EavConfig|null $eavConfig
* @param CompanyContextInterface|null $companyContextInterface
+ * @param CustomAttributeHandler|null $customAttributeHandler
*/
public function __construct(
Context $context,
@@ -74,7 +76,8 @@ public function __construct(
Structure $structureManager,
AclInterface $acl,
?EavConfig $eavConfig = null,
- private ?CompanyContextInterface $companyContextInterface = null
+ private ?CompanyContextInterface $companyContextInterface = null,
+ private ?CustomAttributeHandler $customAttributeHandler = null
) {
parent::__construct($context, $companyContext, $logger);
$this->acl = $acl;
@@ -84,6 +87,8 @@ public function __construct(
->get(EavConfig::class);
$this->companyContextInterface = $companyContextInterface
?: ObjectManager::getInstance()->get(CompanyContextInterface::class);
+ $this->customAttributeHandler = $customAttributeHandler
+ ?: ObjectManager::getInstance()->get(CustomAttributeHandler::class);
}
/**
@@ -137,24 +142,6 @@ public function execute()
return $this->jsonSuccess($customerData);
}
- /**
- * Get attribute type for upcoming validation.
- *
- * @param AbstractAttribute|Attribute $attribute
- * @return string
- */
- private function getAttributeType(AbstractAttribute $attribute): string
- {
- $frontendInput = $attribute->getFrontendInput();
- if ($attribute->usesSource() && in_array($frontendInput, ['select', 'multiselect', 'boolean'])) {
- return $frontendInput;
- } elseif ($attribute->isStatic()) {
- return $frontendInput == 'date' ? 'datetime' : 'varchar';
- } else {
- return $attribute->getBackendType();
- }
- }
-
/**
* Set customer custom date attribute
*
@@ -163,19 +150,7 @@ private function getAttributeType(AbstractAttribute $attribute): string
*/
private function setCustomerCustomDateAttribute(CustomerInterface $customer): void
{
- if ($customer->getCustomAttributes() !== null) {
- $customAttributes = $customer->getCustomAttributes();
- foreach ($customAttributes as $customAttribute) {
- $attributeCode = $customAttribute->getAttributeCode();
- $attribute = $this->eavConfig->getAttribute(Customer::ENTITY, $attributeCode);
- $attributeType = $this->getAttributeType($attribute);
- if ($attributeType === 'datetime') {
- $date = new \DateTime($customAttribute->getValue());
- $customAttribute->setValue($date->format('m/d/Y'));
- }
- $customAttribute->setData('attributeType', $attributeType);
- }
- }
+ $this->customAttributeHandler->handleCustomAttributes($customer);
}
/**
diff --git a/vendor/magento/module-company/Model/Action/Customer/Populator.php b/vendor/magento/module-company/Model/Action/Customer/Populator.php
index a5f4e09734f..b3d3470f202 100644
--- a/vendor/magento/module-company/Model/Action/Customer/Populator.php
+++ b/vendor/magento/module-company/Model/Action/Customer/Populator.php
@@ -5,13 +5,18 @@
*/
namespace Magento\Company\Model\Action\Customer;
+use Magento\Company\Model\Customer\CompanyUserHydrator;
use Magento\Customer\Api\CustomerRepositoryInterface;
use Magento\Customer\Api\Data\CustomerInterface;
use Magento\Customer\Api\Data\CustomerInterfaceFactory;
use Magento\Customer\Model\Customer;
+use Magento\Customer\Model\CustomerFactory;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\Customer\Model\FileUploaderDataResolver;
use Magento\Eav\Model\Config as EavConfig;
use Magento\Framework\Api\DataObjectHelper;
use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\RequestInterface;
use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Store\Model\StoreManagerInterface;
@@ -19,9 +24,22 @@
/**
* Class for populating customer object.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
class Populator
{
+ /**
+ * Form code for customer create.
+ */
+ private const FORM_CREATE = 'customer_account_create';
+
+ /**
+ * Form code for customer edit.
+ */
+ private const FORM_EDIT = 'customer_account_edit';
+
/**
* @var CustomerRepositoryInterface
*/
@@ -30,7 +48,7 @@ class Populator
/**
* @var CustomerInterfaceFactory
*/
- private $customerFactory;
+ private $customerInterfaceFactory;
/**
* @var DataObjectHelper
@@ -42,66 +60,90 @@ class Populator
*/
private $storeManager;
- /**
- * @var EavConfig
- */
- private $eavConfig;
-
/**
* @param CustomerRepositoryInterface $customerRepository
- * @param CustomerInterfaceFactory $customerFactory
+ * @param CustomerInterfaceFactory $customerInterfaceFactory
* @param DataObjectHelper $objectHelper
* @param StoreManagerInterface $storeManager
* @param EavConfig|null $eavConfig
+ * @param CustomerFactory|null $customerFactory
+ * @param CustomerRegistry|null $customerRegistry
+ * @param FileUploaderDataResolver|null $fileUploaderDataResolver
+ * @param CompanyUserHydrator|null $companyUserHydrator
+ * @param RequestInterface|null $request
*/
public function __construct(
- CustomerRepositoryInterface $customerRepository,
- CustomerInterfaceFactory $customerFactory,
- DataObjectHelper $objectHelper,
- StoreManagerInterface $storeManager,
- ?EavConfig $eavConfig = null
+ CustomerRepositoryInterface $customerRepository,
+ CustomerInterfaceFactory $customerInterfaceFactory,
+ DataObjectHelper $objectHelper,
+ StoreManagerInterface $storeManager,
+ private ?EavConfig $eavConfig = null,
+ private ?CustomerFactory $customerFactory = null,
+ private ?CustomerRegistry $customerRegistry = null,
+ private ?FileUploaderDataResolver $fileUploaderDataResolver = null,
+ private ?CompanyUserHydrator $companyUserHydrator = null,
+ private ?RequestInterface $request = null
) {
$this->customerRepository = $customerRepository;
- $this->customerFactory = $customerFactory;
+ $this->customerInterfaceFactory = $customerInterfaceFactory;
$this->objectHelper = $objectHelper;
$this->storeManager = $storeManager;
- $this->eavConfig = $eavConfig ?: ObjectManager::getInstance()
- ->get(EavConfig::class);
+ $this->eavConfig = $eavConfig ?? ObjectManager::getInstance()->get(EavConfig::class);
+ $this->customerFactory = $customerFactory ?? ObjectManager::getInstance()->get(CustomerFactory::class);
+ $this->customerRegistry = $customerRegistry ?? ObjectManager::getInstance()->get(CustomerRegistry::class);
+ $this->fileUploaderDataResolver = $fileUploaderDataResolver ??
+ ObjectManager::getInstance()->get(FileUploaderDataResolver::class);
+ $this->companyUserHydrator = $companyUserHydrator ??
+ ObjectManager::getInstance()->get(CompanyUserHydrator::class);
+ $this->request = $request ?? ObjectManager::getInstance()->get(RequestInterface::class);
}
/**
- * Populate customer.
+ * Populate customer data.
*
* @param array $data
- * @param CustomerInterface|null $customer [optional]
+ * @param CustomerInterface|null $customer
* @return CustomerInterface
- * @throws LocalizedException
- * @throws NoSuchEntityException
+ * @throws LocalizedException|NoSuchEntityException
*/
- public function populate(array $data, CustomerInterface $customer = null)
+ public function populate(array $data, ?CustomerInterface $customer = null): CustomerInterface
{
- if ($customer === null) {
- $customer = $this->customerFactory->create();
- $actionId = 'customer_account_edit-';
+ $customer = $customer ?? $this->customerInterfaceFactory->create();
+ $formType = $customer->getId() ? self::FORM_EDIT : self::FORM_CREATE;
+ $actionId = $formType . '-';
+
+ if (count($this->request->getPostValue())) {
+ $filteredData = $this->companyUserHydrator->filterCompanyUserAttributes($this->request, $formType);
+ $filteredData = $this->populateAttributeDataByDataKey($actionId, $filteredData);
+ $customAttributes = $this->populateFileCustomAttributes($customer);
} else {
- $actionId = 'customer_account_create-';
+ $filteredData = $this->companyUserHydrator->filterCompanyUserAttributesFromArray($data, $formType);
+ $customAttributes = [];
}
- $customerId = $customer->getId();
- $data = $this->populateDateAttributeDataKey($actionId, $data);
$this->objectHelper->populateWithArray(
$customer,
- $data,
- \Magento\Customer\Api\Data\CustomerInterface::class
+ array_merge($customAttributes, $filteredData),
+ CustomerInterface::class
);
+
$this->setCustomerCustomMultilineAttribute($customer);
- $customer->setWebsiteId($this->storeManager->getWebsite()->getId());
- $customer->setStoreId($this->storeManager->getStore()->getId());
- $customer->setId($customerId);
+ $this->assignStoreAndWebsite($customer);
return $customer;
}
+ /**
+ * Assign store and website IDs to the customer.
+ *
+ * @param CustomerInterface $customer
+ */
+ private function assignStoreAndWebsite(CustomerInterface $customer): void
+ {
+ $customer->setWebsiteId($this->storeManager->getWebsite()->getId());
+ $customer->setStoreId($this->storeManager->getStore()->getId());
+ }
+
/**
* Set customer custom multiline attribute
*
@@ -113,7 +155,7 @@ private function setCustomerCustomMultilineAttribute(CustomerInterface $customer
{
$customCustomerAttributes = $customer->getCustomAttributes();
if ($customCustomerAttributes) {
- foreach ($customCustomerAttributes as $customAttributeKey => $customerCustomAttribute) {
+ foreach ($customCustomerAttributes as $customerCustomAttribute) {
$attributeCode = $customerCustomAttribute->getAttributeCode();
$attribute = $this->eavConfig->getAttribute(Customer::ENTITY, $attributeCode);
$attributeType = $attribute->getFrontendInput();
@@ -136,7 +178,7 @@ private function setCustomerCustomMultilineAttribute(CustomerInterface $customer
* @param array $data
* @return array
*/
- private function populateDateAttributeDataKey(string $actionId, array $data): array
+ private function populateAttributeDataByDataKey(string $actionId, array $data): array
{
$dataKeys = preg_grep('/' . $actionId . '/', array_keys($data));
if ($dataKeys) {
@@ -151,4 +193,28 @@ private function populateDateAttributeDataKey(string $actionId, array $data): ar
}
return $data;
}
+
+ /**
+ * Extract custom attributes from request and map them to customer.
+ *
+ * @param CustomerInterface $customer
+ * @return array
+ * @throws NoSuchEntityException
+ */
+ private function populateFileCustomAttributes(CustomerInterface $customer): array
+ {
+ $formCode = $customer->getId() ? self::FORM_EDIT : self::FORM_CREATE;
+ $customerEntity = $customer->getId()
+ ? $this->customerRegistry->retrieve((string)$customer->getId())
+ : $this->customerFactory->create();
+
+ $customerData = $customerEntity->getData();
+
+ $this->fileUploaderDataResolver->overrideFileUploaderData($customerEntity, $customerData);
+
+ return array_filter(
+ $this->companyUserHydrator->filterCompanyUserAttributesFromArray($customerData, $formCode),
+ fn($value) => $value !== false
+ );
+ }
}
diff --git a/vendor/magento/module-company/Model/Action/SaveCustomer.php b/vendor/magento/module-company/Model/Action/SaveCustomer.php
index a080e15dfbc..e17837e3121 100644
--- a/vendor/magento/module-company/Model/Action/SaveCustomer.php
+++ b/vendor/magento/module-company/Model/Action/SaveCustomer.php
@@ -7,11 +7,18 @@
use Magento\Company\Api\CompanyUserManagerInterface;
use Magento\Company\Api\Data\CompanyCustomerInterface;
+use Magento\Company\Model\Action\Customer\Assign;
+use Magento\Company\Model\Action\Customer\Create;
+use Magento\Company\Model\Action\Customer\Populator;
use Magento\Company\Model\CompanyUser;
use Magento\Customer\Api\CustomerRepositoryInterface;
use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\Customer\Mapper;
+use Magento\Customer\Model\CustomerExtractor;
+use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\App\ObjectManager;
use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Exception\FileSystemException;
use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Company\Api\CompanyRepositoryInterface;
@@ -19,6 +26,7 @@
use Magento\Framework\Api\ExtensionAttributesFactory;
use Magento\Company\Api\Data\CompanyCustomerInterfaceFactory;
use Magento\Company\Model\Customer\CompanyUserHydrator;
+use Magento\Framework\Filesystem;
/**
* Create or update customer from request.
@@ -83,17 +91,36 @@ class SaveCustomer
private $companyUserHydrator;
/**
- * @param Customer\Populator $customerPopulator
+ * @var CustomerExtractor
+ */
+ private $customerExtractor;
+
+ /**
+ * @var Mapper
+ */
+ private $customerMapper;
+
+ /**
+ * @var Filesystem
+ */
+ private $filesystem;
+
+ /**
+ * @param Populator $customerPopulator
* @param CustomerRepositoryInterface $customerRepository
* @param CompanyRepositoryInterface $companyRepository
- * @param Customer\Assign $roleAssigner
- * @param Customer\Create $customerCreator
+ * @param Assign $roleAssigner
+ * @param Create $customerCreator
* @param CompanyContextInterface $companyContext
* @param ExtensionAttributesFactory $extensionFactory
* @param CompanyCustomerInterfaceFactory $companyCustomerInterfaceFactory
* @param CompanyUserHydrator $companyUserHydrator
* @param CompanyUserManagerInterface|null $userManager
* @param CompanyUser|null $companyUser
+ * @param CustomerExtractor|null $customerExtractor
+ * @param Mapper|null $customerMapper
+ * @param Filesystem|null $filesystem
+ *
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -107,19 +134,25 @@ public function __construct(
CompanyCustomerInterfaceFactory $companyCustomerInterfaceFactory,
CompanyUserHydrator $companyUserHydrator,
?CompanyUserManagerInterface $userManager = null,
- ?CompanyUser $companyUser = null
+ ?CompanyUser $companyUser = null,
+ ?CustomerExtractor $customerExtractor = null,
+ ?Mapper $customerMapper = null,
+ ?Filesystem $filesystem = null
) {
$this->customerPopulator = $customerPopulator;
$this->customerRepository = $customerRepository;
$this->companyRepository = $companyRepository;
$this->roleAssigner = $roleAssigner;
$this->customerCreator = $customerCreator;
- $this->userManager = $userManager ?? ObjectManager::getInstance()->get(CompanyUserManagerInterface::class);
- $this->userHelper = $companyUser ?? ObjectManager::getInstance()->get(CompanyUser::class);
$this->companyContext = $companyContext;
$this->extensionFactory = $extensionFactory;
$this->companyCustomerInterfaceFactory = $companyCustomerInterfaceFactory;
$this->companyUserHydrator = $companyUserHydrator;
+ $this->userManager = $userManager ?? ObjectManager::getInstance()->get(CompanyUserManagerInterface::class);
+ $this->userHelper = $companyUser ?? ObjectManager::getInstance()->get(CompanyUser::class);
+ $this->customerExtractor = $customerExtractor ?? ObjectManager::getInstance()->get(CustomerExtractor::class);
+ $this->customerMapper = $customerMapper ?? ObjectManager::getInstance()->get(Mapper::class);
+ $this->filesystem = $filesystem ?? ObjectManager::getInstance()->get(Filesystem::class);
}
/**
@@ -143,21 +176,18 @@ public function create(RequestInterface $request)
} catch (NoSuchEntityException $e) {
$customer = null;
}
-
- // Filter company user not allowed attributes from request
- $companyUserData = $this->companyUserHydrator->filterCompanyUserAttributes($request, 'customer_account_create');
-
- $customer = $this->customerPopulator->populate($companyUserData, $customer);
+
+ $customer = $this->customerPopulator->populate(
+ $request->getPostValue(),
+ $customer
+ );
+
$companyId = (int) $this->companyContext->getCompanyId();
if ($companyId) {
- $companyAttributes = $this->getCompanyAttributes($customer);
- $companyRequestPrams = $companyUserData['extension_attributes']['company_attributes'] ?? [];
+ $companyAttributes = $customer->getExtensionAttributes()->getCompanyAttributes();
$companyRequestPrams['company_id'] = $companyId;
- $companyAttributes->setData($companyRequestPrams);
- $customer->getExtensionAttributes()->setCompanyAttributes(
- $companyAttributes
- );
+ $companyAttributes->addData($companyRequestPrams);
}
if ($customer->getId()) {
@@ -194,17 +224,24 @@ public function update(RequestInterface $request)
$company = $this->companyRepository->get(
$customer->getExtensionAttributes()->getCompanyAttributes()->getCompanyId()
);
-
+
$companyId = (int) $this->userHelper->getCurrentCompanyId();
- // Filter company user not allowed attributes from request
- $companyUserData = $this->companyUserHydrator->filterCompanyUserAttributes($request, 'customer_account_edit');
+ $customerPostData = $request->getPostValue();
$customer = $this->customerPopulator->populate(
- $companyUserData,
+ $customerPostData,
$customer
);
-
+
+ $attributeToDelete = (string)$request->getParam('delete_attribute_value');
+ if ($attributeToDelete !== "") {
+ $attributesToDelete = $this->prepareAttributesToDelete($attributeToDelete);
+ foreach ($attributesToDelete as $attribute) {
+ $customerPostData = $this->deleteCustomerFileAttribute($customer, $attribute, $customerPostData);
+ }
+ }
+
$customer->getExtensionAttributes()->setCompanyAttributes(
$customer->getExtensionAttributes()->getCompanyAttributes()
->setCompanyId($companyId)
@@ -251,18 +288,60 @@ private function sendInvitationToExisting(CustomerInterface $customer): void
}
/**
- * Get company attributes from extension attributes.
+ * Convert comma-separated list of attributes to delete into array
*
- * @param CustomerInterface $customer
- * @return CompanyCustomerInterface
+ * @param string $attribute
+ * @return array
*/
- private function getCompanyAttributes(CustomerInterface $customer): CompanyCustomerInterface
+ private function prepareAttributesToDelete(string $attribute) : array
{
- if ($customer->getExtensionAttributes() === null) {
- $customerExtension = $this->extensionFactory->create(CustomerInterface::class);
- $customer->setExtensionAttributes($customerExtension);
+ $result = [];
+ if ($attribute !== "") {
+ if (str_contains($attribute, ',')) {
+ $result = explode(',', $attribute);
+ } else {
+ $result[] = $attribute;
+ }
+ $result = array_unique($result);
+ }
+ return $result;
+ }
+
+ /**
+ * Removes file attribute from customer entity and file from filesystem
+ *
+ * @param CustomerInterface $customer
+ * @param string $attributeToDelete
+ * @param array $customerPostData
+ * @return array
+ * @throws FileSystemException
+ */
+ private function deleteCustomerFileAttribute(
+ CustomerInterface $customer,
+ string $attributeToDelete,
+ array $customerPostData
+ ) : array {
+ if ($attributeToDelete !== '') {
+ $attributes = $this->prepareAttributesToDelete($attributeToDelete);
+ foreach ($attributes as $attr) {
+ $attributeValue = $customer->getCustomAttribute($attr);
+ if ($attributeValue !== null) {
+ if (is_string($attributeValue->getValue()) && $attributeValue->getValue() !== '') {
+ $mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+ $fileName = $attributeValue->getValue();
+ $path = $mediaDirectory->getAbsolutePath('customer' . $fileName);
+ if ($fileName && $mediaDirectory->isFile($path)) {
+ $mediaDirectory->delete($path);
+ }
+ $customer->setCustomAttribute(
+ $attr,
+ ''
+ );
+ $customerPostData[$attr] = '';
+ }
+ }
+ }
}
- $customer->getExtensionAttributes()->setCompanyAttributes($this->companyCustomerInterfaceFactory->create());
- return $customer->getExtensionAttributes()->getCompanyAttributes();
+ return $customerPostData;
}
}
diff --git a/vendor/magento/module-company/Model/Customer/CompanyUserHydrator.php b/vendor/magento/module-company/Model/Customer/CompanyUserHydrator.php
index 75ccd303311..a886e9184fe 100644
--- a/vendor/magento/module-company/Model/Customer/CompanyUserHydrator.php
+++ b/vendor/magento/module-company/Model/Customer/CompanyUserHydrator.php
@@ -44,7 +44,7 @@ class CompanyUserHydrator
private const STOREFRONT_ALLOWED_COMPANY_USER_FIELDS = [
CompanyCustomerInterface::CUSTOMER_ID,
self::COMPANY_USER_ROLE,
- CustomerInterface::EXTENSION_ATTRIBUTES_KEY =>[
+ CustomerInterface::EXTENSION_ATTRIBUTES_KEY => [
self::COMPANY_ATTRIBUTES => [
CompanyCustomerInterface::JOB_TITLE,
CompanyCustomerInterface::TELEPHONE,
@@ -62,7 +62,7 @@ class CompanyUserHydrator
* @var UserContextInterface
*/
private $userContext;
-
+
/**
* @var FormFactory
*/
@@ -82,40 +82,128 @@ public function __construct(
$this->userContext = $userContext;
$this->formFactory = $formFactory;
}
-
+
/**
* Filter company user attributes.
*
* @param RequestInterface $request
- * @param string $formtype
+ * @param string $formType
* @return array
*/
- public function filterCompanyUserAttributes(RequestInterface $request, $formtype = 'customer_account_create')
+ public function filterCompanyUserAttributes(RequestInterface $request, $formType = 'customer_account_create'): array
{
- $contextUserId = (int) $this->userContext->getUserId();
- if (!$contextUserId || $this->userContext->getUserType() !== UserContextInterface::USER_TYPE_CUSTOMER) {
- return $request->getParams();
+ return $this->filterAttributes($request->getParams(), $formType);
+ }
+
+ /**
+ * Filter company user attributes from array.
+ *
+ * @param array $requestData
+ * @param string $formType
+ * @return array
+ */
+ public function filterCompanyUserAttributesFromArray(
+ array $requestData,
+ $formType = 'customer_account_create'
+ ): array {
+ return $this->filterAttributes($requestData, $formType);
+ }
+
+ /**
+ * Filters the allowed attributes for a company user.
+ *
+ * @param array $requestData
+ * @param string $formType
+ * @return array
+ */
+ private function filterAttributes(array $requestData, string $formType): array
+ {
+ if (!$this->isCompanyUser()) {
+ return $requestData;
}
- $customerForm = $this->formFactory->create(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, $formtype);
+
+ return $this->extractAllowedFields($requestData, $formType);
+ }
+
+ /**
+ * Checks if the current user is a valid company user.
+ *
+ * @return bool
+ */
+ private function isCompanyUser(): bool
+ {
+ return $this->userContext->getUserId() > 0 &&
+ $this->userContext->getUserType() === UserContextInterface::USER_TYPE_CUSTOMER;
+ }
+
+ /**
+ * Extract allowed fields based on the form type.
+ *
+ * @param array $requestData
+ * @param string $formType
+ * @return array
+ */
+ private function extractAllowedFields(array $requestData, string $formType): array
+ {
+ $customerForm = $this->formFactory->create(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, $formType);
$allowedAttributes = array_keys($customerForm->getAllowedAttributes());
- $companyUserData = [];
- $params = $request->getParams();
$allowedFields = array_merge(self::STOREFRONT_ALLOWED_COMPANY_USER_FIELDS, $allowedAttributes);
+ $filteredData = [];
+
foreach ($allowedFields as $key => $field) {
- if (is_array($field) && isset($field['company_attributes'])) {
- $companyUserData[$key] = [];
- foreach ($field['company_attributes'] as $subField) {
- if (isset($params[$key]['company_attributes'][$subField])) {
- $companyUserData[$key]['company_attributes'][$subField] =
- $params[$key]['company_attributes'][$subField];
- }
- }
- } elseif (isset($params[$field])) {
- $companyUserData[$field] = $params[$field];
+ if (is_array($field) && isset($field[self::COMPANY_ATTRIBUTES])) {
+ $filteredData[$key] = $this->extractCompanyAttributes(
+ $requestData,
+ $key,
+ $field[self::COMPANY_ATTRIBUTES]
+ );
+ } else {
+ $this->assignIfExists($filteredData, $requestData, $field, $formType);
+ }
+ }
+
+ return $filteredData;
+ }
+
+ /**
+ * Extracts nested company attributes.
+ *
+ * @param array $requestData
+ * @param string $key
+ * @param array $attributes
+ * @return array
+ */
+ private function extractCompanyAttributes(array $requestData, string $key, array $attributes): array
+ {
+ $companyAttributes = [];
+
+ foreach ($attributes as $attribute) {
+ if (isset($requestData[$key][self::COMPANY_ATTRIBUTES][$attribute])) {
+ $companyAttributes[self::COMPANY_ATTRIBUTES][$attribute] =
+ $requestData[$key][self::COMPANY_ATTRIBUTES][$attribute];
}
}
-
- return $companyUserData;
+
+ return $companyAttributes;
+ }
+
+ /**
+ * Assigns a value to the filtered data if it exists in request data.
+ *
+ * @param array $filteredData
+ * @param array $requestData
+ * @param string $field
+ * @param string $formType
+ */
+ private function assignIfExists(array &$filteredData, array $requestData, string $field, string $formType): void
+ {
+ if (isset($requestData[$field])) {
+ $filteredData[$field] = $requestData[$field];
+ } elseif (isset($requestData["{$formType}-{$field}"])) {
+ $filteredData[$field] = $requestData["{$formType}-{$field}"];
+ } elseif (isset($requestData["{$field}_uploaded"])) {
+ $filteredData[$field] = $requestData["{$field}_uploaded"];
+ }
}
}
diff --git a/vendor/magento/module-company/Model/Customer/CustomAttributeHandler.php b/vendor/magento/module-company/Model/Customer/CustomAttributeHandler.php
new file mode 100644
index 00000000000..dd618124090
--- /dev/null
+++ b/vendor/magento/module-company/Model/Customer/CustomAttributeHandler.php
@@ -0,0 +1,115 @@
+customerRegistry->retrieve($customer->getId());
+ $customerData = $customerEntity->getData();
+ $this->fileUploaderDataResolver->overrideFileUploaderData($customerEntity, $customerData);
+ $this->initializeCustomAttributes($customer);
+ if ($customer->getCustomAttributes() !== null) {
+ $customAttributes = $customer->getCustomAttributes();
+ foreach ($customAttributes as $customAttribute) {
+ $attributeCode = $customAttribute->getAttributeCode();
+ $attribute = $this->eavConfig->getAttribute(Customer::ENTITY, $attributeCode);
+ $attributeType = $attribute->getFrontendInput();
+ if (in_array($attributeType, ['file', 'image']) && isset($customerData[$attributeCode][0])) {
+
+ $previewType = str_contains($customerData[$attributeCode][0]['type'], 'image') ?
+ 'image' :
+ (str_contains($customerData[$attributeCode][0]['type'], 'video') ? 'video' : 'document');
+
+ $fileConfig = $customerData[$attributeCode][0];
+ if (isset($fileConfig['url'])) {
+ $fileConfig['url'] .=
+ 'company_user_id' . DIRECTORY_SEPARATOR . $this->urlEncoder->encode($customer->getId());
+ }
+ $fileConfig['previewType'] = $previewType;
+ $customAttribute->setData('file_config', $fileConfig);
+
+ }
+ $customAttribute->setData('attributeType', $attributeType);
+ }
+ }
+ }
+
+ /**
+ * Initialize custom attributes from customer entity
+ *
+ * @param CustomerInterface $customer
+ * @return void
+ */
+ private function initializeCustomAttributes(CustomerInterface $customer): void
+ {
+ $customerAttributes = $this->userDefinedAttributes->getAttributesByForm();
+
+ foreach ($customerAttributes as $attribute) {
+ $attributeCode = $attribute['attribute_code'];
+ if ($customer->getCustomAttribute($attributeCode) === null) {
+ $customer->setCustomAttribute($attributeCode, '');
+ if (in_array($attribute['frontend_input'], ['file', 'image'])) {
+ $customer
+ ->getCustomAttribute($attributeCode)
+ ->setData('attributeType', $attribute['frontend_input']);
+ }
+ }
+ }
+ }
+}
diff --git a/vendor/magento/module-company/Model/Customer/UserDefinedAttributes.php b/vendor/magento/module-company/Model/Customer/UserDefinedAttributes.php
new file mode 100644
index 00000000000..833ab63b396
--- /dev/null
+++ b/vendor/magento/module-company/Model/Customer/UserDefinedAttributes.php
@@ -0,0 +1,70 @@
+collectionFactory = $collectionFactory;
+ }
+
+ /**
+ * Get customer attributes for a specific form
+ *
+ * @param string $formCode
+ * @return array
+ */
+ public function getAttributesByForm(string $formCode = 'customer_account_edit'): array
+ {
+ /** @var \Magento\Customer\Model\ResourceModel\Form\Attribute\Collection $collection */
+ $collection = $this->collectionFactory->create();
+ $collection->addFormCodeFilter($formCode);
+
+ $attributes = [];
+ foreach ($collection as $attribute) {
+ if ($attribute->getIsUserDefined()) {
+ $attributes[] = [
+ 'attribute_id' => $attribute->getId(),
+ 'attribute_code' => $attribute->getAttributeCode(),
+ 'frontend_label' => $attribute->getFrontendLabel(),
+ 'attribute_type' => $attribute->getBackendType(),
+ 'frontend_input' => $attribute->getFrontendInput()
+ ];
+ }
+ }
+
+ return $attributes;
+ }
+}
diff --git a/vendor/magento/module-company/Plugin/CustomerCustomAttributes/Index/ViewfilePlugin.php b/vendor/magento/module-company/Plugin/CustomerCustomAttributes/Index/ViewfilePlugin.php
new file mode 100644
index 00000000000..7a2ac472ab7
--- /dev/null
+++ b/vendor/magento/module-company/Plugin/CustomerCustomAttributes/Index/ViewfilePlugin.php
@@ -0,0 +1,149 @@
+getFileParams();
+
+ if ($companyUserId) {
+ try {
+ $currentCompanyId = (int)$this->companyUser->getCurrentCompanyId();
+ } catch (\Exception $e) {
+ return $proceed();
+ }
+
+ if ($companyStructure =
+ $this->structure->getStructureByCustomerId(
+ $companyUserId,
+ $currentCompanyId
+ )
+ ) {
+ $customer = $this->customerRepository->getById($companyUserId);
+ $customAttributes = $customer->getCustomAttributes();
+ }
+
+ if ($companyStructure && $this->downloadValidator->canDownloadFile($file, $customAttributes)) {
+ list($fileName, $path) = $this->fileDownload->getFilePath($file);
+
+ $pathInfo = $this->fileDownload->getPathInfo($path);
+
+ if ($plain) {
+ return $subject->generateImageResult($path);
+ } else {
+ $name = $pathInfo['basename'];
+ return $this->fileFactory->create(
+ $name,
+ ['type' => 'filename', 'value' => $fileName],
+ DirectoryList::MEDIA
+ );
+ }
+ }
+ return null;
+ }
+ return $proceed();
+ }
+
+ /**
+ * Get parameters from request.
+ *
+ * @return array
+ * @throws NotFoundException
+ */
+ private function getFileParams(): array
+ {
+ $file = null;
+ $plain = false;
+ $companyUserId = false;
+ if ($this->request->getParam('company_user_id')) {
+ $companyUserId = $this->urlDecoder->decode($this->request->getParam('company_user_id'));
+ }
+ if ($this->request->getParam('file')) {
+ // download file
+ $file = $this->urlDecoder->decode(
+ $this->request->getParam('file')
+ );
+ } elseif ($this->request->getParam('image')) {
+ // show plain image
+ $file = $this->urlDecoder->decode(
+ $this->request->getParam('image')
+ );
+ $plain = true;
+ } else {
+ throw new NotFoundException(__('Page not found.'));
+ }
+
+ return [$file, $plain, $companyUserId];
+ }
+}
diff --git a/vendor/magento/module-company/Plugin/View/LayoutPlugin.php b/vendor/magento/module-company/Plugin/View/LayoutPlugin.php
new file mode 100644
index 00000000000..2be72bd9d06
--- /dev/null
+++ b/vendor/magento/module-company/Plugin/View/LayoutPlugin.php
@@ -0,0 +1,56 @@
+request->getModuleName() === 'company' && $name === 'customer_form_template_image') {
+ $result->setTemplate('Magento_Company::form/renderer/image.phtml');
+ }
+
+ return $result;
+ }
+}
diff --git a/vendor/magento/module-company/ViewModel/FileAttribute.php b/vendor/magento/module-company/ViewModel/FileAttribute.php
new file mode 100644
index 00000000000..242cb99d8a6
--- /dev/null
+++ b/vendor/magento/module-company/ViewModel/FileAttribute.php
@@ -0,0 +1,111 @@
+url = $url;
+ $this->uploadUrl = $uploadUrl;
+ }
+
+ /**
+ * Get json definition for js Ui component fields
+ *
+ * @param array $userAttributes
+ * @param AbstractModel $entity
+ * @return string
+ * @throws FileSystemException
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function getJsComponentsDefinitions(
+ array $userAttributes,
+ AbstractModel $entity
+ ): string {
+ $result = [];
+ foreach ($userAttributes as $attribute) {
+ $config = [];
+ $frontendInput = $attribute->getFrontendInput();
+
+ if (in_array($frontendInput, ['file', 'image'])) {
+ $config['component'] = 'Magento_Company/js/component/file-uploader';
+ $config['template'] = 'Magento_Company/form/element/uploader/uploader';
+ $config['previewTmpl'] = 'Magento_Company/form/element/uploader/preview';
+ $config['label'] = $attribute->getDefaultFrontendLabel();
+ $config['formElement'] = 'fileUploader';
+ $config['componentType'] = 'fileUploader';
+ $config['uploaderConfig'] = [
+ 'url' => $this->url->getUrl(
+ $this->uploadUrl
+ )
+ ];
+
+ $config['uploadedInputName'] = sprintf(
+ '%1$s',
+ $attribute->getAttributeCode() . FileForm::UPLOADED_FILE_SUFFIX
+ );
+
+ $config['dataScope'] = $attribute->getAttributeCode();
+
+ if ($attribute->getIsRequired()) {
+ $config['validation'] = [
+ 'required' => true,
+ ];
+ $config['required'] = '1';
+ }
+ }
+
+ $result[$attribute->getAttributeCode()] = $config;
+ }
+
+ return json_encode($result);
+ }
+}
diff --git a/vendor/magento/module-company/etc/di.xml b/vendor/magento/module-company/etc/di.xml
index fed17643116..726df2b59a3 100755
--- a/vendor/magento/module-company/etc/di.xml
+++ b/vendor/magento/module-company/etc/di.xml
@@ -1,9 +1,22 @@
@@ -327,6 +340,14 @@
customer[%1$s]
+
+
+ customer_custom_attributes/customer_file/upload
+ customer
+ customer_custom_attributes/index/viewfile
+ customer[%1$s]
+
+
diff --git a/vendor/magento/module-company/etc/frontend/di.xml b/vendor/magento/module-company/etc/frontend/di.xml
index 49e04ed12f1..4aeeba49d86 100755
--- a/vendor/magento/module-company/etc/frontend/di.xml
+++ b/vendor/magento/module-company/etc/frontend/di.xml
@@ -82,4 +82,11 @@
sortOrder="10"/>
+
+
+
+
+
+
diff --git a/vendor/magento/module-company/view/frontend/layout/company_index_index.xml b/vendor/magento/module-company/view/frontend/layout/company_index_index.xml
index f1c1e0bb74f..7775a8964e4 100644
--- a/vendor/magento/module-company/view/frontend/layout/company_index_index.xml
+++ b/vendor/magento/module-company/view/frontend/layout/company_index_index.xml
@@ -1,9 +1,22 @@
@@ -34,7 +47,7 @@
Magento\Customer\Model\Customer
- CustomerFileAttribute
+ CompanyUsersFileAttribute
@@ -45,7 +58,7 @@
Magento\Customer\Model\Customer
- CustomerFileAttribute
+ CompanyUsersFileAttribute
diff --git a/vendor/magento/module-company/view/frontend/layout/company_users_index.xml b/vendor/magento/module-company/view/frontend/layout/company_users_index.xml
index db5f43b27ec..5f7a8b518d3 100644
--- a/vendor/magento/module-company/view/frontend/layout/company_users_index.xml
+++ b/vendor/magento/module-company/view/frontend/layout/company_users_index.xml
@@ -1,9 +1,22 @@
@@ -30,7 +43,7 @@
Magento\Customer\Model\Customer
- CustomerFileAttribute
+ CompanyUsersFileAttribute
@@ -41,7 +54,7 @@
Magento\Customer\Model\Customer
- CustomerFileAttribute
+ CompanyUsersFileAttribute
diff --git a/vendor/magento/module-company/view/frontend/templates/form/renderer/image.phtml b/vendor/magento/module-company/view/frontend/templates/form/renderer/image.phtml
new file mode 100644
index 00000000000..e4f9fca77ab
--- /dev/null
+++ b/vendor/magento/module-company/view/frontend/templates/form/renderer/image.phtml
@@ -0,0 +1,41 @@
+
+
+getHtmlId();
+$fieldCssClass .= $block->isRequired() ? ' required' : '';
+?>
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+ x,
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+