ish_models 0.0.33.185 → 0.0.33.187

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85b9a6758d41c84ed2393951c0e8bd9733d92f745859689e64940677205962bf
-  data.tar.gz: 4133474740d173f9eddc0339a2c8fcc2b335a199db36f2f19cc813afe2889594
+  metadata.gz: 626e313e49afc2fa1cb393c23b9d3259495eea073c618ef032744b480d4cec9f
+  data.tar.gz: da91ac290e6c5913ec26751a6884c4ecf420e0dd56cf6197547b0868cc4bf2a0
 SHA512:
-  metadata.gz: 4139e2903f034633a246aa43217b5f7eb64f3a5ec475774633d28b97984da2b35fa5ec4fde1ec4798b6c04f49c855db258df812f9dcb1e18e069326886d58031
-  data.tar.gz: 2ce2bed1e8a34efa83e643de5277561c3bc804503c5f6c293e72025ba639fc3b489eebd6d21296fe8d4598f1401bf9387d7fcfa21c686b30b3ed0e4c54a4d3c1
+  metadata.gz: 512418c18cfc423ff4589df45af395c3bc3e6bdb047557a1ee103c78813249bd4f259bbd07cf2b20b3eaccbb88716234d5c5c3d106fd71e092aa396bab4fccf3
+  data.tar.gz: f3192ef13c8fd5374c76358ecf7318e6c9d44989dd3c2ad96ba6e1cd0f5869f3a31ad944b72ea235244292fb70c623039645ce396c55560d65fc54ded46e1269

data/lib/ish/email_context.rb

@@ -46,6 +46,10 @@ class Ish::EmailContext
     Ish::EmailContext.where( type: TYPE_CAMPAIGN )
   end
 
+  def self.unsent_campaigns
+    Ish::EmailContext.where( type: TYPE_CAMPAIGN, sent_at: nil )
+  end
+
   def campaign_leads
     if self.type == TYPE_CAMPAIGN
       return ::EmailCampaignLead.where( email_campaign_id: self.id.to_s ).includes( :lead )
@@ -57,10 +61,18 @@ class Ish::EmailContext
   end
 
 
-  #
-  # For templating:
-  #
-  field :tmpl_name
+  ##
+  ## For templating:
+  ##
+  ## commonly: name, companyName
+  field :tmpl, type: Hash, default: {}
+  def body_templated
+    out = email_template.body
+    tmpl.each do |k, v|
+      out.gsub!("{#{k}}", v)
+    end
+    out
+  end
 
   field :to_email
   validates_presence_of :to_email, if: -> { type == TYPE_SINGLE }

data/lib/ish/user_profile.rb

@@ -54,7 +54,6 @@ class Ish::UserProfile
   has_many :my_maps, :inverse_of => :creator_profile, class_name: 'Gameui::Map'
 
   has_many :invoices,                             :class_name => '::Ish::Invoice'
-  has_many :leads,                                :class_name => '::Ish::Lead'
   has_many :photos
   has_many :reports,   inverse_of: :user_profile
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.185
+  version: 0.0.33.187
 platform: ruby
 authors:
 - piousbox