MC-20244: Pricing :: FPT calculation

- removing display settings form resolver
- fixing a bug with the old weee schema

Author: cpartica

app/code/Magento/WeeeGraphQl/Model/Resolver/FptResolver.php

@@ -14,6 +14,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Tax\Helper\Data as TaxHelper;
 use Magento\Store\Api\Data\StoreInterface;
+use Magento\Tax\Model\Config;
 
 class FptResolver implements ResolverInterface
 {
@@ -58,21 +59,15 @@ public function resolve(
         /** @var StoreInterface $store */
         $store = $context->getExtensionAttributes()->getStore();
 
-
-        if (!$this->weeeHelper->isEnabled($store)) {
-            return $fptArray;
-        }
-
-
-        if ($this->weeeHelper->isDisplayInclDesc($store) || $this->weeeHelper->isDisplayExclDescIncl($store)) {
+        if ($this->weeeHelper->isEnabled($store)) {
             $attributes = $this->weeeHelper->getProductWeeeAttributesForDisplay($product);
             foreach ($attributes as $attribute) {
                 $displayInclTaxes = $this->taxHelper->getPriceDisplayType($store);
                 $amount = $attribute->getData('amount');
                 //add display mode for WEE to not return WEE if excluded
-                if ($displayInclTaxes === 1) {
+                if ($displayInclTaxes === Config::DISPLAY_TYPE_EXCLUDING_TAX) {
                     $amount = $attribute->getData('amount_excl_tax');
-                } elseif ($displayInclTaxes === 2) {
+                } elseif ($displayInclTaxes === Config::DISPLAY_TYPE_INCLUDING_TAX) {
                     $amount = $attribute->getData('amount_excl_tax') + $attribute->getData('tax_amount');
                 }
                 $fptArray[] = [
@@ -84,6 +79,7 @@ public function resolve(
                 ];
             }
         }
+
         return $fptArray;
     }
 }

app/code/Magento/WeeeGraphQl/composer.json

@@ -7,6 +7,7 @@
         "magento/framework": "*"
     },
     "suggest": {
+        "magento/module-tax": "*",
         "magento/module-weee": "*",
         "magento/module-catalog-graph-ql": "*"
     },

app/code/Magento/WeeeGraphQl/etc/schema.graphqls

@@ -3,7 +3,7 @@
 
 enum PriceAdjustmentCodesEnum {
     WEEE
-    WEEETAX
+    WEEE_TAX
 }
 
 type ProductPrice {