harrybomrah
/
epaper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add email_sentdate setting.

This commit is contained in:
邱博亞 2024-09-15 10:22:04 +08:00
parent 845ce926f3
commit fa49a09ab2
5 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/paper_criteria.rb
View File

@ -16,6 +16,7 @@ class PaperCriteria
field :other_emails field :other_emails
field :invalid_emails, type: Array, :default => [] field :invalid_emails, type: Array, :default => []
field :send_failed_emails, type: Array, :default => [] field :send_failed_emails, type: Array, :default => []
field :email_sentdate , :type => DateTime
mount_uploader :image, ImageUploader mount_uploader :image, ImageUploader

8
app/views/admin/e_paper_criterias/_form.html.erb
View File

@ -96,6 +96,14 @@
<div class="hint">Separated by , (comma)</div> <div class="hint">Separated by , (comma)</div>
</div> </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>
<div class="tab-pane fade" id="record"> <div class="tab-pane fade" id="record">
</div> </div>

1
config/locales/en.yml
View File

@ -51,3 +51,4 @@ en:
receivers: Receivers receivers: Receivers
send_newsletter: Send Newsletter send_newsletter: Send Newsletter
language_to_send: "Languages allow be subscribed" language_to_send: "Languages allow be subscribed"
email_sentdate: Email Time

1
config/locales/zh_tw.yml
View File

@ -52,3 +52,4 @@ zh_tw:
receivers: 收件人 receivers: 收件人
send_newsletter: 發送時事通訊 send_newsletter: 發送時事通訊
language_to_send: 開放訂閱語系 language_to_send: 開放訂閱語系
email_sentdate: 寄送時間

1
lib/tasks/e_paper_tasks.rake
View File

@ -11,6 +11,7 @@ namespace :epaper do
papers_data = Admin::EpaperHelper.get_paper_data(paper) papers_data = Admin::EpaperHelper.get_paper_data(paper)
domain = args[:domain] domain = args[:domain]
if !paper.nil? if !paper.nil?
email_sentdate = paper.email_sentdate
email_format = /^[A-Za-z0-9+_.-]+@[A-Za-z0-9.-]+$/ 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 = EPaperSubscriber.where(:language.in=>paper.language_to_send,:email.nin=>['',nil],:subscribed.ne=>false)
subscribers.update_all(:last_paper_sent => paper.id.to_s) subscribers.update_all(:last_paper_sent => paper.id.to_s)