Attachment 93520 Details for Bug 23049 – Bug 23049: Use debit_type in staff client views

[patch] Bug 23049: Use debit_type in staff client views

Bug-23049-Use-debittype-in-staff-client-views.patch (text/plain), 4.42 KB, created by Martin Renvoize (ashimema) on 2019-10-03 07:24:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2019-10-03 07:24:58 UTC

Size: 4.42 KB

patch

obsolete

>From 76190a31c5924bc6369f226213f77bae9f829c83 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Wed, 2 Oct 2019 15:27:00 +0100
>Subject: [PATCH] Bug 23049: Use debit_type in staff client views
>
>---
> Koha/Account/Line.pm | 14 +++++
> .../prog/en/includes/accounts.inc | 54 +++++++++++--------
> 2 files changed, 45 insertions(+), 23 deletions(-)
>
>diff --git a/Koha/Account/Line.pm b/Koha/Account/Line.pm
>index 124aa29153..1f70bb1312 100644
>--- a/Koha/Account/Line.pm
>+++ b/Koha/Account/Line.pm
>@@ -22,6 +22,7 @@ use Data::Dumper;
> 
> use C4::Log qw(logaction);
> 
>+use Koha::Account::DebitType;
> use Koha::Account::Offsets;
> use Koha::Database;
> use Koha::Exceptions::Account;
>@@ -82,6 +83,19 @@ sub checkout {
> return $self->{_checkout};
> }
> 
>+=head3 debit_type
>+
>+Return the debit_type linked to this account line
>+
>+=cut
>+
>+sub debit_type {
>+ my ( $self ) = @_;
>+ my $rs = $self->_result->debit_type;
>+ return unless $rs;
>+ return Koha::Account::DebitType->_new_from_dbic( $rs );
>+}
>+
> =head3 void
> 
> $payment_accountline->void();
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
>index 61a31a2687..75bd7f7243 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
>@@ -1,28 +1,36 @@
> [%- BLOCK account_type_description -%]
>- [%- SWITCH account.accounttype -%]
>- [%- CASE 'Pay' -%]Payment
>- [%- CASE 'N' -%]New card
>- [%- CASE 'OVERDUE' -%]Fine
>- [%- CASE 'ACCOUNT' -%]Account creation fee
>- [%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee
>- [%- CASE 'M' -%]Sundry
>- [%- CASE 'LOST' -%]Lost item
>- [%- CASE 'W' -%]Writeoff
>- [%- CASE 'HE' -%]Hold waiting too long
>- [%- CASE 'RENT' -%]Rental fee
>- [%- CASE 'RENT_DAILY' -%]Daily rental fee
>- [%- CASE 'RENT_RENEW' -%]Renewal of rental item
>- [%- CASE 'RENT_DAILY_RENEW' -%]Rewewal of daily rental item
>- [%- CASE 'FOR' -%]Forgiven
>- [%- CASE 'PF' -%]Lost item processing fee
>- [%- CASE 'PAY' -%]Payment
>- [%- CASE 'WO' -%]Writeoff
>- [%- CASE 'C' -%]Credit
>- [%- CASE 'LOST_RETURN' -%]Lost item fee refund
>- [%- CASE 'Res' -%]Hold fee
>- [%- CASE -%][% account.accounttype | html %]
>+ 
>+ [%- IF account.accounttype -%]
>+ [%- SWITCH account.accounttype -%]
>+ [%- CASE 'Pay' -%]Payment
>+ [%- CASE 'W' -%]Writeoff
>+ [%- CASE 'FOR' -%]Forgiven
>+ [%- CASE 'PAY' -%]Payment
>+ [%- CASE 'WO' -%]Writeoff
>+ [%- CASE 'C' -%]Credit
>+ [%- CASE 'LOST_RETURN' -%]Lost item fee refund
>+ [%- CASE -%][% account.accounttype | html %]
>+ [%- END -%]
>+ [%- ELSIF account.debit_type -%]
>+ [%- SWITCH account.debit_type -%]
>+ [%- CASE 'N' -%]New card
>+ [%- CASE 'OVERDUE' -%]Fine
>+ [%- CASE 'ACCOUNT' -%]Account creation fee
>+ [%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee
>+ [%- CASE 'M' -%]Sundry
>+ [%- CASE 'LOST' -%]Lost item
>+ [%- CASE 'HE' -%]Hold waiting too long
>+ [%- CASE 'RENT' -%]Rental fee
>+ [%- CASE 'RENT_DAILY' -%]Daily rental fee
>+ [%- CASE 'RENT_RENEW' -%]Renewal of rental item
>+ [%- CASE 'RENT_DAILY_RENEW' -%]Rewewal of daily rental item
>+ [%- CASE 'PF' -%]Lost item processing fee
>+ [%- CASE 'Res' -%]Hold fee
>+ [%- CASE -%][% account.debit_type.description | html %]
>+ [%- END -%]
> [%- END -%]
>- [%- PROCESS account_status_description account=account -%]
>+ [%- PROCESS account_status_description account=account -%]
>+ 
> [%- END -%]
> 
> [%- BLOCK offset_type_description -%]
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 23049: 93513 | 93514 | 93515 | 93516 | 93518 | 93519 | 93520 | 93521 | 93522 | 93523 | 93529 | 93557 | 93564 | 93565 | 93567 | 93568 | 93569 | 93570 | 93571 | 93572 | 93573 | 93574 | 93575 | 93576 | 93577 | 93578 | 93579 | 93960 | 93961 | 93962 | 93963 | 93964 | 93965 | 93966 | 93967 | 93968 | 93969 | 93970 | 93972 | 93973 | 93974 | 93975 | 93976 | 93977 | 93978 | 93979 | 93989 | 93990 | 93991 | 93992 | 93993 | 93994 | 93995 | 93996 | 93997 | 93998 | 93999 | 94000 | 94001 | 94002 | 94003 | 94004 | 94005 | 94006 | 94007 | 94008 | 94073 | 94074 | 94075 | 94076 | 94077 | 94078 | 94079 | 94080 | 94081 | 94082 | 94083 | 94084 | 94085 | 94086 | 94087 | 94088 | 94089 | 94090 | 94091 | 94092 | 94093 | 94111 | 94112 | 94113 | 94114 | 94115 | 94116 | 94117 | 94118 | 94119 | 94120 | 94121 | 94122 | 94123 | 94124 | 94125 | 94126 | 94127 | 94128 | 94129 | 94130 | 94131 | 94132 | 94133 | 94134 | 94135 | 94136 | 94137 | 94138 | 94139 | 94140 | 94141 | 94142 | 94143 | 94144 | 94145 | 94146 | 94147 | 94148 | 94149 | 94150 | 94151 | 94152 | 94165 | 94307 | 94308 | 94309 | 94310 | 94311 | 94312 | 94313 | 94314 | 94315 | 94316 | 94317 | 94318 | 94319 | 94320 | 94321 | 94323 | 94324 | 94325 | 94326 | 94327 | 94328 | 94329 | 94331 | 94332 | 94333 | 94334 | 94335 | 94336 | 94337 | 94338 | 94339 | 94340 | 94341 | 94342 | 94343 | 94344 | 94345 | 94346 | 94347 | 94348 | 94349 | 94350 | 94351 | 94352 | 94648