Bugzilla – Attachment 18054 Details for
Bug 8033
remove unused sco/receipt template file
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8033 - add print receipt option to Koha self-check (edit)
Bug-8033---add-print-receipt-option-to-Koha-self-c.patch (text/plain), 4.12 KB, created by
Kyle M Hall (khall)
on 2013-05-09 20:19:06 UTC
(
hide
)
Description:
Bug 8033 - add print receipt option to Koha self-check (edit)
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2013-05-09 20:19:06 UTC
Size:
4.12 KB
patch
obsolete
>From fde20d92197192347baeb854f681376cac812d74 Mon Sep 17 00:00:00 2001 >From: Mason James <mtj@kohaaloha.com> >Date: Fri, 12 Apr 2013 15:55:48 +1200 >Subject: [PATCH] Bug 8033 - add print receipt option to Koha self-check (edit) > >4 misc follow-up fixes > >1/ fixed printslip.tmpl typo >2/ fixed <title i18n-content="title"> display bug >3/ moved hardcoded text string from script to template. >4/ delete unused receipt.tt file > >To Test: > >- Sign in to self checkout. >- Enter a barcode and click submit. >- Click the finish button >- You should be prompted with a message asking if you would like a receipt. > If you click OK you should be taken to the page with the receipt. > If you click Cancel you should not see the reciept and you should be logged out. > >fyi: you should no longer see a "<title> Print Receipt for..." line in chrome/IE >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > .../opac-tmpl/prog/en/modules/sco/printslip.tt | 4 +- > koha-tmpl/opac-tmpl/prog/en/modules/sco/receipt.tt | 57 -------------------- > opac/sco/printslip.pl | 4 +- > 3 files changed, 5 insertions(+), 60 deletions(-) > delete mode 100644 koha-tmpl/opac-tmpl/prog/en/modules/sco/receipt.tt > >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/printslip.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/printslip.tt >index 44954b3..a27009e 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/printslip.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/printslip.tt >@@ -1,5 +1,7 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>[% title %]</title> >+ >+ <title i18n-content="title">Print Receipt for [% borrowernumber %]</title> >+ > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" /> > <link rel="stylesheet" type="text/css" href="[% themelang %]/css/print.css" /> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/receipt.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/receipt.tt >deleted file mode 100644 >index 8339b35..0000000 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/receipt.tt >+++ /dev/null >@@ -1,57 +0,0 @@ >-<!DOCTYPE html PUBLIC "-//W3C//DTD html 4.01 Transitional//EN"> >-<html> >- >-<head> >-<title> RECEIPT </title> >- >-<script type="text/javascript"> >-//<![CDATA[ >-x = 0; >-function callPrint() >-{ >- while (x == 0) >- >- { >- self.print(); >- window.opener.location='/cgi-bin/koha/sco/sco-main.pl?logout.x=1'; >- x = 1; >- } >-} >- >-function closeNow() >-{ >- if (x == 1) >- { >- setTimeout('self.close()',1000); >- } >-} >-//]]> >-</script> >- >-[% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS %]</style>[% END %] >-[% IF ( SCOUserJS ) %]<script type="text/javascript">[% SCOUserJS %]</script>[% END %] >- >-</head> >- >-<body onLoad="callPrint(); closeNow();"> >- >-[% branchname %]<br><br> >-[% cardnumber %]<br> >- >-<!-- begin code Mamata--> >-[% IF ( todayissues ) %]<br> >-<p><b>Today's checkouts</b></p> >-[% FOREACH todayissue IN todayissues %]<br> >-[% todayissue.title |html %]<br> >-[% todayissue.author %]<br> >-[% todayissue.dd %]<br> >-[% todayissue.barcode %]<br> >-[% END %] >-[% END %] >- >-<!-- end code Mamata--> >- >- >-</body> >- >-</html> >diff --git a/opac/sco/printslip.pl b/opac/sco/printslip.pl >index e8a5685..09c6c6a 100755 >--- a/opac/sco/printslip.pl >+++ b/opac/sco/printslip.pl >@@ -45,7 +45,7 @@ my $error = $input->param('error'); > # patrons still need to be able to print receipts > my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > { >- template_name => "/sco/printslip.tmpl", >+ template_name => "/sco/printslip.tt", > query => $input, > type => "opac", > } >@@ -61,7 +61,7 @@ if (my $letter = IssueSlip ($session->param('branch') || $branch, $borrowernumbe > > $template->{VARS}->{slip} = $slip; > $template->{VARS}->{plain} = !$is_html; >-$template->{VARS}->{title} = "Print Receipt for $borrowernumber"; >+$template->{VARS}->{borrowernumber} = $borrowernumber; > $template->{VARS}->{stylesheet} = C4::Context->preference("SlipCSS"); > $template->{VARS}->{error} = $error; > >-- >1.7.2.5
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 8033
:
10648
|
10649
|
10677
|
10678
|
11112
|
12316
|
13559
|
13716
|
14024
|
14025
|
14026
|
14091
|
14094
|
14095
|
14096
|
14097
|
14098
|
14099
|
14100
|
14101
|
14102
|
14134
|
14496
|
14498
|
17373
|
17374
|
18053
|
18054
|
22301
|
22302
|
37489
|
37490
|
37497
|
37651