ish_models 0.0.33.271 → 0.0.33.272

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c695f34fb6f38b0daca48bda88a508f027db99f726989a9418d975b5026541a
-  data.tar.gz: 34fed5affbb1c25f15d4940fe1766cd51d4ab7f26fc73de646ddf0426035f1d0
+  metadata.gz: 569fd681a6098f88e39d36996bc031e4094d57d4250efdf5d76961857b8b5987
+  data.tar.gz: 5737743c665eb8998829713413e0f5c70273596c0d749c6ab2a1ef366498fa1d
 SHA512:
-  metadata.gz: 0d93535ede083430aa2ee86109548a3f8af463021fb95078b5864347431a9bd6ebb73cbd39ff69bb16cdacb8f992f218baa4cdba53e4c844feb9f25e45dfd87c
-  data.tar.gz: a7c61121c5741d2232a5dda85ae16793d317b3aed5fe808f9b025d9d13a611c0f49579b1d581a3001fa969b8ca6b94958fad24ad3ff0de84af51f47a41730078
+  metadata.gz: 6c97854130e7399943406ac285198bbd101d4d3f06a9daa478f6266079b70efc4f62e287e1b1660f51c7187f41241b1b8c62cae8b4a5a6e8eb061d65ebb0030f
+  data.tar.gz: 8912dcb2e23c9da38481c5af234b66bfdab701ffc4ca016f3747b5ff81e0c59bb63c307c4fab62c145dcdfe74ad7b78f2d49daac301098c7216796060a81830e

data/lib/ish/email_campaign.rb

@@ -15,15 +15,6 @@ class Ish::EmailCampaign
 
   field :from_email
   validates_presence_of :from_email
-  FROM_EMAILS = %w|        hello@infiniteshelter.com no-reply@infiniteshelter.com
-    piousbox@gmail.com
-                           hello@piousbox.com        no-reply@piousbox.com        victor@piousbox.com
-    admin@wasya.co         hello@wasya.co            no-reply@wasya.co            victor@wasya.co
-    admin@mail.wasyaco.com hello@mail.wasyaco.com    no-reply@mail.wasyaco.com    victor@mail.wasyaco.com
-  |;
-  def self.from_email_list
-    [ [nil, nil] ] + FROM_EMAILS.map { |i| [i, i] }
-  end
 
   belongs_to :email_template
   def tmpl; email_template; end

data/lib/ish/email_context.rb

@@ -70,10 +70,6 @@ class ::Ish::EmailContext
   def self.scheduled; new.scheduled; end
 
 
-  def self.from_email_list
-    Ish::EmailCampaign.from_email_list
-  end
-
   ## like belongs_to to_lead , but Lead is SQL to just the lead_id
   field :lead_id, type: :integer
   def lead; Lead.find( lead_id ); end
@@ -93,6 +89,7 @@ class ::Ish::EmailContext
       'utm_medium'   => 'email',
       'utm_source'   => tmpl.slug,
     }.map { |k, v| "#{k}=#{v}" }.join("&")
+    eval( tmpl.config_exe )
     binding()
   end
 

data/lib/ish/email_template.rb

@@ -13,6 +13,7 @@ class ::Ish::EmailTemplate
   LAYOUTS = %w| plain
     m20221201react m20221222merryxmas
     m202309_feedback
+    m202309_ror4
     marketing_node_1
     marketing_react_1 marketing_react_2 marketing_react_3
     marketing_ror_1 marketing_ror_2
@@ -25,7 +26,8 @@ class ::Ish::EmailTemplate
   field :subject
   field :body
   field :can_unsubscribe, type: :boolean, default: true
-  field :config_exe, default: ""
+  field :config_exe,                      default: ""      ## used a lot.
+  field :config_json,     type: Object,   default: '{}'
 
   FROM_EMAILS = [
     'Annesque Studio <hello@annesque.studio>',
@@ -64,6 +66,8 @@ class ::Ish::EmailTemplate
     'WasyaCo Consulting <hello@wasyaco.com>',
     'WasyaCo Consulting <no-reply@wasyaco.com>',
     'Victor <victor@wasyaco.com>',
+
+    'Wasya Co Mailer <no-reply@wco.com.de>',
   ];
   field :from_email
   def self.from_email_list

data/lib/ish_models.rb

@@ -65,6 +65,7 @@ require 'video'
 
 require 'office/action'
 require 'office/action_tie'
+require 'office/admin_message'
 require 'office/email_action'
 require 'office/email_action_tie'
 require 'office/email_conversation'

data/lib/office/admin_message.rb

@@ -0,0 +1,11 @@
+
+
+class Office::AdminMessage
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :message
+
+end
+
+

data/lib/office/scheduled_email_action.rb

@@ -33,27 +33,25 @@ class Office::ScheduledEmailAction
 
   def send_and_roll
     sch = self
-    sch.update_attributes({ state: Sch::STATE_INACTIVE })
+    sch.update({ state: Sch::STATE_INACTIVE })
 
     # send now
     ctx = Ctx.create!({
-      email_template_id: sch.act.tmpl.id,
-      lead_id: sch.lead.id,
-      send_at: Time.now,
-      subject: sch.act.tmpl.subject,
-      from_email: sch.act.tmpl.from_email,
+      email_template_id:         sch.act.tmpl.id,
+      from_email:                sch.act.tmpl.from_email,
+      lead_id:                   sch.lead.id,
       scheduled_email_action_id: sch.act.id,
+      send_at:                   Time.now,
+      subject:                   sch.act.tmpl.subject,
     })
 
     # schedule next actions & update the action
     sch.act.ties.each do |tie|
-      next_act = tie.next_email_action
-      next_at  = eval(tie.next_at_exe)
       next_sch = Sch.find_or_initialize_by({
-        lead_id: sch.lead_id,
-        email_action_id: next_act.id,
+        lead_id:         sch.lead_id,
+        email_action_id: tie.next_email_action.id,
       })
-      next_sch.perform_at = next_at
+      next_sch.perform_at = eval(tie.next_at_exe)
       next_sch.state      = Sch::STATE_ACTIVE
       next_sch.save!
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.271
+  version: 0.0.33.272
 platform: ruby
 authors:
 - piousbox
@@ -173,6 +173,7 @@ files:
 - lib/newsitem.rb
 - lib/office/action.rb
 - lib/office/action_tie.rb
+- lib/office/admin_message.rb
 - lib/office/email_action.rb
 - lib/office/email_action_tie.rb
 - lib/office/email_conversation.rb