Bug 20472: Add format to sample notices

[srvgit] / installer / data / mysql / en / mandatory / sample_notices.yml

diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml
index 4e6823e..db40a3a 100644 (file)
--- a/installer/data/mysql/en/mandatory/sample_notices.yml
+++ b/installer/data/mysql/en/mandatory/sample_notices.yml
@@ -57,29 +57,30 @@ tables:
             - "<table>"
             - "[% IF ( LibraryName ) %]"
             - " <tr>"
-            - "    <th colspan=\"4\" class=\"centerednames\">"
+            - "    <th colspan=\"5\" class=\"centerednames\">"
             - "        <h3>[% LibraryName | html %]</h3>"
             - "    </th>"
             - " </tr>"
             - "[% END %]"
             - " <tr>"
-            - "    <th colspan=\"4\" class=\"centerednames\">"
+            - "    <th colspan=\"5\" class=\"centerednames\">"
             - "        <h2><u>Fee receipt</u></h2>"
             - "    </th>"
             - " </tr>"
             - " <tr>"
-            - "    <th colspan=\"4\" class=\"centerednames\">"
+            - "    <th colspan=\"5\" class=\"centerednames\">"
             - "        <h2>[% Branches.GetName( credit.patron.branchcode ) | html %]</h2>"
             - "    </th>"
             - " </tr>"
             - " <tr>"
-            - "    <th colspan=\"4\">"
+            - "    <th colspan=\"5\">"
             - "        Received with thanks from  [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />"
             - "        Card number: [% credit.patron.cardnumber | html %]<br />"
             - "    </th>"
             - " </tr>"
             - "  <tr>"
-            - "    <th>Date</th>"
+            - "    <th>Created</th>"
+            - "    <th>Updated</th>"
             - "    <th>Description of charges</th>"
             - "    <th>Note</th>"
             - "    <th>Amount</th>"
@@ -87,6 +88,7 @@ tables:
             - ""
             - " <tr class=\"highlight\">"
             - "    <td>[% credit.date | $KohaDates %]</td>"
+            - "    <td>[% credit.timestamp | $KohaDates with_hours = 1 %]</td>"
             - "    <td>"
             - "      [% PROCESS account_type_description account=credit %]"
             - "      [%- IF credit.description %], [% credit.description | html %][% END %]"
@@ -95,9 +97,20 @@ tables:
             - "    <td class=\"credit\">[% credit.amount | $Price %]</td>"
             - " </tr>"
             - ""
+            - "[% IF ( tendered ) %]"
+            - "  <tr>"
+            - "    <td colspan=\"3\">Amount tendered: </td>"
+            - "    <td>[% tendered | $Price %]</td>"
+            - "  </tr>"
+            - "  <tr>"
+            - "    <td colspan=\"3\">Change given: </td>"
+            - "    <td>[% change | $Price %]</td>"
+            - "  </tr>"
+            - "[% END %]"
+            - ""
             - "<tfoot>"
             - "  <tr>"
-            - "    <td colspan=\"3\">Total outstanding dues as on date: </td>"
+            - "    <td colspan=\"4\">Total outstanding dues as on date: </td>"
             - "    [% IF ( credit.patron.account.balance >= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% credit.patron.account.balance | $Price %]</td>"
             - "  </tr>"
             - "</tfoot>"
@@ -117,30 +130,31 @@ tables:
             - "<table>"
             - "  [% IF ( LibraryName ) %]"
             - "    <tr>"
-            - "      <th colspan=\"5\" class=\"centerednames\">"
+            - "      <th colspan=\"6\" class=\"centerednames\">"
             - "        <h3>[% LibraryName | html %]</h3>"
             - "      </th>"
             - "    </tr>"
             - "  [% END %]"
             - ""
             - "  <tr>"
-            - "    <th colspan=\"5\" class=\"centerednames\">"
+            - "    <th colspan=\"6\" class=\"centerednames\">"
             - "      <h2><u>INVOICE</u></h2>"
             - "    </th>"
             - "  </tr>"
             - "  <tr>"
-            - "    <th colspan=\"5\" class=\"centerednames\">"
+            - "    <th colspan=\"6\" class=\"centerednames\">"
             - "      <h2>[% Branches.GetName( debit.patron.branchcode ) | html %]</h2>"
             - "    </th>"
             - "  </tr>"
             - "  <tr>"
-            - "    <th colspan=\"5\" >"
+            - "    <th colspan=\"6\" >"
             - "      Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %] <br />"
             - "      Card number: [% debit.patron.cardnumber | html %]<br />"
             - "    </th>"
             - "  </tr>"
             - "  <tr>"
-            - "    <th>Date</th>"
+            - "    <th>Created</th>"
+            - "    <th>Updated</th>"
             - "    <th>Description of charges</th>"
             - "    <th>Note</th>"
             - "    <th style=\"text-align:right;\">Amount</th>"
@@ -149,6 +163,7 @@ tables:
             - ""
             - "  <tr class=\"highlight\">"
             - "    <td>[% debit.date | $KohaDates%]</td>"
+            - "    <td>[% debit.timestamp | $KohaDates with_hours = 1 %]</td>"
             - "    <td>"
             - "      [% PROCESS account_type_description account=debit %]"
             - "      [%- IF debit.description %], [% debit.description | html %][% END %]"
@@ -160,8 +175,8 @@ tables:
             - ""
             - "  <tfoot>"
             - "    <tr>"
-            - "      <td colspan=\"4\">Total outstanding dues as on date: </td>"
-            - "      [% IF ( debit.patron.account.balance <= 0 ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% debit.patron.account.balance | $Price %]</td>"
+            - "      <td colspan=\"5\">Total outstanding dues as on date: </td>"
+            - "      [% IF ( totalcredit ) %]<td class=\"credit\">[% ELSE %]<td class=\"debit\">[% END %][% total | $Price %]</td>"
             - "    </tr>"
             - "  </tfoot>"
             - "</table>"
@@ -228,6 +243,7 @@ tables:
             - "Pages: <<article_requests.pages>>"
             - "Chapters: <<article_requests.chapters>>"
             - "Notes: <<article_requests.patron_notes>>"
+            - "Format: [% IF article_request.format == 'PHOTOCOPY' %]Copy[% ELSIF article_request.format == 'SCAN' %]Scan[% END %]"
             - ""
             - "Your library"
 
@@ -253,8 +269,9 @@ tables:
             - "Pages: <<article_requests.pages>>"
             - "Chapters: <<article_requests.chapters>>"
             - "Notes: <<article_requests.patron_notes>>"
+            - "Format: [% IF article_request.format == 'PHOTOCOPY' %]Copy[% ELSIF article_request.format == 'SCAN' %]Scan[% END %]"
             - ""
-            - "You may pick your article up at <<branches.branchname>>."
+            - "[% IF article_request.format == 'PHOTOCOPY' %]You may pick up your article at [% branch.branchname %].[% ELSIF article_request.format == 'SCAN' %]You can download the scanned materials via the following url(s): [% article_request.urls %].[% END %]"
             - ""
             - "Thank you!"
 
@@ -280,7 +297,7 @@ tables:
             - "Pages: <<article_requests.pages>>"
             - "Chapters: <<article_requests.chapters>>"
             - "Notes: <<article_requests.patron_notes>>"
-            - ""
+            - "Format: [% IF article_request.format == 'PHOTOCOPY' %]Copy[% ELSIF article_request.format == 'SCAN' %]Scan[% END %]"
             - ""
             - "Thank you!"
 
@@ -306,6 +323,7 @@ tables:
             - "Pages: <<article_requests.pages>>"
             - "Chapters: <<article_requests.chapters>>"
             - "Notes: <<article_requests.patron_notes>>"
+            - "Format: [% IF article_request.format == 'PHOTOCOPY' %]Copy[% ELSIF article_request.format == 'SCAN' %]Scan[% END %]"
             - ""
             - "Thank you!"
 
@@ -334,6 +352,7 @@ tables:
             - "Pages: <<article_requests.pages>>"
             - "Chapters: <<article_requests.chapters>>"
             - "Notes: <<article_requests.patron_notes>>"
+            - "Format: [% IF article_request.format == 'PHOTOCOPY' %]Copy[% ELSIF article_request.format == 'SCAN' %]Scan[% END %]"
             - ""
 
         - module: circulation