From 991fef9e2937cb861cac4a1734e114cff8ee6351 Mon Sep 17 00:00:00 2001
From: Mike Rylander <mrylander@gmail.com>
Date: Fri, 5 Aug 2016 12:16:27 -0400
Subject: [PATCH] Allow staff to send an email receipt on demand, if patron has
 a valid email address

Signed-off-by: Mike Rylander <mrylander@gmail.com>
---
 Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2  | 4 ++--
 Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
index e1125c366b..6492621ddd 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2
@@ -139,7 +139,7 @@
         <span class="sr-only">[% l('receipt option') %]</span>
       </button>
       <ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="quick-button">
-        <li role="menuitem" ng-class="{disabled : !may_email_receipt()}"><a ng-click="email_receipt()" a-disabled="!may_email_receipt()" href="#">[% l('Email Receipt') %]</a></li>
+        <li role="menuitem" ng-class="{disabled : !has_email_address()}"><a ng-click="email_receipt()" a-disabled="!has_email_address()" href="#">[% l('Email Receipt') %]</a></li>
         <li role="menuitem"><a ng-click="print_receipt()" href="#">[% l('Print Receipt') %]</a></li>
       </ul>
     </div>
@@ -154,7 +154,7 @@
       </button>
       <ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="done-button">
         <li role="menuitem"><a ng-click="done_no_receipt()" href="#">[% l('No Receipt') %]</a></li>
-        <li role="menuitem" ng-class="{disabled : !may_email_receipt()}"><a ng-click="done_email_receipt()" a-disabled="!may_email_receipt()" href="#">[% l('Email Receipt') %]</a></li>
+        <li role="menuitem" ng-class="{disabled : !has_email_address()}"><a ng-click="done_email_receipt()" a-disabled="!has_email_address()" href="#">[% l('Email Receipt') %]</a></li>
         <li role="menuitem"><a ng-click="done_print_receipt()" href="#">[% l('Print Receipt') %]</a></li>
       </ul>
   </div>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js b/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js
index 8fbd14cdc1..765f25fd64 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js
@@ -44,6 +44,13 @@ function($scope , $q , $routeParams , egCore , egUser , patronSvc ,
         }
     }
 
+    $scope.has_email_address = function() {
+        return (
+            patronSvc.current.email() &&
+            patronSvc.current.email().match(/.*@.*/).length
+        );
+    }
+
     $scope.may_email_receipt = function() {
         return setting_value(
             patronSvc.current,
-- 
2.11.0