Skip to content

Commit f804077

Browse files
deepak-soni1deepak-soni1
authored
LYNX-633: Expose Tax Display Settings via GraphQL in a correct way
1 parent dbeef69 commit f804077

File tree

2 files changed

+45
-40
lines changed

2 files changed

+45
-40
lines changed

‎app/code/Magento/SalesGraphQl/etc/schema.graphqls

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -318,19 +318,19 @@ enum OrderActionType @doc(description: "The list of available order actions.") {
318318
}
319319

320320
type StoreConfig {
321-
display_product_prices_in_catalog: Boolean! @doc(description: "Configuration data from tax/display/type")
322-
display_shipping_prices: Boolean! @doc(description: "Configuration data from tax/display/shipping")
323-
orders_invoices_credit_memos_display_price: Boolean! @doc(description: "Configuration data from tax/sales_display/price")
324-
orders_invoices_credit_memos_display_subtotal: Boolean! @doc(description: "Configuration data from tax/sales_display/subtotal")
325-
orders_invoices_credit_memos_display_shipping_amount: Boolean! @doc(description: "Configuration data from tax/sales_display/shipping")
321+
display_product_prices_in_catalog: Int! @doc(description: "Configuration data from tax/display/type")
322+
display_shipping_prices: Int! @doc(description: "Configuration data from tax/display/shipping")
323+
orders_invoices_credit_memos_display_price: Int! @doc(description: "Configuration data from tax/sales_display/price")
324+
orders_invoices_credit_memos_display_subtotal: Int! @doc(description: "Configuration data from tax/sales_display/subtotal")
325+
orders_invoices_credit_memos_display_shipping_amount: Int! @doc(description: "Configuration data from tax/sales_display/shipping")
326326
orders_invoices_credit_memos_display_grandtotal: Boolean! @doc(description: "Configuration data from tax/sales_display/grandtotal")
327327
orders_invoices_credit_memos_display_full_summary: Boolean! @doc(description: "Configuration data from tax/sales_display/full_summary")
328328
orders_invoices_credit_memos_display_zero_tax: Boolean! @doc(description: "Configuration data from tax/sales_display/zero_tax")
329329
fixed_product_taxes_enable: Boolean! @doc(description: "Configuration data from tax/weee/enable")
330-
fixed_product_taxes_display_prices_in_product_lists: Int @doc(description: "Configuration data from tax/weee/display_list")
331-
fixed_product_taxes_display_prices_on_product_view_page: Int @doc(description: "Configuration data from tax/weee/display")
332-
fixed_product_taxes_display_prices_in_sales_modules: Int @doc(description: "Configuration data from tax/weee/display_sales")
333-
fixed_product_taxes_display_prices_in_emails: Int @doc(description: "Configuration data from tax/weee/display_email")
330+
fixed_product_taxes_display_prices_in_product_lists: Int! @doc(description: "Configuration data from tax/weee/display_list")
331+
fixed_product_taxes_display_prices_on_product_view_page: Int! @doc(description: "Configuration data from tax/weee/display")
332+
fixed_product_taxes_display_prices_in_sales_modules: Int! @doc(description: "Configuration data from tax/weee/display_sales")
333+
fixed_product_taxes_display_prices_in_emails: Int! @doc(description: "Configuration data from tax/weee/display_email")
334334
fixed_product_taxes_apply_tax_to_fpt: Boolean! @doc(description: "Configuration data from tax/weee/apply_vat")
335335
fixed_product_taxes_include_fpt_in_subtotal: Boolean! @doc(description: "Configuration data from tax/weee/include_in_subtotal")
336336
}

‎dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/SalesTaxStoreConfigTest.php

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,48 +8,53 @@
88
namespace Magento\GraphQl\Sales;
99

1010
use Exception;
11+
use Magento\TestFramework\Fixture\Config;
1112
use Magento\TestFramework\TestCase\GraphQlAbstract;
1213

1314
class SalesTaxStoreConfigTest extends GraphQlAbstract
1415
{
1516
private const CONFIG_KEYS = [
16-
'display_product_prices_in_catalog',
17-
'display_shipping_prices',
18-
'orders_invoices_credit_memos_display_price',
19-
'orders_invoices_credit_memos_display_subtotal',
20-
'orders_invoices_credit_memos_display_shipping_amount',
21-
'orders_invoices_credit_memos_display_grandtotal',
22-
'orders_invoices_credit_memos_display_full_summary',
23-
'orders_invoices_credit_memos_display_zero_tax',
24-
'fixed_product_taxes_enable',
25-
'fixed_product_taxes_display_prices_in_product_lists',
26-
'fixed_product_taxes_display_prices_on_product_view_page',
27-
'fixed_product_taxes_display_prices_in_sales_modules',
28-
'fixed_product_taxes_display_prices_in_emails',
29-
'fixed_product_taxes_apply_tax_to_fpt',
30-
'fixed_product_taxes_include_fpt_in_subtotal',
17+
'display_product_prices_in_catalog' => 1,
18+
'display_shipping_prices' => 2,
19+
'orders_invoices_credit_memos_display_price' => 1,
20+
'orders_invoices_credit_memos_display_subtotal' => 2,
21+
'orders_invoices_credit_memos_display_shipping_amount' => 3,
22+
'orders_invoices_credit_memos_display_grandtotal' => 0,
23+
'orders_invoices_credit_memos_display_full_summary' => 0,
24+
'orders_invoices_credit_memos_display_zero_tax' => 0,
25+
'fixed_product_taxes_enable' => 0,
26+
'fixed_product_taxes_display_prices_in_product_lists' => 1,
27+
'fixed_product_taxes_display_prices_on_product_view_page' => 1,
28+
'fixed_product_taxes_display_prices_in_sales_modules' => 1,
29+
'fixed_product_taxes_display_prices_in_emails' => 1,
30+
'fixed_product_taxes_apply_tax_to_fpt' => 0,
31+
'fixed_product_taxes_include_fpt_in_subtotal' => 0
3132
];
33+
3234
/**
3335
* @throws Exception
3436
*/
35-
public function testSalesTaxStoreConfigExists()
37+
#[
38+
Config('tax/display/type', 1),
39+
Config('tax/display/shipping', 2),
40+
Config('tax/sales_display/price', 1),
41+
Config('tax/sales_display/subtotal', 2),
42+
Config('tax/sales_display/shipping', 3),
43+
Config('tax/sales_display/grandtotal', 0),
44+
Config('tax/sales_display/full_summary', 0),
45+
Config('tax/sales_display/zero_tax', 0),
46+
Config('tax/weee/enable', 0),
47+
Config('tax/weee/display_list', 1),
48+
Config('tax/weee/display', 1),
49+
Config('tax/weee/display_sales', 1),
50+
Config('tax/weee/display_email', 1),
51+
Config('tax/weee/apply_vat', 0),
52+
Config('tax/weee/include_in_subtotal', 0)
53+
]
54+
public function testSalesTaxStoreConfig()
3655
{
3756
$response = $this->graphQlQuery($this->getQuery());
38-
$this->assertArrayHasKey('storeConfig', $response);
39-
$this->assertStoreConfigsExist($response['storeConfig']);
40-
}
41-
42-
/**
43-
* Check if all the added store configs are returned in graphql response
44-
*
45-
* @param array $response
46-
* @return void
47-
*/
48-
private function assertStoreConfigsExist(array $response): void
49-
{
50-
foreach (self::CONFIG_KEYS as $key) {
51-
$this->assertArrayHasKey($key, $response);
52-
}
57+
$this->assertEquals(self::CONFIG_KEYS, $response['storeConfig']);
5358
}
5459

5560
/**

0 commit comments

Comments
 (0)