Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Forwardport] Fix method name (typo) #15745

Merged
merged 5 commits into from
Jun 6, 2018
Merged

[Forwardport] Fix method name (typo) #15745

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6bc77cb
art: Fix typo in method name
avoelkl May 25, 2018
c494d73
Revert ":pencil2: Fix typos in Multishipping and User module"
avoelkl May 25, 2018
6e2dea6
bug: Add phpdoc return type
avoelkl May 25, 2018
9850d9c
Remove unneeded white space
dmanners May 25, 2018
c2765a7
Update AbstractMultishipping.php
VladimirZaets Jun 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

/**
* Multishipping checkout base abstract block
* Mustishipping checkout base abstract block
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mustishipping?
Cc: @avoelkl @dmanners

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @orlangur thanks for this. I have already reached out to @avoelkl with regards to this.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would rather not back/forwardort this PR as i accendentially added (and reverted later again) a commit that was supposed to be in another PR.
The typos were fixed in a seperate PR.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vijay-wagento @avoelkl @dmanners
I think we should fix typos in current PR. We haven't the reason to do it in separate PR.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@VladimirZaets I will do it in same PR

*
* @author Magento Core Team <core@magentocommerce.com>
*/
Expand Down
10 changes: 10 additions & 0 deletions app/code/Magento/Multishipping/Block/Checkout/Overview.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,9 +319,19 @@ public function getQuote()
}

/**
* @deprecated
* typo in method name, see getBillingAddressTotals()
* @return mixed
*/
public function getBillinAddressTotals()
{
return $this->getBillingAddressTotals();
}

/**
* @return mixed
*/
public function getBillingAddressTotals()
{
$address = $this->getQuote()->getBillingAddress();
return $this->getShippingAddressTotals($address);
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Multishipping/Block/Checkout/Shipping.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use Magento\Quote\Model\Quote\Address;

/**
* Multishipping checkout shipping
* Mustishipping checkout shipping
*
* @api
* @author Magento Core Team <core@magentocommerce.com>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
<?php endforeach; ?>
</tbody>
<tfoot>
<?= /* @noEscape */ $block->renderTotals($block->getBillinAddressTotals()); ?>
<?= /* @noEscape */ $block->renderTotals($block->getBillingAddressTotals()); ?>
</tfoot>
</table>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/User/Model/Backend/Config/ObserverConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public function getAdminPasswordLifetime()
}

/**
* Get admin maximum security failures from config
* Get admin maxiumum security failures from config
*
* @return int
*/
Expand Down