Skip to content

Commit 94c689b

Browse files
Merge pull request #27 from magmodules/release/1.9.0
Release/1.9.0
2 parents af7c81d + 1a25c83 commit 94c689b

File tree

5 files changed

+33
-18
lines changed

5 files changed

+33
-18
lines changed

Service/WebApi/Order.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,9 @@ private function getProfileData($order): ?array
137137
} else {
138138
return [
139139
'id' => null,
140+
'customer_firstname' => $order->getCustomerFirstname(),
141+
'customer_middlename' => $order->getCustomerMiddlename(),
142+
'customer_lastname' => $order->getCustomerLastname(),
140143
'email' => $order->getCustomerEmail()
141144
];
142145
}

Service/WebApi/Profiles.php

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Magento\Framework\Exception\LocalizedException;
1717
use Magento\Newsletter\Model\Subscriber;
1818
use Magento\Store\Model\StoreManagerInterface;
19+
use Magmodules\Reloadify\Api\Log\RepositoryInterface as LogRepository;
1920

2021
/**
2122
* Profiles web API service class
@@ -55,6 +56,10 @@ class Profiles
5556
* @var AddressRepository
5657
*/
5758
private $addressRepository;
59+
/**
60+
* @var LogRepository
61+
*/
62+
private $logRepository;
5863

5964
/**
6065
* Profiles constructor.
@@ -72,14 +77,16 @@ public function __construct(
7277
CustomerRepositoryInterface $customerRepository,
7378
SearchCriteriaBuilder $searchCriteriaBuilder,
7479
CustomerResource $customerResource,
75-
AddressRepository $addressRepository
80+
AddressRepository $addressRepository,
81+
LogRepository $logRepository
7682
) {
7783
$this->subscriber = $subscriber;
7884
$this->storeManager = $storeManager;
7985
$this->customerRepository = $customerRepository;
8086
$this->searchCriteriaBuilder = $searchCriteriaBuilder;
8187
$this->customerResource = $customerResource;
8288
$this->addressRepository = $addressRepository;
89+
$this->logRepository = $logRepository;
8390
}
8491

8592
/**
@@ -108,19 +115,23 @@ public function execute(int $storeId, array $extra = [], SearchCriteriaInterface
108115
];
109116

110117
if ($billingId = $customer->getDefaultBilling()) {
111-
$billing = $this->addressRepository->getById((int)$billingId);
112-
$mainData += [
113-
"city" => $billing->getCity(),
114-
"province" => $billing->getRegion()->getRegion(),
115-
"street" => implode(',', $billing->getStreet()),
116-
"zipcode" => $billing->getPostcode(),
117-
"country_code" => $billing->getCountryId(),
118-
"first_name" => $billing->getFirstname(),
119-
"middle_name" => $billing->getMiddlename(),
120-
"last_name" => $billing->getLastname(),
121-
"telephone" => $billing->getTelephone(),
122-
"company_name" => $billing->getCompany()
123-
];
118+
try {
119+
$billing = $this->addressRepository->getById((int)$billingId);
120+
$mainData += [
121+
"city" => $billing->getCity(),
122+
"province" => $billing->getRegion()->getRegion(),
123+
"street" => implode(',', $billing->getStreet()),
124+
"zipcode" => $billing->getPostcode(),
125+
"country_code" => $billing->getCountryId(),
126+
"first_name" => $billing->getFirstname(),
127+
"middle_name" => $billing->getMiddlename(),
128+
"last_name" => $billing->getLastname(),
129+
"telephone" => $billing->getTelephone(),
130+
"company_name" => $billing->getCompany()
131+
];
132+
} catch (\Exception $e) {
133+
$this->logRepository->addErrorLog('get profiles', $e->getMessage());
134+
}
124135
}
125136

126137
$data[] = $mainData;

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magmodules/magento2-reloadify",
33
"description": "Reloadify extension for Magento 2",
44
"type": "magento2-module",
5-
"version": "1.8.0",
5+
"version": "1.9.0",
66
"license": [
77
"BSD-2-Clause"
88
],

etc/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<default>
1111
<magmodules_reloadify>
1212
<general>
13-
<version>v1.8.0</version>
13+
<version>v1.9.0</version>
1414
<enable>0</enable>
1515
<debug>0</debug>
1616
</general>

0 commit comments

Comments
 (0)