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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-1 / +21 lines)
Lines 35-40 Link Here
35
35
36
                    [% IF ( impossible ) %]<!-- We tried to issue, but failed. -->
36
                    [% IF ( impossible ) %]<!-- We tried to issue, but failed. -->
37
                        <div class="alert">
37
                        <div class="alert">
38
                            <span class="sco-alert-warning noissue"></span>
38
                            <h3>Item cannot be checked out.</h3>
39
                            <h3>Item cannot be checked out.</h3>
39
                            <p>Sorry, this item cannot be checked out at this station.</p>
40
                            <p>Sorry, this item cannot be checked out at this station.</p>
40
                            [% IF ( title ) %]
41
                            [% IF ( title ) %]
Lines 96-101 Link Here
96
97
97
                    [% IF ( confirm ) %]<!-- We need to confirm the issue.. -->
98
                    [% IF ( confirm ) %]<!-- We need to confirm the issue.. -->
98
                        <div class="alert"><h3>Please confirm the checkout:</h3>
99
                        <div class="alert"><h3>Please confirm the checkout:</h3>
100
                            <span class="sco-alert-warning confirm"></span>
99
                            [% IF ( confirm_renew_issue ) %]
101
                            [% IF ( confirm_renew_issue ) %]
100
                                <p>This item is already checked out to you.</p>
102
                                <p>This item is already checked out to you.</p>
101
                            [% END %]
103
                            [% END %]
Lines 139-144 Link Here
139
                    [% IF ( nopermission ) %]
141
                    [% IF ( nopermission ) %]
140
                        <!-- This is what is displayed if user doesnt have permission -->
142
                        <!-- This is what is displayed if user doesnt have permission -->
141
                        <div class="alert">
143
                        <div class="alert">
144
                        <span class="sco-alert-warning nopermission"></span>
142
                            <h3>Access denied</h3>
145
                            <h3>Access denied</h3>
143
                            <p>Sorry, this self-checkout station has lost authentication.  Please contact the administrator to resolve this problem.</p>
146
                            <p>Sorry, this self-checkout station has lost authentication.  Please contact the administrator to resolve this problem.</p>
144
                        </div>
147
                        </div>
Lines 147-152 Link Here
147
                    [% IF ( different_ip ) %]
150
                    [% IF ( different_ip ) %]
148
                        <!-- This is what is displayed if user doesnt have permission -->
151
                        <!-- This is what is displayed if user doesnt have permission -->
149
                        <div class="alert">
152
                        <div class="alert">
153
                            <span class="sco-alert-warning sessionlost"></span>
150
                            <h3>Session lost</h3>
154
                            <h3>Session lost</h3>
151
                            <p>You are accessing self-checkout from a different IP address! please log in again.</p>
155
                            <p>You are accessing self-checkout from a different IP address! please log in again.</p>
152
                        </div>
156
                        </div>
Lines 155-170 Link Here
155
                    [% IF ( invalid_username_or_password ) %]
159
                    [% IF ( invalid_username_or_password ) %]
156
                        <!-- This is what is displayed if user doesnt have permission -->
160
                        <!-- This is what is displayed if user doesnt have permission -->
157
                        <div class="alert">
161
                        <div class="alert">
162
                            <span class="sco-alert-warning notfound"></span>
158
                            <h3>Record not found</h3>
163
                            <h3>Record not found</h3>
159
                            <p>Your userid was not found in the database.  Please try again.</p>
164
                            <p>Your userid was not found in the database.  Please try again.</p>
160
                        </div>
165
                        </div>
161
                    [% END %]
166
                    [% END %]
162
167
163
                    [% IF ( issued ) %]
168
                    [% IF ( issued ) %]
164
                    <span class="sco-alert-success"></span>
169
                    <span class="sco-alert-success issue"></span>
165
                    <div class="alert alert-info">
170
                    <div class="alert alert-info">
166
                        <p>Item checked out</p>
171
                        <p>Item checked out</p>
167
                    </div>
172
                    </div>
173
                    [% ELSIF ( renewed ) %]
174
                    <span class="sco-alert-success renew"></span>
175
                    <div class="alert alert-info">
176
                        <p>Item renewed</p>
177
                    </div>
178
                    [% ELSIF ( returned == 0 ) %]
179
                    <span class="sco-alert-warning return"></span>
180
                    <div class="alert alert-info">
181
                        <p>Item not checked in: please see circulation staff for assistance</p>
182
                    </div>
183
                    [% ELSIF ( returned == 1 ) %]
184
                    <span class="sco-alert-success return"></span>
185
                    <div class="alert alert-info">
186
                        <p>Item checked in</p>
187
                    </div>
168
                    [% END %]
188
                    [% END %]
169
189
170
190
(-)a/opac/sco/sco-main.pl (-1 / +3 lines)
Lines 126-136 my $return_only = 0; Link Here
126
#warn "issuer cardnumber: " .   $issuer->{cardnumber};
126
#warn "issuer cardnumber: " .   $issuer->{cardnumber};
127
#warn "patron cardnumber: " . $borrower->{cardnumber};
127
#warn "patron cardnumber: " . $borrower->{cardnumber};
128
if ($op eq "logout") {
128
if ($op eq "logout") {
129
    $template->param( loggedout => 1 );
129
    $query->param( patronid => undef, patronlogin => undef, patronpw => undef );
130
    $query->param( patronid => undef, patronlogin => undef, patronpw => undef );
130
}
131
}
131
elsif ( $op eq "returnbook" && $allowselfcheckreturns ) {
132
elsif ( $op eq "returnbook" && $allowselfcheckreturns ) {
132
    my ($doreturn) = AddReturn( $barcode, $branch );
133
    my ($doreturn) = AddReturn( $barcode, $branch );
133
    #warn "returnbook: " . $doreturn;
134
    #warn "returnbook: " . $doreturn;
135
    $template->param( returned => $doreturn );
134
    $borrower = GetMember( cardnumber => $patronid );
136
    $borrower = GetMember( cardnumber => $patronid );
135
}
137
}
136
elsif ( $op eq "checkout" ) {
138
elsif ( $op eq "checkout" ) {
Lines 176-181 elsif ( $op eq "checkout" ) { Link Here
176
        if ($confirmed) {
178
        if ($confirmed) {
177
            #warn "renewing";
179
            #warn "renewing";
178
            AddRenewal( $borrower, $item->{itemnumber} );
180
            AddRenewal( $borrower, $item->{itemnumber} );
181
            $template->param( renewed => 1 );
179
        } else {
182
        } else {
180
            #warn "renew confirmation";
183
            #warn "renew confirmation";
181
            $template->param(
184
            $template->param(
182
- 

Return to bug 18251