wco_models 3.1.0.112 → 3.1.0.114

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36cb41329f3fa93a254a01e4ecff57309e74e147d04d94293e7ef56a44b23a88
-  data.tar.gz: 60dbca9b78bc68838bf08fe613f0c847fc98431411aa46f25f0d677c8b941019
+  metadata.gz: b9b569a16a9ac875085e8bbb82dab997a96759d476a197a59199ee99d6be21d9
+  data.tar.gz: 580890aebb83e9c43f2803949466370fc97dc0dc11cf68d3e0b3beb140132957
 SHA512:
-  metadata.gz: 1510b1021b837c69a2dd1af705ae581d170735ce90c1f58224f6ce999435f94982422a743c2c998cc88510e00e9dea46c94729a0029c5a0dde8cd28adf3a4659
-  data.tar.gz: 6a351a518796b6345772135938e098ad8f8570303d54361f878d7acae7901797ff63d8477002a6db19359b7376b3d9468d8960b1c0de5a09636274dfd982bc6c
+  metadata.gz: 330694e474ee6b97ed590f316bfe77c1f48bf9edfcf94adbf2cdfdc6ae523a21483f087c213ed2fc5367398a736e292d8c0d8ee41c3d0d720d756f97668167ab
+  data.tar.gz: 32cab1e5fa94860b08e97a8a7be5ebee0613291b349274a6feadf36af3664334631a92cfca0cb8291cbb9ea5bd93d2e654ae9f79cb6a62c7fd36b903d66a0694

data/app/assets/stylesheets/wco/{application.css → application.scss}

@@ -16,6 +16,7 @@
 }
 
 .main-header {
+
   border-bottom: 2px solid #6395b9;
 
   li {

data/app/controllers/wco/leads_controller.rb

@@ -30,6 +30,11 @@ class Wco::LeadsController < Wco::ApplicationController
       @leads = @leads.any_of(
         { email: /#{params[:q].downcase}/i },
         { name:  /#{params[:q].downcase}/i } )
+
+      if 1 == @leads.length
+        redirect_to controller: 'wco/leads', action: 'show', id: @leads[0].id
+        return
+      end
     end
 
     # if params[:q_tag_ids].present?

data/app/controllers/wco/prices_controller.rb

@@ -47,11 +47,9 @@ class Wco::PricesController < Wco::ApplicationController
     redirect_to request.referrer || root_path
   end
 
-  def update
-    # if !params[:price][:interval].present?
-    #   @price.interval = nil
-    # end
-  end
+  ## delete and the create, instead
+  # def update
+  # end
 
 end
 

data/app/models/wco/leadset.rb

@@ -19,10 +19,11 @@ class Wco::Leadset
 
 
   has_many :appliances,    class_name: '::WcoHosting::Appliance',   inverse_of: :leadset
-  has_many :appliance_tmpl_prices,        class_name: 'Wco::Price'
+  has_many :appliance_tmpl_prices, class_name: 'Wco::Price'
   has_many :environments,  class_name: '::WcoHosting::Environment', inverse_of: :leadset
-  has_many :invoices,     class_name: 'Wco::Invoice'
+  has_many :invoices,      class_name: 'Wco::Invoice'
   has_many :leads,         class_name: 'Wco::Lead'
+  has_many :subdomains,    class_name: 'WcoHosting::Subdomain'
 
   has_many :profiles,      class_name: 'Wco::Profile',              inverse_of: :leadset
   has_many :subscriptions, class_name: 'Wco::Subscription',         inverse_of: :leadset

data/app/models/wco_hosting/appliance_tmpl.rb

@@ -63,52 +63,11 @@ class WcoHosting::ApplianceTmpl
   # belongs_to :price, class_name: 'Wco::Price', foreign_key: :wco_price_id
 
   field :price_id # stripe
-  attr_accessor :tmp_price_cents
-  attr_accessor :tmp_price_interval
+
   before_validation :set_stripe_product_price, on: :create
   def set_stripe_product_price
     stripe_product  = Stripe::Product.create({ name: "Appliance #{self}" })
     self.product_id = stripe_product.id
-
-    wco_price   = Wco::Price.create!({
-      amount_cents: tmp_price_cents,
-      interval:     tmp_price_interval,
-      product_id:   stripe_product.id,
-      product:      self,
-    })
-    self.prices.push wco_price
-    price_hash = {
-      product:     stripe_product.id,
-      unit_amount: tmp_price_cents,
-      currency:    'usd',
-      recurring: {
-        interval: tmp_price_interval,
-      },
-    }
-    stripe_price = Stripe::Price.create( price_hash )
-    self.price_id = stripe_price.id
-  end
-  before_validation :update_stripe_product_price, on: :update
-  def update_stripe_product_price
-    if tmp_price_cents.present?
-      price_hash = {
-        product:     product_id,
-        unit_amount: tmp_price_cents,
-        currency:    'usd',
-        recurring: {
-          interval: tmp_price_interval,
-        },
-      }
-      stripe_price  = Stripe::Price.create( price_hash )
-      wco_price   = Wco::Price.create!({
-        amount_cents: tmp_price_cents,
-        interval:     tmp_price_interval,
-        price_id:     stripe_price.id,
-        product_id:   product_id,
-        product:      self,
-      })
-      self.prices.push wco_price
-    end
   end
 
 

data/app/models/wco_hosting/domain.rb

@@ -8,12 +8,17 @@ class WcoHosting::Domain
   field :name
   validates :name, presence: true, uniqueness: true
 
+  has_many :subdomains, class_name: 'WcoHosting::Subdomain'
+
   STATUS_ACTIVE   = 'active'
   STATUS_INACTIVE = 'inactive'
   STATUSES        = [ 'active', 'inactive' ]
   field :status
   scope :active, ->{ where(status: STATUS_ACTIVE) }
 
+  def to_s
+    name
+  end
   def self.list
     [[nil,nil]] + active.map { |i| [i.name, i.name ] }
   end

data/app/models/wco_hosting/serverhost.rb

@@ -43,6 +43,7 @@ class WcoHosting::Serverhost
 
   def create_subdomain app
     @obj = app
+    Wco::Log.puts! @obj, '#create_subdomain...', obj: @obj
 
     client = DropletKit::Client.new(access_token: DO_TOKEN_1)
     record = DropletKit::DomainRecord.new(

data/app/models/wco_hosting/subdomain.rb

@@ -0,0 +1,24 @@
+
+class WcoHosting::Subdomain
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Paranoia
+  store_in collection: 'wco_dns_subdomains'
+
+  field :name
+  validates :name, presence: true, uniqueness: { scope: :domain_id }
+
+  belongs_to :domain,  class_name: 'WcoHosting::Domain'
+  belongs_to :leadset, class_name: 'Wco::Leadset'
+
+  # STATUS_ACTIVE   = 'active'
+  # STATUS_INACTIVE = 'inactive'
+  # STATUSES        = [ 'active', 'inactive' ]
+  # field :status
+  # scope :active, ->{ where(status: STATUS_ACTIVE) }
+
+  # def self.list
+  #   [[nil,nil]] + active.map { |i| [i.name, i.name ] }
+  # end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.112
+  version: 3.1.0.114
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-14 00:00:00.000000000 Z
+date: 2024-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -380,7 +380,7 @@ files:
 - app/assets/stylesheets/production_theme.scss
 - app/assets/stylesheets/vendor/bootstrap-4.6.2.min.css
 - app/assets/stylesheets/wco/alerts_notices.scss
-- app/assets/stylesheets/wco/application.css
+- app/assets/stylesheets/wco/application.scss
 - app/assets/stylesheets/wco/chip.scss
 - app/assets/stylesheets/wco/conversations.scss
 - app/assets/stylesheets/wco/galleries.scss
@@ -451,6 +451,7 @@ files:
 - app/models/wco_hosting/domain.rb
 - app/models/wco_hosting/environment.rb
 - app/models/wco_hosting/serverhost.rb
+- app/models/wco_hosting/subdomain.rb
 - app/views/layouts/wco/application.haml
 - app/views/wco/_alerts_notices.haml
 - app/views/wco/_analytics.erb