Attachment 138236 Details for Bug 31257 – Bug 31257: WIP

[patch] Bug 31257: WIP

Bug-31257-WIP.patch (text/plain), 12.40 KB, created by Aleisha Amohia on 2022-07-28 22:37:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aleisha Amohia

Created: 2022-07-28 22:37:17 UTC

Size: 12.40 KB

patch

obsolete

>From 66538893dc3050bc664b0edfb343df1e22b078de Mon Sep 17 00:00:00 2001
>From: Aleisha Amohia <aleishaamohia@hotmail.com>
>Date: Fri, 29 Jul 2022 10:36:37 +1200
>Subject: [PATCH] Bug 31257: WIP
>
>---
> Koha/pdfformat/layout1page.pm                      | 263 +++++++++++++++++++++
> acqui/basketgroup.pl                               |   2 +-
> .../en/modules/admin/preferences/acquisitions.pref |   1 +
> 3 files changed, 265 insertions(+), 1 deletion(-)
> create mode 100644 Koha/pdfformat/layout1page.pm
>
>diff --git a/Koha/pdfformat/layout1page.pm b/Koha/pdfformat/layout1page.pm
>new file mode 100644
>index 00000000000..365273d8cb6
>--- /dev/null
>+++ b/Koha/pdfformat/layout1page.pm
>@@ -0,0 +1,263 @@
>+package Koha::pdfformat::layout2pages;
>+
>+#example script to print a basketgroup
>+#written 07/11/08 by john.soros@biblibre.com and paul.poulain@biblibre.com
>+
>+# Copyright 2008-2009 BibLibre SARL
>+#
>+# This file is part of Koha.
>+#
>+# Koha is free software; you can redistribute it and/or modify it
>+# under the terms of the GNU General Public License as published by
>+# the Free Software Foundation; either version 3 of the License, or
>+# (at your option) any later version.
>+#
>+# Koha is distributed in the hope that it will be useful, but
>+# WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>+# GNU General Public License for more details.
>+#
>+# You should have received a copy of the GNU General Public License
>+# along with Koha; if not, see <http://www.gnu.org/licenses>.
>+
>+#you can use any PDF::API2 module, all you need to do is return the stringifyed pdf object from the printpdf sub.
>+use vars qw(@ISA @EXPORT);
>+use Modern::Perl;
>+use utf8;
>+
>+use Koha::Number::Price;
>+use Koha::DateUtils qw( dt_from_string output_pref );
>+use Koha::Libraries;
>+
>+BEGIN {
>+         use Exporter   ();
>+         our (@ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
>+	@ISA    = qw(Exporter);
>+	@EXPORT = qw(printpdf);
>+}
>+
>+
>+#be careful, all the sizes (height, width, etc...) are in mm, not PostScript points (the default measurment of PDF::API2).
>+#The constants exported transform that into PostScript points (/mm for milimeter, /in for inch, pt is postscript point, and as so is there only to show what is happening.
>+use constant mm => 25.4 / 72;
>+use constant in => 1 / 72;
>+use constant pt => 1;
>+
>+use PDF::API2;
>+#A4 paper specs
>+my ($height, $width) = (297, 210);
>+use PDF::Table;
>+
>+sub printorders {
>+    my ($pdf, $basketgroup, $baskets, $orders) = @_;
>+    
>+    my $cur_format = C4::Context->preference("CurrencyFormat");
>+
>+    $pdf->mediabox($height/mm, $width/mm);
>+    my $page = $pdf->page();
>+    
>+    my $pdftable = PDF::Table->new();
>+    
>+    my $abaskets;
>+    my $arrbasket;
>+    my @keys = ('Basket (no.)', 'Document', 'Qty', 'RRP tax inc.', 'Discount', 'Tax', 'Total tax exc.', 'Total tax inc.');
>+    for my $bkey (@keys) {
>+        push(@$arrbasket, $bkey);
>+    }
>+    push(@$abaskets, $arrbasket);
>+
>+    my $titleinfo;
>+    for my $basket (@$baskets){
>+        for my $line (@{$orders->{$basket->{basketno}}}) {
>+            $arrbasket = undef;
>+            $titleinfo = "";
>+            if ( C4::Context->preference("marcflavour") eq 'UNIMARC' ) {
>+                $titleinfo =  $line->{title} . " / " . $line->{author} .
>+                    ( $line->{isbn} ? " ISBN: " . $line->{isbn} : '' ) .
>+                    ( $line->{en} ? " EN: " . $line->{en} : '' ) .
>+                    ( $line->{itemtype} ? ", " . $line->{itemtype} : '' ) .
>+                    ( $line->{edition} ? ", " . $line->{edition} : '' ) .
>+                    ( $line->{publishercode} ? ' published by '. $line->{publishercode} : '') .
>+                    ( $line->{publicationyear} ? ', '. $line->{publicationyear} : '');
>+            }
>+            else { # MARC21
>+                $titleinfo =  $line->{title} . " " . $line->{author} .
>+                    ( $line->{isbn} ? " ISBN: " . $line->{isbn} : '' ) .
>+                    ( $line->{en} ? " EN: " . $line->{en} : '' ) .
>+                    ( $line->{itemtype} ? " " . $line->{itemtype} : '' ) .
>+                    ( $line->{edition} ? ", " . $line->{edition} : '' ) .
>+                    ( $line->{publishercode} ? ' published by '. $line->{publishercode} : '') .
>+                    ( $line->{copyrightdate} ? ' '. $line->{copyrightdate} : '');
>+            }
>+            push( @$arrbasket,
>+                $basket->{basketno},
>+                $titleinfo. ($line->{order_vendornote} ? "\n----------------\nNote for vendor : " . $line->{order_vendornote} : '' ),
>+                $line->{quantity},
>+                Koha::Number::Price->new( $line->{rrp_tax_included} )->format,
>+                Koha::Number::Price->new( $line->{discount} )->format . '%',
>+                Koha::Number::Price->new( $line->{tax_rate} * 100 )->format . '%',
>+                Koha::Number::Price->new( $line->{total_tax_excluded} )->format,
>+                Koha::Number::Price->new( $line->{total_tax_included} )->format,
>+            );
>+            push(@$abaskets, $arrbasket);
>+        }
>+    }
>+    
>+    $pdftable->table($pdf, $page, $abaskets,
>+        x => 10/mm,
>+        w => ($width - 20)/mm,
>+        start_y => 285/mm,
>+        next_y  => 285/mm,
>+        start_h => 260/mm,
>+        next_h  => 260/mm,
>+        padding => 5,
>+        padding_right => 5,
>+        background_color_odd  => "lightgray",
>+        font       => $pdf->corefont("Times", -encoding => "utf8"),
>+        font_size => 3/mm,
>+        header_props   => {
>+            font       => $pdf->corefont("Times", -encoding => "utf8"),
>+            font_size  => 10,
>+            bg_color   => 'gray',
>+            repeat     => 1,
>+        },
>+        column_props => [
>+            { justify => 'left'  },
>+            { min_w   => 90/mm   },
>+            { justify => 'right' },
>+            { justify => 'right' },
>+            { justify => 'right' },
>+            { justify => 'right' },
>+            { justify => 'right' },
>+            { justify => 'right' },
>+        ],
>+    );
>+    
>+    $pdf->mediabox($width/mm, $height/mm);
>+}
>+
>+sub printhead {
>+    my ($pdf, $basketgroup, $bookseller) = @_;
>+
>+    # get library name
>+    my $libraryname = C4::Context->preference("LibraryName");
>+    my $billing_library  = Koha::Libraries->find( $basketgroup->{billingplace} );
>+    my $delivery_library = Koha::Libraries->find( $basketgroup->{deliveryplace} );
>+    my $freedeliveryplace = $basketgroup->{freedeliveryplace};
>+    # get the subject
>+    my $subject;
>+
>+    # open 1st page (with the header)
>+    my $page = $pdf->openpage(1);
>+    
>+    # create a text
>+    my $text = $page->text;
>+    
>+    # print the libraryname in the header
>+    $text->font( $pdf->corefont("Times", -encoding => "utf8"), 6/mm );
>+    $text->translate(30/mm, ($height-28.5)/mm);
>+    $text->text($libraryname);
>+
>+    # print order info, on the default PDF
>+    $text->font( $pdf->corefont("Times", -encoding => "utf8"), 8/mm );
>+    $text->translate(100/mm, ($height-5-48)/mm);
>+    $text->text($basketgroup->{'id'});
>+    
>+    # print the date
>+    my $today = output_pref({ dt => dt_from_string, dateonly => 1 });
>+    $text->translate(130/mm,  ($height-5-48)/mm);
>+    $text->text($today);
>+    
>+    $text->font( $pdf->corefont("Times", -encoding => "utf8"), 4/mm );
>+    
>+    # print billing infos
>+    $text->translate(100/mm, ($height-86)/mm);
>+    $text->text($libraryname);
>+    $text->translate(100/mm, ($height-97)/mm);
>+    $text->text($billing_library->branchname);
>+    $text->translate(100/mm, ($height-108.5)/mm);
>+    $text->text($billing_library->branchphone);
>+    $text->translate(100/mm, ($height-115.5)/mm);
>+    $text->text($billing_library->branchfax);
>+    $text->translate(100/mm, ($height-122.5)/mm);
>+    $text->text($billing_library->branchaddress1);
>+    $text->translate(100/mm, ($height-127.5)/mm);
>+    $text->text($billing_library->branchaddress2);
>+    $text->translate(100/mm, ($height-132.5)/mm);
>+    $text->text($billing_library->branchaddress3);
>+    $text->translate(100/mm, ($height-137.5)/mm);
>+    $text->text(join(' ', $billing_library->branchzip, $billing_library->branchcity, $billing_library->branchcountry));
>+    $text->translate(100/mm, ($height-147.5)/mm);
>+    $text->text($billing_library->branchemail);
>+    
>+    # print subject
>+    $text->translate(100/mm, ($height-145.5)/mm);
>+    $text->text($subject);
>+    
>+    # print bookseller infos
>+    $text->translate(100/mm, ($height-180)/mm);
>+    $text->text($bookseller->name);
>+    $text->translate(100/mm, ($height-185)/mm);
>+    $text->text($bookseller->postal);
>+    $text->translate(100/mm, ($height-190)/mm);
>+    $text->text($bookseller->address1);
>+    $text->translate(100/mm, ($height-195)/mm);
>+    $text->text($bookseller->address2);
>+    $text->translate(100/mm, ($height-200)/mm);
>+    $text->text($bookseller->address3);
>+    $text->translate(100/mm, ($height-205)/mm);
>+    $text->text($bookseller->accountnumber);
>+    
>+    # print delivery infos
>+    $text->font( $pdf->corefont("Times-Bold", -encoding => "utf8"), 4/mm );
>+    $text->translate(50/mm, ($height-237)/mm);
>+    if ($freedeliveryplace) {
>+        my $start = 242;
>+        my @fdp = split('\n', $freedeliveryplace);
>+        foreach (@fdp) {
>+            $text->text($_);
>+            $text->translate( 50 / mm, ( $height - $start ) / mm );
>+            $start += 5;
>+        }
>+    } else {
>+        $text->text( $delivery_library->branchaddress1 );
>+        $text->translate( 50 / mm, ( $height - 242 ) / mm );
>+        $text->text( $delivery_library->branchaddress2 );
>+        $text->translate( 50 / mm, ( $height - 247 ) / mm );
>+        $text->text( $delivery_library->branchaddress3 );
>+        $text->translate( 50 / mm, ( $height - 252 ) / mm );
>+        $text->text( join( ' ', $delivery_library->branchzip, $delivery_library->branchcity, $delivery_library->branchcountry ) );
>+    }
>+    $text->translate(50/mm, ($height-262)/mm);
>+    $text->text($basketgroup->{deliverycomment});
>+}
>+
>+sub printfooters {
>+    my $pdf = shift;
>+    for ( 1..$pdf->pages ) {
>+        my $page = $pdf->openpage($_);
>+        my $text = $page->text;
>+        $text->font( $pdf->corefont("Times", -encoding => "utf8"), 3/mm );
>+        $text->translate(10/mm,  10/mm);
>+        $text->text("Page $_ / ".$pdf->pages);
>+    }
>+}
>+
>+sub printpdf {
>+    my ($basketgroup, $bookseller, $baskets, $orders, $GST) = @_;
>+    # open the default PDF that will be used for base (1st page already filled)
>+    my $pdf_template = C4::Context->config('intrahtdocs') . '/' . C4::Context->preference('template') . '/pdf/layout2pages.pdf';
>+    my $pdf = PDF::API2->open($pdf_template);
>+    $pdf->pageLabel( 0, {
>+        -style => 'roman',
>+    } ); # start with roman numbering
>+    # fill the 1st page (basketgroup information)
>+    printhead($pdf, $basketgroup, $bookseller);
>+    # fill other pages (orders)
>+    printorders($pdf, $basketgroup, $baskets, $orders);
>+    # print something on each page (usually the footer, but you could also put a header
>+    printfooters($pdf);
>+    return $pdf->stringify;
>+}
>+
>+1;
>diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl
>index 336a8fb4d2f..38f7b6b44c5 100755
>--- a/acqui/basketgroup.pl
>+++ b/acqui/basketgroup.pl
>@@ -125,7 +125,7 @@ sub printbasketgrouppdf{
>     my ($basketgroupid) = @_;
> 
>     my $pdfformat = C4::Context->preference("OrderPdfFormat");
>-    my @valid_pdfformats = qw(pdfformat::layout3pages pdfformat::layout2pages pdfformat::layout3pagesfr pdfformat::layout2pagesde);
>+    my @valid_pdfformats = qw(pdfformat::layout3pages pdfformat::layout2pages pdfformat::layout3pagesfr pdfformat::layout2pagesde pdfformat::layout1page);
>     if (grep {$_ eq $pdfformat} @valid_pdfformats) {
>         $pdfformat = "Koha::$pdfformat";
>         my $pdfformat_filepath = File::Spec->catfile(split /::/, $pdfformat) . '.pm';
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
>index fd9475d15e8..62c57505aab 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
>@@ -118,6 +118,7 @@ Acquisitions:
>             - Use the
>             - pref: OrderPdfFormat
>               choices:
>+                  "pdfformat::layout1page":    English 1-page
>                   "pdfformat::layout2pages":   English 2-page
>                   "pdfformat::layout3pages":   English 3-page
>                   "pdfformat::layout3pagesfr": French 3-page
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 31257: 138236 | 138454 | 140644 | 140645 | 141299 | 141304 | 141305 | 141551 | 141552 | 141553