Bugzilla – Attachment 163738 Details for
Bug 36408
Move boraccount.tt modals to includes/modals/
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 36408: Move issue payout modal to include
Bug-36408-Move-issue-payout-modal-to-include.patch (text/plain), 8.44 KB, created by
Lucas Gass (lukeg)
on 2024-03-22 19:48:32 UTC
(
hide
)
Description:
Bug 36408: Move issue payout modal to include
Filename:
MIME Type:
Creator:
Lucas Gass (lukeg)
Created:
2024-03-22 19:48:32 UTC
Size:
8.44 KB
patch
obsolete
>From ade2c8f5384e03669a585170c1dc26436193c718 Mon Sep 17 00:00:00 2001 >From: Lucas Gass <lucas@bywatersolutions.com> >Date: Fri, 22 Mar 2024 19:41:04 +0000 >Subject: [PATCH] Bug 36408: Move issue payout modal to include > >To test: >1. APPLY PATCH >2. Go to the transaction tab on a patron account and "Create manual credit" >3. Now go to the transaction page and look for the "Payout amount" button >4. Make sure the modal loads properly and you can make a full payout and a partial payout. >5. Turn on "UseCashRegisters" and make a new register. >6. Ensure you can select the register correctly when paying out. >--- > .../prog/en/includes/modals/issue_payout.inc | 53 ++++++++++++++++++ > .../prog/en/modules/members/boraccount.tt | 55 +------------------ > 2 files changed, 54 insertions(+), 54 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/modals/issue_payout.inc > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/issue_payout.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/issue_payout.inc >new file mode 100644 >index 0000000000..f746fb9149 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/issue_payout.inc >@@ -0,0 +1,53 @@ >+<!-- Issue payout modal --> >+<div class="modal" id="issuePayoutModal" tabindex="-1" role="dialog" aria-labelledby="issuePayoutLabel"> >+ <form id="payout_form" action="/cgi-bin/koha/members/boraccount.pl" method="post" enctype="multipart/form-data" class="validated"> >+ [% INCLUDE 'csrf-token.inc' %] >+ <input type="hidden" name="accountlines_id" value="" id="payoutline"> >+ <input type="hidden" name="op" value="cud-payout"> >+ <input type="hidden" name="borrowernumber" value="[% account.borrowernumber | html %]"> >+ <div class="modal-dialog" role="document"> >+ <div class="modal-content"> >+ <div class="modal-header"> >+ <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> >+ <h4 class="modal-title" id="issuePayoutLabel">Issue payout</h4> >+ </div> >+ <div class="modal-body"> >+ [% IF Koha.Preference('UseCashRegisters') && ( registers.size == 0 ) %] >+ <div id="payout_error" class="dialog alert"> >+ You must have at least one cash register associated with this branch before you can record cash payouts. >+ </div> >+ [% END %] >+ <fieldset class="rows"> >+ <ol> >+ <li> >+ <span id="paid" class="label">Outstanding credit: </span><span>[% payout.amount | $Price %]</span> >+ </li> >+ <li> >+ <label class="required" for="amount">Returned to patron: </label> >+ <input type="text" inputmode="numeric" pattern="[0-9]*" id="amount" name="amount" required="required"> >+ <span class="required">Required</span> >+ </li> >+ >+ [% INCLUDE 'transaction_types.inc' type="payout" %] >+ >+ [% IF Koha.Preference('UseCashRegisters') %] >+ <li> >+ <label for="registerid">Cash register: </label> >+ <select name="registerid" id="payout_registerid"> >+ <option id="noregister" disabled selected="selected" value="">-- Select an option--</option> >+ [% PROCESS options_for_registers %] >+ </select> >+ </li> >+ [% END %] >+ >+ </ol> >+ </fieldset> <!-- /.rows --> >+ </div> <!-- /.modal-body --> >+ <div class="modal-footer"> >+ <button type="submit" class="btn btn-default" id="borr_payout_confirm">Confirm</button> >+ <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> >+ </div> <!-- /.modal-footer --> >+ </div> <!-- /.modal-content --> >+ </div> <!-- /.modal-dialog --> >+ </form> <!-- /#payout_form --> >+</div> <!-- /#issuePayoutModal --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >index a051fc2732..70f5bdb9db 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -242,60 +242,7 @@ > </div> <!-- /.col-sm-2.col-sm-pull-10 --> > </div> <!-- /.row --> > >- <!-- Issue payout modal --> >- <div class="modal" id="issuePayoutModal" tabindex="-1" role="dialog" aria-labelledby="issuePayoutLabel"> >- <form id="payout_form" action="/cgi-bin/koha/members/boraccount.pl" method="post" enctype="multipart/form-data" class="validated"> >- [% INCLUDE 'csrf-token.inc' %] >- <input type="hidden" name="accountlines_id" value="" id="payoutline"> >- <input type="hidden" name="op" value="cud-payout"> >- <input type="hidden" name="borrowernumber" value="[% account.borrowernumber | html %]"> >- <div class="modal-dialog" role="document"> >- <div class="modal-content"> >- <div class="modal-header"> >- <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> >- <h4 class="modal-title" id="issuePayoutLabel">Issue payout</h4> >- </div> >- <div class="modal-body"> >- [% IF Koha.Preference('UseCashRegisters') && ( registers.size == 0 ) %] >- <div id="payout_error" class="dialog alert"> >- You must have at least one cash register associated with this branch before you can record cash payouts. >- </div> >- [% END %] >- <fieldset class="rows"> >- <ol> >- <li> >- <span id="paid" class="label">Outstanding credit: </span><span>[% payout.amount | $Price %]</span> >- </li> >- <li> >- <label class="required" for="amount">Returned to patron: </label> >- <input type="text" inputmode="numeric" pattern="[0-9]*" id="amount" name="amount" required="required"> >- <span class="required">Required</span> >- </li> >- >- [% INCLUDE 'transaction_types.inc' type="payout" %] >- >- [% IF Koha.Preference('UseCashRegisters') %] >- <li> >- <label for="registerid">Cash register: </label> >- <select name="registerid" id="payout_registerid"> >- <option id="noregister" disabled selected="selected" value="">-- Select an option--</option> >- [% PROCESS options_for_registers %] >- </select> >- </li> >- [% END %] >- >- </ol> >- </fieldset> <!-- /.rows --> >- </div> <!-- /.modal-body --> >- <div class="modal-footer"> >- <button type="submit" class="btn btn-default" id="borr_payout_confirm">Confirm</button> >- <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> >- </div> <!-- /.modal-footer --> >- </div> <!-- /.modal-content --> >- </div> <!-- /.modal-dialog --> >- </form> <!-- /#payout_form --> >- </div> <!-- /#issuePayoutModal --> >- >+ [% INCLUDE 'modals/issue_payout.inc' %] > <!-- Issue refund modal --> > <div class="modal" id="issueRefundModal" tabindex="-1" role="dialog" aria-labelledby="issueRefundLabel"> > <form id="refund_form" action="/cgi-bin/koha/members/boraccount.pl" method="post" enctype="multipart/form-data" class="validated"> >-- >2.30.2
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 36408
: 163738 |
163739
|
163740