From 82ef0448d4caaa768e7aacad24369c12531f9650 Mon Sep 17 00:00:00 2001
From: rulingcom <orbit@rulingcom.com>
Date: Wed, 2 Sep 2026 11:12:04 +0800
Subject: [PATCH] change email setting

---
 app/controllers/admin/announcements_controller.rb | 7 +++++++
 app/models/bulletin.rb                            | 1 +
 app/views/admin/announcements/_form.html.erb      | 5 +++++
 3 files changed, 13 insertions(+)

diff --git a/app/controllers/admin/announcements_controller.rb b/app/controllers/admin/announcements_controller.rb
index 64e45b9..b604c8f 100644
--- a/app/controllers/admin/announcements_controller.rb
+++ b/app/controllers/admin/announcements_controller.rb
@@ -670,6 +670,13 @@ class Admin::AnnouncementsController < OrbitAdminController
         :is_sent=>is_sent
       )
       bulletin.email.deliver
+      bulletin.update_attributes(
+        :email_member_ids => [],
+        :other_mailaddress => "",
+        :email_id => nil,
+        :email_sent => false,
+        :email_last_sent_at => Time.now
+      )
     else
       bulletin.email.destroy if !bulletin.email.nil?
     end
diff --git a/app/models/bulletin.rb b/app/models/bulletin.rb
index 2cd924c..2898b8b 100644
--- a/app/models/bulletin.rb
+++ b/app/models/bulletin.rb
@@ -79,6 +79,7 @@ class Bulletin
 
   field :email_id
   field :email_sent, :type => Boolean, :default => false
+  field :email_last_sent_at, :type => DateTime
   field :email_sentdate , :type => DateTime
   field :email_member_ids
   field :other_mailaddress
diff --git a/app/views/admin/announcements/_form.html.erb b/app/views/admin/announcements/_form.html.erb
index 492361c..72b5be5 100644
--- a/app/views/admin/announcements/_form.html.erb
+++ b/app/views/admin/announcements/_form.html.erb
@@ -471,6 +471,11 @@
       <div class="control-group">
         <label class="control-label muted" for="remind-check"><%= t("announcement.email_to") %></label>
         <div class="controls">
+          <% if @bulletin.email_last_sent_at.present? %>
+            <p class="help-block">
+              前次寄送已於 <%= @bulletin.email_last_sent_at.strftime("%Y年%m月%d日 %H:%M:%S") %> 寄出，如有設定限制收件人數及寄信頻率，請到系統管理的待寄送信件確認
+            </p>
+          <% end %>
           <label class="checkbox inline">
             <%= f.check_box :email_sent, {:id=>'remind-check'} %>
             <%= t('announcement.activate_email_reminder')%>