Skip to content

Commit 2676768

Browse files
committed
MAGETWO-69185: Unable to create shipping label if Region not specified for shipping origin
1 parent 2bc3bb0 commit 2676768

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

app/code/Magento/Shipping/Model/Shipping/Labels.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ public function requestToShipment(Shipment $orderShipment)
122122
|| !$storeInfo->getName()
123123
|| !$storeInfo->getPhone()
124124
|| !$originStreet1
125-
|| !$shipperRegionCode
126125
|| !$this->_scopeConfig->getValue(
127126
Shipment::XML_PATH_STORE_CITY,
128127
ScopeInterface::SCOPE_STORE,

app/code/Magento/Shipping/Test/Unit/Model/Shipping/LabelsTest.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
*/
66
namespace Magento\Shipping\Test\Unit\Model\Shipping;
77

8-
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
9-
use Magento\Framework\DataObject;
8+
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
109
use Magento\Sales\Model\Order\Shipment;
1110
use Magento\Store\Model\ScopeInterface;
1211

@@ -69,8 +68,8 @@ protected function setUp()
6968
->setMethods(['getValue'])
7069
->getMock();
7170

72-
$objectManagerHelper = new ObjectManager($this);
73-
$this->labels = $objectManagerHelper->getObject(
71+
$bjectManagerHelper = new ObjectManagerHelper($this);
72+
$this->labels = $bjectManagerHelper->getObject(
7473
\Magento\Shipping\Model\Shipping\Labels::class,
7574
[
7675
'shipmentRequestFactory' => $requestFactory,

0 commit comments

Comments
 (0)