Skip to content

Commit a3d8b78

Browse files
viktorpetrykviktorpetryk
committed
Merge remote-tracking branch 'origin/MC-35194' into 2.4-develop-pr111
2 parents a81410a + 5c25bb1 commit a3d8b78

File tree

2 files changed

+32
-28
lines changed

2 files changed

+32
-28
lines changed

‎app/code/Magento/Ups/etc/adminhtml/system.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
<field id="access_license_number" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1">
1414
<label>Access License Number</label>
1515
<backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
16-
<depends>
17-
<field id="carriers/ups/active">1</field>
18-
</depends>
1916
</field>
2017
<field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" canRestore="1">
2118
<label>Enabled for Checkout</label>
@@ -89,9 +86,6 @@
8986
<field id="password" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1">
9087
<label>Password</label>
9188
<backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
92-
<depends>
93-
<field id="carriers/ups/active">1</field>
94-
</depends>
9589
</field>
9690
<field id="pickup" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" canRestore="1">
9791
<label>Pickup Method</label>
@@ -123,9 +117,6 @@
123117
<field id="username" translate="label" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="1">
124118
<label>User ID</label>
125119
<backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
126-
<depends>
127-
<field id="carriers/ups/active">1</field>
128-
</depends>
129120
</field>
130121
<field id="negotiated_active" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" canRestore="1">
131122
<label>Enable Negotiated Rates</label>

‎app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml‎

Lines changed: 32 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,44 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/** @var $upsModel \Magento\Ups\Helper\Config */
8-
/** @var $block \Magento\Ups\Block\Backend\System\CarrierConfig */
9-
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
7+
use Magento\Framework\Escaper;
8+
use Magento\Framework\Json\Helper\Data;
9+
use Magento\Framework\View\Helper\SecureHtmlRenderer;
10+
use Magento\Store\Model\Website;
11+
use Magento\Ups\Block\Backend\System\CarrierConfig;
1012

13+
/**
14+
* @var CarrierConfig $block
15+
* @var Escaper $escaper
16+
* @var SecureHtmlRenderer $secureRenderer
17+
*/
1118
$upsCarrierConfig = $block->getCarrierConfig();
1219
$orShipArr = $upsCarrierConfig->getCode('originShipment');
1320
$defShipArr = $upsCarrierConfig->getCode('method');
1421

1522
$sectionCode = $block->getRequest()->getParam('section');
1623
$websiteCode = $block->getRequest()->getParam('website');
1724
$storeCode = $block->getRequest()->getParam('store');
18-
/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
25+
/** @var Data $jsonHelper */
1926
$jsonHelper = $block->getData('jsonHelper');
2027

2128
if (!$storeCode && $websiteCode) {
22-
/** @var $web \Magento\Store\Model\Website */
29+
/** @var Website $web */
2330
$web = $block->getWebsiteModel()->load($websiteCode);
2431
$storedAllowedMethods = explode(',', $web->getConfig('carriers/ups/allowed_methods'));
25-
$storedOriginShipment = $block->escapeHtml($web->getConfig('carriers/ups/origin_shipment'));
26-
$storedFreeShipment = $block->escapeHtml($web->getConfig('carriers/ups/free_method'));
27-
$storedUpsType = $block->escapeHtml($web->getConfig('carriers/ups/type'));
32+
$storedOriginShipment = $escaper->escapeHtml($web->getConfig('carriers/ups/origin_shipment'));
33+
$storedFreeShipment = $escaper->escapeHtml($web->getConfig('carriers/ups/free_method'));
34+
$storedUpsType = $escaper->escapeHtml($web->getConfig('carriers/ups/type'));
2835
} elseif ($storeCode) {
2936
$storedAllowedMethods = explode(',', $block->getConfig('carriers/ups/allowed_methods', $storeCode));
30-
$storedOriginShipment = $block->escapeHtml($block->getConfig('carriers/ups/origin_shipment', $storeCode));
31-
$storedFreeShipment = $block->escapeHtml($block->getConfig('carriers/ups/free_method', $storeCode));
32-
$storedUpsType = $block->escapeHtml($block->getConfig('carriers/ups/type', $storeCode));
37+
$storedOriginShipment = $escaper->escapeHtml($block->getConfig('carriers/ups/origin_shipment', $storeCode));
38+
$storedFreeShipment = $escaper->escapeHtml($block->getConfig('carriers/ups/free_method', $storeCode));
39+
$storedUpsType = $escaper->escapeHtml($block->getConfig('carriers/ups/type', $storeCode));
3340
} else {
3441
$storedAllowedMethods = explode(',', $block->getConfig('carriers/ups/allowed_methods'));
35-
$storedOriginShipment = $block->escapeHtml($block->getConfig('carriers/ups/origin_shipment'));
36-
$storedFreeShipment = $block->escapeHtml($block->getConfig('carriers/ups/free_method'));
37-
$storedUpsType = $block->escapeHtml($block->getConfig('carriers/ups/type'));
42+
$storedOriginShipment = $escaper->escapeHtml($block->getConfig('carriers/ups/origin_shipment'));
43+
$storedFreeShipment = $escaper->escapeHtml($block->getConfig('carriers/ups/free_method'));
44+
$storedUpsType = $escaper->escapeHtml($block->getConfig('carriers/ups/type'));
3845
}
3946
?>
4047

@@ -87,14 +94,16 @@ require(["prototype"], function(){
8794
'carriers_ups_origin_shipment','carriers_ups_negotiated_active','carriers_ups_shipper_number',
8895
'carriers_ups_mode_xml','carriers_ups_include_taxes'];
8996
this.onlyUpsElements = ['carriers_ups_gateway_url'];
97+
this.authUpsXmlElements = ['carriers_ups_username',
98+
'carriers_ups_password','carriers_ups_access_license_number'];
9099
91100
script;
92101
$scriptString .= 'this.storedOriginShipment = \'' . /* @noEscape */ $storedOriginShipment . '\';
93102
this.storedFreeShipment = \'' . /* @noEscape */ $storedFreeShipment . '\';
94-
this.storedUpsType = \'' . /* @noEscape */ $storedUpsType . '\';';
103+
this.storedUpsType = \'' . /* @noEscape */ $storedUpsType . '\';';
95104
?>
96-
<?php $scriptString .= 'this.storedAllowedMethods = ' . /* @noEscape */ $jsonHelper->jsonEncode($storedAllowedMethods) .
97-
';
105+
<?php $scriptString .= 'this.storedAllowedMethods = '
106+
. /* @noEscape */ $jsonHelper->jsonEncode($storedAllowedMethods) . ';
98107
this.originShipmentObj = ' . /* @noEscape */ $jsonHelper->jsonEncode($orShipArr) . ';
99108
this.originShipmentObj[\'default\'] = ' . /* @noEscape */ $jsonHelper->jsonEncode($defShipArr) . ';';
100109

@@ -119,8 +128,9 @@ $scriptString .= <<<script
119128
120129
script;
121130

122-
$scriptString .= 'freeMethod.insert(new Element(\'option\', {value:\'\'}).update(\'' . $block->escapeHtml(__('None')) .
123-
'\'));';
131+
$scriptString .= 'freeMethod.insert(new Element(\'option\', {value:\'\'}).update(\''
132+
. $escaper->escapeHtml(__('None'))
133+
. '\'));';
124134

125135
$scriptString .= <<<script
126136
var code, option;
@@ -178,6 +188,9 @@ $scriptString .= <<<script
178188
}
179189
Event.observe($('carriers_ups_origin_shipment'), 'change', this.changeOriginShipment.bind(this));
180190
showRowArrayElements(this.onlyUpsXmlElements);
191+
if (\$F(this.carriersUpsActiveId) !== '1'){
192+
hideRowArrayElements(this.authUpsXmlElements);
193+
}
181194
hideRowArrayElements(this.onlyUpsElements);
182195
this.changeOriginShipment(null, null);
183196
}

0 commit comments

Comments
 (0)