Bugzilla – Attachment 163739 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 refund modal to include
Bug-36408-Move-issue-refund-modal-to-include.patch (text/plain), 8.60 KB, created by
Lucas Gass (lukeg)
on 2024-03-22 20:03:13 UTC
(
hide
)
Description:
Bug 36408: Move issue refund modal to include
Filename:
MIME Type:
Creator:
Lucas Gass (lukeg)
Created:
2024-03-22 20:03:13 UTC
Size:
8.60 KB
patch
obsolete
>From 1ea4495b7ade09074cac74f7ae6aafb3efa5052f Mon Sep 17 00:00:00 2001 >From: Lucas Gass <lucas@bywatersolutions.com> >Date: Fri, 22 Mar 2024 19:57:07 +0000 >Subject: [PATCH] Bug 36408: Move issue refund modal to include > >To test: >1. APPLY PATCH >2. Go to the transaction tab on a patron account and "Create manual invoice". >3. Pay it. >4. Go to the transaction tab on a patron account and look for the "Issue refund" button. >5. Make sure the modal loads and properly and you make a full refund and a patrion one. >6. Turn on "UseCashRegisters" and make a new register. >7. Ensure you can select the register correctly when issuing a refund. >--- > .../prog/en/includes/modals/issue_refund.inc | 56 ++++++++++++++++++ > .../prog/en/modules/members/boraccount.tt | 57 +------------------ > 2 files changed, 57 insertions(+), 56 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/modals/issue_refund.inc > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/issue_refund.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/issue_refund.inc >new file mode 100644 >index 0000000000..77a7c25a20 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/issue_refund.inc >@@ -0,0 +1,56 @@ >+<!-- 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"> >+ [% INCLUDE 'csrf-token.inc' %] >+ <input type="hidden" name="accountlines_id" value="" id="refundline"> >+ <input type="hidden" name="op" value="cud-refund"> >+ <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="issueRefundLabel">Issue refund</h4> >+ </div> >+ <div class="modal-body"> >+ [% IF Koha.Preference('UseCashRegisters') && ( registers.size == 0 ) %] >+ <div id="refund_error" class="dialog alert"> >+ You must have at least one cash register associated with this branch before you can record cash refunds. >+ </div> >+ [% END %] >+ <fieldset class="rows"> >+ <ol> >+ <li> >+ <span id="item" class="label">Account: </span><span></span> >+ </li> >+ <li> >+ <span id="paid" class="label">Amount paid: </span><span></span> >+ </li> >+ <li> >+ <label class="required" for="amount">Returned to patron: </label> >+ <input type="text" inputmode="numeric" pattern="[0-9]*" id="returned" name="amount" required="required"> >+ <span class="required">Required</span> >+ </li> >+ >+ [% INCLUDE 'transaction_types.inc' type="refund" %] >+ >+ [% IF Koha.Preference('UseCashRegisters') %] >+ <li> >+ <label for="registerid">Cash register: </label> >+ <select name="registerid" id="refund_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_refund_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> <!-- /#refund_form --> >+</div> <!-- /#issueRefundModal --> >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 70f5bdb9db..322c74dfa1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -243,62 +243,7 @@ > </div> <!-- /.row --> > > [% 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"> >- [% INCLUDE 'csrf-token.inc' %] >- <input type="hidden" name="accountlines_id" value="" id="refundline"> >- <input type="hidden" name="op" value="cud-refund"> >- <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="issueRefundLabel">Issue refund</h4> >- </div> >- <div class="modal-body"> >- [% IF Koha.Preference('UseCashRegisters') && ( registers.size == 0 ) %] >- <div id="refund_error" class="dialog alert"> >- You must have at least one cash register associated with this branch before you can record cash refunds. >- </div> >- [% END %] >- <fieldset class="rows"> >- <ol> >- <li> >- <span id="item" class="label">Account: </span><span></span> >- </li> >- <li> >- <span id="paid" class="label">Amount paid: </span><span></span> >- </li> >- <li> >- <label class="required" for="amount">Returned to patron: </label> >- <input type="text" inputmode="numeric" pattern="[0-9]*" id="returned" name="amount" required="required"> >- <span class="required">Required</span> >- </li> >- >- [% INCLUDE 'transaction_types.inc' type="refund" %] >- >- [% IF Koha.Preference('UseCashRegisters') %] >- <li> >- <label for="registerid">Cash register: </label> >- <select name="registerid" id="refund_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_refund_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> <!-- /#refund_form --> >- </div> <!-- /#issueRefundModal --> >+ [% INCLUDE 'modals/issue_refund.inc' %] > > <!-- Apply discount modal --> > <div class="modal" id="applyDiscountModal" tabindex="-1" role="dialog" aria-labelledby="applyDiscountLabel"> >-- >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