|
1 | 1 | <?php
|
2 | 2 | /**
|
3 |
| - * Copyright © Magento, Inc. All rights reserved. |
4 |
| - * See COPYING.txt for license details. |
| 3 | + * Copyright 2011 Adobe |
| 4 | + * All Rights Reserved. |
5 | 5 | */
|
6 | 6 |
|
7 | 7 | namespace Magento\Shipping\Block\Adminhtml\Order;
|
|
18 | 18 | class Packaging extends \Magento\Backend\Block\Template
|
19 | 19 | {
|
20 | 20 | /**
|
21 |
| - * Source size model |
| 21 | + * Source size model instance |
22 | 22 | *
|
23 | 23 | * @var \Magento\Shipping\Model\Carrier\Source\GenericInterface
|
24 | 24 | */
|
25 | 25 | protected $_sourceSizeModel;
|
26 | 26 |
|
27 | 27 | /**
|
28 |
| - * Core registry |
| 28 | + * Core registry instance |
29 | 29 | *
|
30 | 30 | * @var \Magento\Framework\Registry
|
31 | 31 | */
|
@@ -87,42 +87,29 @@ public function getConfigDataJson()
|
87 | 87 | {
|
88 | 88 | $shipmentId = $this->getShipment()->getId();
|
89 | 89 | $orderId = $this->getRequest()->getParam('order_id');
|
90 |
| - $urlParams = []; |
91 |
| - |
92 | 90 | $itemsQty = [];
|
93 | 91 | $itemsPrice = [];
|
94 | 92 | $itemsName = [];
|
95 | 93 | $itemsWeight = [];
|
96 | 94 | $itemsProductId = [];
|
97 | 95 | $itemsOrderItemId = [];
|
98 |
| - if ($shipmentId) { |
99 |
| - $urlParams['shipment_id'] = $shipmentId; |
100 |
| - $createLabelUrl = $this->getUrl('adminhtml/order_shipment/createLabel', $urlParams); |
101 |
| - $itemsGridUrl = $this->getUrl('adminhtml/order_shipment/getShippingItemsGrid', $urlParams); |
102 |
| - foreach ($this->getShipment()->getAllItems() as $item) { |
103 |
| - $itemsQty[$item->getId()] = $item->getQty(); |
104 |
| - $itemsPrice[$item->getId()] = $item->getPrice(); |
105 |
| - $itemsName[$item->getId()] = $item->getName(); |
106 |
| - $itemsWeight[$item->getId()] = $item->getWeight(); |
107 |
| - $itemsProductId[$item->getId()] = $item->getProductId(); |
108 |
| - $itemsOrderItemId[$item->getId()] = $item->getOrderItemId(); |
109 |
| - } |
110 |
| - } else { |
111 |
| - if ($orderId) { |
112 |
| - $urlParams['order_id'] = $orderId; |
113 |
| - $createLabelUrl = $this->getUrl('adminhtml/order_shipment/save', $urlParams); |
114 |
| - $itemsGridUrl = $this->getUrl('adminhtml/order_shipment/getShippingItemsGrid', $urlParams); |
115 | 96 |
|
116 |
| - foreach ($this->getShipment()->getAllItems() as $item) { |
117 |
| - $itemsQty[$item->getOrderItemId()] = $item->getQty() * 1; |
118 |
| - $itemsPrice[$item->getOrderItemId()] = $item->getPrice(); |
119 |
| - $itemsName[$item->getOrderItemId()] = $item->getName(); |
120 |
| - $itemsWeight[$item->getOrderItemId()] = $item->getWeight(); |
121 |
| - $itemsProductId[$item->getOrderItemId()] = $item->getProductId(); |
122 |
| - $itemsOrderItemId[$item->getOrderItemId()] = $item->getOrderItemId(); |
123 |
| - } |
124 |
| - } |
| 97 | + $urlParams = $shipmentId ? ['shipment_id' => $shipmentId] : ($orderId ? ['order_id' => $orderId] : []); |
| 98 | + $createLabelUrl = $this->getUrl( |
| 99 | + $shipmentId ? 'adminhtml/order_shipment/createLabel' : 'adminhtml/order_shipment/save', |
| 100 | + $urlParams |
| 101 | + ); |
| 102 | + $itemsGridUrl = $this->getUrl('adminhtml/order_shipment/getShippingItemsGrid', $urlParams); |
| 103 | + |
| 104 | + foreach ($this->getShipment()->getAllItems() as $item) { |
| 105 | + $itemsQty[$item->getOrderItemId()] = $item->getQty() * 1; |
| 106 | + $itemsPrice[$item->getOrderItemId()] = $item->getPrice(); |
| 107 | + $itemsName[$item->getOrderItemId()] = $item->getName(); |
| 108 | + $itemsWeight[$item->getOrderItemId()] = $item->getWeight(); |
| 109 | + $itemsProductId[$item->getOrderItemId()] = $item->getProductId(); |
| 110 | + $itemsOrderItemId[$item->getOrderItemId()] = $item->getOrderItemId(); |
125 | 111 | }
|
| 112 | + |
126 | 113 | $data = [
|
127 | 114 | 'createLabelUrl' => $createLabelUrl,
|
128 | 115 | 'itemsGridUrl' => $itemsGridUrl,
|
|
0 commit comments