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

(-)a/installer/data/mysql/atomicupdate/bug_20772-add-price_paid_column_to_illrequests.perl (-1 / +1 lines)
Lines 2-8 $DBversion = 'XXX'; # will be replaced by the RM Link Here
2
if( CheckVersion( $DBversion ) ) {
2
if( CheckVersion( $DBversion ) ) {
3
3
4
     if( !column_exists( 'illrequests', 'price_paid' ) ) {
4
     if( !column_exists( 'illrequests', 'price_paid' ) ) {
5
        $dbh->do( "ALTER TABLE illrequests ADD COLUMN price_paid varchar(20) DEFAULT NULL" );
5
        $dbh->do( "ALTER TABLE illrequests ADD COLUMN price_paid varchar(20) DEFAULT NULL AFTER 'cost'" );
6
     }
6
     }
7
7
8
    SetVersion( $DBversion );
8
    SetVersion( $DBversion );
(-)a/installer/data/mysql/atomicupdate/bug_20772-add-readonly-flag-to-illrequestattributes.perl (-1 / +1 lines)
Lines 2-8 $DBversion = 'XXX'; # will be replaced by the RM Link Here
2
if( CheckVersion( $DBversion ) ) {
2
if( CheckVersion( $DBversion ) ) {
3
3
4
     if( !column_exists( 'illrequestattributes', 'readonly' ) ) {
4
     if( !column_exists( 'illrequestattributes', 'readonly' ) ) {
5
        $dbh->do( "ALTER TABLE illrequestattributes ADD COLUMN readonly tinyint(1) NOT NULL DEFAULT 1" );
5
        $dbh->do( "ALTER TABLE illrequestattributes ADD COLUMN readonly tinyint(1) NOT NULL DEFAULT 1 AFTER 'value'" );
6
        $dbh->do( "UPDATE illrequestattributes SET readonly = 1" );
6
        $dbh->do( "UPDATE illrequestattributes SET readonly = 1" );
7
     }
7
     }
8
8
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt (-5 / +5 lines)
Lines 429-435 Link Here
429
                                </li>
429
                                </li>
430
                                <li class="cost">
430
                                <li class="cost">
431
                                    <label class="cost">Cost:</label>
431
                                    <label class="cost">Cost:</label>
432
                                    [% request.cost || 'N/A' | html %]
432
                                    [% IF request.cost %][% request.cost | html %][% ELSE %]<span>N/A</span>[% END %]
433
                                </li>
433
                                </li>
434
                                <li class="price_paid">
434
                                <li class="price_paid">
435
                                    <label class="price_paid">Price paid:</label>
435
                                    <label class="price_paid">Price paid:</label>
Lines 502-508 Link Here
502
                            <div class="rows">
502
                            <div class="rows">
503
                                <div class="orderid">
503
                                <div class="orderid">
504
                                    <span class="label orderid">Order ID:</span>
504
                                    <span class="label orderid">Order ID:</span>
505
                                    [% request.orderid || "N/A" | html %]
505
                                    [% IF request.orderid %][% request.orderid | html %][% ELSE %]<span>N/A</span>[% END %]
506
                                </div>
506
                                </div>
507
                                <div class="borrowernumber">
507
                                <div class="borrowernumber">
508
                                    <span class="label borrowernumber">Patron:</span>
508
                                    <span class="label borrowernumber">Patron:</span>
Lines 514-520 Link Here
514
514
515
                                <div class="biblio_id">
515
                                <div class="biblio_id">
516
                                    <span class="label biblio_id">Bibliographic record ID:</span>
516
                                    <span class="label biblio_id">Bibliographic record ID:</span>
517
                                    [% request.biblio_id || "N/A" | html %]
517
                                    [% IF request.biblio_id %][% request.biblio_id | html %][% ELSE %]<span>N/A</span>[% END %]
518
                                </div>
518
                                </div>
519
                                <div class="branchcode">
519
                                <div class="branchcode">
520
                                    <span class="label branchcode">Library:</span>
520
                                    <span class="label branchcode">Library:</span>
Lines 534-544 Link Here
534
                                </div>
534
                                </div>
535
                                <div class="cost">
535
                                <div class="cost">
536
                                    <span class="label cost">Cost:</span>
536
                                    <span class="label cost">Cost:</span>
537
                                    [% request.cost || "N/A" | html %]
537
                                    [% IF request.cost %][% request.cost | html %][% ELSE %]<span>N/A</span>[% END %]
538
                                </div>
538
                                </div>
539
                                <div class="price_paid">
539
                                <div class="price_paid">
540
                                    <span class="label price_paid">Price paid:</span>
540
                                    <span class="label price_paid">Price paid:</span>
541
                                    [% request.price_paid || "N/A" %]
541
                                    [% IF request.price_paid %][% request.price_paid | html %][% ELSE %]<span>N/A</span>[% END %]
542
                                </div>
542
                                </div>
543
                                <div class="req_id">
543
                                <div class="req_id">
544
                                    <span class="label req_id">Request number:</span>
544
                                    <span class="label req_id">Request number:</span>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt (-4 / +7 lines)
Lines 125-132 Link Here
125
                            [% FOREACH request IN requests %]
125
                            [% FOREACH request IN requests %]
126
                                [% status = request.status | html %]
126
                                [% status = request.status | html %]
127
                                <tr>
127
                                <tr>
128
                                    <td>[% request.metadata.Author || 'N/A' | html %]</td>
128
                                    <td>
129
                                    <td>[% request.metadata.Title || 'N/A' | html %]</td>
129
                                        [% IF request.metadata.Author %][% request.metadata.Author | html %][% ELSE %]<span>N/A</span>[% END %]
130
                                    </td>
131
                                    <td>
132
                                        [% IF request.metadata.Title %][% request.metadata.Title | html %][% ELSE %]<span>N/A</span>[% END %]
133
                                    </td>
130
                                    <td>[% request.backend | html %]</td>
134
                                    <td>[% request.backend | html %]</td>
131
                                    <td>[% request.medium | html %]</td>
135
                                    <td>[% request.medium | html %]</td>
132
                                    <td>[% request.capabilities.$status.name | html %]</td>
136
                                    <td>[% request.capabilities.$status.name | html %]</td>
Lines 192-198 Link Here
192
                                [% FOREACH meta IN request.metadata %]
196
                                [% FOREACH meta IN request.metadata %]
193
                                    <div class="requestattr-[% meta.key | html %]">
197
                                    <div class="requestattr-[% meta.key | html %]">
194
                                        <span class="label">[% meta.key | html %]:</span>
198
                                        <span class="label">[% meta.key | html %]:</span>
195
                                        [% meta.value || 'N/A' | html %]
199
                                        [% IF meta.value %][% meta.value | html %][% ELSE %]<span>N/A</span>[% END %]
196
                                    </div>
200
                                    </div>
197
                                [% END %]
201
                                [% END %]
198
                            </div>
202
                            </div>
199
- 

Return to bug 20772