Compare commits

..

No commits in common. "fa49a09ab260d5a4433337d9ff017745276e7f9d" and "2e25d70d92a5186b8f659e20fc7e82c3f16d1281" have entirely different histories.

5 changed files with 3 additions and 17 deletions

View File

@ -16,7 +16,6 @@ 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

View File

@ -96,14 +96,6 @@
<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>

View File

@ -47,8 +47,6 @@ en:
sending_notes: Sending Notes
subscriber: Subscribers
website_member: Website Members
other_emails: Other Email
other_email: Other Email
receivers: Receivers
send_newsletter: Send Newsletter
language_to_send: "Languages allow be subscribed"
email_sentdate: Email Time

View File

@ -48,8 +48,6 @@ zh_tw:
sending_notes: 寄送備註
subscriber: 訂閱者
website_member: 網站會員
other_emails: 其他Email
other_email: 其他Email
receivers: 收件人
send_newsletter: 發送時事通訊
language_to_send: 開放訂閱語系
email_sentdate: 寄送時間

View File

@ -11,7 +11,6 @@ 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)