Bugzilla – Attachment 100167 Details for
Bug 23354
Add a 'Point of sale' screen to allow anonymous payments
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23354: (RM follow-up) Correction for cash register selection
Bug-23354-RM-follow-up-Correction-for-cash-registe.patch (text/plain), 2.42 KB, created by
Martin Renvoize (ashimema)
on 2020-03-05 08:54:20 UTC
(
hide
)
Description:
Bug 23354: (RM follow-up) Correction for cash register selection
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2020-03-05 08:54:20 UTC
Size:
2.42 KB
patch
obsolete
>From 8d8c5f7311820ff87e29be52d2290c5686454b94 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Thu, 5 Mar 2020 08:51:51 +0000 >Subject: [PATCH] Bug 23354: (RM follow-up) Correction for cash register > selection > >The form element for selectin cash register override at point of sale was >misnamed and as such one could not actually override the cash register. > >This patch corrects the form element name and updates the logic very >slighlty to ensure we still fall back to the defualt no the subsequent >page load. > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > pos/pay.pl | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > >diff --git a/pos/pay.pl b/pos/pay.pl >index fe9ee8703b..acee17d3c9 100755 >--- a/pos/pay.pl >+++ b/pos/pay.pl >@@ -31,9 +31,10 @@ my ( $template, $loggedinuser, $cookie, $user_flags ) = get_template_and_user( > ); > my $logged_in_user = Koha::Patrons->find($loggedinuser) or die "Not logged in"; > >-my $library_id = C4::Context->userenv->{'branch'}; >-my $registerid = $input->param('registerid'); >-my $registers = Koha::Cash::Registers->search( >+my $library_id = C4::Context->userenv->{'branch'}; >+my $registerid = $input->param('registerid'); >+my $default_registerid = $input->param('default_register'); >+my $registers = Koha::Cash::Registers->search( > { branch => $library_id, archived => 0 }, > { order_by => { '-asc' => 'name' } } > ); >@@ -42,22 +43,21 @@ if ( !$registers->count ) { > $template->param( error_registers => 1 ); > } > else { >- if ( !$registerid ) { >+ if ( !$default_registerid ) { > my $default_register = Koha::Cash::Registers->find( > { branch => $library_id, branch_default => 1 } ); >- $registerid = $default_register->id if $default_register; >+ $default_registerid = >+ $default_register ? $default_register->id : $registers->next->id; > } >- $registerid = $registers->next->id if !$registerid; > > $template->param( >- registerid => $registerid, >- registers => $registers, >+ default_register => $default_registerid, >+ registers => $registers, > ); > } > > my $invoice_types = >- Koha::Account::DebitTypes->search_with_library_limits( >- { can_be_sold => 1 }, >+ Koha::Account::DebitTypes->search_with_library_limits( { can_be_sold => 1 }, > {}, $library_id ); > $template->param( invoice_types => $invoice_types ); > >-- >2.20.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 23354
:
92066
|
92431
|
92432
|
92433
|
92502
|
92830
|
92831
|
92832
|
92833
|
92834
|
92873
|
92874
|
92875
|
92876
|
92877
|
92878
|
92890
|
92891
|
92892
|
92893
|
92894
|
92895
|
93116
|
93117
|
93118
|
93119
|
93120
|
93121
|
93122
|
93123
|
93124
|
93465
|
93466
|
93467
|
93468
|
93469
|
93470
|
93471
|
93472
|
93473
|
93604
|
93605
|
93606
|
93607
|
93608
|
93609
|
93610
|
93611
|
93612
|
94689
|
94690
|
94691
|
94692
|
94693
|
94694
|
94695
|
94696
|
94697
|
94698
|
94699
|
95678
|
95679
|
95680
|
95681
|
95682
|
95683
|
95684
|
95685
|
95686
|
95687
|
95688
|
95689
|
95690
|
95691
|
95692
|
95693
|
97013
|
97014
|
97015
|
97016
|
97017
|
97018
|
97019
|
97020
|
97021
|
97022
|
97023
|
97024
|
97025
|
97026
|
97027
|
97028
|
97029
|
97169
|
97170
|
97171
|
97188
|
97189
|
97200
|
97201
|
97202
|
97203
|
97204
|
97205
|
97206
|
97207
|
97208
|
97209
|
97210
|
97211
|
97212
|
97213
|
97214
|
97215
|
97216
|
97217
|
97218
|
97219
|
97271
|
97272
|
97273
|
97274
|
97275
|
97276
|
97277
|
97278
|
97279
|
97280
|
97281
|
97282
|
97283
|
97284
|
97285
|
97286
|
97287
|
97288
|
97289
|
97290
|
97291
|
97292
|
97725
|
97726
| 100167