Skip to content

Commit 0c4bd23

Browse files
ENGCOM-6809: Update getCustomer method in order class #26423
- Merge Pull Request #26423 from sertlab/magento2:FS/getcustomer-returns-null-25269 - Merged commits: 1. 92816ab 2. 427a4ad 3. f8bcd47 4. 80c737a 5. 5a1f48e 6. 57e2532 7. 3ca45d8
2 parents 1eef9bd + 3ca45d8 commit 0c4bd23

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

app/code/Magento/Sales/Model/Order.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
* @method bool hasCustomerNoteNotify()
5252
* @method bool hasForcedCanCreditmemo()
5353
* @method bool getIsInProcess()
54-
* @method \Magento\Customer\Model\Customer getCustomer()
54+
* @method \Magento\Customer\Model\Customer|null getCustomer()
5555
* @method \Magento\Sales\Model\Order setSendEmail(bool $value)
5656
* @SuppressWarnings(PHPMD.ExcessivePublicCount)
5757
* @SuppressWarnings(PHPMD.TooManyFields)
@@ -1326,7 +1326,7 @@ public function getTrackingNumbers()
13261326
*/
13271327
public function getShippingMethod($asObject = false)
13281328
{
1329-
$shippingMethod = parent::getShippingMethod();
1329+
$shippingMethod = $this->getData('shipping_method');
13301330
if (!$asObject || !$shippingMethod) {
13311331
return $shippingMethod;
13321332
} else {

0 commit comments

Comments
 (0)