Bugzilla – Attachment 163740 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 apply discount modal to include
Bug-36408-Move-apply-discount-modal-to-include.patch (text/plain), 6.34 KB, created by
Lucas Gass (lukeg)
on 2024-03-22 20:17:20 UTC
(
hide
)
Description:
Bug 36408: Move apply discount modal to include
Filename:
MIME Type:
Creator:
Lucas Gass (lukeg)
Created:
2024-03-22 20:17:20 UTC
Size:
6.34 KB
patch
obsolete
>From 72c14eaf470a443bda85a07a347d3bade729e973 Mon Sep 17 00:00:00 2001 >From: Lucas Gass <lucas@bywatersolutions.com> >Date: Fri, 22 Mar 2024 20:15:34 +0000 >Subject: [PATCH] Bug 36408: Move apply discount modal to include > >To test: >1. APPLY PATCH >2. Go to the transaction tab on a patron account and "Create manual invoice". >3. Now go to the transaction tab for that patron and attempt to apply a discount. >4. Make sure the modal loads properly and you are able to apply the discount. >--- > .../en/includes/modals/apply_discount.inc | 38 ++++++++++++++++++ > .../prog/en/modules/members/boraccount.tt | 40 +------------------ > 2 files changed, 39 insertions(+), 39 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/modals/apply_discount.inc > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/apply_discount.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/apply_discount.inc >new file mode 100644 >index 0000000000..a93085f265 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/apply_discount.inc >@@ -0,0 +1,38 @@ >+<!-- Apply discount modal --> >+<div class="modal" id="applyDiscountModal" tabindex="-1" role="dialog" aria-labelledby="applyDiscountLabel"> >+ <form id="discount_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="discountline"> >+ <input type="hidden" name="op" value="cud-discount"> >+ <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="applyDiscountLabel">Apply discount</h4> >+ </div> >+ <div class="modal-body"> >+ <fieldset class="rows"> >+ <ol> >+ <li> >+ <span id="item" class="label">Account type: </span><span></span> >+ </li> >+ <li> >+ <span id="charged" class="label">Amount charged: </span><span></span> >+ </li> >+ <li> >+ <label class="required" for="amount">Discount to apply: </label> >+ <input type="text" inputmode="numeric" pattern="[0-9]*" id="discount" name="amount" required="required"> >+ <span class="required">Required</span> >+ </li> >+ </ol> >+ </fieldset> <!-- /.rows --> >+ </div> <!-- /.modal-body --> >+ <div class="modal-footer"> >+ <button type="submit" class="btn btn-default">Confirm</button> >+ <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> >+ </div> <!-- /.modal-footer --> >+ </div> <!-- /.modal-content --> >+ </div> <!-- /.modal-dialog --> >+ </form> <!-- /#discount_form --> >+</div> <!-- /#applyDiscountModal --> >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 322c74dfa1..16aceab48f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -244,45 +244,7 @@ > > [% INCLUDE 'modals/issue_payout.inc' %] > [% INCLUDE 'modals/issue_refund.inc' %] >- >- <!-- Apply discount modal --> >- <div class="modal" id="applyDiscountModal" tabindex="-1" role="dialog" aria-labelledby="applyDiscountLabel"> >- <form id="discount_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="discountline"> >- <input type="hidden" name="op" value="cud-discount"> >- <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="applyDiscountLabel">Apply discount</h4> >- </div> >- <div class="modal-body"> >- <fieldset class="rows"> >- <ol> >- <li> >- <span id="item" class="label">Account type: </span><span></span> >- </li> >- <li> >- <span id="charged" class="label">Amount charged: </span><span></span> >- </li> >- <li> >- <label class="required" for="amount">Discount to apply: </label> >- <input type="text" inputmode="numeric" pattern="[0-9]*" id="discount" name="amount" required="required"> >- <span class="required">Required</span> >- </li> >- </ol> >- </fieldset> <!-- /.rows --> >- </div> <!-- /.modal-body --> >- <div class="modal-footer"> >- <button type="submit" class="btn btn-default">Confirm</button> >- <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> >- </div> <!-- /.modal-footer --> >- </div> <!-- /.modal-content --> >- </div> <!-- /.modal-dialog --> >- </form> <!-- /#discount_form --> >- </div> <!-- /#applyDiscountModal --> >+ [% INCLUDE 'modals/issue_refund.inc' %] > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >-- >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