Bugzilla – Attachment 156487 Details for
Bug 34967
Move Prices.t to t/db_dependent
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 34967: Remove Test::DBIx::Class
Bug-34967-Remove-TestDBIxClass.patch (text/plain), 34.34 KB, created by
Katrin Fischer
on 2023-10-03 10:04:57 UTC
(
hide
)
Description:
Bug 34967: Remove Test::DBIx::Class
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2023-10-03 10:04:57 UTC
Size:
34.34 KB
patch
obsolete
>From a0cc54fcf6face47e2ff03fc58d4996b8b5b5eee Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Fri, 29 Sep 2023 15:52:35 +0000 >Subject: [PATCH] Bug 34967: Remove Test::DBIx::Class > >Move everything in one subtest > >Test plan: >Run t/Prices.t > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > t/Prices.t | 972 ++++++++++++++++++++++++++--------------------------- > 1 file changed, 483 insertions(+), 489 deletions(-) > >diff --git a/t/Prices.t b/t/Prices.t >index 2217c27e64..2215b0be93 100755 >--- a/t/Prices.t >+++ b/t/Prices.t >@@ -1,509 +1,503 @@ >+#!/usr/bin/perl >+ > use Modern::Perl; >-use Test::More; >+use Test::More tests => 1; > use Test::MockModule; > > use t::lib::Mocks; >+use t::lib::TestBuilder; > >-use Module::Load::Conditional qw/check_install/; >+use Koha::Database; >+use Koha::Number::Price; > >-BEGIN { >- if ( check_install( module => 'Test::DBIx::Class' ) ) { >- plan tests => 15; >- } else { >- plan skip_all => "Need Test::DBIx::Class" >- } >-} >- >-use_ok('C4::Context'); >-use_ok('Koha::Number::Price'); >- >-t::lib::Mocks::mock_preference( 'TaxRates', '0.02|0.05|0.196' ); >- >-use Test::DBIx::Class; >- >-my $db = Test::MockModule->new('Koha::Database'); >-$db->mock( _new_schema => sub { return Schema(); } ); >-Koha::Database::flush_schema_cache(); >- >-fixtures_ok [ >- Currency => [ >- [ qw/ currency symbol rate active / ], >- [ 'my_cur', 'â¬', 1, 1, ], >- ], >- Aqbookseller => [ >- [ qw/ id name listincgst invoiceincgst / ], >- [ 1, '0 0', 0, 0 ], >- [ 2, '0 1', 0, 1 ], >- [ 3, '1 0', 1, 0 ], >- [ 4, '1 1', 1, 1 ], >- ], >- Aqbasket => [ >- [ qw/ basketno basketname booksellerid / ], >- [ 1, '0 0', 1 ], >- [ 2, '0 1', 2 ], >- [ 3, '1 0', 3 ], >- [ 4, '1 1', 4 ], >- ], >-], 'add currency fixtures'; >- >-my $bookseller_module = Test::MockModule->new('Koha::Acquisition::Bookseller'); >- >-my ( $basketno_0_0, $basketno_0_1, $basketno_1_0, $basketno_1_1 ) = (1, 2, 3, 4); >-my ( $invoiceid_0_0, $invoiceid_1_1 ); >-my $today; >- >-for my $currency_format ( qw( US FR ) ) { >- t::lib::Mocks::mock_preference( 'CurrencyFormat', $currency_format ); >- subtest 'Configuration 1: 0 0 (Vendor List prices do not include tax / Invoice prices do not include tax)' => sub { >- plan tests => 8; >- >- my $biblionumber_0_0 = 42; >- >- my $order_0_0 = Koha::Acquisition::Order->new({ >- biblionumber => $biblionumber_0_0, >- quantity => 2, >- listprice => 82, >- unitprice => 73.80, >- quantityreceived => 2, >- basketno => $basketno_0_0, >- invoiceid => $invoiceid_0_0, >- rrp => 82.00, >- ecost => 73.80, >- tax_rate_on_ordering => 0.0500, >- tax_rate_on_receiving => 0.0500, >- discount => 10, >- datereceived => $today >- }); >- $order_0_0->populate_with_prices_for_ordering(); >- >- compare( >- { >- got => $order_0_0->rrp_tax_included, >- expected => 86.10, >- conf => '0 0', >- field => 'rrp_tax_included' >- } >- ); >- compare( >- { >- got => $order_0_0->rrp_tax_excluded, >- expected => 82.00, >- conf => '0 0', >- field => 'rrp_tax_excluded' >- } >- ); >- compare( >- { >- got => $order_0_0->ecost_tax_included, >- expected => 77.49, >- conf => '0 0', >- field => 'ecost_tax_included' >- } >- ); >- compare( >- { >- got => $order_0_0->ecost_tax_excluded, >- expected => 73.80, >- conf => '0 0', >- field => 'ecost_tax_excluded' >- } >- ); >- compare( >- { >- got => $order_0_0->tax_value_on_ordering, >- expected => 7.38, >- conf => '0 0', >- field => 'tax_value' >- } >- ); >+my $schema = Koha::Database->new->schema; >+$schema->storage->txn_begin; >+my $builder = t::lib::TestBuilder->new; > >- $order_0_0->populate_with_prices_for_receiving(); >+subtest 'Tests from t' => sub { >+ plan tests => 12; > >- compare( >- { >- got => $order_0_0->unitprice_tax_included, >- expected => 77.49, >- conf => '0 0', >- field => 'unitprice_tax_included' >- } >- ); >- compare( >- { >- got => $order_0_0->unitprice_tax_excluded, >- expected => 73.80, >- conf => '0 0', >- field => 'unitprice_tax_excluded' >- } >- ); >- compare( >- { >- got => $order_0_0->tax_value_on_receiving, >- expected => 7.38, >- conf => '0 0', >- field => 'tax_value' >- } >- ); >- }; >- >- subtest 'Configuration 1: 1 1 (Vendor List prices do include tax / Invoice prices include tax)' => sub { >- plan tests => 11; >- >- my $biblionumber_1_1 = 43; >- my $order_1_1 = Koha::Acquisition::Order->new({ >- biblionumber => $biblionumber_1_1, >- quantity => 2, >- listprice => 82, >- unitprice => 73.80, >- quantityreceived => 2, >- basketno => $basketno_1_1, >- invoiceid => $invoiceid_1_1, >- rrp => 82.00, >- ecost => 73.80, >- tax_rate_on_ordering => 0.0500, >- tax_rate_on_receiving => 0.0500, >- discount => 10, >- datereceived => $today >- }); >- >- $order_1_1->populate_with_prices_for_ordering(); >- >- compare( >- { >- got => $order_1_1->rrp_tax_included, >- expected => 82.00, >- conf => '1 1', >- field => 'rrp_tax_included' >- } >- ); >- compare( >- { >- got => $order_1_1->rrp_tax_excluded, >- expected => 78.10, >- conf => '1 1', >- field => 'rrp_tax_excluded' >- } >- ); >- compare( >- { >- got => $order_1_1->ecost_tax_included, >- expected => 73.80, >- conf => '1 1', >- field => 'ecost_tax_included' >- } >- ); >- compare( >- { >- got => $order_1_1->ecost_tax_excluded, >- expected => 70.29, >- conf => '1 1', >- field => 'ecost_tax_excluded' >- } >- ); >- compare( >- { >- got => $order_1_1->tax_value_on_ordering, >- expected => 7.03, >- conf => '1 1', >- field => 'tax_value' >- } >- ); >- >- $order_1_1->populate_with_prices_for_receiving(); >- >- compare( >- { >- got => $order_1_1->unitprice_tax_included, >- expected => 73.80, >- conf => '1 1', >- field => 'unitprice_tax_included' >- } >- ); >- compare( >- { >- got => $order_1_1->unitprice_tax_excluded, >- expected => 70.29, >- conf => '1 1', >- field => 'unitprice_tax_excluded' >- } >- ); >- compare( >- { >- got => $order_1_1->tax_value_on_receiving, >- expected => 7.03, >- conf => '1 1', >- field => 'tax_value' >- } >- ); >+ t::lib::Mocks::mock_preference( 'TaxRates', '0.02|0.05|0.196' ); >+ my $bookseller_module = Test::MockModule->new('Koha::Acquisition::Bookseller'); > >- # When unitprice is 0.00 >- # Koha::Acquisition::Order::populate_with_prices_for_ordering() falls >- # back to using ecost_tax_included and ecost_tax_excluded >- $order_1_1 = Koha::Acquisition::Order->new({ >- biblionumber => $biblionumber_1_1, >- quantity => 1, >- listprice => 10, >- unitprice => '0.00', >- quantityreceived => 1, >- basketno => $basketno_1_1, >- invoiceid => $invoiceid_1_1, >- rrp => 10.00, >- ecost => 10.00, >- tax_rate_on_ordering => 0.1500, >- tax_rate_on_receiving => 0.1500, >- discount => 0, >- datereceived => $today >- }); >- >- $order_1_1->populate_with_prices_for_ordering(); >- >- compare( >+ my ( @booksellers, @baskets ); >+ my @names = ( '0 0', '0 1', '1 0', '1 1' ); >+ foreach my $i ( 1..4 ) { >+ push @booksellers, $builder->build_object( > { >- got => $order_1_1->ecost_tax_included, >- expected => 10.00, >- conf => '1 1', >- field => 'ecost_tax_included' >+ class => 'Koha::Acquisition::Booksellers', >+ value => >+ { name => $names[ $i - 1 ], listincgst => $i < 3 ? 0 : 1, invoiceincgst => $i % 2 == 0 ? 1 : 0 } > } > ); >- compare( >+ push @baskets, $builder->build_object( > { >- got => $order_1_1->ecost_tax_excluded, >- expected => 8.70, >- conf => '1 1', >- field => 'ecost_tax_excluded' >- } >- ); >- compare( >- { >- got => $order_1_1->tax_value_on_ordering, >- expected => 1.30, >- conf => '1 1', >- field => 'tax_value' >- } >- ); >- }; >- >- subtest 'Configuration 1: 1 0 (Vendor List prices include tax / Invoice prices do not include tax)' => sub { >- plan tests => 9; >- >- my $biblionumber_1_0 = 44; >- my $order_1_0 = Koha::Acquisition::Order->new({ >- biblionumber => $biblionumber_1_0, >- quantity => 2, >- listprice => 82, >- unitprice => 0, >- quantityreceived => 2, >- basketno => $basketno_1_0, >- invoiceid => $invoiceid_1_1, >- rrp => 82.00, >- ecost => 73.80, >- tax_rate_on_ordering => 0.0500, >- tax_rate_on_receiving => 0.0500, >- discount => 10, >- datereceived => $today >- }); >- >- $order_1_0->populate_with_prices_for_ordering(); >- >- compare( >- { >- got => $order_1_0->rrp_tax_included, >- expected => 82, >- conf => '1 0', >- field => 'rrp_tax_included' >- } >- ); >- compare( >- { >- got => $order_1_0->rrp_tax_excluded, >- expected => 78.10, >- conf => '1 0', >- field => 'rrp_tax_excluded' >- } >- ); >- compare( >- { >- got => $order_1_0->ecost_tax_included, >- expected => 73.80, >- conf => '1 0', >- field => 'ecost_tax_included' >- } >- ); >- compare( >- { >- got => $order_1_0->ecost_tax_excluded, >- expected => 70.29, >- conf => '1 0', >- field => 'ecost_tax_excluded' >- } >- ); >- # If we order with unitprice = 0, tax is calculated from the ecost >- # (note that in addorder.pl and addorderiso2709 the unitprice may/will be set to the ecost >- compare( >- { >- got => $order_1_0->tax_value_on_ordering, >- expected => 7.03, >- conf => '1 0', >- field => 'tax_value' >- } >- ); >- $order_1_0->unitprice(70.29); >- $order_1_0->populate_with_prices_for_ordering(); >- >- # If a unitprice is provided at ordering, we calculate the tax from that >- compare( >- { >- got => $order_1_0->tax_value_on_ordering, >- expected => 6.69, >- conf => '1 0', >- field => 'tax_value' >+ class => 'Koha::Acquisition::Baskets', >+ value => >+ { basketname => $names[ $i - 1 ], booksellerid => $booksellers[$i-1]->id } > } > ); >+ } > >- $order_1_0->populate_with_prices_for_receiving(); >+ my ( $basketno_0_0, $basketno_0_1, $basketno_1_0, $basketno_1_1 ) = map { $_->id } @baskets; >+ my ( $invoiceid_0_0, $invoiceid_1_1 ); >+ my $today; >+ >+ for my $currency_format ( qw( US FR ) ) { >+ t::lib::Mocks::mock_preference( 'CurrencyFormat', $currency_format ); >+ subtest 'Configuration 1: 0 0 (Vendor List prices do not include tax / Invoice prices do not include tax)' => sub { >+ plan tests => 8; >+ >+ my $biblionumber_0_0 = 42; >+ >+ my $order_0_0 = Koha::Acquisition::Order->new({ >+ biblionumber => $biblionumber_0_0, >+ quantity => 2, >+ listprice => 82, >+ unitprice => 73.80, >+ quantityreceived => 2, >+ basketno => $basketno_0_0, >+ invoiceid => $invoiceid_0_0, >+ rrp => 82.00, >+ ecost => 73.80, >+ tax_rate_on_ordering => 0.0500, >+ tax_rate_on_receiving => 0.0500, >+ discount => 10, >+ datereceived => $today >+ }); >+ $order_0_0->populate_with_prices_for_ordering(); >+ >+ compare( >+ { >+ got => $order_0_0->rrp_tax_included, >+ expected => 86.10, >+ conf => '0 0', >+ field => 'rrp_tax_included' >+ } >+ ); >+ compare( >+ { >+ got => $order_0_0->rrp_tax_excluded, >+ expected => 82.00, >+ conf => '0 0', >+ field => 'rrp_tax_excluded' >+ } >+ ); >+ compare( >+ { >+ got => $order_0_0->ecost_tax_included, >+ expected => 77.49, >+ conf => '0 0', >+ field => 'ecost_tax_included' >+ } >+ ); >+ compare( >+ { >+ got => $order_0_0->ecost_tax_excluded, >+ expected => 73.80, >+ conf => '0 0', >+ field => 'ecost_tax_excluded' >+ } >+ ); >+ compare( >+ { >+ got => $order_0_0->tax_value_on_ordering, >+ expected => 7.38, >+ conf => '0 0', >+ field => 'tax_value' >+ } >+ ); >+ >+ $order_0_0->populate_with_prices_for_receiving(); >+ >+ compare( >+ { >+ got => $order_0_0->unitprice_tax_included, >+ expected => 77.49, >+ conf => '0 0', >+ field => 'unitprice_tax_included' >+ } >+ ); >+ compare( >+ { >+ got => $order_0_0->unitprice_tax_excluded, >+ expected => 73.80, >+ conf => '0 0', >+ field => 'unitprice_tax_excluded' >+ } >+ ); >+ compare( >+ { >+ got => $order_0_0->tax_value_on_receiving, >+ expected => 7.38, >+ conf => '0 0', >+ field => 'tax_value' >+ } >+ ); >+ }; >+ >+ subtest 'Configuration 1: 1 1 (Vendor List prices do include tax / Invoice prices include tax)' => sub { >+ plan tests => 11; >+ >+ my $biblionumber_1_1 = 43; >+ my $order_1_1 = Koha::Acquisition::Order->new({ >+ biblionumber => $biblionumber_1_1, >+ quantity => 2, >+ listprice => 82, >+ unitprice => 73.80, >+ quantityreceived => 2, >+ basketno => $basketno_1_1, >+ invoiceid => $invoiceid_1_1, >+ rrp => 82.00, >+ ecost => 73.80, >+ tax_rate_on_ordering => 0.0500, >+ tax_rate_on_receiving => 0.0500, >+ discount => 10, >+ datereceived => $today >+ }); >+ >+ $order_1_1->populate_with_prices_for_ordering(); >+ >+ compare( >+ { >+ got => $order_1_1->rrp_tax_included, >+ expected => 82.00, >+ conf => '1 1', >+ field => 'rrp_tax_included' >+ } >+ ); >+ compare( >+ { >+ got => $order_1_1->rrp_tax_excluded, >+ expected => 78.10, >+ conf => '1 1', >+ field => 'rrp_tax_excluded' >+ } >+ ); >+ compare( >+ { >+ got => $order_1_1->ecost_tax_included, >+ expected => 73.80, >+ conf => '1 1', >+ field => 'ecost_tax_included' >+ } >+ ); >+ compare( >+ { >+ got => $order_1_1->ecost_tax_excluded, >+ expected => 70.29, >+ conf => '1 1', >+ field => 'ecost_tax_excluded' >+ } >+ ); >+ compare( >+ { >+ got => $order_1_1->tax_value_on_ordering, >+ expected => 7.03, >+ conf => '1 1', >+ field => 'tax_value' >+ } >+ ); >+ >+ $order_1_1->populate_with_prices_for_receiving(); >+ >+ compare( >+ { >+ got => $order_1_1->unitprice_tax_included, >+ expected => 73.80, >+ conf => '1 1', >+ field => 'unitprice_tax_included' >+ } >+ ); >+ compare( >+ { >+ got => $order_1_1->unitprice_tax_excluded, >+ expected => 70.29, >+ conf => '1 1', >+ field => 'unitprice_tax_excluded' >+ } >+ ); >+ compare( >+ { >+ got => $order_1_1->tax_value_on_receiving, >+ expected => 7.03, >+ conf => '1 1', >+ field => 'tax_value' >+ } >+ ); >+ >+ # When unitprice is 0.00 >+ # Koha::Acquisition::Order::populate_with_prices_for_ordering() falls >+ # back to using ecost_tax_included and ecost_tax_excluded >+ $order_1_1 = Koha::Acquisition::Order->new({ >+ biblionumber => $biblionumber_1_1, >+ quantity => 1, >+ listprice => 10, >+ unitprice => '0.00', >+ quantityreceived => 1, >+ basketno => $basketno_1_1, >+ invoiceid => $invoiceid_1_1, >+ rrp => 10.00, >+ ecost => 10.00, >+ tax_rate_on_ordering => 0.1500, >+ tax_rate_on_receiving => 0.1500, >+ discount => 0, >+ datereceived => $today >+ }); >+ >+ $order_1_1->populate_with_prices_for_ordering(); >+ >+ compare( >+ { >+ got => $order_1_1->ecost_tax_included, >+ expected => 10.00, >+ conf => '1 1', >+ field => 'ecost_tax_included' >+ } >+ ); >+ compare( >+ { >+ got => $order_1_1->ecost_tax_excluded, >+ expected => 8.70, >+ conf => '1 1', >+ field => 'ecost_tax_excluded' >+ } >+ ); >+ compare( >+ { >+ got => $order_1_1->tax_value_on_ordering, >+ expected => 1.30, >+ conf => '1 1', >+ field => 'tax_value' >+ } >+ ); >+ }; >+ >+ subtest 'Configuration 1: 1 0 (Vendor List prices include tax / Invoice prices do not include tax)' => sub { >+ plan tests => 9; >+ >+ my $biblionumber_1_0 = 44; >+ my $order_1_0 = Koha::Acquisition::Order->new({ >+ biblionumber => $biblionumber_1_0, >+ quantity => 2, >+ listprice => 82, >+ unitprice => 0, >+ quantityreceived => 2, >+ basketno => $basketno_1_0, >+ invoiceid => $invoiceid_1_1, >+ rrp => 82.00, >+ ecost => 73.80, >+ tax_rate_on_ordering => 0.0500, >+ tax_rate_on_receiving => 0.0500, >+ discount => 10, >+ datereceived => $today >+ }); >+ >+ $order_1_0->populate_with_prices_for_ordering(); >+ >+ compare( >+ { >+ got => $order_1_0->rrp_tax_included, >+ expected => 82, >+ conf => '1 0', >+ field => 'rrp_tax_included' >+ } >+ ); >+ compare( >+ { >+ got => $order_1_0->rrp_tax_excluded, >+ expected => 78.10, >+ conf => '1 0', >+ field => 'rrp_tax_excluded' >+ } >+ ); >+ compare( >+ { >+ got => $order_1_0->ecost_tax_included, >+ expected => 73.80, >+ conf => '1 0', >+ field => 'ecost_tax_included' >+ } >+ ); >+ compare( >+ { >+ got => $order_1_0->ecost_tax_excluded, >+ expected => 70.29, >+ conf => '1 0', >+ field => 'ecost_tax_excluded' >+ } >+ ); >+ # If we order with unitprice = 0, tax is calculated from the ecost >+ # (note that in addorder.pl and addorderiso2709 the unitprice may/will be set to the ecost >+ compare( >+ { >+ got => $order_1_0->tax_value_on_ordering, >+ expected => 7.03, >+ conf => '1 0', >+ field => 'tax_value' >+ } >+ ); >+ $order_1_0->unitprice(70.29); >+ $order_1_0->populate_with_prices_for_ordering(); >+ >+ # If a unitprice is provided at ordering, we calculate the tax from that >+ compare( >+ { >+ got => $order_1_0->tax_value_on_ordering, >+ expected => 6.69, >+ conf => '1 0', >+ field => 'tax_value' >+ } >+ ); >+ >+ $order_1_0->populate_with_prices_for_receiving(); >+ >+ compare( >+ { >+ got => $order_1_0->unitprice_tax_included, >+ expected => 73.80, >+ conf => '1 0', >+ field => 'unitprice_tax_included' >+ } >+ ); >+ compare( >+ { >+ got => $order_1_0->unitprice_tax_excluded, >+ expected => 70.29, >+ conf => '1 0', >+ field => 'unitprice_tax_excluded' >+ } >+ ); >+ compare( >+ { >+ got => $order_1_0->tax_value_on_receiving, >+ expected => 7.03, >+ conf => '1 0', >+ field => 'tax_value' >+ } >+ ); >+ }; >+ >+ subtest 'Configuration 1: 0 1 (Vendor List prices do not include tax / Invoice prices include tax)' => sub { >+ plan tests => 9; >+ >+ my $biblionumber_0_1 = 45; >+ my $order_0_1 = Koha::Acquisition::Order->new({ >+ biblionumber => $biblionumber_0_1, >+ quantity => 2, >+ listprice => 82, >+ unitprice => 0, >+ quantityreceived => 2, >+ basketno => $basketno_0_1, >+ invoiceid => $invoiceid_1_1, >+ rrp => 82.00, >+ ecost => 73.80, >+ tax_rate_on_ordering => 0.0500, >+ tax_rate_on_receiving => 0.0500, >+ discount => 10, >+ datereceived => $today >+ }); >+ >+ $order_0_1->populate_with_prices_for_ordering(); >+ >+ compare( >+ { >+ got => $order_0_1->rrp_tax_included, >+ expected => 86.10, >+ conf => '0 1', >+ field => 'rrp_tax_included' >+ } >+ ); >+ compare( >+ { >+ got => $order_0_1->rrp_tax_excluded, >+ expected => 82.00, >+ conf => '0 1', >+ field => 'rrp_tax_excluded' >+ } >+ ); >+ compare( >+ { >+ got => $order_0_1->ecost_tax_included, >+ expected => 77.49, >+ conf => '0 1', >+ field => 'ecost_tax_included' >+ } >+ ); >+ compare( >+ { >+ got => $order_0_1->ecost_tax_excluded, >+ expected => 73.80, >+ conf => '0 1', >+ field => 'ecost_tax_excluded' >+ } >+ ); >+ # If we order with unitprice = 0, tax is calculated from the ecost >+ # (note that in addorder.pl and addorderiso2709 the unitprice may/will be set to the ecost >+ compare( >+ { >+ got => $order_0_1->tax_value_on_ordering, >+ expected => 7.38, >+ conf => '0 1', >+ field => 'tax_value' >+ } >+ ); >+ $order_0_1->unitprice(77.490000); >+ $order_0_1->populate_with_prices_for_ordering(); >+ >+ # If a unitprice is provided at ordering, we calculate the tax from that >+ compare( >+ { >+ got => $order_0_1->tax_value_on_ordering, >+ expected => 7.75, >+ conf => '0 1', >+ field => 'tax_value' >+ } >+ ); >+ $order_0_1->populate_with_prices_for_receiving(); >+ >+ compare( >+ { >+ got => $order_0_1->unitprice_tax_included, >+ expected => 77.49, >+ conf => '0 1', >+ field => 'unitprice_tax_included' >+ } >+ ); >+ compare( >+ { >+ got => $order_0_1->unitprice_tax_excluded, >+ expected => 73.80, >+ conf => '0 1', >+ field => 'unitprice_tax_excluded' >+ } >+ ); >+ compare( >+ { >+ got => $order_0_1->tax_value_on_receiving, >+ expected => 7.38, >+ conf => '0 1', >+ field => 'tax_value' >+ } >+ ); >+ }; >+ } > >- compare( >- { >- got => $order_1_0->unitprice_tax_included, >- expected => 73.80, >- conf => '1 0', >- field => 'unitprice_tax_included' >- } >- ); >- compare( >- { >- got => $order_1_0->unitprice_tax_excluded, >- expected => 70.29, >- conf => '1 0', >- field => 'unitprice_tax_excluded' >- } >- ); >- compare( >- { >- got => $order_1_0->tax_value_on_receiving, >- expected => 7.03, >- conf => '1 0', >- field => 'tax_value' >- } >- ); >- }; >- >- subtest 'Configuration 1: 0 1 (Vendor List prices do not include tax / Invoice prices include tax)' => sub { >- plan tests => 9; >- >- my $biblionumber_0_1 = 45; >- my $order_0_1 = Koha::Acquisition::Order->new({ >- biblionumber => $biblionumber_0_1, >- quantity => 2, >- listprice => 82, >- unitprice => 0, >- quantityreceived => 2, >- basketno => $basketno_0_1, >- invoiceid => $invoiceid_1_1, >- rrp => 82.00, >- ecost => 73.80, >- tax_rate_on_ordering => 0.0500, >- tax_rate_on_receiving => 0.0500, >- discount => 10, >- datereceived => $today >- }); >- >- $order_0_1->populate_with_prices_for_ordering(); >- >- compare( >- { >- got => $order_0_1->rrp_tax_included, >- expected => 86.10, >- conf => '0 1', >- field => 'rrp_tax_included' >- } >- ); >- compare( >- { >- got => $order_0_1->rrp_tax_excluded, >- expected => 82.00, >- conf => '0 1', >- field => 'rrp_tax_excluded' >- } >- ); >- compare( >- { >- got => $order_0_1->ecost_tax_included, >- expected => 77.49, >- conf => '0 1', >- field => 'ecost_tax_included' >- } >- ); >- compare( >- { >- got => $order_0_1->ecost_tax_excluded, >- expected => 73.80, >- conf => '0 1', >- field => 'ecost_tax_excluded' >- } >- ); >- # If we order with unitprice = 0, tax is calculated from the ecost >- # (note that in addorder.pl and addorderiso2709 the unitprice may/will be set to the ecost >- compare( >- { >- got => $order_0_1->tax_value_on_ordering, >- expected => 7.38, >- conf => '0 1', >- field => 'tax_value' >- } >+ sub compare { >+ my ($params) = @_; >+ is( >+ Koha::Number::Price->new( $params->{got} )->format, >+ Koha::Number::Price->new( $params->{expected} )->format, >+ "configuration $params->{conf}: $params->{field} should be correctly calculated" > ); >- $order_0_1->unitprice(77.490000); >- $order_0_1->populate_with_prices_for_ordering(); >+ } > >- # If a unitprice is provided at ordering, we calculate the tax from that >- compare( >- { >- got => $order_0_1->tax_value_on_ordering, >- expected => 7.75, >- conf => '0 1', >- field => 'tax_value' >- } >- ); >- $order_0_1->populate_with_prices_for_receiving(); >+ # format_for_editing >+ for my $currency_format ( qw( US FR ) ) { >+ t::lib::Mocks::mock_preference( 'CurrencyFormat', $currency_format ); >+ is( Koha::Number::Price->new( 1234567 )->format_for_editing, '1234567.00', 'format_for_editing should return unformated integer part with 2 decimals' ); >+ is( Koha::Number::Price->new( 1234567.89 )->format_for_editing, '1234567.89', 'format_for_editing should return unformated integer part with 2 decimals' ); >+ } >+}; > >- compare( >- { >- got => $order_0_1->unitprice_tax_included, >- expected => 77.49, >- conf => '0 1', >- field => 'unitprice_tax_included' >- } >- ); >- compare( >- { >- got => $order_0_1->unitprice_tax_excluded, >- expected => 73.80, >- conf => '0 1', >- field => 'unitprice_tax_excluded' >- } >- ); >- compare( >- { >- got => $order_0_1->tax_value_on_receiving, >- expected => 7.38, >- conf => '0 1', >- field => 'tax_value' >- } >- ); >- }; >-} >- >-sub compare { >- my ($params) = @_; >- is( >- Koha::Number::Price->new( $params->{got} )->format, >- Koha::Number::Price->new( $params->{expected} )->format, >-"configuration $params->{conf}: $params->{field} should be correctly calculated" >- ); >-} >- >-# format_for_editing >-for my $currency_format ( qw( US FR ) ) { >- t::lib::Mocks::mock_preference( 'CurrencyFormat', $currency_format ); >- is( Koha::Number::Price->new( 1234567 )->format_for_editing, '1234567.00', 'format_for_editing should return unformated integer part with 2 decimals' ); >- is( Koha::Number::Price->new( 1234567.89 )->format_for_editing, '1234567.89', 'format_for_editing should return unformated integer part with 2 decimals' ); >-} >+$schema->storage->txn_rollback; >-- >2.30.2
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=156487">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 34967
:
156432
|
156433
|
156434
| 156487 |
156488
|
156489