File tree Expand file tree Collapse file tree 5 files changed +10
-10
lines changed
app/code/Magento/Sales/view/adminhtml
templates/order/create/form Expand file tree Collapse file tree 5 files changed +10
-10
lines changed Original file line number Diff line number Diff line change 47
47
<block class =" Magento\Sales\Block\Adminhtml\Order\Create\Form\Account" template =" Magento_Sales::order/create/form/account.phtml" name =" form_account" />
48
48
<block class =" Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template =" Magento_Sales::order/create/form/address.phtml" name =" shipping_address" >
49
49
<arguments >
50
- <argument name =" customerAddressViewModel " xsi : type =" object" >Magento\Sales\ViewModel\Customer\AddressFormatter</argument >
50
+ <argument name =" customerAddressFormatter " xsi : type =" object" >Magento\Sales\ViewModel\Customer\AddressFormatter</argument >
51
51
<argument name =" customerAddressCollection" xsi : type =" object" >Magento\Customer\Model\ResourceModel\Address\Collection</argument >
52
52
</arguments >
53
53
</block >
54
54
<block class =" Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template =" Magento_Sales::order/create/form/address.phtml" name =" billing_address" >
55
55
<arguments >
56
- <argument name =" customerAddressViewModel " xsi : type =" object" >Magento\Sales\ViewModel\Customer\AddressFormatter</argument >
56
+ <argument name =" customerAddressFormatter " xsi : type =" object" >Magento\Sales\ViewModel\Customer\AddressFormatter</argument >
57
57
<argument name =" customerAddressCollection" xsi : type =" object" >Magento\Customer\Model\ResourceModel\Address\Collection</argument >
58
58
</arguments >
59
59
</block >
Original file line number Diff line number Diff line change 10
10
<referenceContainer name =" content" >
11
11
<block class =" Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template =" Magento_Sales::order/create/form/address.phtml" name =" billing_address" >
12
12
<arguments >
13
- <argument name =" customerAddressViewModel " xsi : type =" object" >Magento\Sales\ViewModel\Customer\AddressFormatter</argument >
13
+ <argument name =" customerAddressFormatter " xsi : type =" object" >Magento\Sales\ViewModel\Customer\AddressFormatter</argument >
14
14
<argument name =" customerAddressCollection" xsi : type =" object" >Magento\Customer\Model\ResourceModel\Address\Collection</argument >
15
15
</arguments >
16
16
</block >
Original file line number Diff line number Diff line change 22
22
<block class =" Magento\Sales\Block\Adminhtml\Order\Create\Form\Account" template =" Magento_Sales::order/create/form/account.phtml" name =" form_account" />
23
23
<block class =" Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template =" Magento_Sales::order/create/form/address.phtml" name =" shipping_address" >
24
24
<arguments >
25
- <argument name =" customerAddressViewModel " xsi : type =" object" >Magento\Sales\ViewModel\Customer\AddressFormatter</argument >
25
+ <argument name =" customerAddressFormatter " xsi : type =" object" >Magento\Sales\ViewModel\Customer\AddressFormatter</argument >
26
26
<argument name =" customerAddressCollection" xsi : type =" object" >Magento\Customer\Model\ResourceModel\Address\Collection</argument >
27
27
</arguments >
28
28
</block >
29
29
<block class =" Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template =" Magento_Sales::order/create/form/address.phtml" name =" billing_address" >
30
30
<arguments >
31
- <argument name =" customerAddressViewModel " xsi : type =" object" >Magento\Sales\ViewModel\Customer\AddressFormatter</argument >
31
+ <argument name =" customerAddressFormatter " xsi : type =" object" >Magento\Sales\ViewModel\Customer\AddressFormatter</argument >
32
32
<argument name =" customerAddressCollection" xsi : type =" object" >Magento\Customer\Model\ResourceModel\Address\Collection</argument >
33
33
</arguments >
34
34
</block >
Original file line number Diff line number Diff line change 10
10
<referenceContainer name =" content" >
11
11
<block class =" Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template =" Magento_Sales::order/create/form/address.phtml" name =" shipping_address" >
12
12
<arguments >
13
- <argument name =" customerAddressViewModel " xsi : type =" object" >Magento\Sales\ViewModel\Customer\AddressFormatter</argument >
13
+ <argument name =" customerAddressFormatter " xsi : type =" object" >Magento\Sales\ViewModel\Customer\AddressFormatter</argument >
14
14
<argument name =" customerAddressCollection" xsi : type =" object" >Magento\Customer\Model\ResourceModel\Address\Collection</argument >
15
15
</arguments >
16
16
</block >
Original file line number Diff line number Diff line change @@ -17,9 +17,9 @@ if ($block->getCustomerId()) {
17
17
}
18
18
19
19
/**
20
- * @var \Magento\Sales\ViewModel\Customer\Address $customerAddressViewModel
20
+ * @var \Magento\Sales\ViewModel\Customer\AddressFormatter $customerAddressFormatter
21
21
*/
22
- $ customerAddressViewModel = $ block ->getData ('customerAddressViewModel ' );
22
+ $ customerAddressFormatter = $ block ->getData ('customerAddressFormatter ' );
23
23
24
24
/**
25
25
* @var \Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address|\Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address $block
@@ -32,7 +32,7 @@ if ($block->getIsShipping()):
32
32
require(["Magento_Sales/order/create/form"], function(){
33
33
34
34
order.shippingAddressContainer = '<?= /* @escapeNotVerified */ $ _fieldsContainerId ?> ';
35
- order.setAddresses(<?= /* @escapeNotVerified */ $ customerAddressViewModel ->getAddressesJson ($ addressArray ) ?> );
35
+ order.setAddresses(<?= /* @escapeNotVerified */ $ customerAddressFormatter ->getAddressesJson ($ addressArray ) ?> );
36
36
37
37
});
38
38
</script>
@@ -77,7 +77,7 @@ endif; ?>
77
77
<?php foreach ($ addressArray as $ addressId => $ address ): ?>
78
78
<option
79
79
value="<?= /* @escapeNotVerified */ $ addressId ?> "<?php if ($ addressId == $ block ->getAddressId ()): ?> selected="selected"<?php endif ; ?> >
80
- <?= /* @escapeNotVerified */ $ block ->escapeHtml ($ customerAddressViewModel ->getAddressAsString ($ address )) ?>
80
+ <?= /* @escapeNotVerified */ $ block ->escapeHtml ($ customerAddressFormatter ->getAddressAsString ($ address )) ?>
81
81
</option>
82
82
<?php endforeach ; ?>
83
83
</select>
You can’t perform that action at this time.
0 commit comments