Attachment #143833 for bug #32182

View | Details | Raw Unified | Return to bug 32182
Collapse All | Expand All




    }
}

.statictabs {
    @include card;

    h3{
        padding-bottom: .7em;
        margin: 0;
        color: #696969;
    }

    td {
        border: 0;

        ul {
            li {
                clear: left;
                font-size: 90%;
                list-style: url("../img/item-bullet.svg");
                padding: .2em 0;

                &.result_itype_image {
                    list-style: none;
                    list-style-type: none;
                }

                img {
                    float: left;
                    margin: 3px 5px 3px -5px;
                    max-width: 25px;
                }
            }
        }
    }

    span {
        &.status {
            clear: left;
            color: #900;
            display: block;
        }

        &.unavailable {
            clear: left;
            display: block;
        }
    }


    > ul {
        line-height: 1.3;
        margin: 0;
        outline: 0 none;
        padding: .2em .2em 0;
        text-decoration: none;
        display: flex;

        li {
            list-style-type: none;
            margin-right: .4em;

            a {
                background-color: $background-color-secondary;
                border-radius: 4px 4px 0 0;
                color: #111;
                display: inline-block;
                padding: .5em 1em;
                text-decoration: none;
                white-space: nowrap;
            }

            &.active,
            &:hover {
                a {
                    background-color: $background-color-primary;
                    color: #fff;
                }
            }

        }
    }

    .tabs-container {
        border: 2px solid $background-color-primary;
        border-radius: 4px;
        display: block;
        padding: 1em 1.4em;
    }
}

.toptabs {
    margin-top: 5px;
}




<form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" /></form>

<!-- The manual invoice and credit buttons -->
<div class="toptabs">
    <ul class="nav nav-tabs" role="tablist">
        <li role="presentation" class="transactions active">
            <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Transactions</a>
        </li>
        <li role="presentation" class="makepayment">
            <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Make a payment</a>
        </li>
        [% IF CAN_user_updatecharges_manual_invoice %]
            <li role="presentation" class="manualinvoice">
                <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Create manual invoice</a>
            </li>
        [% END %]
        [% IF CAN_user_updatecharges_manual_credit %]
            <li role="presentation" class="manualcredit">
                <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Create manual credit</a>
            </li>
        [% END %]
    </ul> <!-- /.nav.nav-tabs -->
    <div class="tab-content">
        <div role="tabpanel" class="tab-pane active">
[% INCLUDE 'renew_results.inc' renew_results=renew_results %]
<!-- The table with the account items -->
<table id="table_account_fines">

  </tr>
  </tfoot>
</table>
</div> <!-- /.tab-pane -->
</div> <!-- /.tab-content -->
</div> <!-- /.toptabs -->

            </main>
        </div> <!-- /.col-sm-10.col-sm-push-2 -->




            <h1>Manual credit</h1>

            <!-- The manual invoice and credit buttons -->
            <div class="toptabs">
                <ul class="nav nav-tabs" role="tablist">
                    <li role="presentation" class="transactions">
                        <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Transactions</a>
                    </li>
                    <li role="presentation" class="makepayment">
                        <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Make a payment</a>
                    </li>
                    [% IF CAN_user_updatecharges_manual_invoice %]
                        <li role="presentation" class="manualinvoice">
                            <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Create manual invoice</a>
                        </li>
                    [% END %]
                    <li role="presentation" class="manualcredit active">
                        <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Create manual credit</a>
                    </li>
                </ul> <!-- /.nav.nav-tabs -->
                <div class="tab-content">
                    <div role="tabpanel" class="tab-pane active">
                        <form action="/cgi-bin/koha/members/mancredit.pl" method="post" id="mancredit">
                            <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" />
                            <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />

                            <fieldset class="rows">
                                <legend>Manual credit</legend>
                                <ol>
                                    <li>
                                        <label for="type">Credit type: </label>
                                        <select name="type" id="type">
                                            [% FOREACH credit_type IN credit_types %]
                                            <option value="[% credit_type.code | html %]">[%- PROCESS credit_type_description credit_type=credit_type -%]</option>
                                            [% END %]
                                        </select>
                                    </li>
                                    <li><label for="barcode">Barcode: </label><input type="text" name="barcode" id="barcode" /></li>
                                    <li><label for="desc">Description: </label><input type="text" name="desc" size="50" id="desc" /></li>
                                    <li><label for="note">Note: </label><input type="text" name="note" size="50" id="note" /></li>
                                    <li><label for="amount" class="required">Amount: </label><input type="text" inputmode="decimal" pattern="^\d+(\.\d{2})?$" name="amount" id="amount" required="required" min="0" value=""/> Example: 5.00</li>
                                    [% INCLUDE 'transaction_types.inc' type="credit" %]
                                    [% IF Koha.Preference('UseCashRegisters') %]
                                    <li>
                                        [% IF Koha.Preference('RequireCashRegister') %]
                                            <label for="cash_register" class="required">
                                        [% ELSE %]
                                            <label for="cash_register">
                                        [% END %]
                                            Cash register:
                                        </label>

                                        [% IF Koha.Preference('RequireCashRegister') %]
                                            <select name="cash_register" id="cash_register" required="required">
                                        [% ELSE %]
                                            <select name="cash_register" id="cash_register">
                                        [% END %]
                                            <option id="noregister" disabled selected="selected" value="">-- Select an option--</option>
                                            [% PROCESS options_for_registers %]
                                        </select>

                                        [% IF Koha.Preference('RequireCashRegister') %]
                                            <span class="required">Required</span>
                                        [% END %]
                                    </li>
                                    [% END %]
                                </ol>
                            </fieldset>
                            <li><label for="barcode">Barcode: </label><input type="text" name="barcode" id="barcode" /></li>
                            <li><label for="desc">Description: </label><input type="text" name="desc" size="50" id="desc" /></li>
                            <li><label for="note">Note: </label><input type="text" name="note" size="50" id="note" /></li>
                            <li><label for="amount" class="required">Amount: </label><input type="text" inputmode="decimal" pattern="^\d+(\.\d{2})?$" name="amount" id="amount" required="required" min="0" value=""/> Example: 5.00</li>
                            [% INCLUDE 'transaction_types.inc' type="credit" %]
                            [% IF Koha.Preference('UseCashRegisters') %]
                            <li>
                                [% IF Koha.Preference('RequireCashRegister') %]
                                    <label for="cash_register" class="required">
                                [% ELSE %]
                                    <label for="cash_register">
                                [% END %]
                                    Cash register:
                                </label>

                                [% IF Koha.Preference('RequireCashRegister') %]
                                    <select name="cash_register" id="cash_register" required="required">
                                [% ELSE %]
                                    <select name="cash_register" id="cash_register">
                                [% END %]
                                    <option id="noregister" disabled selected="selected" value="">-- Select an option--</option>
                                    [% PROCESS options_for_registers %]
                                </select>

                                [% IF Koha.Preference('RequireCashRegister') %]
                                    <span class="required">Required</span>
                                [% END %]
                            </li>
                            [% END %]
                        </ol>
                    </fieldset>

                    [% IF available_additional_fields %]
                        [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %]
                    [% END %]

                            [% IF available_additional_fields %]
                                [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %]
                            [% END %]

                            <fieldset class="action"><input type="submit" name="add" value="Add credit" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]">Cancel</a></fieldset>
                        </form>
                    </div> <!-- /.tab-pane -->
                </div> <!-- /.tab-content -->
            </div> <!-- /.toptabs -->

            </main>
        </div> <!-- /.col-sm-10.col-sm-push-2 -->

Lines 46-62 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (-11 / +20 lines)
46	<h1>Manual invoice</h1>	46	<h1>Manual invoice</h1>
47		47
48	<!-- The manual invoice and credit buttons -->	48	<!-- The manual invoice and credit buttons -->
49	<div class="statictabs">	49	<div class="toptabs">
50	<ul>	50	<ul class="nav nav-tabs" role="tablist">
51	<li class="transactions"><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber \| uri %]">Transactions</a></li>	51	<li role="presentation" class="transactions">
52	<li class="makepayment"><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber \| uri %]" >Make a payment</a></li>	52	<a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber \| uri %]" role="tab">Transactions</a>
53	<li class="active manualinvoice"><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber \| uri %]" >Create manual invoice</a></li>	53	</li>
		54	<li role="presentation" class="makepayment">
		55	<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber \| uri %]" role="tab">Make a payment</a>
		56	</li>
		57	<li role="presentation" class="manualinvoice active">
		58	<a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber \| uri %]" role="tab">Create manual invoice</a>
		59	</li>
54	[% IF CAN_user_updatecharges_manual_credit %]	60	[% IF CAN_user_updatecharges_manual_credit %]
55	<li class="manualcredit"><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber \| uri %]" >Create manual credit</a></li>	61	<li role="presentation" class="manualcredit">
		62	<a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber \| uri %]" role="tab">Create manual credit</a>
		63	</li>
56	[% END %]	64	[% END %]
57	</ul>	65	</ul> <!-- /.nav.nav-tabs -->
58	<div class="tabs-container">	66	<div class="tab-content">
59		67	<div role="tabpanel" class="tab-pane active">
60	[% IF error == 'itemnumber' %]	68	[% IF error == 'itemnumber' %]
61	<div id="error_message" class="dialog alert">	69	<div id="error_message" class="dialog alert">
62	Error: Invalid barcode entered, please try again	70	Error: Invalid barcode entered, please try again
Lines 102-109 Link Here
102	</fieldset>	110	</fieldset>
103	</form>	111	</form>
104		112
105	</div>	113	</div> <!-- /.tab-pane -->
106	</div>	114	</div> <!-- /.tab-content -->
		115	</div> <!-- /.toptabs -->
107		116
108	</main>	117	</main>
109	</div> <!-- /.col-sm-10.col-sm-push-2 -->	118	</div> <!-- /.col-sm-10.col-sm-push-2 -->




<h1>Make a payment</h1>

<!-- The manual invoice and credit buttons -->
<div class="toptabs">
    <ul class="nav nav-tabs" role="tablist">
        <li role="presentation" class="transactions">
            <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Transactions</a>
        </li>
        <li role="presentation" class="makepayment active">
            <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Make a payment</a>
        </li>
        [% IF CAN_user_updatecharges_manual_invoice %]
            <li role="presentation" class="manualinvoice">
                <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Create manual invoice</a>
            </li>
        [% END %]
        [% IF CAN_user_updatecharges_manual_credit %]
            <li role="presentation" class="manualcredit">
                <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Create manual credit</a>
            </li>
        [% END %]
    </ul> <!-- /.nav.nav-tabs -->
    <div class="tab-content">
        <div role="tabpanel" class="tab-pane active">

[% INCLUDE 'renew_results.inc' renew_results=renew_results %]
[% IF ( accounts ) %]

[% ELSE %]
    <p>[% INCLUDE 'patron-title.inc' %] has no outstanding fines.</p>
[% END %]
        </div> <!-- /.tab-pane -->
    </div> <!-- /.tab-content -->
</div> <!-- /.toptabs -->

            </main>
        </div> <!-- /.col-sm-10.col-sm-push-2 -->




[% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]

<!-- The manual invoice and credit buttons -->
<div class="toptabs">
    <ul class="nav nav-tabs" role="tablist">
        <li role="presentation" class="transactions">
            <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Transactions</a>
        </li>
        <li role="presentation" class="makepayment active">
            <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Make a payment</a>
        </li>
        <li role="presentation">
            <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Create manual invoice</a>
        </li>
        <li role="presentation">
            <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" role="tab">Create manual credit</a>
        </li>
    </ul> <!-- /.nav.nav-tabs -->
    <div class="tab-content">
        <div role="tabpanel" class="tab-pane active">
[% IF ( error_over ) %]
    <div id="error_message" class="dialog alert">
    You must pay a value less than or equal to [% total_due | $Price %].

    </form>
    [% END %]
[% END %]
        </div> <!-- /.tab-pane -->
    </div> <!-- /.tab-content -->
</div> <!-- /.toptabs -->

            </main>
        </div> <!-- /.col-sm-10.col-sm-push-2 -->




<h1>Comments</h1>

<!-- The manual invoice and credit buttons -->
<div class="toptabs">
    <ul class="nav nav-tabs" role="tablist">
        [% IF ( status ) %]
            <li role="presentation" class="active">
        [% ELSE %]
            <li role="presentation">
        [% END %]
            <a href="/cgi-bin/koha/reviews/reviewswaiting.pl?status=1">Approved comments</a>
        </li>
        [% IF ( status ) %]
            <li role="presentation">
        [% ELSE %]
            <li role="presentation" class="active">
        [% END %]
            <a href="/cgi-bin/koha/reviews/reviewswaiting.pl" >Comments awaiting moderation</a>
        </li>
    </ul> <!-- /.nav.nav-tabs -->
    <div class="tab-content">
        <div role="tabpanel" class="tab-pane active">

[% IF ( reviews ) %]
<table id="commentst">

[% ELSE %]
[% IF ( status ) %]<p><strong>No comments have been approved.</strong></p>[% ELSE %]<p><strong>No comments to moderate.</strong></p>[% END %]
[% END %]
        </div> <!-- /.tab-pane -->
    </div> <!-- /.tab-content -->
</div> <!-- /.toptabs -->

            </main>
        </div> <!-- /.col-sm-10.col-sm-push-2 -->
- 

Return to bug 32182

Lines 2735-2828 td.bundle { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-88 lines)
2735	}	2735	}
2736	}	2736	}
2737		2737
2738	.statictabs {
2739	@include card;
2740
2741	h3{
2742	padding-bottom: .7em;
2743	margin: 0;
2744	color: #696969;
2745	}
2746
2747	td {
2748	border: 0;
2749
2750	ul {
2751	li {
2752	clear: left;
2753	font-size: 90%;
2754	list-style: url("../img/item-bullet.svg");
2755	padding: .2em 0;
2756
2757	&.result_itype_image {
2758	list-style: none;
2759	list-style-type: none;
2760	}
2761
2762	img {
2763	float: left;
2764	margin: 3px 5px 3px -5px;
2765	max-width: 25px;
2766	}
2767	}
2768	}
2769	}
2770
2771	span {
2772	&.status {
2773	clear: left;
2774	color: #900;
2775	display: block;
2776	}
2777
2778	&.unavailable {
2779	clear: left;
2780	display: block;
2781	}
2782	}
2783
2784
2785	> ul {
2786	line-height: 1.3;
2787	margin: 0;
2788	outline: 0 none;
2789	padding: .2em .2em 0;
2790	text-decoration: none;
2791	display: flex;
2792
2793	li {
2794	list-style-type: none;
2795	margin-right: .4em;
2796
2797	a {
2798	background-color: $background-color-secondary;
2799	border-radius: 4px 4px 0 0;
2800	color: #111;
2801	display: inline-block;
2802	padding: .5em 1em;
2803	text-decoration: none;
2804	white-space: nowrap;
2805	}
2806
2807	&.active,
2808	&:hover {
2809	a {
2810	background-color: $background-color-primary;
2811	color: #fff;
2812	}
2813	}
2814
2815	}
2816	}
2817
2818	.tabs-container {
2819	border: 2px solid $background-color-primary;
2820	border-radius: 4px;
2821	display: block;
2822	padding: 1em 1.4em;
2823	}
2824	}
2825
2826	.toptabs {	2738	.toptabs {
2827	margin-top: 5px;	2739	margin-top: 5px;
2828	}	2740	}

Lines 51-68 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-14 / +24 lines)
51	<form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber \| html %]" /></form>	51	<form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber \| html %]" /></form>
52		52
53	<!-- The manual invoice and credit buttons -->	53	<!-- The manual invoice and credit buttons -->
54	<div class="statictabs">	54	<div class="toptabs">
55	<ul>	55	<ul class="nav nav-tabs" role="tablist">
56	<li class="active transactions"><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber \| uri %]">Transactions</a></li>	56	<li role="presentation" class="transactions active">
57	<li class="makepayment"><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber \| uri %]" >Make a payment</a></li>	57	<a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber \| uri %]" role="tab">Transactions</a>
58	[% IF CAN_user_updatecharges_manual_invoice %]	58	</li>
59	<li class="manualinvoice"><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber \| uri %]" >Create manual invoice</a></li>	59	<li role="presentation" class="makepayment">
60	[% END %]	60	<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber \| uri %]" role="tab">Make a payment</a>
61	[% IF CAN_user_updatecharges_manual_credit %]	61	</li>
62	<li class="manualcredit"><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber \| uri %]" >Create manual credit</a></li>	62	[% IF CAN_user_updatecharges_manual_invoice %]
63	[% END %]	63	<li role="presentation" class="manualinvoice">
64	</ul>	64	<a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber \| uri %]" role="tab">Create manual invoice</a>
65	<div class="tabs-container">	65	</li>
		66	[% END %]
		67	[% IF CAN_user_updatecharges_manual_credit %]
		68	<li role="presentation" class="manualcredit">
		69	<a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber \| uri %]" role="tab">Create manual credit</a>
		70	</li>
		71	[% END %]
		72	</ul> <!-- /.nav.nav-tabs -->
		73	<div class="tab-content">
		74	<div role="tabpanel" class="tab-pane active">
66	[% INCLUDE 'renew_results.inc' renew_results=renew_results %]	75	[% INCLUDE 'renew_results.inc' renew_results=renew_results %]
67	<!-- The table with the account items -->	76	<!-- The table with the account items -->
68	<table id="table_account_fines">	77	<table id="table_account_fines">
Lines 165-172 Link Here
165	</tr>	174	</tr>
166	</tfoot>	175	</tfoot>
167	</table>	176	</table>
168	</div>	177	</div> <!-- /.tab-pane -->
169	</div>	178	</div> <!-- /.tab-content -->
		179	</div> <!-- /.toptabs -->
170		180
171	</main>	181	</main>
172	</div> <!-- /.col-sm-10.col-sm-push-2 -->	182	</div> <!-- /.col-sm-10.col-sm-push-2 -->

Lines 46-118 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt (-62 / +70 lines)
46	<h1>Manual credit</h1>	46	<h1>Manual credit</h1>
47		47
48	<!-- The manual invoice and credit buttons -->	48	<!-- The manual invoice and credit buttons -->
49	<div class="statictabs">	49	<div class="toptabs">
50	<ul>	50	<ul class="nav nav-tabs" role="tablist">
51	<li class="transactions"><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber \| uri %]">Transactions</a></li>	51	<li role="presentation" class="transactions">
52	<li class="makepayment"><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber \| uri %]" >Make a payment</a></li>	52	<a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber \| uri %]" role="tab">Transactions</a>
		53	</li>
		54	<li role="presentation" class="makepayment">
		55	<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber \| uri %]" role="tab">Make a payment</a>
		56	</li>
53	[% IF CAN_user_updatecharges_manual_invoice %]	57	[% IF CAN_user_updatecharges_manual_invoice %]
54	<li class="manualinvoice"><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber \| uri %]" >Create manual invoice</a></li>	58	<li role="presentation" class="manualinvoice">
		59	<a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber \| uri %]" role="tab">Create manual invoice</a>
		60	</li>
55	[% END %]	61	[% END %]
56	<li class="active manualcredit"><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber \| uri %]" >Create manual credit</a></li>	62	<li role="presentation" class="manualcredit active">
57	</ul>	63	<a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber \| uri %]" role="tab">Create manual credit</a>
58	<div class="tabs-container">	64	</li>
59		65	</ul> <!-- /.nav.nav-tabs -->
60	<form action="/cgi-bin/koha/members/mancredit.pl" method="post" id="mancredit">	66	<div class="tab-content">
61	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber \| html %]" />	67	<div role="tabpanel" class="tab-pane active">
62	<input type="hidden" name="csrf_token" value="[% csrf_token \| html %]" />	68	<form action="/cgi-bin/koha/members/mancredit.pl" method="post" id="mancredit">
63		69	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber \| html %]" />
64	<fieldset class="rows">	70	<input type="hidden" name="csrf_token" value="[% csrf_token \| html %]" />
65	<legend>Manual credit</legend>	71
66	<ol>	72	<fieldset class="rows">
67	<li>	73	<legend>Manual credit</legend>
68	<label for="type">Credit type: </label>	74	<ol>
69	<select name="type" id="type">	75	<li>
70	[% FOREACH credit_type IN credit_types %]	76	<label for="type">Credit type: </label>
71	<option value="[% credit_type.code \| html %]">[%- PROCESS credit_type_description credit_type=credit_type -%]</option>	77	<select name="type" id="type">
		78	[% FOREACH credit_type IN credit_types %]
		79	<option value="[% credit_type.code \| html %]">[%- PROCESS credit_type_description credit_type=credit_type -%]</option>
		80	[% END %]
		81	</select>
		82	</li>
		83	<li><label for="barcode">Barcode: </label><input type="text" name="barcode" id="barcode" /></li>
		84	<li><label for="desc">Description: </label><input type="text" name="desc" size="50" id="desc" /></li>
		85	<li><label for="note">Note: </label><input type="text" name="note" size="50" id="note" /></li>
		86	<li><label for="amount" class="required">Amount: </label><input type="text" inputmode="decimal" pattern="^\d+(\.\d{2})?$" name="amount" id="amount" required="required" min="0" value=""/> Example: 5.00</li>
		87	[% INCLUDE 'transaction_types.inc' type="credit" %]
		88	[% IF Koha.Preference('UseCashRegisters') %]
		89	<li>
		90	[% IF Koha.Preference('RequireCashRegister') %]
		91	<label for="cash_register" class="required">
		92	[% ELSE %]
		93	<label for="cash_register">
		94	[% END %]
		95	Cash register:
		96	</label>
		97
		98	[% IF Koha.Preference('RequireCashRegister') %]
		99	<select name="cash_register" id="cash_register" required="required">
		100	[% ELSE %]
		101	<select name="cash_register" id="cash_register">
		102	[% END %]
		103	<option id="noregister" disabled selected="selected" value="">-- Select an option--</option>
		104	[% PROCESS options_for_registers %]
		105	</select>
		106
		107	[% IF Koha.Preference('RequireCashRegister') %]
		108	<span class="required">Required</span>
		109	[% END %]
		110	</li>
72	[% END %]	111	[% END %]
73	</select>	112	</ol>
74	</li>	113	</fieldset>
75	<li><label for="barcode">Barcode: </label><input type="text" name="barcode" id="barcode" /></li>
76	<li><label for="desc">Description: </label><input type="text" name="desc" size="50" id="desc" /></li>
77	<li><label for="note">Note: </label><input type="text" name="note" size="50" id="note" /></li>
78	<li><label for="amount" class="required">Amount: </label><input type="text" inputmode="decimal" pattern="^\d+(\.\d{2})?$" name="amount" id="amount" required="required" min="0" value=""/> Example: 5.00</li>
79	[% INCLUDE 'transaction_types.inc' type="credit" %]
80	[% IF Koha.Preference('UseCashRegisters') %]
81	<li>
82	[% IF Koha.Preference('RequireCashRegister') %]
83	<label for="cash_register" class="required">
84	[% ELSE %]
85	<label for="cash_register">
86	[% END %]
87	Cash register:
88	</label>
89
90	[% IF Koha.Preference('RequireCashRegister') %]
91	<select name="cash_register" id="cash_register" required="required">
92	[% ELSE %]
93	<select name="cash_register" id="cash_register">
94	[% END %]
95	<option id="noregister" disabled selected="selected" value="">-- Select an option--</option>
96	[% PROCESS options_for_registers %]
97	</select>
98
99	[% IF Koha.Preference('RequireCashRegister') %]
100	<span class="required">Required</span>
101	[% END %]
102	</li>
103	[% END %]
104	</ol>
105	</fieldset>
106
107	[% IF available_additional_fields %]
108	[% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %]
109	[% END %]
110		114
111	<fieldset class="action"><input type="submit" name="add" class="btn btn-primary" value="Add credit" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber \| html %]">Cancel</a></fieldset>	115	[% IF available_additional_fields %]
112	</form>	116	[% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %]
		117	[% END %]
113		118
114	</div>	119	<fieldset class="action"><input type="submit" name="add" value="Add credit" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber \| html %]">Cancel</a></fieldset>
115	</div>	120	</form>
		121	</div> <!-- /.tab-pane -->
		122	</div> <!-- /.tab-content -->
		123	</div> <!-- /.toptabs -->
116		124
117	</main>	125	</main>
118	</div> <!-- /.col-sm-10.col-sm-push-2 -->	126	</div> <!-- /.col-sm-10.col-sm-push-2 -->

Lines 46-63 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-13 / +24 lines)
46	<h1>Make a payment</h1>	46	<h1>Make a payment</h1>
47		47
48	<!-- The manual invoice and credit buttons -->	48	<!-- The manual invoice and credit buttons -->
49	<div class="statictabs">	49	<div class="toptabs">
50	<ul>	50	<ul class="nav nav-tabs" role="tablist">
51	<li class="transactions"><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber \| uri %]">Transactions</a></li>	51	<li role="presentation" class="transactions">
52	<li class="active makepayment"><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber \| uri %]" >Make a payment</a></li>	52	<a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber \| uri %]" role="tab">Transactions</a>
53	[% IF CAN_user_updatecharges_manual_invoice %]	53	</li>
54	<li class="manualinvoice"><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber \| uri %]" >Create manual invoice</a></li>	54	<li role="presentation" class="makepayment active">
55	[% END %]	55	<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber \| uri %]" role="tab">Make a payment</a>
56	[% IF CAN_user_updatecharges_manual_credit %]	56	</li>
57	<li class="manualcredit"><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber \| uri %]" >Create manual credit</a></li>	57	[% IF CAN_user_updatecharges_manual_invoice %]
58	[% END %]	58	<li role="presentation" class="manualinvoice">
59	</ul>	59	<a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber \| uri %]" role="tab">Create manual invoice</a>
60	<div class="tabs-container">	60	</li>
		61	[% END %]
		62	[% IF CAN_user_updatecharges_manual_credit %]
		63	<li role="presentation" class="manualcredit">
		64	<a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber \| uri %]" role="tab">Create manual credit</a>
		65	</li>
		66	[% END %]
		67	</ul> <!-- /.nav.nav-tabs -->
		68	<div class="tab-content">
		69	<div role="tabpanel" class="tab-pane active">
61		70
62	[% INCLUDE 'renew_results.inc' renew_results=renew_results %]	71	[% INCLUDE 'renew_results.inc' renew_results=renew_results %]
63	[% IF ( accounts ) %]	72	[% IF ( accounts ) %]
Lines 180-186 Link Here
180	[% ELSE %]	189	[% ELSE %]
181	<p>[% INCLUDE 'patron-title.inc' %] has no outstanding fines.</p>	190	<p>[% INCLUDE 'patron-title.inc' %] has no outstanding fines.</p>
182	[% END %]	191	[% END %]
183	</div></div>	192	</div> <!-- /.tab-pane -->
		193	</div> <!-- /.tab-content -->
		194	</div> <!-- /.toptabs -->
184		195
185	</main>	196	</main>
186	</div> <!-- /.col-sm-10.col-sm-push-2 -->	197	</div> <!-- /.col-sm-10.col-sm-push-2 -->

Lines 97-118 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (-17 / +20 lines)
97	[% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]	97	[% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
98		98
99	<!-- The manual invoice and credit buttons -->	99	<!-- The manual invoice and credit buttons -->
100	<div class="statictabs">	100	<div class="toptabs">
101	<ul>	101	<ul class="nav nav-tabs" role="tablist">
102	<li>	102	<li role="presentation" class="transactions">
103	<a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber \| uri %]">Transactions</a>	103	<a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber \| uri %]" role="tab">Transactions</a>
104	</li>	104	</li>
105	<li class="active">	105	<li role="presentation" class="makepayment active">
106	<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber \| uri %]" >Make a payment</a>	106	<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber \| uri %]" role="tab">Make a payment</a>
107	</li>	107	</li>
108	<li>	108	<li role="presentation">
109	<a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber \| uri %]" >Create manual invoice</a>	109	<a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber \| uri %]" role="tab">Create manual invoice</a>
110	</li>	110	</li>
111	<li>	111	<li role="presentation">
112	<a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber \| uri %]" >Create manual credit</a>	112	<a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber \| uri %]" role="tab">Create manual credit</a>
113	</li>	113	</li>
114	</ul>	114	</ul> <!-- /.nav.nav-tabs -->
115	<div class="tabs-container">	115	<div class="tab-content">
		116	<div role="tabpanel" class="tab-pane active">
116	[% IF ( error_over ) %]	117	[% IF ( error_over ) %]
117	<div id="error_message" class="dialog alert">	118	<div id="error_message" class="dialog alert">
118	You must pay a value less than or equal to [% total_due \| $Price %].	119	You must pay a value less than or equal to [% total_due \| $Price %].
Lines 370-376 Link Here
370	</form>	371	</form>
371	[% END %]	372	[% END %]
372	[% END %]	373	[% END %]
373	</div></div>	374	</div> <!-- /.tab-pane -->
		375	</div> <!-- /.tab-content -->
		376	</div> <!-- /.toptabs -->
374		377
375	</main>	378	</main>
376	</div> <!-- /.col-sm-10.col-sm-push-2 -->	379	</div> <!-- /.col-sm-10.col-sm-push-2 -->

Lines 43-54 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt (-9 / +22 lines)
43	<h1>Comments</h1>	43	<h1>Comments</h1>
44		44
45	<!-- The manual invoice and credit buttons -->	45	<!-- The manual invoice and credit buttons -->
46	<div class="statictabs">	46	<div class="toptabs">
47	<ul>	47	<ul class="nav nav-tabs" role="tablist">
48	[% IF ( status ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?status=1">Approved comments</a></li>	48	[% IF ( status ) %]
49	[% IF ( status ) %]<li>[% ELSE %]<li class="active">[% END %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl" >Comments awaiting moderation</a></li>	49	<li role="presentation" class="active">
50	</ul>	50	[% ELSE %]
51	<div class="tabs-container">	51	<li role="presentation">
		52	[% END %]
		53	<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?status=1">Approved comments</a>
		54	</li>
		55	[% IF ( status ) %]
		56	<li role="presentation">
		57	[% ELSE %]
		58	<li role="presentation" class="active">
		59	[% END %]
		60	<a href="/cgi-bin/koha/reviews/reviewswaiting.pl" >Comments awaiting moderation</a>
		61	</li>
		62	</ul> <!-- /.nav.nav-tabs -->
		63	<div class="tab-content">
		64	<div role="tabpanel" class="tab-pane active">
52		65
53	[% IF ( reviews ) %]	66	[% IF ( reviews ) %]
54	<table id="commentst">	67	<table id="commentst">
Lines 88-95 Link Here
88	[% ELSE %]	101	[% ELSE %]
89	[% IF ( status ) %]<p><strong>No comments have been approved.</strong></p>[% ELSE %]<p><strong>No comments to moderate.</strong></p>[% END %]	102	[% IF ( status ) %]<p><strong>No comments have been approved.</strong></p>[% ELSE %]<p><strong>No comments to moderate.</strong></p>[% END %]
90	[% END %]	103	[% END %]
91	</div>	104	</div> <!-- /.tab-pane -->
92	</div>	105	</div> <!-- /.tab-content -->
		106	</div> <!-- /.toptabs -->
93		107
94	</main>	108	</main>
95	</div> <!-- /.col-sm-10.col-sm-push-2 -->	109	</div> <!-- /.col-sm-10.col-sm-push-2 -->
96	-