From 8d0347f2c58dcf4f362a88e043d9212bd0777fbe Mon Sep 17 00:00:00 2001 From: Cristian Partica <cpartica@ebay.com> Date: Thu, 14 May 2015 17:54:41 -0500 Subject: [PATCH] MAGETWO-24445: [TECH DEBT] Rename hidden_tax to discount_tax_compensation - comments and db schema labels update *hidden tax* --- CHANGELOG.md | 2 +- .../Magento/Quote/Setup/InstallSchema.php | 16 ++--- .../Sales/Api/Data/CreditmemoInterface.php | 32 +++++----- .../Api/Data/CreditmemoItemInterface.php | 14 ++-- .../Sales/Api/Data/InvoiceInterface.php | 32 +++++----- .../Sales/Api/Data/InvoiceItemInterface.php | 16 ++--- .../Magento/Sales/Api/Data/OrderInterface.php | 64 +++++++++---------- .../Sales/Api/Data/OrderItemInterface.php | 54 ++++++++-------- .../Magento/Sales/Setup/InstallSchema.php | 54 ++++++++-------- .../Model/Order/Creditmemo/Total/TaxTest.php | 2 +- .../Tax/Model/Sales/Total/Quote/Tax.php | 2 +- 11 files changed, 144 insertions(+), 144 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ddcbc8c2cc0..3fb4e53e717 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2328,7 +2328,7 @@ * Canadian provincial sales taxes * Fixed issues with bundle product price inconsistency across the system * Added warnings if invalid tax configuration is created in the Admin panel - * Fixed issues with regards to hidden tax + * Fixed issues with regards to discount tax compensation * Fixed bugs: * Fixed an issue where grouped price was not applied for grouped products * Fixed an issue where a fatal error occurred when opening a grouped product page without assigned products on the frontend diff --git a/app/code/Magento/Quote/Setup/InstallSchema.php b/app/code/Magento/Quote/Setup/InstallSchema.php index 3fe1c59ef80..c31aef43f30 100644 --- a/app/code/Magento/Quote/Setup/InstallSchema.php +++ b/app/code/Magento/Quote/Setup/InstallSchema.php @@ -644,25 +644,25 @@ class InstallSchema implements InstallSchemaInterface \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Hidden Tax Amount' + 'Discount Tax Compensation Amount' )->addColumn( 'base_discount_tax_compensation_amount', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Base Hidden Tax Amount' + 'Base Discount Tax Compensation Amount' )->addColumn( 'shipping_discount_tax_compensation_amount', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Shipping Hidden Tax Amount' + 'Shipping Discount Tax Compensation Amount' )->addColumn( 'base_shipping_discount_tax_compensation_amnt', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Base Shipping Hidden Tax Amount' + 'Base Shipping Discount Tax Compensation Amount' )->addColumn( 'shipping_incl_tax', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, @@ -939,13 +939,13 @@ class InstallSchema implements InstallSchemaInterface \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Hidden Tax Amount' + 'Discount Tax Compensation Amount' )->addColumn( 'base_discount_tax_compensation_amount', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Base Hidden Tax Amount' + 'Base Discount Tax Compensation Amount' )->addIndex( $installer->getIdxName('quote_item', ['parent_item_id']), ['parent_item_id'] @@ -1213,13 +1213,13 @@ class InstallSchema implements InstallSchemaInterface \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Hidden Tax Amount' + 'Discount Tax Compensation Amount' )->addColumn( 'base_discount_tax_compensation_amount', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Base Hidden Tax Amount' + 'Base Discount Tax Compensation Amount' )->addIndex( $installer->getIdxName('quote_address_item', ['quote_address_id']), ['quote_address_id'] diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php index 77408f92891..1f38fca2a63 100644 --- a/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php +++ b/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php @@ -185,19 +185,19 @@ interface CreditmemoInterface extends \Magento\Framework\Api\ExtensibleDataInter */ const UPDATED_AT = 'updated_at'; /* - * Hidden tax amount. + * Discount tax compensation amount. */ const DISCOUNT_TAX_COMPENSATION_AMOUNT = 'discount_tax_compensation_amount'; /* - * Base hidden tax amount. + * Base discount tax compensation amount. */ const BASE_DISCOUNT_TAX_COMPENSATION_AMOUNT = 'base_discount_tax_compensation_amount'; /* - * Shipping hidden tax amount. + * Shipping discount tax compensation amount. */ const SHIPPING_DISCOUNT_TAX_COMPENSATION_AMOUNT = 'shipping_discount_tax_compensation_amount'; /* - * Base shipping hidden tax amount. + * Base shipping discount tax compensation amount. */ const BASE_SHIPPING_DISCOUNT_TAX_COMPENSATION_AMNT = 'base_shipping_discount_tax_compensation_amnt'; /* @@ -301,9 +301,9 @@ interface CreditmemoInterface extends \Magento\Framework\Api\ExtensibleDataInter public function getBaseGrandTotal(); /** - * Gets the credit memo base hidden tax amount. + * Gets the credit memo base discount tax compensation amount. * - * @return float Credit memo base hidden tax amount. + * @return float Credit memo base discount tax compensation amount. */ public function getBaseDiscountTaxCompensationAmount(); @@ -315,9 +315,9 @@ interface CreditmemoInterface extends \Magento\Framework\Api\ExtensibleDataInter public function getBaseShippingAmount(); /** - * Gets the credit memo base shipping hidden tax amount. + * Gets the credit memo base shipping discount tax compensation amount. * - * @return float Credit memo base shipping hidden tax amount. + * @return float Credit memo base shipping discount tax compensation amount. */ public function getBaseShippingDiscountTaxCompensationAmnt(); @@ -450,9 +450,9 @@ interface CreditmemoInterface extends \Magento\Framework\Api\ExtensibleDataInter public function getGrandTotal(); /** - * Gets the credit memo hidden tax amount. + * Gets the credit memo discount tax compensation amount. * - * @return float Credit memo hidden tax amount. + * @return float Credit memo discount tax compensation amount. */ public function getDiscountTaxCompensationAmount(); @@ -498,9 +498,9 @@ interface CreditmemoInterface extends \Magento\Framework\Api\ExtensibleDataInter public function getShippingAmount(); /** - * Gets the credit memo shipping hidden tax amount. + * Gets the credit memo shipping discount tax compensation amount. * - * @return float Credit memo shipping hidden tax amount. + * @return float Credit memo shipping discount tax compensation amount. */ public function getShippingDiscountTaxCompensationAmount(); @@ -915,7 +915,7 @@ interface CreditmemoInterface extends \Magento\Framework\Api\ExtensibleDataInter public function setUpdatedAt($timestamp); /** - * Sets the credit memo hidden tax amount. + * Sets the credit memo discount tax compensation amount. * * @param float $amount * @return $this @@ -923,7 +923,7 @@ interface CreditmemoInterface extends \Magento\Framework\Api\ExtensibleDataInter public function setDiscountTaxCompensationAmount($amount); /** - * Sets the credit memo base hidden tax amount. + * Sets the credit memo base discount tax compensation amount. * * @param float $amount * @return $this @@ -931,7 +931,7 @@ interface CreditmemoInterface extends \Magento\Framework\Api\ExtensibleDataInter public function setBaseDiscountTaxCompensationAmount($amount); /** - * Sets the credit memo shipping hidden tax amount. + * Sets the credit memo shipping discount tax compensation amount. * * @param float $amount * @return $this @@ -939,7 +939,7 @@ interface CreditmemoInterface extends \Magento\Framework\Api\ExtensibleDataInter public function setShippingDiscountTaxCompensationAmount($amount); /** - * Sets the credit memo base shipping hidden tax amount. + * Sets the credit memo base shipping discount tax compensation amount. * * @param float $amnt * @return $this diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoItemInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoItemInterface.php index 7669d679ec4..d9f8997ba52 100644 --- a/app/code/Magento/Sales/Api/Data/CreditmemoItemInterface.php +++ b/app/code/Magento/Sales/Api/Data/CreditmemoItemInterface.php @@ -107,11 +107,11 @@ interface CreditmemoItemInterface extends \Magento\Framework\Api\ExtensibleDataI */ const NAME = 'name'; /* - * Hidden tax amount. + * Discount tax compensation amount. */ const DISCOUNT_TAX_COMPENSATION_AMOUNT = 'discount_tax_compensation_amount'; /* - * Base hidden tax amount. + * Base discount tax compensation amount. */ const BASE_DISCOUNT_TAX_COMPENSATION_AMOUNT = 'base_discount_tax_compensation_amount'; /* @@ -173,7 +173,7 @@ interface CreditmemoItemInterface extends \Magento\Framework\Api\ExtensibleDataI public function getBaseDiscountAmount(); /** - * Gets the base hidden tax amount for a credit memo item. + * Gets the base discount tax compensation amount for a credit memo item. * * @return float */ @@ -272,9 +272,9 @@ interface CreditmemoItemInterface extends \Magento\Framework\Api\ExtensibleDataI public function setEntityId($entityId); /** - * Gets the hidden tax amount for a credit memo item. + * Gets the discount tax compensation amount for a credit memo item. * - * @return float Hidden tax amount. + * @return float Discount tax compensation amount. */ public function getDiscountTaxCompensationAmount(); @@ -559,7 +559,7 @@ interface CreditmemoItemInterface extends \Magento\Framework\Api\ExtensibleDataI public function setName($name); /** - * Sets the hidden tax amount for a credit memo item. + * Sets the discount tax compensation amount for a credit memo item. * * @param float $amount * @return $this @@ -567,7 +567,7 @@ interface CreditmemoItemInterface extends \Magento\Framework\Api\ExtensibleDataI public function setDiscountTaxCompensationAmount($amount); /** - * Sets the base hidden tax amount for a credit memo item. + * Sets the base discount tax compensation amount for a credit memo item. * * @param float $amount * @return $this diff --git a/app/code/Magento/Sales/Api/Data/InvoiceInterface.php b/app/code/Magento/Sales/Api/Data/InvoiceInterface.php index c00a1213648..2b595e3d956 100644 --- a/app/code/Magento/Sales/Api/Data/InvoiceInterface.php +++ b/app/code/Magento/Sales/Api/Data/InvoiceInterface.php @@ -160,19 +160,19 @@ interface InvoiceInterface extends \Magento\Framework\Api\ExtensibleDataInterfac */ const UPDATED_AT = 'updated_at'; /* - * Hidden tax amount. + * Discount tax compensation amount. */ const DISCOUNT_TAX_COMPENSATION_AMOUNT = 'discount_tax_compensation_amount'; /* - * Base hidden tax amount. + * Base discount tax compensation amount. */ const BASE_DISCOUNT_TAX_COMPENSATION_AMOUNT = 'base_discount_tax_compensation_amount'; /* - * Shipping hidden tax amount. + * Shipping discount tax compensation amount. */ const SHIPPING_DISCOUNT_TAX_COMPENSATION_AMOUNT = 'shipping_discount_tax_compensation_amount'; /* - * Base shipping hidden tax amount. + * Base shipping discount tax compensation amount. */ const BASE_SHIPPING_DISCOUNT_TAX_COMPENSATION_AMNT = 'base_shipping_discount_tax_compensation_amnt'; /* @@ -222,9 +222,9 @@ interface InvoiceInterface extends \Magento\Framework\Api\ExtensibleDataInterfac public function getBaseGrandTotal(); /** - * Gets the base hidden tax amount for the invoice. + * Gets the base discount tax compensation amount for the invoice. * - * @return float Base hidden tax amount. + * @return float Base discount tax compensation amount. */ public function getBaseDiscountTaxCompensationAmount(); @@ -236,9 +236,9 @@ interface InvoiceInterface extends \Magento\Framework\Api\ExtensibleDataInterfac public function getBaseShippingAmount(); /** - * Gets the base shipping hidden tax amount for the invoice. + * Gets the base shipping discount tax compensation amount for the invoice. * - * @return float Base shipping hidden tax amount. + * @return float Base shipping discount tax compensation amount. */ public function getBaseShippingDiscountTaxCompensationAmnt(); @@ -378,9 +378,9 @@ interface InvoiceInterface extends \Magento\Framework\Api\ExtensibleDataInterfac public function getGrandTotal(); /** - * Gets the hidden tax amount for the invoice. + * Gets the discount tax compensation amount for the invoice. * - * @return float Hidden tax amount. + * @return float Discount tax compensation amount. */ public function getDiscountTaxCompensationAmount(); @@ -427,9 +427,9 @@ interface InvoiceInterface extends \Magento\Framework\Api\ExtensibleDataInterfac public function getShippingAmount(); /** - * Gets the shipping hidden tax amount for the invoice. + * Gets the shipping discount tax compensation amount for the invoice. * - * @return float Shipping hidden tax amount. + * @return float Shipping discount tax compensation amount. */ public function getShippingDiscountTaxCompensationAmount(); @@ -827,7 +827,7 @@ interface InvoiceInterface extends \Magento\Framework\Api\ExtensibleDataInterfac public function setIncrementId($id); /** - * Sets the hidden tax amount for the invoice. + * Sets the discount tax compensation amount for the invoice. * * @param float $amount * @return $this @@ -835,7 +835,7 @@ interface InvoiceInterface extends \Magento\Framework\Api\ExtensibleDataInterfac public function setDiscountTaxCompensationAmount($amount); /** - * Sets the base hidden tax amount for the invoice. + * Sets the base discount tax compensation amount for the invoice. * * @param float $amount * @return $this @@ -843,7 +843,7 @@ interface InvoiceInterface extends \Magento\Framework\Api\ExtensibleDataInterfac public function setBaseDiscountTaxCompensationAmount($amount); /** - * Sets the shipping hidden tax amount for the invoice. + * Sets the shipping discount tax compensation amount for the invoice. * * @param float $amount * @return $this @@ -851,7 +851,7 @@ interface InvoiceInterface extends \Magento\Framework\Api\ExtensibleDataInterfac public function setShippingDiscountTaxCompensationAmount($amount); /** - * Sets the base shipping hidden tax amount for the invoice. + * Sets the base shipping discount tax compensation amount for the invoice. * * @param float $amnt * @return $this diff --git a/app/code/Magento/Sales/Api/Data/InvoiceItemInterface.php b/app/code/Magento/Sales/Api/Data/InvoiceItemInterface.php index c12e1d0c827..439300f94c4 100644 --- a/app/code/Magento/Sales/Api/Data/InvoiceItemInterface.php +++ b/app/code/Magento/Sales/Api/Data/InvoiceItemInterface.php @@ -104,11 +104,11 @@ interface InvoiceItemInterface extends \Magento\Framework\Api\ExtensibleDataInte */ const NAME = 'name'; /* - * Hidden tax amount. + * Discount tax compensation amount. */ const DISCOUNT_TAX_COMPENSATION_AMOUNT = 'discount_tax_compensation_amount'; /* - * Base hidden tax amount. + * Base discount tax compensation amount. */ const BASE_DISCOUNT_TAX_COMPENSATION_AMOUNT = 'base_discount_tax_compensation_amount'; @@ -134,9 +134,9 @@ interface InvoiceItemInterface extends \Magento\Framework\Api\ExtensibleDataInte public function getBaseDiscountAmount(); /** - * Gets the base hidden tax amount for the invoice item. + * Gets the base discount tax compensation amount for the invoice item. * - * @return float Base hidden tax amount. + * @return float Base discount tax compensation amount. */ public function getBaseDiscountTaxCompensationAmount(); @@ -205,9 +205,9 @@ interface InvoiceItemInterface extends \Magento\Framework\Api\ExtensibleDataInte public function setEntityId($entityId); /** - * Gets the hidden tax amount for the invoice item. + * Gets the discount tax compensation amount for the invoice item. * - * @return float Hidden tax amount. + * @return float Discount tax compensation amount. */ public function getDiscountTaxCompensationAmount(); @@ -457,7 +457,7 @@ interface InvoiceItemInterface extends \Magento\Framework\Api\ExtensibleDataInte public function setName($name); /** - * Sets the hidden tax amount for the invoice item. + * Sets the discount tax compensation amount for the invoice item. * * @param float $amount * @return $this @@ -465,7 +465,7 @@ interface InvoiceItemInterface extends \Magento\Framework\Api\ExtensibleDataInte public function setDiscountTaxCompensationAmount($amount); /** - * Sets the base hidden tax amount for the invoice item. + * Sets the base discount tax compensation amount for the invoice item. * * @param float $amount * @return $this diff --git a/app/code/Magento/Sales/Api/Data/OrderInterface.php b/app/code/Magento/Sales/Api/Data/OrderInterface.php index cba660f3964..71f24533e7d 100644 --- a/app/code/Magento/Sales/Api/Data/OrderInterface.php +++ b/app/code/Magento/Sales/Api/Data/OrderInterface.php @@ -514,35 +514,35 @@ interface OrderInterface extends \Magento\Framework\Api\ExtensibleDataInterface */ const CUSTOMER_GENDER = 'customer_gender'; /* - * Hidden tax amount. + * Discount tax compensation amount. */ const DISCOUNT_TAX_COMPENSATION_AMOUNT = 'discount_tax_compensation_amount'; /* - * Base hidden tax amount. + * Base discount tax compensation amount. */ const BASE_DISCOUNT_TAX_COMPENSATION_AMOUNT = 'base_discount_tax_compensation_amount'; /* - * Shipping hidden tax amount. + * Shipping discount tax compensation amount. */ const SHIPPING_DISCOUNT_TAX_COMPENSATION_AMOUNT = 'shipping_discount_tax_compensation_amount'; /* - * Base shipping hidden tax amount. + * Base shipping discount tax compensation amount. */ const BASE_SHIPPING_DISCOUNT_TAX_COMPENSATION_AMNT = 'base_shipping_discount_tax_compensation_amnt'; /* - * Hidden tax invoiced. + * Discount tax compensation invoiced. */ const DISCOUNT_TAX_COMPENSATION_INVOICED = 'discount_tax_compensation_invoiced'; /* - * Base hidden tax invoiced. + * Base discount tax compensation invoiced. */ const BASE_DISCOUNT_TAX_COMPENSATION_INVOICED = 'base_discount_tax_compensation_invoiced'; /* - * Hidden tax refunded. + * Discount tax compensation refunded. */ const DISCOUNT_TAX_COMPENSATION_REFUNDED = 'discount_tax_compensation_refunded'; /* - * Base hidden tax refunded. + * Base discount tax compensation refunded. */ const BASE_DISCOUNT_TAX_COMPENSATION_REFUNDED = 'base_discount_tax_compensation_refunded'; /* @@ -656,23 +656,23 @@ interface OrderInterface extends \Magento\Framework\Api\ExtensibleDataInterface public function getBaseGrandTotal(); /** - * Gets the base hidden tax amount for the order. + * Gets the base discount tax compensation amount for the order. * - * @return float Base hidden tax amount. + * @return float Base discount tax compensation amount. */ public function getBaseDiscountTaxCompensationAmount(); /** - * Gets the base hidden tax invoiced amount for the order. + * Gets the base discount tax compensation invoiced amount for the order. * - * @return float Base hidden tax invoiced. + * @return float Base discount tax compensation invoiced. */ public function getBaseDiscountTaxCompensationInvoiced(); /** - * Gets the base hidden tax refunded amount for the order. + * Gets the base discount tax compensation refunded amount for the order. * - * @return float Base hidden tax refunded. + * @return float Base discount tax compensation refunded. */ public function getBaseDiscountTaxCompensationRefunded(); @@ -698,9 +698,9 @@ interface OrderInterface extends \Magento\Framework\Api\ExtensibleDataInterface public function getBaseShippingDiscountAmount(); /** - * Gets the base shipping hidden tax amount for the order. + * Gets the base shipping discount tax compensation amount for the order. * - * @return float Base shipping hidden tax amount. + * @return float Base shipping discount tax compensation amount. */ public function getBaseShippingDiscountTaxCompensationAmnt(); @@ -1120,23 +1120,23 @@ interface OrderInterface extends \Magento\Framework\Api\ExtensibleDataInterface public function getGrandTotal(); /** - * Gets the hidden tax amount for the order. + * Gets the discount tax compensation amount for the order. * - * @return float Hidden tax amount. + * @return float Discount tax compensation amount. */ public function getDiscountTaxCompensationAmount(); /** - * Gets the hidden tax invoiced amount for the order. + * Gets the discount tax compensation invoiced amount for the order. * - * @return float Hidden tax invoiced amount. + * @return float Discount tax compensation invoiced amount. */ public function getDiscountTaxCompensationInvoiced(); /** - * Gets the hidden tax refunded amount for the order. + * Gets the discount tax compensation refunded amount for the order. * - * @return float Hidden tax refunded amount. + * @return float Discount tax compensation refunded amount. */ public function getDiscountTaxCompensationRefunded(); @@ -1288,9 +1288,9 @@ interface OrderInterface extends \Magento\Framework\Api\ExtensibleDataInterface public function getShippingDiscountAmount(); /** - * Gets the shipping hidden tax amount for the order. + * Gets the shipping discount tax compensation amount for the order. * - * @return float Shipping hidden tax amount. + * @return float Shipping discount tax compensation amount. */ public function getShippingDiscountTaxCompensationAmount(); @@ -2602,7 +2602,7 @@ interface OrderInterface extends \Magento\Framework\Api\ExtensibleDataInterface public function setCustomerGender($customerGender); /** - * Sets the hidden tax amount for the order. + * Sets the discount tax compensation amount for the order. * * @param float $amount * @return $this @@ -2610,7 +2610,7 @@ interface OrderInterface extends \Magento\Framework\Api\ExtensibleDataInterface public function setDiscountTaxCompensationAmount($amount); /** - * Sets the base hidden tax amount for the order. + * Sets the base discount tax compensation amount for the order. * * @param float $amount * @return $this @@ -2618,7 +2618,7 @@ interface OrderInterface extends \Magento\Framework\Api\ExtensibleDataInterface public function setBaseDiscountTaxCompensationAmount($amount); /** - * Sets the shipping hidden tax amount for the order. + * Sets the shipping discount tax compensation amount for the order. * * @param float $amount * @return $this @@ -2626,7 +2626,7 @@ interface OrderInterface extends \Magento\Framework\Api\ExtensibleDataInterface public function setShippingDiscountTaxCompensationAmount($amount); /** - * Sets the base shipping hidden tax amount for the order. + * Sets the base shipping discount tax compensation amount for the order. * * @param float $amnt * @return $this @@ -2634,7 +2634,7 @@ interface OrderInterface extends \Magento\Framework\Api\ExtensibleDataInterface public function setBaseShippingDiscountTaxCompensationAmnt($amnt); /** - * Sets the hidden tax invoiced amount for the order. + * Sets the discount tax compensation invoiced amount for the order. * * @param float $discountTaxCompensationInvoiced * @return $this @@ -2642,7 +2642,7 @@ interface OrderInterface extends \Magento\Framework\Api\ExtensibleDataInterface public function setDiscountTaxCompensationInvoiced($discountTaxCompensationInvoiced); /** - * Sets the base hidden tax invoiced amount for the order. + * Sets the base discount tax compensation invoiced amount for the order. * * @param float $baseDiscountTaxCompensationInvoiced * @return $this @@ -2650,7 +2650,7 @@ interface OrderInterface extends \Magento\Framework\Api\ExtensibleDataInterface public function setBaseDiscountTaxCompensationInvoiced($baseDiscountTaxCompensationInvoiced); /** - * Sets the hidden tax refunded amount for the order. + * Sets the discount tax compensation refunded amount for the order. * * @param float $discountTaxCompensationRefunded * @return $this @@ -2658,7 +2658,7 @@ interface OrderInterface extends \Magento\Framework\Api\ExtensibleDataInterface public function setDiscountTaxCompensationRefunded($discountTaxCompensationRefunded); /** - * Sets the base hidden tax refunded amount for the order. + * Sets the base discount tax compensation refunded amount for the order. * * @param float $baseDiscountTaxCompensationRefunded * @return $this diff --git a/app/code/Magento/Sales/Api/Data/OrderItemInterface.php b/app/code/Magento/Sales/Api/Data/OrderItemInterface.php index 4b8e2c4851d..91e7f173b59 100644 --- a/app/code/Magento/Sales/Api/Data/OrderItemInterface.php +++ b/app/code/Magento/Sales/Api/Data/OrderItemInterface.php @@ -242,27 +242,27 @@ interface OrderItemInterface extends \Magento\Framework\Api\ExtensibleDataInterf */ const BASE_ROW_TOTAL_INCL_TAX = 'base_row_total_incl_tax'; /* - * Hidden tax amount. + * Discount tax compensation amount. */ const DISCOUNT_TAX_COMPENSATION_AMOUNT = 'discount_tax_compensation_amount'; /* - * Base hidden tax amount. + * Base discount tax compensation amount. */ const BASE_DISCOUNT_TAX_COMPENSATION_AMOUNT = 'base_discount_tax_compensation_amount'; /* - * Hidden tax invoiced. + * Discount tax compensation invoiced. */ const DISCOUNT_TAX_COMPENSATION_INVOICED = 'discount_tax_compensation_invoiced'; /* - * Base hidden tax invoiced. + * Base discount tax compensation invoiced. */ const BASE_DISCOUNT_TAX_COMPENSATION_INVOICED = 'base_discount_tax_compensation_invoiced'; /* - * Hidden tax refunded. + * Discount tax compensation refunded. */ const DISCOUNT_TAX_COMPENSATION_REFUNDED = 'discount_tax_compensation_refunded'; /* - * Base hidden tax refunded. + * Base discount tax compensation refunded. */ const BASE_DISCOUNT_TAX_COMPENSATION_REFUNDED = 'base_discount_tax_compensation_refunded'; /* @@ -453,23 +453,23 @@ interface OrderItemInterface extends \Magento\Framework\Api\ExtensibleDataInterf public function getBaseDiscountRefunded(); /** - * Gets the base hidden tax amount for the order item. + * Gets the base discount tax compensation amount for the order item. * - * @return float Base hidden tax amount. + * @return float Base discount tax compensation amount. */ public function getBaseDiscountTaxCompensationAmount(); /** - * Gets the base hidden tax invoiced for the order item. + * Gets the base discount tax compensation invoiced for the order item. * - * @return float Base hidden tax invoiced. + * @return float Base discount tax compensation invoiced. */ public function getBaseDiscountTaxCompensationInvoiced(); /** - * Gets the base hidden tax refunded for the order item. + * Gets the base discount tax compensation refunded for the order item. * - * @return float Base hidden tax refunded. + * @return float Base discount tax compensation refunded. */ public function getBaseDiscountTaxCompensationRefunded(); @@ -734,30 +734,30 @@ interface OrderItemInterface extends \Magento\Framework\Api\ExtensibleDataInterf public function getGwTaxAmountRefunded(); /** - * Gets the hidden tax amount for the order item. + * Gets the discount tax compensation amount for the order item. * - * @return float Hidden tax amount. + * @return float Discount tax compensation amount. */ public function getDiscountTaxCompensationAmount(); /** - * Gets the hidden tax canceled for the order item. + * Gets the discount tax compensation canceled for the order item. * - * @return float Hidden tax canceled. + * @return float Discount tax compensation canceled. */ public function getDiscountTaxCompensationCanceled(); /** - * Gets the hidden tax invoiced for the order item. + * Gets the discount tax compensation invoiced for the order item. * - * @return float Hidden tax invoiced. + * @return float Discount tax compensation invoiced. */ public function getDiscountTaxCompensationInvoiced(); /** - * Gets the hidden tax refunded for the order item. + * Gets the discount tax compensation refunded for the order item. * - * @return float Hidden tax refunded. + * @return float Discount tax compensation refunded. */ public function getDiscountTaxCompensationRefunded(); @@ -1511,7 +1511,7 @@ interface OrderItemInterface extends \Magento\Framework\Api\ExtensibleDataInterf public function setBaseRowTotalInclTax($amount); /** - * Sets the hidden tax amount for the order item. + * Sets the discount tax compensation amount for the order item. * * @param float $amount * @return $this @@ -1519,7 +1519,7 @@ interface OrderItemInterface extends \Magento\Framework\Api\ExtensibleDataInterf public function setDiscountTaxCompensationAmount($amount); /** - * Sets the base hidden tax amount for the order item. + * Sets the base discount tax compensation amount for the order item. * * @param float $amount * @return $this @@ -1527,7 +1527,7 @@ interface OrderItemInterface extends \Magento\Framework\Api\ExtensibleDataInterf public function setBaseDiscountTaxCompensationAmount($amount); /** - * Sets the hidden tax invoiced for the order item. + * Sets the discount tax compensation invoiced for the order item. * * @param float $discountTaxCompensationInvoiced * @return $this @@ -1535,7 +1535,7 @@ interface OrderItemInterface extends \Magento\Framework\Api\ExtensibleDataInterf public function setDiscountTaxCompensationInvoiced($discountTaxCompensationInvoiced); /** - * Sets the base hidden tax invoiced for the order item. + * Sets the base discount tax compensation invoiced for the order item. * * @param float $baseDiscountTaxCompensationInvoiced * @return $this @@ -1543,7 +1543,7 @@ interface OrderItemInterface extends \Magento\Framework\Api\ExtensibleDataInterf public function setBaseDiscountTaxCompensationInvoiced($baseDiscountTaxCompensationInvoiced); /** - * Sets the hidden tax refunded for the order item. + * Sets the discount tax compensation refunded for the order item. * * @param float $discountTaxCompensationRefunded * @return $this @@ -1551,7 +1551,7 @@ interface OrderItemInterface extends \Magento\Framework\Api\ExtensibleDataInterf public function setDiscountTaxCompensationRefunded($discountTaxCompensationRefunded); /** - * Sets the base hidden tax refunded for the order item. + * Sets the base discount tax compensation refunded for the order item. * * @param float $baseDiscountTaxCompensationRefunded * @return $this @@ -1567,7 +1567,7 @@ interface OrderItemInterface extends \Magento\Framework\Api\ExtensibleDataInterf public function setTaxCanceled($taxCanceled); /** - * Sets the hidden tax canceled for the order item. + * Sets the discount tax compensation canceled for the order item. * * @param float $discountTaxCompensationCanceled * @return $this diff --git a/app/code/Magento/Sales/Setup/InstallSchema.php b/app/code/Magento/Sales/Setup/InstallSchema.php index 09351ad634e..3348679b847 100644 --- a/app/code/Magento/Sales/Setup/InstallSchema.php +++ b/app/code/Magento/Sales/Setup/InstallSchema.php @@ -778,49 +778,49 @@ class InstallSchema implements InstallSchemaInterface \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Hidden Tax Amount' + 'Discount Tax Compensation Amount' )->addColumn( 'base_discount_tax_compensation_amount', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Base Hidden Tax Amount' + 'Base Discount Tax Compensation Amount' )->addColumn( 'shipping_discount_tax_compensation_amount', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Shipping Hidden Tax Amount' + 'Shipping Discount Tax Compensation Amount' )->addColumn( 'base_shipping_discount_tax_compensation_amnt', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Base Shipping Hidden Tax Amount' + 'Base Shipping Discount Tax Compensation Amount' )->addColumn( 'discount_tax_compensation_invoiced', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Hidden Tax Invoiced' + 'Discount Tax Compensation Invoiced' )->addColumn( 'base_discount_tax_compensation_invoiced', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Base Hidden Tax Invoiced' + 'Base Discount Tax Compensation Invoiced' )->addColumn( 'discount_tax_compensation_refunded', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Hidden Tax Refunded' + 'Discount Tax Compensation Refunded' )->addColumn( 'base_discount_tax_compensation_refunded', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Base Hidden Tax Refunded' + 'Base Discount Tax Compensation Refunded' )->addColumn( 'shipping_incl_tax', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, @@ -1615,37 +1615,37 @@ class InstallSchema implements InstallSchemaInterface \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Hidden Tax Amount' + 'Discount Tax Compensation Amount' )->addColumn( 'base_discount_tax_compensation_amount', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Base Hidden Tax Amount' + 'Base Discount Tax Compensation Amount' )->addColumn( 'discount_tax_compensation_invoiced', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Hidden Tax Invoiced' + 'Discount Tax Compensation Invoiced' )->addColumn( 'base_discount_tax_compensation_invoiced', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Base Hidden Tax Invoiced' + 'Base Discount Tax Compensation Invoiced' )->addColumn( 'discount_tax_compensation_refunded', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Hidden Tax Refunded' + 'Discount Tax Compensation Refunded' )->addColumn( 'base_discount_tax_compensation_refunded', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Base Hidden Tax Refunded' + 'Base Discount Tax Compensation Refunded' )->addColumn( 'tax_canceled', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, @@ -1657,7 +1657,7 @@ class InstallSchema implements InstallSchemaInterface \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Hidden Tax Canceled' + 'Discount Tax Compensation Canceled' )->addColumn( 'tax_refunded', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, @@ -2763,25 +2763,25 @@ class InstallSchema implements InstallSchemaInterface \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Hidden Tax Amount' + 'Discount Tax Compensation Amount' )->addColumn( 'base_discount_tax_compensation_amount', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Base Hidden Tax Amount' + 'Base Discount Tax Compensation Amount' )->addColumn( 'shipping_discount_tax_compensation_amount', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Shipping Hidden Tax Amount' + 'Shipping Discount Tax Compensation Amount' )->addColumn( 'base_shipping_discount_tax_compensation_amnt', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Base Shipping Hidden Tax Amount' + 'Base Shipping Discount Tax Compensation Amount' )->addColumn( 'shipping_incl_tax', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, @@ -3132,13 +3132,13 @@ class InstallSchema implements InstallSchemaInterface \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Hidden Tax Amount' + 'Discount Tax Compensation Amount' )->addColumn( 'base_discount_tax_compensation_amount', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Base Hidden Tax Amount' + 'Base Discount Tax Compensation Amount' )->addColumn( 'tax_ratio', \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, @@ -3473,25 +3473,25 @@ class InstallSchema implements InstallSchemaInterface \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Hidden Tax Amount' + 'Discount Tax Compensation Amount' )->addColumn( 'base_discount_tax_compensation_amount', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Base Hidden Tax Amount' + 'Base Discount Tax Compensation Amount' )->addColumn( 'shipping_discount_tax_compensation_amount', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Shipping Hidden Tax Amount' + 'Shipping Discount Tax Compensation Amount' )->addColumn( 'base_shipping_discount_tax_compensation_amnt', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Base Shipping Hidden Tax Amount' + 'Base Shipping Discount Tax Compensation Amount' )->addColumn( 'shipping_incl_tax', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, @@ -3878,13 +3878,13 @@ class InstallSchema implements InstallSchemaInterface \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Hidden Tax Amount' + 'Discount Tax Compensation Amount' )->addColumn( 'base_discount_tax_compensation_amount', \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4', [], - 'Base Hidden Tax Amount' + 'Base Discount Tax Compensation Amount' )->addColumn( 'tax_ratio', \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php index 44c833c69c2..e4a36e24263 100644 --- a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php +++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php @@ -378,7 +378,7 @@ class TaxTest extends \PHPUnit_Framework_TestCase ]; // scenario 4: 3 items, 2 invoiced, price includes tax - // partial credit memo, make sure that hidden tax is calculated correctly + // partial credit memo, make sure that discount tax compensation is calculated correctly $result['partial_invoice_partial_creditmemo_price_incl_tax'] = [ 'order_data' => [ 'data_fields' => [ diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php index ea410863372..00ba67b0d11 100644 --- a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php +++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php @@ -39,7 +39,7 @@ class Tax extends CommonTaxCollector protected $_config; /** - * Hidden taxes array + * Discount tax compensationes array * * @var array */ -- GitLab