From 5ff21fda5a00e8d270f772520ba04552018d3af8 Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 8 Dec 2008 19:09:13 +0000
Subject: [PATCH] let's assume that the default combined XML notice template is
 primarily used for mailing notices, since emails are already handled by the
 system.  as such, if a user does not have a valid address, do not add them to
 the notice

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_4@11446 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/examples/templates/overdue_combined_xml.example | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Open-ILS/examples/templates/overdue_combined_xml.example b/Open-ILS/examples/templates/overdue_combined_xml.example
index 024821fffd..74ea16d38a 100644
--- a/Open-ILS/examples/templates/overdue_combined_xml.example
+++ b/Open-ILS/examples/templates/overdue_combined_xml.example
@@ -2,17 +2,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <file type="notice" date="[% date.format(date.now,'%Y-%m-%d') %]" time="[% date.format(date.now, '%H:%M:%S') %]">
     [%- FOREACH circ_set = overdues %]
-    <notice type='overdue' notify_interval='[% circ_set.notice.notify_interval %]'>
         [%- SET user = circ_set.circ_list.0.usr -%]
         [%- SET lib = circ_set.circ_list.0.circ_lib -%]
         [%- SET user_addr = user.mailing_address -%]
-        [%- IF !user_addr -%]
+        [%- IF !user_addr or user_addr.valid == 'f' -%]
                 [%- SET user_addr = user.billing_address -%]
         [%- END %]
         [%- SET lib_addr = lib.mailing_address -%]
         [%- IF !lib_addr -%]
                 [%- SET lib_addr = lib.billing_address -%]
-        [%- END %]
+        [%- END -%]
+        [%- IF !user_addr or user_addr.valid == 'f'; NEXT; END; %]
+    <notice type='overdue' notify_interval='[% circ_set.notice.notify_interval %]'>
         <patron>
             <barcode>[% user.card.barcode %]</barcode>
             <first_given_name>[% user.first_given_name %]</first_given_name>
-- 
2.11.0