From fa49a09ab260d5a4433337d9ff017745276e7f9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B1=E5=8D=9A=E4=BA=9E?= <naruto0426@rulingcom.com>
Date: Sun, 15 Sep 2024 10:22:04 +0800
Subject: [PATCH] Add email_sentdate setting.

---
 app/models/paper_criteria.rb                     | 1 +
 app/views/admin/e_paper_criterias/_form.html.erb | 8 ++++++++
 config/locales/en.yml                            | 1 +
 config/locales/zh_tw.yml                         | 1 +
 lib/tasks/e_paper_tasks.rake                     | 1 +
 5 files changed, 12 insertions(+)

diff --git a/app/models/paper_criteria.rb b/app/models/paper_criteria.rb
index 283f131..de5d121 100644
--- a/app/models/paper_criteria.rb
+++ b/app/models/paper_criteria.rb
@@ -16,6 +16,7 @@ class PaperCriteria
   field :other_emails
   field :invalid_emails, type: Array, :default => []
   field :send_failed_emails, type: Array, :default => []
+  field :email_sentdate , :type => DateTime
 
   mount_uploader :image, ImageUploader
 
diff --git a/app/views/admin/e_paper_criterias/_form.html.erb b/app/views/admin/e_paper_criterias/_form.html.erb
index 42ca732..19b70ac 100644
--- a/app/views/admin/e_paper_criterias/_form.html.erb
+++ b/app/views/admin/e_paper_criterias/_form.html.erb
@@ -96,6 +96,14 @@
             <div class="hint">Separated by , (comma)</div>
         </div>
       </div>
+      <div class="content-box">
+        <div class="control-group">
+          <label class="control-label muted"><%= t("e_paper.email_sentdate") %></label>
+          <div class="controls">
+            <%= f.datetime_picker :email_sentdate, :no_label => true %>
+          </div>
+        </div>
+      </div>
     </div>
     <div class="tab-pane fade" id="record">
     </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 69a1a5d..be9e753 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -51,3 +51,4 @@ en:
     receivers: Receivers
     send_newsletter: Send Newsletter
     language_to_send: "Languages allow be subscribed"
+    email_sentdate: Email Time
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 20b1222..d5a7210 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -52,3 +52,4 @@ zh_tw:
     receivers: 收件人
     send_newsletter: 發送時事通訊
     language_to_send: 開放訂閱語系
+    email_sentdate: 寄送時間
\ No newline at end of file
diff --git a/lib/tasks/e_paper_tasks.rake b/lib/tasks/e_paper_tasks.rake
index 963535f..c8e3d39 100644
--- a/lib/tasks/e_paper_tasks.rake
+++ b/lib/tasks/e_paper_tasks.rake
@@ -11,6 +11,7 @@ namespace :epaper do
 		papers_data = Admin::EpaperHelper.get_paper_data(paper)
 		domain = args[:domain]
 		if !paper.nil?
+			email_sentdate = paper.email_sentdate
 			email_format = /^[A-Za-z0-9+_.-]+@[A-Za-z0-9.-]+$/
 			subscribers = EPaperSubscriber.where(:language.in=>paper.language_to_send,:email.nin=>['',nil],:subscribed.ne=>false)
 			subscribers.update_all(:last_paper_sent => paper.id.to_s)