fix issue with zip based taxes, added functional test

This commit is contained in:
Steffen Mahler 2020-02-08 20:42:32 +01:00
parent 00c43e21de
commit 7dff220da9
3 changed files with 444 additions and 131 deletions

View File

@ -743,10 +743,10 @@ class Cart
*
* @return void
*/
public function calculateItemsTax()
public function calculateItemsTax(): void
{
if (!$cart = $this->getCart()) {
return false;
return;
}
foreach ($cart->items()->get() as $item) {
@ -783,6 +783,10 @@ class Cart
'country' => $address->country,
])->orderBy('tax_rate', 'desc')->get();
$item->tax_percent = 0;
$item->tax_amount = 0;
$item->base_tax_amount = 0;
if ($taxRates->count()) {
foreach ($taxRates as $rate) {
$haveTaxRate = false;
@ -804,17 +808,12 @@ class Cart
$item->tax_amount = ($item->total * $rate->tax_rate) / 100;
$item->base_tax_amount = ($item->base_total * $rate->tax_rate) / 100;
$item->save();
break;
}
}
} else {
$item->tax_percent = 0;
$item->tax_amount = 0;
$item->base_tax_amount = 0;
$item->save();
}
$item->save();
}
}

View File

@ -1,122 +0,0 @@
<?php
namespace Tests\Functional\Cart;
use FunctionalTester;
use Illuminate\Support\Facades\Config;
use Webkul\Tax\Models\TaxMap;
use Webkul\Tax\Models\TaxRate;
use Webkul\Tax\Models\TaxCategory;
use Cart;
class CartCest
{
private $country;
private $product1, $product2;
private $tax1, $tax2;
function _before(FunctionalTester $I)
{
$this->country = strtoupper(Config::get('app.default_country')) ?? 'DE';
$this->tax1 = $I->have(TaxRate::class, [
'country' => $this->country
]);
$taxCategorie1 = $I->have(TaxCategory::class);
$I->have(TaxMap::class, [
'tax_rate_id' => $this->tax1->id,
'tax_category_id' => $taxCategorie1->id
]);
$this->tax2 = $I->have(TaxRate::class, [
'country' => $this->country
]);
$taxCategorie2 = $I->have(TaxCategory::class);
$I->have(TaxMap::class, [
'tax_rate_id' => $this->tax2->id,
'tax_category_id' => $taxCategorie2->id
]);
$config1 = [
'productInventory' => ['qty' => 100],
'attributeValues' => [
'status' => true,
'new' => 1,
'tax_category_id' => $taxCategorie1->id,
],
];
$this->product1 = $I->haveProduct(\Webkul\Core\Helpers\Laravel5Helper::SIMPLE_PRODUCT, $config1);
$config2 = [
'productInventory' => ['qty' => 100],
'attributeValues' => [
'status' => true,
'new' => 1,
'tax_category_id' => $taxCategorie2->id,
],
];
$this->product2 = $I->haveProduct(\Webkul\Core\Helpers\Laravel5Helper::SIMPLE_PRODUCT, $config2);
}
public function checkCartWithMultipleTaxRates(FunctionalTester $I)
{
$prod1Quantity = $I->fake()->numberBetween(9, 30);
// quantity of product1 should be not even
if ($prod1Quantity % 2 !== 0) {
$prod1Quantity -= 1;
}
$prod2Quantity = $I->fake()->numberBetween(9, 30);
// quantity of product2 should be even
if ($prod2Quantity % 2 == 0) {
$prod2Quantity -= 1;
}
Cart::addProduct($this->product1->id, [
'_token' => session('_token'),
'product_id' => $this->product1->id,
'quantity' => 1,
]);
$I->amOnPage('/checkout/cart');
$I->see('Tax ' . $this->tax1->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($this->tax1->tax_rate));
$I->see(
core()->currency(round($this->product1->price * $this->tax1->tax_rate / 100, 2)),
'#basetaxamount-' . core()->taxRateAsIdentifier($this->tax1->tax_rate)
);
Cart::addProduct($this->product1->id, [
'_token' => session('_token'),
'product_id' => $this->product1->id,
'quantity' => $prod1Quantity,
]);
$I->amOnPage('/checkout/cart');
$I->see('Tax ' . $this->tax1->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($this->tax1->tax_rate));
$I->see(
core()->currency(round(($prod1Quantity + 1) * $this->product1->price * $this->tax1->tax_rate / 100, 2)),
'#basetaxamount-' . core()->taxRateAsIdentifier($this->tax1->tax_rate)
);
Cart::addProduct($this->product2->id, [
'_token' => session('_token'),
'product_id' => $this->product2->id,
'quantity' => $prod2Quantity,
]);
$I->amOnPage('/checkout/cart');
$I->see('Tax ' . $this->tax1->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($this->tax1->tax_rate));
$taxAmount1 = round(($prod1Quantity + 1) * $this->product1->price * $this->tax1->tax_rate / 100, 2);
$I->see(core()->currency($taxAmount1),'#basetaxamount-' . core()->taxRateAsIdentifier($this->tax1->tax_rate));
$I->see('Tax ' . $this->tax2->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($this->tax2->tax_rate));
$taxAmount2 = round($prod2Quantity * $this->product2->price * $this->tax2->tax_rate / 100, 2);
$I->see(core()->currency($taxAmount2),'#basetaxamount-' . core()->taxRateAsIdentifier($this->tax2->tax_rate));
$cart = Cart::getCart();
$I->assertEquals(2, $cart->items_count);
$I->assertEquals((float)($prod1Quantity + 1 + $prod2Quantity), $cart->items_qty);
$I->assertEquals($taxAmount1 + $taxAmount2, $cart->tax_total);
}
}

View File

@ -0,0 +1,436 @@
<?php
namespace Tests\Functional\Cart;
use FunctionalTester;
use Illuminate\Support\Facades\Config;
use Webkul\Core\Helpers\Laravel5Helper;
use Webkul\Tax\Models\TaxMap;
use Webkul\Tax\Models\TaxRate;
use Webkul\Tax\Models\TaxCategory;
use Webkul\Customer\Models\Customer;
use Webkul\Customer\Models\CustomerAddress;
use Cart;
class CartTaxesCest
{
public $country;
function _before(FunctionalTester $I)
{
$this->country = strtoupper(Config::get('app.default_country')) ?? 'DE';
}
public function checkCartWithMultipleTaxRates(FunctionalTester $I): void
{
$tax1 = $I->have(TaxRate::class, [
'country' => $this->country,
]);
$taxCategorie1 = $I->have(TaxCategory::class);
$I->have(TaxMap::class, [
'tax_rate_id' => $tax1->id,
'tax_category_id' => $taxCategorie1->id,
]);
$tax2 = $I->have(TaxRate::class, [
'country' => $this->country,
]);
$taxCategorie2 = $I->have(TaxCategory::class);
$I->have(TaxMap::class, [
'tax_rate_id' => $tax2->id,
'tax_category_id' => $taxCategorie2->id,
]);
$config1 = [
'productInventory' => ['qty' => 100],
'attributeValues' => [
'status' => true,
'new' => 1,
'tax_category_id' => $taxCategorie1->id,
],
];
$product1 = $I->haveProduct(Laravel5Helper::SIMPLE_PRODUCT, $config1);
$config2 = [
'productInventory' => ['qty' => 100],
'attributeValues' => [
'status' => true,
'new' => 1,
'tax_category_id' => $taxCategorie2->id,
],
];
$product2 = $I->haveProduct(Laravel5Helper::SIMPLE_PRODUCT, $config2);
$prod1Quantity = $I->fake()->numberBetween(9, 30);
// quantity of product1 should be not even
if ($prod1Quantity % 2 !== 0) {
$prod1Quantity -= 1;
}
$prod2Quantity = $I->fake()->numberBetween(9, 30);
// quantity of product2 should be even
if ($prod2Quantity % 2 == 0) {
$prod2Quantity -= 1;
}
Cart::addProduct($product1->id, [
'_token' => session('_token'),
'product_id' => $product1->id,
'quantity' => 1,
]);
$I->amOnPage('/checkout/cart');
$I->see('Tax ' . $tax1->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax1->tax_rate));
$I->see(
core()->currency(round($product1->price * $tax1->tax_rate / 100, 2)),
'#basetaxamount-' . core()->taxRateAsIdentifier($tax1->tax_rate)
);
Cart::addProduct($product1->id, [
'_token' => session('_token'),
'product_id' => $product1->id,
'quantity' => $prod1Quantity,
]);
$I->amOnPage('/checkout/cart');
$I->see('Tax ' . $tax1->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax1->tax_rate));
$I->see(
core()->currency(round(($prod1Quantity + 1) * $product1->price * $tax1->tax_rate / 100, 2)),
'#basetaxamount-' . core()->taxRateAsIdentifier($tax1->tax_rate)
);
Cart::addProduct($product2->id, [
'_token' => session('_token'),
'product_id' => $product2->id,
'quantity' => $prod2Quantity,
]);
$I->amOnPage('/checkout/cart');
$I->see('Tax ' . $tax1->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax1->tax_rate));
$taxAmount1 = round(($prod1Quantity + 1) * $product1->price * $tax1->tax_rate / 100, 2);
$I->see(core()->currency($taxAmount1), '#basetaxamount-' . core()->taxRateAsIdentifier($tax1->tax_rate));
$I->see('Tax ' . $tax2->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax2->tax_rate));
$taxAmount2 = round($prod2Quantity * $product2->price * $tax2->tax_rate / 100, 2);
$I->see(core()->currency($taxAmount2), '#basetaxamount-' . core()->taxRateAsIdentifier($tax2->tax_rate));
$cart = Cart::getCart();
$I->assertEquals(2, $cart->items_count);
$I->assertEquals((float)($prod1Quantity + 1 + $prod2Quantity), $cart->items_qty);
$I->assertEquals($taxAmount1 + $taxAmount2, $cart->tax_total);
Cart::removeItem($cart->items[1]->id);
$I->amOnPage('/checkout/cart');
$I->amOnPage('/checkout/cart');
$I->see('Tax ' . $tax1->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax1->tax_rate));
$taxAmount1 = round(($prod1Quantity + 1) * $product1->price * $tax1->tax_rate / 100, 2);
$I->see(core()->currency($taxAmount1), '#basetaxamount-' . core()->taxRateAsIdentifier($tax1->tax_rate));
$I->dontSee('Tax ' . $tax2->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax2->tax_rate));
$taxAmount2 = round($prod2Quantity * $product2->price * $tax2->tax_rate / 100, 2);
$I->dontSee(core()->currency($taxAmount2), '#basetaxamount-' . core()->taxRateAsIdentifier($tax2->tax_rate));
$cart = Cart::getCart();
$I->assertEquals(1, $cart->items_count);
$I->assertEquals((float)($prod1Quantity + 1), $cart->items_qty);
$I->assertEquals($taxAmount1, $cart->tax_total);
}
public function checkCartWithMultipleZipRangeBasedTaxes(FunctionalTester $I): void
{
$tax11 = $I->have(TaxRate::class, [
'country' => $this->country,
'is_zip' => 1,
'zip_code' => null,
'zip_from' => '00000',
'zip_to' => '49999',
'tax_rate' => $I->fake()->randomFloat(2, 3, 8),
]);
$tax12 = $I->have(TaxRate::class, [
'country' => $this->country,
'is_zip' => 1,
'zip_code' => null,
'zip_from' => '50000',
'zip_to' => '89999',
'tax_rate' => $I->fake()->randomFloat(2, 3, 8),
]);
$taxCategorie1 = $I->have(TaxCategory::class);
$I->have(TaxMap::class, [
'tax_rate_id' => $tax11->id,
'tax_category_id' => $taxCategorie1->id,
]);
$I->have(TaxMap::class, [
'tax_rate_id' => $tax12->id,
'tax_category_id' => $taxCategorie1->id,
]);
$tax21 = $I->have(TaxRate::class, [
'country' => $this->country,
'is_zip' => 1,
'zip_code' => null,
'zip_from' => '00000',
'zip_to' => '49999',
'tax_rate' => $I->fake()->randomFloat(2, 14, 25),
]);
$tax22 = $I->have(TaxRate::class, [
'country' => $this->country,
'is_zip' => 1,
'zip_code' => null,
'zip_from' => '50000',
'zip_to' => '89999',
'tax_rate' => $I->fake()->randomFloat(2, 14, 25),
]);
$taxCategorie2 = $I->have(TaxCategory::class);
$I->have(TaxMap::class, [
'tax_rate_id' => $tax21->id,
'tax_category_id' => $taxCategorie2->id,
]);
$I->have(TaxMap::class, [
'tax_rate_id' => $tax22->id,
'tax_category_id' => $taxCategorie2->id,
]);
$config1 = [
'productInventory' => ['qty' => 100],
'attributeValues' => [
'status' => true,
'new' => 1,
'tax_category_id' => $taxCategorie1->id,
],
];
$product1 = $I->haveProduct(Laravel5Helper::SIMPLE_PRODUCT, $config1);
$config2 = [
'productInventory' => ['qty' => 100],
'attributeValues' => [
'status' => true,
'new' => 1,
'tax_category_id' => $taxCategorie2->id,
],
];
$product2 = $I->haveProduct(Laravel5Helper::SIMPLE_PRODUCT, $config2);
$customer = $I->have(Customer::class);
$addressZip012345 = $I->have(CustomerAddress::class, [
'customer_id' => $customer->id,
'postcode' => '012345',
'vat_id' => 'DE123456789',
'country' => $this->country,
'default_address' => 1,
]);
Cart::addProduct($product1->id, [
'_token' => session('_token'),
'product_id' => $product1->id,
'quantity' => 1,
]);
Cart::saveCustomerAddress(
[
'billing' => [
'address1' => $addressZip012345->address1,
'use_for_shipping' => 1,
'email' => $customer->email,
'company_name' => $addressZip012345->company_name,
'first_name' => $addressZip012345->first_name,
'last_name' => $addressZip012345->last_name,
'city' => $addressZip012345->city,
'state' => $addressZip012345->state,
'postcode' => $addressZip012345->postcode,
'country' => $addressZip012345->country,
],
'shipping' => [
'address1' => '',
],
]);
$I->wantToTest('customer address with postcode in range of 00000 - 49999');
$I->amOnPage('/checkout/cart');
$I->see('Tax ' . $tax11->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax11->tax_rate));
$I->see(
core()->currency(round($product1->price * $tax11->tax_rate / 100, 2)),
'#basetaxamount-' . core()->taxRateAsIdentifier($tax11->tax_rate)
);
$I->dontSee('Tax ' . $tax12->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax12->tax_rate));
$I->dontSee(
core()->currency(round($product1->price * $tax12->tax_rate / 100, 2)),
'#basetaxamount-' . core()->taxRateAsIdentifier($tax12->tax_rate)
);
$I->dontSee('Tax ' . $tax21->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax21->tax_rate));
$I->dontSee(
core()->currency(round($product2->price * $tax21->tax_rate / 100, 2)),
'#basetaxamount-' . core()->taxRateAsIdentifier($tax21->tax_rate)
);
$I->dontSee('Tax ' . $tax22->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax22->tax_rate));
$I->dontSee(
core()->currency(round($product2->price * $tax22->tax_rate / 100, 2)),
'#basetaxamount-' . core()->taxRateAsIdentifier($tax22->tax_rate)
);
Cart::addProduct($product2->id, [
'_token' => session('_token'),
'product_id' => $product2->id,
'quantity' => 1,
]);
$I->amOnPage('/checkout/cart');
$I->see('Tax ' . $tax11->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax11->tax_rate));
$I->see(
core()->currency(round($product1->price * $tax11->tax_rate / 100, 2)),
'#basetaxamount-' . core()->taxRateAsIdentifier($tax11->tax_rate)
);
$I->dontSee('Tax ' . $tax12->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax12->tax_rate));
$I->dontSee(
core()->currency(round($product1->price * $tax12->tax_rate / 100, 2)),
'#basetaxamount-' . core()->taxRateAsIdentifier($tax12->tax_rate)
);
$I->see('Tax ' . $tax21->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax21->tax_rate));
$I->see(
core()->currency(round($product2->price * $tax21->tax_rate / 100, 2)),
'#basetaxamount-' . core()->taxRateAsIdentifier($tax21->tax_rate)
);
$I->dontSee('Tax ' . $tax22->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax22->tax_rate));
$I->dontSee(
core()->currency(round($product2->price * $tax22->tax_rate / 100, 2)),
'#basetaxamount-' . core()->taxRateAsIdentifier($tax22->tax_rate)
);
$taxAmount1 = round($product1->price * $tax11->tax_rate / 100, 2);
$I->see(core()->currency($taxAmount1), '#basetaxamount-' . core()->taxRateAsIdentifier($tax11->tax_rate));
$taxAmount2 = round($product2->price * $tax21->tax_rate / 100, 2);
$I->see(core()->currency($taxAmount2), '#basetaxamount-' . core()->taxRateAsIdentifier($tax21->tax_rate));
$I->wantToTest('customer address with postcode in range of 50000 - 89999');
$addressZip67890 = $I->have(CustomerAddress::class, [
'customer_id' => $customer->id,
'postcode' => '67890',
'vat_id' => 'DE123456789',
'country' => $this->country,
'default_address' => 1,
]);
Cart::saveCustomerAddress(
[
'billing' => [
'address1' => $addressZip67890->address1,
'use_for_shipping' => 1,
'email' => $customer->email,
'company_name' => $addressZip67890->company_name,
'first_name' => $addressZip67890->first_name,
'last_name' => $addressZip67890->last_name,
'city' => $addressZip67890->city,
'state' => $addressZip67890->state,
'postcode' => $addressZip67890->postcode,
'country' => $addressZip67890->country,
],
'shipping' => [
'address1' => '',
],
]);
$I->amOnPage('/checkout/cart');
$I->dontSee('Tax ' . $tax11->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax11->tax_rate));
$I->dontSee(
core()->currency(round($product1->price * $tax11->tax_rate / 100, 2)),
'#basetaxamount-' . core()->taxRateAsIdentifier($tax11->tax_rate)
);
$I->see('Tax ' . $tax12->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax12->tax_rate));
$I->see(
core()->currency(round($product1->price * $tax12->tax_rate / 100, 2)),
'#basetaxamount-' . core()->taxRateAsIdentifier($tax12->tax_rate)
);
$I->dontSee('Tax ' . $tax21->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax21->tax_rate));
$I->dontSee(
core()->currency(round($product2->price * $tax21->tax_rate / 100, 2)),
'#basetaxamount-' . core()->taxRateAsIdentifier($tax21->tax_rate)
);
$I->see('Tax ' . $tax22->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax22->tax_rate));
$I->see(
core()->currency(round($product2->price * $tax22->tax_rate / 100, 2)),
'#basetaxamount-' . core()->taxRateAsIdentifier($tax22->tax_rate)
);
$taxAmount1 = round($product1->price * $tax12->tax_rate / 100, 2);
$I->see(core()->currency($taxAmount1), '#basetaxamount-' . core()->taxRateAsIdentifier($tax12->tax_rate));
$taxAmount2 = round($product2->price * $tax22->tax_rate / 100, 2);
$I->see(core()->currency($taxAmount2), '#basetaxamount-' . core()->taxRateAsIdentifier($tax22->tax_rate));
$I->wantToTest('customer address with postcode in range of 90000 - 99000');
$I->wanttoTest('as we dont have any taxes in this zip range');
$addressZip98765 = $I->have(CustomerAddress::class, [
'customer_id' => $customer->id,
'postcode' => '98765',
'vat_id' => 'DE123456789',
'country' => $this->country,
'default_address' => 1,
]);
Cart::saveCustomerAddress(
[
'billing' => [
'address1' => $addressZip98765->address1,
'use_for_shipping' => 1,
'email' => $customer->email,
'company_name' => $addressZip98765->company_name,
'first_name' => $addressZip98765->first_name,
'last_name' => $addressZip98765->last_name,
'city' => $addressZip98765->city,
'state' => $addressZip98765->state,
'postcode' => $addressZip98765->postcode,
'country' => $addressZip98765->country,
],
'shipping' => [
'address1' => '',
],
]);
$I->amOnPage('/checkout/cart');
$I->dontSee('Tax ' . $tax11->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax11->tax_rate));
$I->dontSee(
core()->currency(round($product1->price * $tax11->tax_rate / 100, 2)),
'#basetaxamount-' . core()->taxRateAsIdentifier($tax11->tax_rate)
);
$I->dontSee('Tax ' . $tax12->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax12->tax_rate));
$I->dontSee(
core()->currency(round($product1->price * $tax12->tax_rate / 100, 2)),
'#basetaxamount-' . core()->taxRateAsIdentifier($tax12->tax_rate)
);
$I->dontSee('Tax ' . $tax21->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax21->tax_rate));
$I->dontSee(
core()->currency(round($product2->price * $tax21->tax_rate / 100, 2)),
'#basetaxamount-' . core()->taxRateAsIdentifier($tax21->tax_rate)
);
$I->dontSee('Tax ' . $tax22->tax_rate . ' %', '#taxrate-' . core()->taxRateAsIdentifier($tax22->tax_rate));
$I->dontSee(
core()->currency(round($product2->price * $tax22->tax_rate / 100, 2)),
'#basetaxamount-' . core()->taxRateAsIdentifier($tax22->tax_rate)
);
}
}