Skip to content

Commit cab7b03

Browse files
krissyhiserotekrissyhiserote
committed
Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-90828-tech-debt-cleanup-background-attributes-for-banner
2 parents bf484d5 + b8528ae commit cab7b03

File tree

42 files changed

+60
-846
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+60
-846
lines changed

‎app/code/Magento/Customer/view/frontend/templates/widget/name.phtml‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,15 @@ $suffix = $block->showSuffix();
2828
?>
2929
<?php if (($prefix || $middle || $suffix) && !$block->getNoWrap()): ?>
3030
<div class="field required fullname <?= $block->escapeHtmlAttr($block->getContainerClassName()) ?>">
31-
<label for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>" class="label">
32-
<span><?= $block->escapeHtml(__('Name')) ?></span>
33-
</label>
31+
<label for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>" class="label"><span><?= $block->escapeHtml(__('Name')) ?></span></label>
3432
<div class="control">
3533
<fieldset class="fieldset fieldset-fullname">
3634
<div class="fields">
3735
<?php endif; ?>
3836

3937
<?php if ($prefix): ?>
4038
<div class="field field-name-prefix<?php if ($block->isPrefixRequired()) echo ' required' ?>">
41-
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>">
42-
<span><?= $block->escapeHtml($block->getStoreLabel('prefix')) ?></span>
43-
</label>
44-
39+
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('prefix')) ?></span></label>
4540
<div class="control">
4641
<?php if ($block->getPrefixOptions() === false): ?>
4742
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"
@@ -65,10 +60,7 @@ $suffix = $block->showSuffix();
6560
</div>
6661
<?php endif; ?>
6762
<div class="field field-name-firstname required">
68-
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>">
69-
<span><?= $block->escapeHtml($block->getStoreLabel('firstname')) ?></span>
70-
</label>
71-
63+
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('firstname')) ?></span></label>
7264
<div class="control">
7365
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>"
7466
name="<?= $block->escapeHtmlAttr($block->getFieldName('firstname')) ?>"
@@ -80,10 +72,7 @@ $suffix = $block->showSuffix();
8072
<?php if ($middle): ?>
8173
<?php $isMiddlenameRequired = $block->isMiddlenameRequired(); ?>
8274
<div class="field field-name-middlename<?= $isMiddlenameRequired ? ' required' : '' ?>">
83-
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>">
84-
<span><?= $block->escapeHtml($block->getStoreLabel('middlename')) ?></span>
85-
</label>
86-
75+
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('middlename')) ?></span></label>
8776
<div class="control">
8877
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>"
8978
name="<?= $block->escapeHtmlAttr($block->getFieldName('middlename')) ?>"
@@ -94,10 +83,7 @@ $suffix = $block->showSuffix();
9483
</div>
9584
<?php endif; ?>
9685
<div class="field field-name-lastname required">
97-
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>">
98-
<span><?= $block->escapeHtml($block->getStoreLabel('lastname')) ?></span>
99-
</label>
100-
86+
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('lastname')) ?></span></label>
10187
<div class="control">
10288
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>"
10389
name="<?= $block->escapeHtmlAttr($block->getFieldName('lastname')) ?>"
@@ -108,10 +94,7 @@ $suffix = $block->showSuffix();
10894
</div>
10995
<?php if ($suffix): ?>
11096
<div class="field field-name-suffix<?php if ($block->isSuffixRequired()) echo ' required' ?>">
111-
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>">
112-
<span><?= $block->escapeHtml($block->getStoreLabel('suffix')) ?></span>
113-
</label>
114-
97+
<label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('suffix')) ?></span></label>
11598
<div class="control">
11699
<?php if ($block->getSuffixOptions() === false): ?>
117100
<input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"

‎app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ public function execute()
3232
}
3333
}
3434

35-
$this->getResponse()->setRedirect($this->_storeManager->getStore()->getBaseUrl());
35+
$resultRedirect = $this->resultRedirectFactory->create();
36+
$resultRedirect->setUrl($this->_storeManager->getStore()->getBaseUrl());
37+
return $resultRedirect;
3638
}
3739
}

‎app/code/Magento/Store/Model/PathConfig.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ public function shouldBeSecure($path)
8383
*/
8484
public function getDefaultPath()
8585
{
86-
return $this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE);
86+
$store = $this->storeManager->getStore();
87+
$value = $this->scopeConfig->getValue('web/default/front', ScopeInterface::SCOPE_STORE, $store);
88+
return $value;
8789
}
8890
}

‎app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,23 @@ protected function clearValues(Address\Total $total)
152152
$total->setBaseTotalAmount('subtotal', 0);
153153
$total->setTotalAmount('tax', 0);
154154
$total->setBaseTotalAmount('tax', 0);
155+
$total->setTotalAmount('shipping', 0);
156+
$total->setBaseTotalAmount('shipping', 0);
155157
$total->setTotalAmount('discount_tax_compensation', 0);
156158
$total->setBaseTotalAmount('discount_tax_compensation', 0);
157159
$total->setTotalAmount('shipping_discount_tax_compensation', 0);
158160
$total->setBaseTotalAmount('shipping_discount_tax_compensation', 0);
159161
$total->setSubtotalInclTax(0);
160162
$total->setBaseSubtotalInclTax(0);
163+
$total->setShippingInclTax(0);
164+
$total->setBaseShippingInclTax(0);
165+
$total->setShippingTaxAmount(0);
166+
$total->setBaseShippingTaxAmount(0);
167+
$total->setShippingAmountForDiscount(0);
168+
$total->setBaseShippingAmountForDiscount(0);
169+
$total->setBaseShippingAmountForDiscount(0);
170+
$total->setTotalAmount('extra_tax', 0);
171+
$total->setBaseTotalAmount('extra_tax', 0);
161172
}
162173

163174
/**

‎app/code/Magento/Theme/view/adminhtml/web/favicon.ico‎

32.6 KB
Binary file not shown.

‎app/code/Magento/Theme/view/frontend/web/favicon.ico‎

32.6 KB
Binary file not shown.

‎app/code/Magento/Theme/view/install/web/favicon.ico‎

32.6 KB
Binary file not shown.

‎app/code/Magento/Webapi/Controller/Soap.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ class Soap implements \Magento\Framework\App\FrontControllerInterface
5151
*/
5252
protected $_errorProcessor;
5353

54+
/**
55+
* @var \Magento\Framework\App\State
56+
*/
57+
protected $_appState;
58+
5459
/**
5560
* @var \Magento\Framework\Locale\ResolverInterface
5661
*/

‎app/code/Magento/Webapi/Controller/Soap/Request/Handler.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public function __construct(
107107
*
108108
* @param string $operation
109109
* @param array $arguments
110-
* @return \stdClass|null
110+
* @return array
111111
* @throws WebapiException
112112
* @throws \LogicException
113113
* @throws AuthorizationException

‎app/code/Magento/Webapi/Model/Plugin/GuestAuthorization.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class GuestAuthorization
1919
* Check if resource for which access is needed has anonymous permissions defined in webapi config.
2020
*
2121
* @param \Magento\Framework\Authorization $subject
22-
* @param callable $proceed
22+
* @param \Closure $proceed
2323
* @param string $resource
2424
* @param string $privilege
2525
* @return bool true If resource permission is anonymous,

0 commit comments

Comments
 (0)