Skip to content

fix(commerce_pos): support inclusive tax #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wilderuncat wants to merge 2 commits into from
Closed

fix(commerce_pos): support inclusive tax #22

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4c316f
fix(commerce_pos): support inclusive tax
Mar 31, 2017
ef57abe
fix(commerce_pos): adjust the amount by the inclusive tax rates
Apr 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 48 additions & 17 deletions classes/CommercePosTransactionBaseActions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,23 +185,25 @@ public function addProduct($product, $quantity = 1, $combine = TRUE, $price = NU

rules_invoke_event('commerce_product_calculate_sell_price', $line_item);

$amount = $price ? $price : $line_item_wrapper->commerce_unit_price->amount->raw();
$currency = $line_item_wrapper->commerce_unit_price->currency_code->raw();

// We "snapshot" the calculated sell price and use it as the line item's
// base price.
$unit_price = array(
'amount' => $amount,
'currency_code' => $currency,
);

$unit_price['data'] = commerce_price_component_add($unit_price, 'base_price', array(
'amount' => $amount,
'currency_code' => $currency,
'data' => array(),
), TRUE, FALSE);

$line_item_wrapper->commerce_unit_price->set($unit_price);
if (!empty($price)) {
$amount = $price;
$currency = $line_item_wrapper->commerce_unit_price->currency_code->raw();

// We "snapshot" the calculated sell price and use it as the line item's
// base price.
$unit_price = array(
'amount' => $amount,
'currency_code' => $currency,
);

$unit_price['data'] = commerce_price_component_add($unit_price, 'base_price', array(
'amount' => $amount,
'currency_code' => $currency,
'data' => array(),
), TRUE, FALSE);

$line_item_wrapper->commerce_unit_price->set($unit_price);
}

if (module_exists('commerce_pricing_attributes')) {
// Hack to prevent the combine logic in addLineItem()
Expand Down Expand Up @@ -269,6 +271,35 @@ public function setLineItemPrice($line_item_id, $price) {
$line_item_wrapper = entity_metadata_wrapper('commerce_line_item', $line_item);
$unit_price = commerce_price_wrapper_value($line_item_wrapper, 'commerce_unit_price', TRUE);

// To make this work properly with inclusive taxes, we need to increase
// the amount they set by the tax rate of all inclusive taxes.
$inclusive_taxes = array();
foreach ($unit_price['data']['components'] as $key => $component) {
// Find tax components based on the tax_rate property the Tax modules
// adds to tax rate component types.
if ($component_type = commerce_price_component_type_load($component['name'])) {
// Ensure the tax rate still exists.
if (!empty($component_type['tax_rate']) &&
$tax_rate = commerce_tax_rate_load($component_type['tax_rate'])
) {
// If this tax is displayed inclusively with product prices, add
// it to an array that we'll calculate in reverse order later.
if ($component['included']) {
$inclusive_taxes[] = $tax_rate;
}
}
}
}

// If this unit price had inclusive taxes...
if (!empty($inclusive_taxes)) {
foreach (array_reverse($inclusive_taxes) as $tax_rate) {
// Update the price by each tax rate.
$price = $price * (1 + $tax_rate['rate']);
$price = commerce_tax_rate_round_amount($tax_rate, $price);
}
}

// Change the base_price.
$unit_price['amount'] = $price;
$unit_price['data']['components'][0]['amount'] = $price;
Expand Down