-
Notifications
You must be signed in to change notification settings - Fork 9.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #762 from magento-okapis/MAGETWO-61120-Tax-Configu…
…ration Fixed issues: - MAGETWO-61120: Tax and Order total not correct when discount is applied
- Loading branch information
Showing
14 changed files
with
1,099 additions
and
123 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
142 changes: 142 additions & 0 deletions
142
app/code/Magento/Tax/Model/System/Message/Notification/ApplyDiscountOnPrices.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © 2013-2017 Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| namespace Magento\Tax\Model\System\Message\Notification; | ||
|
|
||
| use Magento\Tax\Model\Config; | ||
|
|
||
| /** | ||
| * Class allows to show admin notification about possible issues related to "Apply Discount On Prices" setting. | ||
| * | ||
| * Warning is displayed in case when "Catalog Prices" = "Excluding Tax" | ||
| * AND "Apply Discount On Prices" = "Including Tax" | ||
| * AND "Apply Customer Tax" = "After Discount" | ||
| */ | ||
| class ApplyDiscountOnPrices implements \Magento\Tax\Model\System\Message\NotificationInterface | ||
| { | ||
| /** | ||
| * @var \Magento\Store\Model\StoreManagerInterface | ||
| */ | ||
| private $storeManager; | ||
|
|
||
| /** | ||
| * @var \Magento\Framework\UrlInterface | ||
| */ | ||
| private $urlBuilder; | ||
|
|
||
| /** | ||
| * @var Config | ||
| */ | ||
| private $taxConfig; | ||
|
|
||
| /** | ||
| * Stores with invalid display settings | ||
| * | ||
| * @var array | ||
| */ | ||
| private $storesWithInvalidSettings; | ||
|
|
||
| /** | ||
| * @param \Magento\Store\Model\StoreManagerInterface $storeManager | ||
| * @param \Magento\Framework\UrlInterface $urlBuilder | ||
| * @param Config $taxConfig | ||
| */ | ||
| public function __construct( | ||
| \Magento\Store\Model\StoreManagerInterface $storeManager, | ||
| \Magento\Framework\UrlInterface $urlBuilder, | ||
| Config $taxConfig | ||
| ) { | ||
| $this->storeManager = $storeManager; | ||
| $this->urlBuilder = $urlBuilder; | ||
| $this->taxConfig = $taxConfig; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| * @codeCoverageIgnore | ||
| */ | ||
| public function getIdentity() | ||
| { | ||
| return 'TAX_NOTIFICATION_APPLY_DISCOUNT'; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function isDisplayed() | ||
| { | ||
| if (!$this->taxConfig->isWrongApplyDiscountSettingIgnored() && $this->getStoresWithWrongSettings()) { | ||
| return true; | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function getText() | ||
| { | ||
| $messageDetails = ''; | ||
|
|
||
| if ($this->isDisplayed()) { | ||
| $messageDetails .= '<strong>'; | ||
| $messageDetails .= __('To apply the discount on prices including tax and apply the tax after discount, set Catalog Prices to “Including Tax”. '); | ||
| $messageDetails .= '</strong><p>'; | ||
| $messageDetails .= __('Store(s) affected: '); | ||
| $messageDetails .= implode(', ', $this->getStoresWithWrongSettings()); | ||
| $messageDetails .= '</p><p>'; | ||
| $messageDetails .= __( | ||
| 'Click on the link to <a href="%1">ignore this notification</a>', | ||
| $this->urlBuilder->getUrl('tax/tax/ignoreTaxNotification', ['section' => 'apply_discount']) | ||
| ); | ||
| $messageDetails .= "</p>"; | ||
| } | ||
|
|
||
| return $messageDetails; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| * @codeCoverageIgnore | ||
| */ | ||
| public function getSeverity() | ||
| { | ||
| return self::SEVERITY_CRITICAL; | ||
| } | ||
|
|
||
| /** | ||
| * Return list of store names which have invalid settings. | ||
| * | ||
| * @return array | ||
| */ | ||
| private function getStoresWithWrongSettings() | ||
| { | ||
| if (null !== $this->storesWithInvalidSettings) { | ||
| return $this->storesWithInvalidSettings; | ||
| } | ||
| $this->storesWithInvalidSettings = []; | ||
| $storeCollection = $this->storeManager->getStores(true); | ||
| foreach ($storeCollection as $store) { | ||
| if (!$this->checkSettings($store)) { | ||
| $website = $store->getWebsite(); | ||
| $this->storesWithInvalidSettings[] = $website->getName() . ' (' . $store->getName() . ')'; | ||
| } | ||
| } | ||
| return $this->storesWithInvalidSettings; | ||
| } | ||
|
|
||
| /** | ||
| * Check if settings are valid. | ||
| * | ||
| * @param null|int|bool|string|\Magento\Store\Model\Store $store $store | ||
| * @return bool false if settings are incorrect | ||
| */ | ||
| private function checkSettings($store = null) | ||
| { | ||
| return $this->taxConfig->priceIncludesTax($store) | ||
| || !$this->taxConfig->applyTaxAfterDiscount($store) | ||
| || !$this->taxConfig->discountTax($store); | ||
| } | ||
| } |
Oops, something went wrong.