Bugzilla – Attachment 178237 Details for
Bug 38010
Migrate vendors to Vue
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 38010: (QA follow-up) Remove unnecessary code from booksellers.pl
Bug-38010-QA-follow-up-Remove-unnecessary-code-fro.patch (text/plain), 8.55 KB, created by
Matt Blenkinsop
on 2025-02-18 13:50:01 UTC
(
hide
)
Description:
Bug 38010: (QA follow-up) Remove unnecessary code from booksellers.pl
Filename:
MIME Type:
Creator:
Matt Blenkinsop
Created:
2025-02-18 13:50:01 UTC
Size:
8.55 KB
patch
obsolete
>From 495471cbb4d15ea5396c32b85034e8719b84f29f Mon Sep 17 00:00:00 2001 >From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> >Date: Tue, 11 Feb 2025 13:57:43 +0000 >Subject: [PATCH] Bug 38010: (QA follow-up) Remove unnecessary code from > booksellers.pl > >--- > acqui/booksellers.pl | 89 ++++--------------- > .../prog/en/modules/acqui/booksellers.tt | 34 +------ > 2 files changed, 20 insertions(+), 103 deletions(-) > >diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl >index 12c28a7a38e..81d735cba38 100755 >--- a/acqui/booksellers.pl >+++ b/acqui/booksellers.pl >@@ -1,7 +1,5 @@ > #!/usr/bin/perl > >-#script to show suppliers and orders >- > # Copyright 2000-2002 Katipo Communications > # Copyright 2008-2009 BibLibre SARL > # Copyright 2010 PTFS Europe >@@ -27,22 +25,12 @@ booksellers.pl > > =head1 DESCRIPTION > >-this script displays the list of suppliers & baskets like C<$supplier> given on input arg. >-thus, this page brings differents features like to display supplier's details, >-to add an order for a specific supplier or to just add a new supplier. >+this script displays the baskets for a vendor > > =head1 CGI PARAMETERS > > =over 4 > >-=item supplier >- >-C<$supplier> is the string with which we search for a supplier >- >-=back >- >-=over 4 >- > =item id or booksellerid > > The id of the supplier whose baskets we will display >@@ -52,17 +40,14 @@ The id of the supplier whose baskets we will display > =cut > > use Modern::Perl; >-use C4::Auth qw( get_template_and_user haspermission ); >-use C4::Budgets qw( GetBudgetHierarchy GetBudget CanUserUseBudget ); >-use C4::Output qw( output_html_with_http_headers ); >-use CGI qw ( -utf8 ); >+use C4::Auth qw( get_template_and_user haspermission ); >+use C4::Output qw( output_html_with_http_headers ); >+use CGI qw ( -utf8 ); > > use C4::Acquisition qw( GetBasket GetBasketsInfosByBookseller CanUserManageBasket GetBasketgroup ); >-use C4::Context; > > use Koha::Acquisition::Booksellers; > use Koha::Patrons; >-use Koha::Acquisition::Currencies; > > my $query = CGI->new; > my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user( >@@ -75,65 +60,24 @@ my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user( > ); > > #parameters >-my $supplier = $query->param('supplier'); > my $booksellerid = $query->param('booksellerid'); > my $allbaskets = $query->param('allbaskets') || 0; > my @suppliers; > >+my $vendor; >+my $loop_suppliers = []; >+ > if ($booksellerid) { >- push @suppliers, Koha::Acquisition::Booksellers->find($booksellerid); >-} else { >- @suppliers = Koha::Acquisition::Booksellers->search( >- [ >- { name => { -like => "%$supplier%" } }, >- { 'aqbookseller_aliases.alias' => { -like => "%$supplier%" } }, >- ], >- { >- order_by => { -asc => 'name' }, >- join => 'aqbookseller_aliases', >- distinct => 1, >- } >- )->as_list; >-} >+ $vendor = Koha::Acquisition::Booksellers->find($booksellerid); > >-my $supplier_count = @suppliers; >-if ( $supplier_count == 1 ) { > $template->param( >- supplier_name => $suppliers[0]->name, >- booksellerid => $suppliers[0]->id, >- basketcount => $suppliers[0]->baskets->count, >- subscriptionscount => $suppliers[0]->subscriptions->count, >- active => $suppliers[0]->active, >+ supplier_name => $vendor->name, >+ booksellerid => $vendor->id, >+ basketcount => $vendor->baskets->count, >+ subscriptionscount => $vendor->subscriptions->count, >+ active => $vendor->active, > ); >-} > >-my $uid; >- >-# FIXME This script should only be accessed by a valid logged in patron >-if ($loggedinuser) { >- >- # FIXME Should not be needed, logged in patron should be cached >- $uid = Koha::Patrons->find($loggedinuser)->userid; >-} >- >-my $userenv = C4::Context::userenv; >-my $viewbaskets = C4::Context->preference('AcqViewBaskets'); >- >-my $userbranch = $userenv->{branch}; >- >-my $budgets = GetBudgetHierarchy; >-my $has_budgets = 0; >-foreach my $r ( @{$budgets} ) { >- next unless ( CanUserUseBudget( $loggedinuser, $r, $userflags ) ); >- >- $has_budgets = 1; >- last; >-} >- >-#build result page >-my $loop_suppliers = []; >- >-for my $vendor (@suppliers) { > my $baskets = GetBasketsInfosByBookseller( $vendor->id, $allbaskets ); > > my $loop_basket = []; >@@ -167,13 +111,12 @@ for my $vendor (@suppliers) { > basketcount => $vendor->baskets->count, > subscriptioncount => $vendor->subscriptions->count, > }; >- > } >+ > $template->param( > loop_suppliers => $loop_suppliers, >- supplier => ( $booksellerid || $supplier ), >- count => $supplier_count, >- has_budgets => $has_budgets, >+ supplier => $booksellerid, >+ count => $vendor ? 1 : 0, > ); > $template->{VARS}->{'allbaskets'} = $allbaskets; > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >index aef88404e5b..e0d9c138f55 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >@@ -42,34 +42,8 @@ > [% WRAPPER 'main-container.inc' asides=asides %] > > [% INCLUDE 'acquisitions-toolbar.inc' %] >- [% UNLESS ( count == 1 ) %] >- [% UNLESS count %] >- <h1>Your vendor search returned no results.</h1> >- [% ELSIF ( supplier.length < 1 ) %] >- <h1>Vendor search: [% count | html %] results found</h1> >- [% ELSE %] >- <h1>Vendor search: [% count | html %] results found for '[% supplier | html %]'</h1> >- [% END %] >- [% END %] >+ > [% IF ( loop_suppliers.size ) %] >- [% UNLESS (count == 1) %] >- <p >- >Choose a vendor in the list to jump directly to the right place. >- <select id="supplierlist"> >- [% FOREACH supplier1 IN loop_suppliers %] >- <option value="[% supplier1.booksellerid | html %]">[% supplier1.name | html %]</option> >- [% END %] >- </select> >- </p> >- [% IF ( allbaskets ) %] >- <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&booksellerid=[% booksellerid | uri %]">Show active baskets only</a> >- [% ELSE %] >- <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&booksellerid=[% booksellerid | uri %]&allbaskets=1">Show all baskets</a> >- [% END %] >- [% END %] >- [% UNLESS booksellerid %] >- | <a href="#" id="show_active_vendors">Show active vendors only</a><a href="#" id="show_all_vendors">Show all vendors</a> >- [% END %] > <div id="acqui_order_supplierlist"> > [% FOREACH supplier IN loop_suppliers %] > [% UNLESS supplier.active %] >@@ -110,9 +84,9 @@ > [% IF ( supplier.basketcount > 0 ) %] > <div> > [% IF ( allbaskets ) %] >- <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier.booksellerid | uri %]&booksellerid=[% booksellerid | uri %]">Show active baskets only</a> >+ <a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | uri %]">Show active baskets only</a> > [% ELSE %] >- <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier.booksellerid | uri %]&booksellerid=[% booksellerid | uri %]&allbaskets=1">Show all baskets</a> >+ <a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | uri %]&allbaskets=1">Show all baskets</a> > [% END %] > </div> > [% END %] >@@ -246,7 +220,7 @@ > <p> > No pending baskets. > [% IF ( supplier.basketcount > 0 && count > 1 ) %] >- <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=1&booksellerid=[% supplier.booksellerid | uri %]&allbaskets=1">View all baskets</a>. >+ <a href="/cgi-bin/koha/acqui/booksellers.pl?&booksellerid=[% supplier.booksellerid | uri %]&allbaskets=1">View all baskets</a>. > [% END %] > </p> > [% END %][%# IF ( supplier.loop_basket.size ) %] >-- >2.48.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 38010
:
174119
|
174120
|
174121
|
174122
|
174123
|
174124
|
174125
|
174126
|
174128
|
174129
|
174130
|
174131
|
174132
|
174133
|
174134
|
174135
|
174136
|
174137
|
174138
|
174139
|
174140
|
174141
|
174142
|
174143
|
174144
|
174145
|
174146
|
174147
|
174148
|
174151
|
174152
|
174153
|
174154
|
174155
|
174156
|
174157
|
174158
|
174159
|
174160
|
174161
|
174162
|
174163
|
174164
|
174165
|
174166
|
174167
|
174168
|
174169
|
174170
|
174171
|
174172
|
174173
|
174174
|
174175
|
174176
|
174177
|
174178
|
174179
|
174194
|
174196
|
174197
|
174198
|
174199
|
174200
|
174201
|
174202
|
174203
|
174204
|
174205
|
174206
|
174207
|
174208
|
174209
|
174210
|
174211
|
174212
|
174213
|
174214
|
174215
|
174216
|
174217
|
174218
|
174220
|
174221
|
174222
|
174223
|
174224
|
174225
|
174226
|
174248
|
174266
|
174267
|
174269
|
174270
|
174273
|
174327
|
174328
|
174329
|
174330
|
174331
|
174332
|
174333
|
174334
|
174335
|
174336
|
174337
|
174338
|
174339
|
174340
|
174341
|
174342
|
174343
|
174344
|
174345
|
174346
|
174347
|
174348
|
174349
|
174350
|
174351
|
174352
|
174353
|
174354
|
174355
|
174356
|
174357
|
174358
|
174359
|
174360
|
174603
|
175098
|
175099
|
175100
|
175101
|
175102
|
175103
|
175104
|
175105
|
175106
|
175107
|
175108
|
175109
|
175110
|
175111
|
175112
|
175113
|
175114
|
175115
|
175116
|
175117
|
175118
|
175119
|
175120
|
175121
|
175122
|
175123
|
175124
|
175125
|
175126
|
175127
|
175128
|
175129
|
175130
|
175131
|
175133
|
175134
|
175135
|
175136
|
175137
|
175167
|
175168
|
175170
|
175240
|
175241
|
175242
|
175243
|
175248
|
175249
|
175266
|
175791
|
175799
|
176547
|
178182
|
178183
|
178184
|
178185
|
178186
|
178187
|
178188
|
178189
|
178190
|
178191
|
178192
|
178193
|
178194
|
178195
|
178196
|
178197
|
178198
|
178199
|
178200
|
178201
|
178202
|
178203
|
178204
|
178205
|
178206
|
178207
|
178208
|
178209
|
178210
|
178211
|
178212
|
178213
|
178214
|
178215
|
178216
|
178217
|
178218
|
178219
|
178220
|
178221
|
178222
|
178223
|
178224
|
178225
|
178226
|
178227
|
178228
|
178229
|
178230
|
178231
|
178232
|
178233
|
178234
|
178235
|
178236
|
178237
|
178238
|
178239
|
178240
|
178241
|
178242
|
181579
|
181585
|
181727
|
181728
|
181729
|
181730
|
181731
|
181732
|
181733
|
181734
|
181735
|
181736
|
181737
|
181738
|
181739
|
181740
|
181741
|
181742
|
181743
|
181744
|
181745
|
181746
|
181747
|
181748
|
181749
|
181750
|
181751
|
181752
|
181753
|
181754
|
181755
|
181756
|
181757
|
181758
|
181759
|
181760
|
181761
|
181762
|
181763
|
181764
|
181765
|
181766
|
181767
|
181768
|
181769
|
181770
|
181771
|
181772
|
181773
|
181774
|
181775
|
181776
|
181777
|
181778
|
181779
|
181780
|
181781
|
181782
|
181783
|
181784
|
181785
|
181786
|
181787
|
181788
|
181789
|
181790
|
181791
|
181792
|
181793
|
181794
|
181795
|
181796
|
181797
|
181798
|
181799
|
181800
|
181801
|
181802
|
181803
|
181804
|
181805
|
181806
|
181807
|
181808
|
181809
|
181810
|
181811
|
181812
|
181813
|
181814
|
181815
|
181816
|
181817
|
181818
|
181819
|
181820
|
181821
|
181891
|
181898
|
181901
|
181963
|
181964
|
182053
|
182351
|
182438