Bugzilla – Attachment 79836 Details for
Bug 21467
Allow several receipts for a given subscription
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21467: Add subscription's info when ordering
Bug-21467-Add-subscriptions-info-when-ordering.patch (text/plain), 2.75 KB, created by
Jonathan Druart
on 2018-10-02 16:51:13 UTC
(
hide
)
Description:
Bug 21467: Add subscription's info when ordering
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2018-10-02 16:51:13 UTC
Size:
2.75 KB
patch
obsolete
>From 4a09781e698eead9a2b2415e98f89d00934a6351 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Tue, 2 Oct 2018 12:39:38 -0300 >Subject: [PATCH] Bug 21467: Add subscription's info when ordering > >When ordering from a subscription, there is now a "hint" to display the >number of issues and the frequency. It will be easier to estimate the >quantity to receive. >--- > acqui/neworderempty.pl | 7 ++++++- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt | 10 ++++++++++ > 2 files changed, 16 insertions(+), 1 deletion(-) > >diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl >index 0e6f2c14c2..a90d6dfb63 100755 >--- a/acqui/neworderempty.pl >+++ b/acqui/neworderempty.pl >@@ -94,6 +94,7 @@ use Koha::MarcSubfieldStructures; > use Koha::ItemTypes; > use Koha::Patrons; > use Koha::RecordProcessor; >+use Koha::Subscriptions; > > our $input = new CGI; > my $booksellerid = $input->param('booksellerid'); # FIXME: else ERROR! >@@ -383,7 +384,11 @@ if ( defined $from_subscriptionid ) { > $basket = GetBasket( $input->param('basketno') ); > } > >- $template->param( subscriptionid => $from_subscriptionid ); >+ my $subscription = Koha::Subscriptions->find($from_subscriptionid); >+ $template->param( >+ subscriptionid => $from_subscriptionid, >+ subscription => $subscription, >+ ); > } > > # Find the items.barcode subfield for barcode validations >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >index 4cd4937564..450d47c4df 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >@@ -321,6 +321,16 @@ > [% END %] > <!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, usefull when receiveing an order --> > <input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="1" /> >+ >+ [% IF subscription %] >+ <br/> >+ <span class="hint"> >+ Frequency: [% subscription.frequency.description | html %] | >+ [% IF subscription.numberlength %]Number of issues: [% subscription.numberlength | html %][% END %] >+ [% IF subscription.weeklength %]Number of weeks: [% subscription.weeklength | html %][% END %] >+ [% IF subscription.monthlength %]Number of months: [% subscription.monthlength | html %][% END %] >+ </span> >+ [% END %] > </li> > <li> > [% IF ( close ) %] >-- >2.11.0
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 21467
:
79801
|
79802
|
79834
|
79835
|
79836
|
79837
|
79838
|
80546
|
80706
|
80707
|
80717
|
80718
|
80719
|
80720
|
80721
|
80722
|
80723
|
80724
|
81394
|
81395
|
81396
|
81397
|
81398
|
81399
|
81400
|
81430
|
81797
|
81798
|
81799
|
81800
|
81801
|
81802
|
81803
|
81804
|
81805
|
81806
|
81807
|
81808
|
81809
|
81810
|
81811
|
82117
|
82122
|
82123
|
82124
|
82125
|
82126
|
82127
|
82128
|
82129
|
82130
|
82131
|
82132