Compare commits
2 Commits
2e25d70d92
...
fa49a09ab2
Author | SHA1 | Date |
---|---|---|
|
fa49a09ab2 | |
|
845ce926f3 |
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -47,6 +47,8 @@ en:
|
||||||
sending_notes: Sending Notes
|
sending_notes: Sending Notes
|
||||||
subscriber: Subscribers
|
subscriber: Subscribers
|
||||||
website_member: Website Members
|
website_member: Website Members
|
||||||
other_email: Other Email
|
other_emails: Other Email
|
||||||
receivers: Receivers
|
receivers: Receivers
|
||||||
send_newsletter: Send Newsletter
|
send_newsletter: Send Newsletter
|
||||||
|
language_to_send: "Languages allow be subscribed"
|
||||||
|
email_sentdate: Email Time
|
||||||
|
|
|
@ -48,6 +48,8 @@ zh_tw:
|
||||||
sending_notes: 寄送備註
|
sending_notes: 寄送備註
|
||||||
subscriber: 訂閱者
|
subscriber: 訂閱者
|
||||||
website_member: 網站會員
|
website_member: 網站會員
|
||||||
other_email: 其他Email
|
other_emails: 其他Email
|
||||||
receivers: 收件人
|
receivers: 收件人
|
||||||
send_newsletter: 發送時事通訊
|
send_newsletter: 發送時事通訊
|
||||||
|
language_to_send: 開放訂閱語系
|
||||||
|
email_sentdate: 寄送時間
|
|
@ -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)
|
||||||
|
|
Loading…
Reference in New Issue