ish_models 0.0.33.258 → 0.0.33.260

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e1f1bed433ccb852de3a46410a673a4e4552b4f48221f4c286ca15f5b805689
-  data.tar.gz: 180e91b85001dbdca3d42a7af78a5dabf7fb6b5aa5e92b153e75e5ac7b1d1e2b
+  metadata.gz: 6291450aa3af2a529bc54e193556c1463ee7cfaad5161ad2e777cfe39c09b9dd
+  data.tar.gz: 36613413540c6348a4b752b1c1d3b32c6ff0d4f00023a92e398a45db1bcea500
 SHA512:
-  metadata.gz: ad31349efdde87b88e17797f250a3fc99e7c25fad9d1a38d061a8519f4773e0b30aa065371f9645f025d7390ce3bfecbda8742857139ad96077bcebb1580c8d4
-  data.tar.gz: cc3390211ef7febde3b27b4f3bddd9dd4916e1bcd128cb6d5587b89c435bd6435002cafe05bd78ec4c09e812c040587d17db793d1384056273d27c83f09a8eff
+  metadata.gz: 786129d1e89cff3d9584f90a031421a2bd491780a47c9cc2043d4ab8f38219bb86f5f14447682f697ad9efb69d43c5afce4ad0bc5a6be5549038c151dd70f8e2
+  data.tar.gz: f25a822b37ae6f9209318e7c550600792921fa9c82e8561a06563d2f9d3f6f6ddfcd8565063da20d66a6121dd2a8781ac4666e16855795cd589d68dd2c4446bb

data/lib/ish/invoice.rb

@@ -9,18 +9,27 @@ class Ish::Invoice
   include Mongoid::Timestamps
   include Mongoid::Autoinc
 
-  store_in :collection => 'ish_invoice'
+  store_in collection: 'ish_invoice'
 
-  field :email, :type => String
+  field :email, type: String
 
-  field :number, :type => Integer
+  field :invoice_id, type: String # stripe
+
+  field :leadset_id, type: Integer
+  def leadset
+    Leadset.find leadset_id
+  end
+
+  field :number, type: Integer
   increments :number
 
-  field :amount, :type => Integer
+  field :amount, type: Integer
 
   has_many :payments, :class_name => 'Ish::Payment'
-  field :paid_amount, :type => Integer, :default => 0
+  field :paid_amount, type: Integer, :default => 0
+
+  field :description, type: String
 
-  field :description, :type => String
+  field :items, type: Array
 
 end

data/lib/ish/user_profile.rb

@@ -17,7 +17,6 @@ class Ish::UserProfile
   validates_format_of :email,:with => /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/
   validates_uniqueness_of :email
 
-
   field :name
 
   def export_fields
@@ -34,11 +33,16 @@ class Ish::UserProfile
   field :fb_expires_in
 
   field :lang, default: 'en'
+  field :leadset_id, type: Integer
+  def organization_name
+    'Some Org'
+    # ::Leadset.find( leadset_id )&.name
+  end
 
-  ROLES = [ :guy, :manager, :admin ]
   ROLE_GUY     = :guy
   ROLE_MANAGER = :manager
   ROLE_ADMIN   = :admin
+  ROLES        = [ :guy, :manager, :admin ]
   field :role_name, :type => Symbol, default: :guy
 
   has_one  :profile_photo,                   inverse_of: :profile_city,    class_name: 'Photo'
@@ -57,7 +61,6 @@ class Ish::UserProfile
   has_many :newsitems,                       inverse_of: :profile
   has_and_belongs_to_many :friends,   :class_name => '::Ish::UserProfile', inverse_of: :friendeds
   has_and_belongs_to_many :friendeds, :class_name => '::Ish::UserProfile', inverse_of: :friends
-  belongs_to :organization, class_name: '::Wco::Organization', inverse_of: :profile
 
   def sudoer?
     %w( piousbox@gmail.com victor@wasya.co ).include?( self.email )
@@ -82,6 +85,7 @@ class Ish::UserProfile
 
   field :is_purchasing, type: Boolean, default: false
 
+  field :customer_id # stripe
 
   # used in rake tasks
   def self.generate delta

data/lib/ish_models.rb

@@ -74,7 +74,7 @@ require 'office/email_message'
 require 'office/email_message_stub'
 require 'office/scheduled_email_action'
 
-require 'wco/organization'
+# require 'wco/organization' ## Use leadset. _vp_ 2023-08-09
 require 'wco/product'
 require 'wco/subscription'
 

data/lib/office/email_conversation.rb

@@ -14,7 +14,7 @@ class Office::EmailConversation
 
   field :lead_ids, type: :array, default: []
   def leads
-    Lead.find( lead_ids )
+    Lead.find( lead_ids.compact )
   end
 
   has_many :email_messages

data/lib/wco/{organization.rb → organization.rb-trash}

@@ -1,4 +1,7 @@
 
+##
+## @TODO: merge this into a Leadset (sql) _vp_ 2023-08-09
+##
 class Wco::Organization
   include Mongoid::Document
   include Mongoid::Timestamps

data/lib/wco/product.rb

@@ -4,8 +4,19 @@ class Wco::Product
   include Mongoid::Timestamps
 
   field :name
+
   field :product_id # stripe
+  field :price_id   # stripe
+
+  field :price_cents, type: Integer
+
+  INTERVALS = [ nil, 'day', 'week', 'month', 'year' ]
+  field :interval, type: String
 
   has_many :subscriptions, class_name: '::Wco::Subscription', inverse_of: :subscription
 
+  def self.list
+    [ [nil,nil] ] + self.all.map { |i| [i.name, i.price_id] }
+  end
+
 end

data/lib/wco/subscription.rb

@@ -3,7 +3,7 @@ class Wco::Subscription
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  belongs_to :organization, class_name: '::Wco::Organization', inverse_of: :subscriptions
+  # belongs_to :organization, class_name: '::Wco::Organization', inverse_of: :subscriptions
   belongs_to :product,      class_name: '::Wco::Product',      inverse_of: :subscriptions
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.258
+  version: 0.0.33.260
 platform: ruby
 authors:
 - piousbox
@@ -171,7 +171,7 @@ files:
 - lib/photo.rb
 - lib/report.rb
 - lib/video.rb
-- lib/wco/organization.rb
+- lib/wco/organization.rb-trash
 - lib/wco/product.rb
 - lib/wco/subscription.rb
 homepage: https://wasya.co