Skip to content

Commit

Permalink
Merge branch 'develop' into release/1.8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
sertlab committed Nov 28, 2023
2 parents c6c3d54 + ac3679f commit 01b5bc8
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
4 changes: 3 additions & 1 deletion Plugin/CustomerPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@ public function beforeSetContactData(Customer $subject)

if ($company = $this->helper->getCompanyForCustomer($customer)) {
$customer->setCompany($company->getCompanyName());
$customer->setCompanyStatus(ConfigInterface::COMPANY_STATUS_LABELS[$company->getStatus()]);
$customer->setCompanyStatus(
ConfigInterface::COMPANY_STATUS_LABELS[$company->getStatus()] ?? $company->getStatus()
);
$customer->setCustomerType(
$this->isCompanyAdmin($customer, $company)
? ConfigInterface::CUSTOMER_TYPE_COMPANY_ADMIN
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ composer require dotdigital/dotdigital-magento2-extension-b2b

## Changelog

### 1.8.1

##### Improvements
- Our CustomerPlugin does not now require company statuses to match fixed values.

### 1.8.0

##### What's new
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "dotdigital/dotdigital-magento2-extension-b2b",
"description": "Dotdigital for Adobe Commerce: B2B module",
"type": "magento2-module",
"version": "1.8.0",
"version": "1.8.1",
"license": "MIT",
"repositories": [
{
Expand Down

0 comments on commit 01b5bc8

Please sign in to comment.