|
| 1 | +diff --git a/vendor/magento/module-negotiable-quote/view/frontend/web/js/view/shipping-address/address-renderer/default.js b/vendor/magento/module-negotiable-quote/view/frontend/web/js/view/shipping-address/address-renderer/default.js |
| 2 | +index 2a60e20aa6..8e52105860 100644 |
| 3 | +--- a/vendor/magento/module-negotiable-quote/view/frontend/web/js/view/shipping-address/address-renderer/default.js |
| 4 | ++++ b/vendor/magento/module-negotiable-quote/view/frontend/web/js/view/shipping-address/address-renderer/default.js |
| 5 | +@@ -4,10 +4,12 @@ |
| 6 | + */ |
| 7 | + |
| 8 | + define([ |
| 9 | ++ 'jquery', |
| 10 | + 'ko', |
| 11 | ++ 'underscore', |
| 12 | + 'Magento_Checkout/js/view/shipping-address/address-renderer/default', |
| 13 | + 'Magento_Checkout/js/model/quote' |
| 14 | +-], function (ko, AddressRendererView, quote) { |
| 15 | ++], function ($, ko, _, AddressRendererView, quote) { |
| 16 | + 'use strict'; |
| 17 | + |
| 18 | + return AddressRendererView.extend({ |
| 19 | +@@ -53,6 +55,32 @@ define([ |
| 20 | + }, this); |
| 21 | + |
| 22 | + return this; |
| 23 | ++ }, |
| 24 | ++ |
| 25 | ++ /** |
| 26 | ++ * Get customer attribute label |
| 27 | ++ * |
| 28 | ++ * @param {*} attribute |
| 29 | ++ * @returns {*} |
| 30 | ++ */ |
| 31 | ++ getCustomAttributeLabel: function (attribute) { |
| 32 | ++ var resultAttribute; |
| 33 | ++ |
| 34 | ++ if (typeof attribute === 'string') { |
| 35 | ++ return attribute; |
| 36 | ++ } |
| 37 | ++ |
| 38 | ++ if (attribute.label) { |
| 39 | ++ return attribute.label; |
| 40 | ++ } |
| 41 | ++ |
| 42 | ++ if (typeof this.source.get('customAttributes') !== 'undefined') { |
| 43 | ++ resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], { |
| 44 | ++ value: attribute.value |
| 45 | ++ }); |
| 46 | ++ } |
| 47 | ++ |
| 48 | ++ return resultAttribute && resultAttribute.label || attribute.value; |
| 49 | + } |
| 50 | + }); |
| 51 | + }); |
| 52 | +diff --git a/vendor/magento/module-negotiable-quote/view/frontend/web/js/view/shipping-address/list.js b/vendor/magento/module-negotiable-quote/view/frontend/web/js/view/shipping-address/list.js |
| 53 | +index 6eb8c420b5..9d3b015f2f 100644 |
| 54 | +--- a/vendor/magento/module-negotiable-quote/view/frontend/web/js/view/shipping-address/list.js |
| 55 | ++++ b/vendor/magento/module-negotiable-quote/view/frontend/web/js/view/shipping-address/list.js |
| 56 | +@@ -17,7 +17,8 @@ define([ |
| 57 | + var defaultRendererTemplate = { |
| 58 | + parent: '${ $.$data.parentName }', |
| 59 | + name: '${ $.$data.name }', |
| 60 | +- component: 'Magento_NegotiableQuote/js/view/shipping-address/address-renderer/default' |
| 61 | ++ component: 'Magento_NegotiableQuote/js/view/shipping-address/address-renderer/default', |
| 62 | ++ provider: 'checkoutProvider' |
| 63 | + }; |
| 64 | + |
| 65 | + return ListView.extend({ |
| 66 | +diff --git a/vendor/magento/module-negotiable-quote/view/frontend/web/template/shipping-address/address-renderer/default.html b/vendor/magento/module-negotiable-quote/view/frontend/web/template/shipping-address/address-renderer/default.html |
| 67 | +index 02a5ce557e..61c0e15725 100644 |
| 68 | +--- a/vendor/magento/module-negotiable-quote/view/frontend/web/template/shipping-address/address-renderer/default.html |
| 69 | ++++ b/vendor/magento/module-negotiable-quote/view/frontend/web/template/shipping-address/address-renderer/default.html |
| 70 | +@@ -4,33 +4,26 @@ |
| 71 | + * See COPYING.txt for license details. |
| 72 | + */ |
| 73 | + --> |
| 74 | +-<div class="shipping-address-item" data-bind="css: isSelected() ? 'selected-item' : 'not-selected-item'"> |
| 75 | +- <!-- ko text: address().prefix --><!-- /ko --> <!-- ko text: address().firstname --><!-- /ko --> |
| 76 | +- <!-- ko text: address().lastname --><!-- /ko --> <!-- ko text: address().suffix --><!-- /ko --><br/> |
| 77 | +- <!-- ko text: address().street --><!-- /ko --><br/> |
| 78 | +- <!-- ko text: address().city --><!-- /ko -->, <span data-bind="html: address().region"></span> <!-- ko text: address().postcode --><!-- /ko --><br/> |
| 79 | +- <!-- ko text: getCountryName(address().countryId) --><!-- /ko --><br/> |
| 80 | +- <!-- ko if: (address().telephone) --> |
| 81 | +- <a data-bind="text: address().telephone, attr: {'href': 'tel:' + address().telephone}"></a> |
| 82 | +- <!-- /ko --><br/> |
| 83 | +- <!-- ko foreach: { data: address().customAttributes, as: 'element' } --> |
| 84 | +- <!-- ko foreach: { data: Object.keys(element), as: 'attribute' } --> |
| 85 | +- <!-- ko if: (typeof element[attribute] === "object") --> |
| 86 | +- <!-- ko text: element[attribute].value --><!-- /ko --> |
| 87 | +- <!-- /ko --> |
| 88 | +- <!-- ko if: (typeof element[attribute] === "string") --> |
| 89 | +- <!-- ko text: element[attribute] --><!-- /ko --> |
| 90 | +- <!-- /ko --><br/> |
| 91 | +- <!-- /ko --> |
| 92 | +- <!-- /ko --> |
| 93 | +- <!-- ko if: (address().isEditable()) --> |
| 94 | +- <button type="button" |
| 95 | ++<div class="shipping-address-item" css="'selected-item' : isSelected() , 'not-selected-item':!isSelected()"> |
| 96 | ++ <text args="address().prefix"/> <text args="address().firstname"/> <text args="address().middlename"/> |
| 97 | ++ <text args="address().lastname"/> <text args="address().suffix"/><br/> |
| 98 | ++ <text args="_.values(address().street).join(', ')"/><br/> |
| 99 | ++ <text args="address().city "/>, <span text="address().region"></span> <text args="address().postcode"/><br/> |
| 100 | ++ <text args="getCountryName(address().countryId)"/><br/> |
| 101 | ++ <a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br/> |
| 102 | ++ |
| 103 | ++ <each args="data: address().customAttributes, as: 'element'"> |
| 104 | ++ <text args="$parent.getCustomAttributeLabel(element)"/> |
| 105 | ++ <br/> |
| 106 | ++ </each> |
| 107 | ++ <button visible="address().isEditable()" type="button" |
| 108 | + class="action edit-address-link" |
| 109 | +- data-bind="click: editAddress, visible: address().isEditable()"> |
| 110 | +- <span data-bind="i18n: 'Edit'"></span> |
| 111 | ++ click="editAddress"> |
| 112 | ++ <span translate="'Edit'"></span> |
| 113 | + </button> |
| 114 | +- <!-- /ko --> |
| 115 | +- <button type="button" data-bind="click: selectAddress, visible: !isQuoteAddressLocked" class="action action-select-shipping-item"> |
| 116 | +- <span data-bind="i18n: 'Ship Here'"></span> |
| 117 | ++ <!-- ko if: (!isSelected()) --> |
| 118 | ++ <button type="button" click="selectAddress" class="action action-select-shipping-item"> |
| 119 | ++ <span translate="'Ship Here'"></span> |
| 120 | + </button> |
| 121 | ++ <!-- /ko --> |
| 122 | + </div> |
| 123 | +diff --git a/vendor/magento/module-purchase-order/view/frontend/web/js/view/checkout/shipping-address/list.js b/vendor/magento/module-purchase-order/view/frontend/web/js/view/checkout/shipping-address/list.js |
| 124 | +index 1fe4acbf85..c98f97733e 100644 |
| 125 | +--- a/vendor/magento/module-purchase-order/view/frontend/web/js/view/checkout/shipping-address/list.js |
| 126 | ++++ b/vendor/magento/module-purchase-order/view/frontend/web/js/view/checkout/shipping-address/list.js |
| 127 | +@@ -18,7 +18,8 @@ define([ |
| 128 | + defaultRendererTemplate = { |
| 129 | + parent: '${ $.$data.parentName }', |
| 130 | + name: '${ $.$data.name }', |
| 131 | +- component: 'Magento_PurchaseOrder/js/view/checkout/shipping-address/address-renderer/default' |
| 132 | ++ component: 'Magento_PurchaseOrder/js/view/checkout/shipping-address/address-renderer/default', |
| 133 | ++ provider: 'checkoutProvider' |
| 134 | + }; |
| 135 | + |
| 136 | + return Component.extend({ |
| 137 | +diff --git a/vendor/magento/module-purchase-order/view/frontend/web/template/checkout/shipping-information/address-renderer/default.html b/vendor/magento/module-purchase-order/view/frontend/web/template/checkout/shipping-information/address-renderer/default.html |
| 138 | +index a91fc816f0..26dd7742d1 100644 |
| 139 | +--- a/vendor/magento/module-purchase-order/view/frontend/web/template/checkout/shipping-information/address-renderer/default.html |
| 140 | ++++ b/vendor/magento/module-purchase-order/view/frontend/web/template/checkout/shipping-information/address-renderer/default.html |
| 141 | +@@ -13,22 +13,7 @@ |
| 142 | + <a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br/> |
| 143 | + |
| 144 | + <each args="data: address().customAttributes, as: 'element'"> |
| 145 | +- <each args="data: Object.keys(element), as: 'attribute'"> |
| 146 | +- <!-- ko if: (element[attribute].attribute_code != "default_company_address") --> |
| 147 | +- <if args="typeof element[attribute] === 'object'"> |
| 148 | +- <if args="element[attribute].label"> |
| 149 | +- <text args="element[attribute].label"/> |
| 150 | +- </if> |
| 151 | +- <ifnot args="element[attribute].label"> |
| 152 | +- <if args="element[attribute].value"> |
| 153 | +- <text args="element[attribute].value"/> |
| 154 | +- </if> |
| 155 | +- </ifnot> |
| 156 | +- </if> |
| 157 | +- <if args="typeof element[attribute] === 'string'"> |
| 158 | +- <text args="element[attribute]"/> |
| 159 | +- </if><br/> |
| 160 | +- <!-- /ko --> |
| 161 | +- </each> |
| 162 | ++ <text args="$parent.getCustomAttributeLabel(element)"/> |
| 163 | ++ <br/> |
| 164 | + </each> |
| 165 | + </if> |
0 commit comments