From 3afbcad2c1bcc67d242839f2696cb14e380b4a6a Mon Sep 17 00:00:00 2001
From: Jonathan Prykop <jonathan@freeside.biz>
Date: Wed, 28 Oct 2015 23:37:58 -0500
Subject: [PATCH] RT#38432: OFM - Send refund receipt [v3 message prepare]

---
 FS/FS/cust_refund.pm | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index d156d22a8..166e53783 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -377,20 +377,17 @@ sub send_receipt {
   return "Could not load template"
     unless $msg_template;
 
-  my $cust_msg = $msg_template->prepare(
-    'cust_main'     => $cust_main,
-    'object'        => $self,
-    'msgtype'       => 'receipt',
-  );
-  return 'Error preparing message' unless $cust_msg;
-  my $error = $cust_msg->insert;
-  return $error if $error;
-
   my $queue = new FS::queue {
-    'job'     => 'FS::cust_msg::process_send',
+    'job'     => 'FS::Misc::process_send_email',
     'custnum' => $cust_main->custnum,
   };
-  $error = $queue->insert( $cust_msg->custmsgnum );
+  my $error = $queue->insert(
+    FS::msg_template->by_key($msgnum)->prepare(
+      'cust_main'     => $cust_main,
+      'object'        => $self,
+    ),
+    'msgtype' => 'receipt', # override msg_template's default
+  );
 
   return $error;
 }
-- 
2.11.0