Skip to content

Commit

Permalink
Merge pull request #479 from trade-tariff/HOTT-1552-remove-multiplier…
Browse files Browse the repository at this point in the history 
…-symbol

HOTT-1552 Exclude multiplier from duty calculation
  • Loading branch information
@jebw
jebw committed May 3, 2022
2 parents 258a3f7 + 378e1ba commit 2a777d4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
2 changes: 0 additions & 2 deletions app/services/expression_evaluators/measure_unit.rb
View file
Expand Up @@ -24,8 +24,6 @@ def calculation_duty_expression
measure.duty_expression.formatted_base
end

expression = "#{expression} * #{quantity_string}"

sanitize(expression, tags: %w[span abbr], attributes: %w[title])
end

Expand Down
8 changes: 4 additions & 4 deletions spec/models/duty_calculator_spec.rb
View file
Expand Up @@ -40,7 +40,7 @@
['Import duty<br><span class="govuk-green govuk-body-xs"> Third-country duty (UK)</span>', '2.70% * £1,260.89', '£34.04'],
['Import duty<br><span class="govuk-green govuk-body-xs"> Additional duties (safeguard) (UK)</span>', '25.00% * £1,260.89', '£315.22'],
['Import duty<br><span class="govuk-green govuk-body-xs"> Additional Duties (UK)</span>', '25.00% * £1,260.89', '£315.22'],
['Import duty (C490)<br><span class="govuk-green govuk-body-xs"> Definitive anti-dumping duty (UK)</span>', '<span>144.10</span> GBP / <abbr title="Tonne">1000 kg/biodiesel</abbr> * 2.00', '£288.20'],
['Import duty (C490)<br><span class="govuk-green govuk-body-xs"> Definitive anti-dumping duty (UK)</span>', '<span>144.10</span> GBP / <abbr title="Tonne">1000 kg/biodiesel</abbr>', '£288.20'],
['VAT <br><span class="govuk-green govuk-body-xs"> Standard rate</span>', '20.00% * £2,213.58', '£442.72'],
['<strong>Duty Total</strong>', nil, '<strong>£1,395.40</strong>'],
],
Expand All @@ -62,7 +62,7 @@
['Import duty<br><span class="govuk-green govuk-body-xs"> Tariff preference (UK)</span>', '0.00% * £1,260.89', '£0.00'],
['Import duty<br><span class="govuk-green govuk-body-xs"> Additional duties (safeguard) (UK)</span>', '25.00% * £1,260.89', '£315.22'],
['Import duty<br><span class="govuk-green govuk-body-xs"> Additional Duties (UK)</span>', '25.00% * £1,260.89', '£315.22'],
['Import duty (C490)<br><span class="govuk-green govuk-body-xs"> Definitive anti-dumping duty (UK)</span>', '<span>144.10</span> GBP / <abbr title="Tonne">1000 kg/biodiesel</abbr> * 2.00', '£288.20'],
['Import duty (C490)<br><span class="govuk-green govuk-body-xs"> Definitive anti-dumping duty (UK)</span>', '<span>144.10</span> GBP / <abbr title="Tonne">1000 kg/biodiesel</abbr>', '£288.20'],
['VAT <br><span class="govuk-green govuk-body-xs"> Standard rate</span>', '20.00% * £2,179.54', '£435.91'],
['<strong>Duty Total</strong>', nil, '<strong>£1,354.55</strong>'],
],
Expand All @@ -84,7 +84,7 @@
['Import duty<br><span class="govuk-green govuk-body-xs"> Non Preferential Quota (UK)</span>', '20.00% * £1,260.89', '£252.18'],
['Import duty<br><span class="govuk-green govuk-body-xs"> Additional duties (safeguard) (UK)</span>', '25.00% * £1,260.89', '£315.22'],
['Import duty<br><span class="govuk-green govuk-body-xs"> Additional Duties (UK)</span>', '25.00% * £1,260.89', '£315.22'],
['Import duty (C490)<br><span class="govuk-green govuk-body-xs"> Definitive anti-dumping duty (UK)</span>', '<span>144.10</span> GBP / <abbr title="Tonne">1000 kg/biodiesel</abbr> * 2.00', '£288.20'],
['Import duty (C490)<br><span class="govuk-green govuk-body-xs"> Definitive anti-dumping duty (UK)</span>', '<span>144.10</span> GBP / <abbr title="Tonne">1000 kg/biodiesel</abbr>', '£288.20'],
['VAT <br><span class="govuk-green govuk-body-xs"> Standard rate</span>', '20.00% * £2,431.71', '£486.34'],
['<strong>Duty Total</strong>', nil, '<strong>£1,657.17</strong>'],
],
Expand All @@ -106,7 +106,7 @@
['Import duty<br><span class="govuk-green govuk-body-xs"> Suspension - goods for certain categories of ships, boats and other vessels and for drilling or production platforms (UK)</span>', '0.00% * £1,260.89', '£0.00'],
['Import duty<br><span class="govuk-green govuk-body-xs"> Additional duties (safeguard) (UK)</span>', '25.00% * £1,260.89', '£315.22'],
['Import duty<br><span class="govuk-green govuk-body-xs"> Additional Duties (UK)</span>', '25.00% * £1,260.89', '£315.22'],
['Import duty (C490)<br><span class="govuk-green govuk-body-xs"> Definitive anti-dumping duty (UK)</span>', '<span>144.10</span> GBP / <abbr title="Tonne">1000 kg/biodiesel</abbr> * 2.00', '£288.20'],
['Import duty (C490)<br><span class="govuk-green govuk-body-xs"> Definitive anti-dumping duty (UK)</span>', '<span>144.10</span> GBP / <abbr title="Tonne">1000 kg/biodiesel</abbr>', '£288.20'],
['VAT <br><span class="govuk-green govuk-body-xs"> Standard rate</span>', '20.00% * £2,179.54', '£435.91'],
['<strong>Duty Total</strong>', nil, '<strong>£1,354.55</strong>'],
],
Expand Down
8 changes: 4 additions & 4 deletions spec/services/expression_evaluators/measure_unit_spec.rb
View file
Expand Up @@ -12,7 +12,7 @@

let(:expected_evaluation) do
{
calculation: '<span>35.10</span> GBP / <abbr title="Hectokilogram">100 kg</abbr> * 1.00',
calculation: '<span>35.10</span> GBP / <abbr title="Hectokilogram">100 kg</abbr>',
formatted_value: '£35.10',
total_quantity: 1.0,
unit: 'kilogrammes',
Expand All @@ -35,7 +35,7 @@

let(:expected_evaluation) do
{
calculation: '<span>35.10</span> EUR / <abbr title="Hectokilogram">100 kg</abbr> * 100.00',
calculation: '<span>35.10</span> EUR / <abbr title="Hectokilogram">100 kg</abbr>',
formatted_value: '£3,008.42',
unit: 'x 100 kg',
total_quantity: 100.0,
Expand All @@ -56,7 +56,7 @@

let(:expected_evaluation) do
{
calculation: '<span>35.10</span> GBP / <abbr title="Hectokilogram">100 kg</abbr> * 100.00',
calculation: '<span>35.10</span> GBP / <abbr title="Hectokilogram">100 kg</abbr>',
value: 3510.0,
formatted_value: '£3,510.00',
unit: 'x 100 kg',
Expand All @@ -77,7 +77,7 @@

let(:expected_evaluation) do
{
calculation: '<span>35.10</span> GBP / <abbr title="Hectokilogram">100 kg</abbr> * 100.00',
calculation: '<span>35.10</span> GBP / <abbr title="Hectokilogram">100 kg</abbr>',
value: 3510.0,
formatted_value: '£3,510.00',
unit: 'x 100 kg',
Expand Down

0 comments on commit 2a777d4

Please sign in to comment.