Bugzilla – Attachment 152273 Details for
Bug 33176
Improve enforcing of RequirePaymentType
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33176: Enforce bad values
Bug-33176-Enforce-bad-values.patch (text/plain), 4.60 KB, created by
Katrin Fischer
on 2023-06-10 19:22:09 UTC
(
hide
)
Description:
Bug 33176: Enforce bad values
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2023-06-10 19:22:09 UTC
Size:
4.60 KB
patch
obsolete
>From 7e632cdabd219f98bb0f4c69b8dffb2a83e72538 Mon Sep 17 00:00:00 2001 >From: Lucas Gass <lucas@bywatersolutions.com> >Date: Wed, 7 Jun 2023 18:40:48 +0000 >Subject: [PATCH] Bug 33176: Enforce bad values > >1. Turn on RequirePaymentType >2. Create a manual invocie on a patron account >3. Go to pay it, 'Payment type:' is marked as required. >4. In the inscept the select input ( #payment_type ) with your browser's dev tools. Removed the required attribute. >5. You are able to make the payment without a payment type. >6. Apply patch and restart_all >7. Try 4-5 again. This time you should get a 500 error and the payment should not go through. >8. Try a paymnet again this time manipulate the DOM and change the value of 'CASH' to something else like 'SOMETHINGELSE'. >9. Try to submit the payment and again you will get a 500 error. The payment should not go through. >10. Turn RequirePaymentType off. Try a payment with a payment type, you shoud be successful. >11. Make sure tests will pass > >Signed-off-by: Sam Lau <samalau@gmail.com> >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > Koha/Account.pm | 16 ++++++++++++---- > Koha/Exceptions/Account.pm | 4 ++++ > t/db_dependent/Koha/Account.t | 18 +++++++++++++++--- > 3 files changed, 31 insertions(+), 7 deletions(-) > >diff --git a/Koha/Account.pm b/Koha/Account.pm >index 4522dce890..6e63242eb9 100644 >--- a/Koha/Account.pm >+++ b/Koha/Account.pm >@@ -87,6 +87,18 @@ sub pay { > > my $userenv = C4::Context->userenv; > >+ Koha::Exceptions::Account::PaymentTypeRequired->throw() >+ if ( C4::Context->preference("RequirePaymentType") >+ && !defined($payment_type) ); >+ >+ my $av = Koha::AuthorisedValues->search_with_library_limits({ category => 'PAYMENT_TYPE', authorised_value => $payment_type }); >+ >+ if ( !$av->count && C4::Context->preference("RequirePaymentType")) { >+ Koha::Exceptions::Account::InvalidPaymentType->throw( >+ error => 'Invalid payment type' >+ ); >+ } >+ > my $manager_id = $userenv ? $userenv->{number} : undef; > my $interface = $params ? ( $params->{interface} || C4::Context->interface ) : C4::Context->interface; > my $payment = $self->payin_amount( >@@ -105,10 +117,6 @@ sub pay { > } > ); > >- Koha::Exceptions::Account::PaymentTypeRequired->throw() >- if ( C4::Context->preference("RequirePaymentType") >- && !defined($payment_type) ); >- > # NOTE: Pay historically always applied as much credit as it could to all > # existing outstanding debits, whether passed specific debits or otherwise. > if ( $payment->amountoutstanding ) { >diff --git a/Koha/Exceptions/Account.pm b/Koha/Exceptions/Account.pm >index 26bbac593c..0b36f0818f 100644 >--- a/Koha/Exceptions/Account.pm >+++ b/Koha/Exceptions/Account.pm >@@ -51,6 +51,10 @@ use Exception::Class ( > 'Koha::Exceptions::Account::PaymentTypeRequired' => { > isa => 'Koha::Exceptions::Account', > description => 'Account transaction requires a payment type' >+ }, >+ 'Koha::Exceptions::Account::InvalidPaymentType' => { >+ isa => 'Koha::Exceptions::Account', >+ description => 'Invalid payment type' > } > ); > >diff --git a/t/db_dependent/Koha/Account.t b/t/db_dependent/Koha/Account.t >index 65c0246650..46f57f1358 100755 >--- a/t/db_dependent/Koha/Account.t >+++ b/t/db_dependent/Koha/Account.t >@@ -691,7 +691,7 @@ subtest 'reconcile_balance' => sub { > > subtest 'pay() tests' => sub { > >- plan tests => 7; >+ plan tests => 8; > > $schema->storage->txn_begin; > >@@ -708,13 +708,25 @@ subtest 'pay() tests' => sub { > $account->pay( > { > amount => 5, >- interface => 'intranet' >+ interface => 'intranet', > } > ); > } > 'Koha::Exceptions::Account::PaymentTypeRequired', > 'Exception thrown for RequirePaymentType:1 + payment_type:undef'; > >+ throws_ok { >+ $account->pay( >+ { >+ amount => 5, >+ interface => 'intranet', >+ payment_type => 'FOOBAR' >+ } >+ ); >+ } >+ 'Koha::Exceptions::Account::InvalidPaymentType', >+ 'Exception thrown for InvalidPaymentType:1 + payment_type:FOOBAR'; >+ > t::lib::Mocks::mock_preference( 'RequirePaymentType', 0 ); > my $context = Test::MockModule->new('C4::Context'); > $context->mock( 'userenv', { branch => $library->id } ); >@@ -750,7 +762,7 @@ subtest 'pay() tests' => sub { > my $result = $account->pay( > { > amount => 20, >- payment_Type => 'CASH', >+ payment_type => 'CASH', > interface => 'intranet' > } > ); >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 33176
:
149617
|
149619
|
150254
|
150255
|
152131
|
152203
|
152204
|
152205
|
152271
|
152272
| 152273