Sixth installment Patron card generation feature

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-menu.inc
index bb66506..9607ab4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-menu.inc
@@ -1,6 +1,7 @@
 <ul>
-       <li><a href="/cgi-bin/koha/labels/label-home.pl">Label Layouts</a></li>
-       <li><a href="/cgi-bin/koha/labels/label-templates.pl">Label Templates</a></li>
+       <li><a href="/cgi-bin/koha/labels/label-home.pl">Layouts</a></li>
+       <li><a href="/cgi-bin/koha/labels/label-templates.pl">Templates</a></li>
        <li><a href="/cgi-bin/koha/labels/label-profiles.pl">Printer Profiles</a></li>
-       <li><a href="/cgi-bin/koha/labels/label-manager.pl">Create or Print Label Batches</a></li>
+       <li><a href="/cgi-bin/koha/labels/label-manager.pl?type=labels">Create or Print Label Batches</a></li>
+       <li><a href="/cgi-bin/koha/labels/label-manager.pl?type=patroncards">Create or Print Patron Card Batches</a></li>
 </ul>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
index e07b8cd..91a4b6e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
@@ -10,7 +10,7 @@ function Plugin(batch_id) {
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Labels</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <!-- TMPL_IF EXPR="(batch_type eq 'labels')" -->Labels<!-- TMPL_ELSIF EXPR="(batch_type eq 'patroncards')" -->Patron Cards<!-- /TMPL_IF --></div>
  <div id="doc3" class="yui-t2">
   <div id="bd">
    <div id="yui-main">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
index a04b9dd..c93966e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
@@ -17,8 +17,8 @@
     <dt><a href="/cgi-bin/koha/tools/koha-news.pl">News</a></dt>
     <dd>Write news for the OPAC and staff interfaces</dd>
        
-    <dt><a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a></dt>
-    <dd>Create printable labels and barcodes from catalog data</dd>
+    <dt><a href="/cgi-bin/koha/labels/label-home.pl">Label and Patron Card Creator</a></dt>
+    <dd>Create printable labels and barcodes from catalog data and patron cards from patron data</dd>
 
     <dt><a href="/cgi-bin/koha/tools/holidays.pl">Calendar</a></dt>
     <dd>Define days when the library is closed</dd>

diff --git a/labels/label-print-pdf.pl b/labels/label-print-pdf.pl
index d21c193..9c5cf4c 100755 (executable)
--- a/labels/label-print-pdf.pl
+++ b/labels/label-print-pdf.pl
@@ -36,6 +36,7 @@ my @resultsloop;
 
 #$DB::single = 1;
 
+my $batch_type   = $conf_data->{'type'};
 my $barcodetype  = $conf_data->{'barcodetype'};
 my $printingtype = $conf_data->{'printingtype'};
 my $guidebox     = $conf_data->{'guidebox'};
@@ -258,7 +259,6 @@ foreach $item (@resultsloop) {
     }
 
     elsif ( $printingtype eq 'PATCRD' ) {
-        my $borrowernumber = '3';       # Hardcoded for testing purposes...
         my $patron_data = $item;
 
         #FIXME: This needs to be paramatized and passed in from the user...