woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-01 07:02:48 +08:00
Code Issues Projects Packages Wiki Activity Actions

Revert PCP-590-incorrect-tax-details as is causing line items not sent to PayPal

Browse source
This commit is contained in:
dinamiko 2022-04-04 11:35:50 +02:00
parent d6286ec6e5
commit 5369af13e2
4 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/ppcp-api-client/src/Factory/AmountFactory.php
View file

@ -76,12 +76,12 @@ class AmountFactory {
$item_total = $cart->get_cart_contents_total() + $cart->get_discount_total() + $total_fees_amount;
$item_total = new Money( (float) $item_total, $this->currency );
$shipping = new Money(
(float) $cart->get_shipping_total(),
(float) $cart->get_shipping_total() + $cart->get_shipping_tax(),
$this->currency
);
$taxes = new Money(
$cart->get_subtotal_tax() + $cart->get_shipping_tax(),
$cart->get_subtotal_tax(),
$this->currency
);
@ -131,7 +131,7 @@ class AmountFactory {
$currency
);
$shipping = new Money(
(float) $order->get_shipping_total(),
(float) $order->get_shipping_total() + (float) $order->get_shipping_tax(),
$currency
);
$taxes = new Money(

10
modules/ppcp-api-client/src/Factory/ItemFactory.php
View file

@ -42,9 +42,8 @@ class ItemFactory {
* @return Item[]
*/
public function from_wc_cart( \WC_Cart $cart ): array {
$shipping_tax = round( $cart->get_shipping_tax(), 2 );
$items = array_map(
function ( array $item ) use ( $shipping_tax ): Item {
$items = array_map(
function ( array $item ): Item {
$product = $item['data'];
/**
@ -58,7 +57,7 @@ class ItemFactory {
$price_without_tax = (float) wc_get_price_excluding_tax( $product );
$price_without_tax_rounded = round( $price_without_tax, 2 );
$tax = round( $price - $price_without_tax_rounded, 2 );
$tax = new Money( $tax + $shipping_tax, $this->currency );
$tax = new Money( $tax, $this->currency );
return new Item(
mb_substr( $product->get_name(), 0, 127 ),
new Money( $price_without_tax_rounded, $this->currency ),
@ -132,13 +131,12 @@ class ItemFactory {
*/
$product = $item->get_product();
$currency = $order->get_currency();
$shipping_tax = round( (float) $order->get_shipping_tax(), 2 );
$quantity = (int) $item->get_quantity();
$price = (float) $order->get_item_subtotal( $item, true );
$price_without_tax = (float) $order->get_item_subtotal( $item, false );
$price_without_tax_rounded = round( $price_without_tax, 2 );
$tax = round( $price - $price_without_tax_rounded, 2 );
$tax = new Money( $tax + $shipping_tax, $currency );
$tax = new Money( $tax, $currency );
return new Item(
mb_substr( $product->get_name(), 0, 127 ),

6
tests/PHPUnit/ApiClient/Factory/AmountFactoryTest.php
View file

@ -68,11 +68,11 @@ class AmountFactoryTest extends TestCase
$this->assertEquals((float) 1, $result->value());
$this->assertEquals((float) 10, $result->breakdown()->discount()->value());
$this->assertEquals($this->currency, $result->breakdown()->discount()->currency_code());
$this->assertEquals((float) 4, $result->breakdown()->shipping()->value());
$this->assertEquals((float) 9, $result->breakdown()->shipping()->value());
$this->assertEquals($this->currency, $result->breakdown()->shipping()->currency_code());
$this->assertEquals((float) 5, $result->breakdown()->item_total()->value());
$this->assertEquals($this->currency, $result->breakdown()->item_total()->currency_code());
$this->assertEquals((float) 13, $result->breakdown()->tax_total()->value());
$this->assertEquals((float) 8, $result->breakdown()->tax_total()->value());
$this->assertEquals($this->currency, $result->breakdown()->tax_total()->currency_code());
}
@ -161,7 +161,7 @@ class AmountFactoryTest extends TestCase
$result = $this->testee->from_wc_order($order);
$this->assertEquals((float) 3, $result->breakdown()->discount()->value());
$this->assertEquals((float) 6, $result->breakdown()->item_total()->value());
$this->assertEquals((float) 1, $result->breakdown()->shipping()->value());
$this->assertEquals((float) 1.5, $result->breakdown()->shipping()->value());
$this->assertEquals((float) 100, $result->value());
$this->assertEquals((float) 2, $result->breakdown()->tax_total()->value());
$this->assertEquals($this->currency, $result->breakdown()->discount()->currency_code());

9
tests/PHPUnit/ApiClient/Factory/ItemFactoryTest.php
View file

@ -41,7 +41,6 @@ class ItemFactoryTest extends TestCase
$cart
->expects('get_cart_contents')
->andReturn($items);
$cart->expects('get_shipping_tax')->andReturn(1);
expect('wc_get_price_including_tax')
->with($product)
@ -73,7 +72,7 @@ class ItemFactoryTest extends TestCase
$this->assertEquals('name', $item->name());
$this->assertEquals('sku', $item->sku());
$this->assertEquals(1, $item->unit_amount()->value());
$this->assertEquals(3, $item->tax()->value());
$this->assertEquals(2, $item->tax()->value());
}
public function testFromCartDigitalGood()
@ -103,7 +102,6 @@ class ItemFactoryTest extends TestCase
$cart
->expects('get_cart_contents')
->andReturn($items);
$cart->expects('get_shipping_tax')->andReturn(1);
expect('wc_get_price_including_tax')
->with($product)
@ -174,7 +172,6 @@ class ItemFactoryTest extends TestCase
$order
->expects('get_fees')
->andReturn([]);
$order->expects('get_shipping_tax')->andReturn(1);
$result = $testee->from_wc_order($order);
$this->assertCount(1, $result);
@ -188,7 +185,7 @@ class ItemFactoryTest extends TestCase
$this->assertEquals(1, $item->quantity());
$this->assertEquals(Item::PHYSICAL_GOODS, $item->category());
$this->assertEquals(1, $item->unit_amount()->value());
$this->assertEquals(3, $item->tax()->value());
$this->assertEquals(2, $item->tax()->value());
}
public function testFromWcOrderDigitalGood()
@ -238,7 +235,6 @@ class ItemFactoryTest extends TestCase
$order
->expects('get_fees')
->andReturn([]);
$order->expects('get_shipping_tax')->andReturn(1);
$result = $testee->from_wc_order($order);
$item = current($result);
@ -297,7 +293,6 @@ class ItemFactoryTest extends TestCase
$order
->expects('get_fees')
->andReturn([]);
$order->expects('get_shipping_tax')->andReturn(1);
$result = $testee->from_wc_order($order);
$item = current($result);