Bugzilla – Attachment 131530 Details for
Bug 28138
Add system preference to make the payment type required
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 28138: Add syspref to make the payment type required
Bug-28138-Add-syspref-to-make-the-payment-type-req.patch (text/plain), 4.99 KB, created by
Shi Yao Wang
on 2022-03-09 20:46:08 UTC
(
hide
)
Description:
Bug 28138: Add syspref to make the payment type required
Filename:
MIME Type:
Creator:
Shi Yao Wang
Created:
2022-03-09 20:46:08 UTC
Size:
4.99 KB
patch
obsolete
>From 759f50430b77b811e4de2b975054d831739ff3e4 Mon Sep 17 00:00:00 2001 >From: Julian Maurice <julian.maurice@biblibre.com> >Date: Tue, 13 Apr 2021 10:06:24 +0200 >Subject: [PATCH] Bug 28138: Add syspref to make the payment type required > >The payment type is already required when using the cash register >feature, but some users want to force selecting a payment type even >when cash registers are not used > >The new system preference name is RequirePaymentType > >Test plan: >1. Apply patch and run updatedatabase.pl >2. Disable UseCashRegisters and RequirePaymentType sysprefs >3. Create some authorised values in PAYMENT_TYPE category if needed >4. Create a manual invoice and pay it. Notice that the payment type is > optional. >5. Enable RequirePaymentType >6. Create a manual invoice and pay it. Notice that the payment type is > now required. >7. Enable UseCashRegisters and verify that the payment type is always > required, even if RequirePaymentType is disabled > >Rebased by Thibaud Guillot <thibaud.guillot@biblibre.com> on 21-12-02 > >Signed-off-by: shiyao <shiyao@inlibro.com> >--- > .../add-system-preference-RequirePaymentType.perl | 9 +++++++++ > installer/data/mysql/mandatory/sysprefs.sql | 1 + > .../intranet-tmpl/prog/en/includes/transaction_types.inc | 2 +- > .../prog/en/modules/admin/preferences/accounting.pref | 7 +++++++ > 4 files changed, 18 insertions(+), 1 deletion(-) > create mode 100644 installer/data/mysql/atomicupdate/add-system-preference-RequirePaymentType.perl > >diff --git a/installer/data/mysql/atomicupdate/add-system-preference-RequirePaymentType.perl b/installer/data/mysql/atomicupdate/add-system-preference-RequirePaymentType.perl >new file mode 100644 >index 0000000000..5ba51c1a38 >--- /dev/null >+++ b/installer/data/mysql/atomicupdate/add-system-preference-RequirePaymentType.perl >@@ -0,0 +1,9 @@ >+$DBversion = 'XXX'; >+if ( CheckVersion($DBversion) ) { >+ $dbh->do(q{ >+ INSERT IGNORE INTO systempreferences (`variable`,`value`,`options`,`explanation`,`type`) >+ VALUES ('RequirePaymentType','0','','Require staff to select a payment type when a payment is made','YesNo') >+ }); >+ >+ NewVersion( $DBversion, '28138', 'Add system preference RequirePaymentType'); >+} >diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql >index dd83a00fd8..d26a58a13f 100644 >--- a/installer/data/mysql/mandatory/sysprefs.sql >+++ b/installer/data/mysql/mandatory/sysprefs.sql >@@ -563,6 +563,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('RentalsInNoissuesCharge','1',NULL,'Rental charges block checkouts (added to noissuescharge).','YesNo'), > ('ReplyToDefault','',NULL,'Use this email address as the replyto in emails','Free'), > ('ReportsLog','0',NULL,'If ON, log information about reports.','YesNo'), >+('RequirePaymentType','0','','Require staff to select a payment type when a payment is made','YesNo'), > ('RequireStrongPassword','1','','Require a strong login password for staff and patrons','YesNo'), > ('ReservesControlBranch','PatronLibrary','ItemHomeLibrary|PatronLibrary','Branch checked for members reservations rights','Choice'), > ('ReservesMaxPickUpDelay','7','','Define the Maximum delay to pick up an item on hold','Integer'), >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/transaction_types.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/transaction_types.inc >index 267e5b30ed..cc1ef8a0cb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/transaction_types.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/transaction_types.inc >@@ -6,7 +6,7 @@ > [% END %] > [% IF payment_types.size > 0 %] > <li> >- [% IF Koha.Preference('UseCashRegisters') %] >+ [% IF Koha.Preference('UseCashRegisters') || Koha.Preference('RequirePaymentType') %] > <label for="[% type | html %]_type" class="required">[% IF type == 'payment' %]Payment[% ELSE %]Transaction[% END %] type: </label> > <select name="[% type | html %]_type" id="[% type | html %]_type" class="required" required="required"> > [% IF type == 'refund' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/accounting.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/accounting.pref >index b23880179b..29df8f75a0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/accounting.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/accounting.pref >@@ -12,6 +12,13 @@ Accounting: > 1: "Do" > 0: "Don't" > - automatically display a print dialog for a payment receipt when making a payment. >+ - >+ - pref: RequirePaymentType >+ choices: >+ 0: "Do not require" >+ 1: "Require" >+ - staff to select a payment type when a payment is made. >+ - This preference has no effect when UseCashRegisters is enabled or when no payment type is defined in PAYMENT_TYPE authorised value category > - > - pref: RoundFinesAtPayment > choices: >-- >2.25.1
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 28138
:
119507
|
119509
|
128166
|
131530
|
131643
|
133606
|
133609
|
133610
|
133611
|
133814
|
133815
|
133816
|
133817
|
133821