wco_models 3.1.0.201 → 3.1.0.203

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56346f95d6ca584729b290eda840e6743b5931bea5024b5cefb8f3faa95e2be4
-  data.tar.gz: 2ce94dc19d287f6f459ae913534cc724d33930d6a83a06b43209d9ff79942f12
+  metadata.gz: 33c64aaf74ef19b78f3ad77b966b57e8c078af95a21960acef1d7a31b2513b43
+  data.tar.gz: b2a5a688f5872b582c73cd3b16d4aae7c4ec709bfe46f4136fca93bfd98a2526
 SHA512:
-  metadata.gz: 45d941024cf9244c3e0235dde45cfb2b85819d8d7723bad7f9468327b6bd3014bd255b6821c4bda17a87cf15c60fc2074461d31f6a752c6d4620dc9f9f8f1a5c
-  data.tar.gz: d99a60cca66c2d1d5f2324af4116f95ec08f56e3b05fda6a3743831aee90966d3903f13f39a8c26860b89a2a411f77b8aa8c4dae9e03e51020e01f2941bdbbf7
+  metadata.gz: baebd3f21a934e5b8a4ce0adf1e6e615b67d7cfbc77225db40fdcc3b30835ae802132af1c0b2ae954b7db1eaf47a11f303eff9b14838808f4177bc22f03bbb48
+  data.tar.gz: 6424f8a5fada86870743887674767e7c4ca39ee7ead9d60130da21954061ed7cdbe9843ad0b4b33653df3e32fd826a1cc4839b8474cf5d77b161f6b33a0724ee

data/app/assets/stylesheets/wco/application.scss

@@ -34,10 +34,20 @@ $enable-important-utilities: false;
 /* F */
 
 .field {
+  border-bottom: 1px solid gray;
+  border-left: 1px solid gray;
+
+  // border-top: 2px solid white;
+  // border-left: 2px solid white;
+
   display: flex;
+
+  margin-top: 1em;
   margin-bottom: 0.5em;
 
-  input {
+  padding: 0.5em;
+
+  input[type=text] {
     flex-grow: 1;
   }
 

data/app/assets/stylesheets/wco/main.scss

@@ -22,6 +22,9 @@ textarea {
   color: blue;
 }
 
+.border-left {
+  border-left: 1px solid red !important;
+}
 .border-right {
   border-right: 1px solid red !important;
 }
@@ -144,18 +147,19 @@ textarea.monospace {
 
 .header {
   display: flex;
+  justify-content: center;
 
   > * {
     padding-right: 0.2em;
   }
 
-  h5.title {
+  .title {
     display: flex;
   }
 }
 
 .hide, .hidden {
-  display: none;
+  display: none !important;
 }
 
 

data/app/controllers/wco/invoices_controller.rb

@@ -53,6 +53,7 @@ class Wco::InvoicesController < Wco::ApplicationController
   end
 
   def create_stripe
+    params[:invoice][:is_stripe] = true
     @invoice = Wco::Invoice.new params[:invoice].permit!
     authorize! :create, @invoice
 

data/app/controllers/wco/leadsets_controller.rb

@@ -63,6 +63,10 @@ class Wco::LeadsetsController < Wco::ApplicationController
     @leads         = @leadset.leads.page( params[:leads_page] ).per( current_profile.per_page )
     @subscriptions = @leadset.subscriptions
     @invoices      = @leadset.invoices
+
+    @prices = @leadset.appliance_tmpls
+    ## _TODO: can remove
+    @all_prices = Wco::Price.all
   end
 
   def update
@@ -83,8 +87,11 @@ class Wco::LeadsetsController < Wco::ApplicationController
   private
 
   def set_lists
-    @appliance_tmpls      = WcoHosting::ApplianceTmpl.all
+    @appliance_tmpls_list       = WcoHosting::ApplianceTmpl.all
+    @appliance_tmpl_prices_list = Wco::Price.all
+    @serverhosts          = WcoHosting::Serverhost.all
     @serverhosts_list     = WcoHosting::Serverhost.list
+    @tags                 = Wco::Tag.all
     @tags_list            = Wco::Tag.list
     @leads_list           = Wco::Lead.all.map { |lead| [ lead.email, lead.id ] }
     @templates_list       = WcoEmail::EmailTemplate.all.map { |t| [ t.slug, t.id ] }

data/app/controllers/wco/prices_controller.rb

@@ -7,6 +7,8 @@ class Wco::PricesController < Wco::ApplicationController
 
     @price.interval = nil if !params[:price][:interval].present?
     @product        = params[:price][:product_type].constantize.find @price.product_id
+    @price.product  = @product
+
     stripe_product  = Stripe::Product.retrieve( @product.product_id )
     price_hash = {
       product:     stripe_product.id,
@@ -17,11 +19,9 @@ class Wco::PricesController < Wco::ApplicationController
       price_hash[:recurring] = { interval: @price.interval }
     end
     stripe_price = Stripe::Price.create( price_hash )
-    # flash_notice 'Created stripe price.'
     flash_notice stripe_price
-
-    @price.product  = @product
     @price.price_id = stripe_price[:id]
+
     if @price.save
       flash_notice @price
     else
@@ -47,6 +47,13 @@ class Wco::PricesController < Wco::ApplicationController
     redirect_to request.referrer || root_path
   end
 
+  def new
+    @price = Wco::Price.new
+    authorize! :new, @price
+
+    @products_list = Wco::Product.list + WcoHosting::ApplianceTmpl.list
+  end
+
   ## delete and the create, instead
   # def update
   # end

data/app/models/do/dns_record.rb-txt

@@ -0,0 +1,15 @@
+
+From: https://docs.digitalocean.com/reference/api/digitalocean/#tag/Domain-Records/operation/domains_list_records
+
+new:
+
+POST /v2/domains/$DOMAIN_NAME/records
+
+{
+  type: 'A',
+  name: 'subdomain',
+  data: '127.0.0.1',
+  ttl: 3600,
+}
+
+DELETE /v2/domains/$DOMAIN_NAME/records/$DOMAIN_RECORD_ID

data/app/models/wco/leadset.rb

@@ -34,13 +34,13 @@ class Wco::Leadset
   validates :email, uniqueness: { allow_nil: true } # presence: true
 
 
-  has_many :appliances,    class_name: '::WcoHosting::Appliance',   inverse_of: :leadset
-  has_many :appliance_tmpl_prices, class_name: 'Wco::Price'
+  has_many :appliances,      class_name: '::WcoHosting::Appliance',   inverse_of: :leadset
+  has_many :appliance_tmpls, class_name: 'Wco::Price', inverse_of: :leadset
 
   has_many :environments,  class_name: '::WcoHosting::Environment', inverse_of: :leadset
   has_many :invoices,      class_name: 'Wco::Invoice'
   has_many :leads,         class_name: 'Wco::Lead'
-  has_many :subdomains,    class_name: 'WcoHosting::Subdomain'
+  # 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/leadset_appliance_tmpl.rb

@@ -0,0 +1,15 @@
+
+class Wco::LeadsetApplianceTmpl
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Paranoia
+  store_in collection: 'wco_leadset_appliance_tmpls'
+
+  belongs_to :leadset,        class_name: 'Wco::Leadset'
+  belongs_to :appliance_tmpl, class_name: 'WcoHosting::ApplianceTmpl'
+  has_one :price, class_name: 'Wco::Price'
+
+
+end
+
+

data/app/models/wco/log.rb

@@ -13,10 +13,15 @@ class Wco::Log
 
   has_and_belongs_to_many :tags
 
+  def self.puts message, obj: nil
+    create( message: message.to_s, obj: obj )
+    p message
+  end
+
   def self.puts! message, label, obj: nil
-    create( message: message, label: label, obj: obj )
-    puts "+++ +++ #{label}:"
-    puts message.inspect
+    create( message: message.to_s, label: label.to_s, obj: obj )
+    p "+++ +++ #{label}:"
+    p message.inspect
   end
 
   def to_s

data/app/models/wco/price.rb

@@ -8,7 +8,7 @@ class Wco::Price
   ## Wco::Product, WcoHosting::ApplianceTmpl
   belongs_to :product, polymorphic: true
 
-  belongs_to :appliance_tmpl_leadset, class_name: 'Wco::Leadset', optional: true
+  belongs_to :leadset, class_name: 'Wco::Leadset'
 
   has_many :subscriptions, class_name: 'Wco::Subscription', inverse_of: :price, foreign_key: :wco_price_id
 

data/app/models/wco/profile.rb

@@ -11,17 +11,18 @@ class Wco::Profile
 
 
   field :per_page, type: :integer, default: 25
+  field :show_n_thumbs, type: :integer, default: 8
+
 
   field :schwab_access_token,  type: :string
   field :schwab_refresh_token, type: :string
   field :schwab_id_token,      type: :string
 
-  field :show_n_thumbs, type: :integer, default: 8
 
   has_many :reports, class_name: 'Wco::Report'
   has_many :stocks, class_name: 'Iro::Stock'
 
-  belongs_to :leadset,          class_name: 'Wco::Leadset', inverse_of: :profile,         optional: true
+  belongs_to :leadset, class_name: 'Wco::Leadset', inverse_of: :profile
   has_many :newsitems, class_name: 'Wco::Newsitem'
   has_and_belongs_to_many :shared_galleries, class_name: 'Wco::Gallery', inverse_of: :shared_profiles
 

data/app/models/wco_email/message_stub.rb

@@ -24,6 +24,7 @@ class WcoEmail::MessageStub
   STATUSES         = [ STATUS_PENDING, STATUS_PROCESSED, STATUS_FAILED ]
   field :status, default: STATUS_PENDING
   scope :pending, ->{ where( status: STATUS_PENDING ) }
+  scope :failed,  ->{ where( status: STATUS_FAILED  ) }
 
   field     :bucket # 'ish-ses' (current), 'ish-ses-2024'
 

data/app/models/wco_hosting/appliance.rb

@@ -6,23 +6,23 @@ class WcoHosting::Appliance
   include Wco::Utils
   store_in collection: 'wco_appliances'
 
-  has_many :logs, as: :obj, class_name: 'Wco::Log'
-  has_many :files,          class_name: 'WcoHosting::File'
+  # field :slug, type: String
+  def slug
+    "#{subdomain}_#{domain.name.gsub('.', '_')}"
+  end
+
+  has_many :logs,      class_name: 'Wco::Log', inverse_of: :obj
+  has_many :files,     class_name: 'WcoHosting::File'
 
   field :rc_json, type: Object, default: '{}'
   def rc
     OpenStruct.new JSON.parse rc_json
   end
 
-  belongs_to :leadset,      class_name: 'Wco::Leadset', inverse_of: :appliances
-  belongs_to :subscription, class_name: 'Wco::Subscription' # , inverse_of: :appliance
-
-  # field :service_name
-  # before_validation :set_service_name, on: :create, unless: ->{ service_name }
-  # def set_service_name
-  #   self[:service_name] = host.gsub(".", "_")
-  # end
+  field :port
 
+  belongs_to :leadset,      class_name: 'Wco::Leadset', inverse_of: :appliances
+  belongs_to :subscription, class_name: 'Wco::Subscription', optional: true # , inverse_of: :appliance
 
   belongs_to :environment, class_name: 'WcoHosting::Environment', inverse_of: :appliances, optional: true
   def environment_name
@@ -45,13 +45,15 @@ class WcoHosting::Appliance
 
   belongs_to :serverhost,  class_name: 'WcoHosting::Serverhost', optional: true
 
-  field :port
 
   STATE_PENDING    = 'pending'
   STATE_LIVE       = 'live'
   STATE_TERMINATED = 'terminated'
   field :state, default: STATE_PENDING
 
+  field :stdout, default: ''
+  field :stderr, default: ''
+
   def to_s
     appliance_tmpl # kind
   end

data/app/models/wco_hosting/appliance_tmpl.rb

@@ -76,8 +76,9 @@ class WcoHosting::ApplianceTmpl
   end
 
   has_many :appliances, class_name: 'WcoHosting::Appliance'
+  has_many :leadsets,   class_name: 'Wco::LeadsetApplianceTmpl', inverse_of: :appliance_tmpl
   has_many :subscriptions, as: :product, class_name: 'Wco::Subscription'
-  has_many :prices, as: :product, class_name: 'Wco::Price'
+  has_many :prices,        as: :product, class_name: 'Wco::Price'
   has_and_belongs_to_many :task_tmpls, class_name: 'WcoHosting::TaskTmpl'
 
   field :product_id # stripe

data/app/models/wco_hosting/domain.rb

@@ -8,7 +8,7 @@ class WcoHosting::Domain
   field :name
   validates :name, presence: true, uniqueness: true
 
-  has_many :subdomains, class_name: 'WcoHosting::Subdomain'
+  has_many :appliances, class_name: 'WcoHosting::Appliance'
 
   STATUS_ACTIVE   = 'active'
   STATUS_INACTIVE = 'inactive'

data/app/models/wco_hosting/serverhost.rb

@@ -27,34 +27,31 @@ class WcoHosting::Serverhost
   # field :ssh_username
   # field :ssh_key
 
+  field :do_id, type: :string
+
   has_many :appliances, class_name: 'WcoHosting::Appliance'
   has_many :files,      class_name: 'WcoHosting::File'
 
-  def create_appliance app
-    # puts! app, 'Serverhost#create_appliance'
-
-    create_subdomain(   app )
-    create_volume(      app )
-    add_docker_service( app )
-    add_nginx_site(     app )
-    # load_database( app )
+  def self.do_list_keys
+    out = HTTParty.get( "https://api.digitalocean.com/v2/account/keys",
+      headers: { 'Authorization' => "Bearer #{DO_READER_TOKEN}" },
+      :debug_output => $stdout,
+    );
+  end
 
-    update({ next_port: app.serverhost.next_port + 1 })
+  def self.list
+    [[nil,nil]] + all.map { |s| [s.name, s.id] }
+    # all.map { |s| [s.name, s.id] }
   end
 
-  def create_subdomain app
+  def add_docker_service app
     @obj = app
-    Wco::Log.puts! @obj, '#create_subdomain...', obj: @obj
-
-    client = DropletKit::Client.new(access_token: DO_TOKEN_1)
-    record = DropletKit::DomainRecord.new(
-      type: 'A',
-      name: app.subdomain,
-      data: app.serverhost.public_ip,
-    )
-    client.domain_records.create(record, for_domain: app.domain )
-
-    Wco::Log.puts! record, 'created subdomain?', obj: @obj
+    cmd =<<~AOL
+      cd /Users/piousbox/projects/ansible
+      . zenv/bin/activate
+      ansible-playbook -i inventory/do.yml --limit #{self.name} playbooks/hosted-packagedapp.yml --extra-vars '{"appliance_slug": "#{app.slug}", "codebase_zip": "#{app.tmpl.volume_zip_url}", "next_port": "#{self.next_port}"}'
+    AOL
+    do_exec cmd
   end
 
   def add_nginx_site app
@@ -79,87 +76,69 @@ class WcoHosting::Serverhost
     do_exec cmd
   end
 
-  def add_docker_service app
-    @obj = app
-    Wco::Log.puts! nil, '#add_docker_service', obj: @obj
-
-    ac   = ActionController::Base.new
-    ac.instance_variable_set( :@app, app )
-    ac.instance_variable_set( :@workdir, WORKDIR )
-    # rendered_str = ac.render_to_string("wco_hosting/docker-compose/dc-#{app.tmpl.kind}")
-    rendered_str = ac.render_to_string("wco_hosting/docker-compose/dc-any")
-    Wco::Log.puts! rendered_str, 'add_docker_service rendered_str', obj: @obj
-
-    file = Tempfile.new('prefix')
-    file.write rendered_str
-    file.close
-    # puts! file.path, 'file.path'
-
-    cmd = "scp #{file.path} #{ssh_host}:#{WORKDIR}/dc-#{app.service_name}.yml "
-    do_exec cmd
-
-    cmd = "ssh #{ssh_host} 'cd #{WORKDIR} ; \
-      docker compose -f dc-#{app.service_name}.yml up -d #{app.service_name} ; \
-      echo ok #add_docker_service ' "
-    do_exec cmd
+=begin
+  def create_appliance app
+    # puts! app, 'Serverhost#create_appliance'
+    create_subdomain(   app )
+    create_volume(      app )
+    add_docker_service( app )
+    add_nginx_site(     app )
+    # load_database( app )
   end
+=end
 
-  def create_wordpress_volume app
+  def create_subdomain app
     @obj = app
-
-    ac   = ActionController::Base.new
-    ac.instance_variable_set( :@app, app )
-    ac.instance_variable_set( :@workdir, WORKDIR )
-    rendered_str = ac.render_to_string("wco_hosting/scripts/create_volume")
-    Wco::Log.puts! rendered_str, 'create_volume rendered_str', obj: @obj
-
-    file = Tempfile.new('prefix')
-    file.write rendered_str
-    file.close
-    # puts! file.path, 'file.path'
-
-    cmd = "scp #{file.path} #{ssh_host}:#{WORKDIR}/scripts/create_volume"
-    do_exec cmd
-
-    cmd = "ssh #{ssh_host} 'chmod a+x #{WORKDIR}/scripts/create_volume ; \
-      #{WORKDIR}/wco_hosting/scripts/create_volume ' "
-    do_exec cmd
+    Wco::Log.puts! @obj, 'Creating subdomain...', obj: @obj
+    client = DropletKit::Client.new(access_token: DO_TOKEN_1)
+    record = DropletKit::DomainRecord.new(
+      type: 'A',
+      name: app.subdomain,
+      data: app.serverhost.public_ip,
+    )
+    client.domain_records.create(record, for_domain: app.domain )
+    Wco::Log.puts! record, 'Created subdomain.', obj: @obj
+    # WcoHosting::Subdomain.create!( domain: app.domain, name: app.subdomain )
   end
 
-  def create_volume app
-    @obj = app
-    Wco::Log.puts! app.service_name, 'Serverhost#create_volume', obj: @obj
-
-    ac   = ActionController::Base.new
-    ac.instance_variable_set( :@app, app )
-    ac.instance_variable_set( :@workdir, WORKDIR )
-    rendered_str = ac.render_to_string("wco_hosting/scripts/create_volume")
-    Wco::Log.puts! rendered_str, 'create_volume rendered_str', obj: @obj
-
-    file = Tempfile.new('prefix')
-    file.write rendered_str
-    file.close
-    # puts! file.path, 'file.path'
-
-    cmd = "scp #{file.path} #{ssh_host}:#{WORKDIR}/scripts/create_volume"
-    do_exec( cmd )
-
-    cmd = "ssh #{ssh_host} 'chmod a+x #{WORKDIR}/scripts/create_volume ; #{WORKDIR}/scripts/create_volume ' "
-    do_exec( cmd )
+  def do_create_server!
+    out = HTTParty.post( "https://api.digitalocean.com/v2/droplets", body: {
+        name: name,
+        size: "s-1vcpu-2gb",
+        region: "sfo2",
+        image: "ubuntu-22-04-x64",
+        ssh_keys: [ 40460634 ], # 2np, "71:9a:7e:9a:54:55:af:d0:16:47:5c:57:a8:c3:f0:2b"
+        vpc_uuid: "b9f748b6-4649-4506-a457-b70d2b57b313",
+      }.to_json,
+      headers: { 'Content-Type'  => 'application/json',
+                 'Authorization' => "Bearer #{DO_DROPLET_TOKEN}" },
+      :debug_output => $stdout,
+    );
+    puts! out, '#create_do_server()'
+    out = out.parsed_response
+    self.do_id = out['droplet']['id']
+    self.save
+
+    do_project_id = '4dad5c55-1a11-4c2b-9e14-1cd69513d940' # WcoHosting DO project id
+    out = HTTParty.post( "https://api.digitalocean.com/v2/projects/#{do_project_id}/resources", body: {
+        resources: [ "do:droplet:#{out['droplet']['id']}" ],
+      }.to_json,
+      headers: { 'Content-Type'  => 'application/json',
+                 'Authorization' => "Bearer #{DO_DROPLET_TOKEN}" },
+      :debug_output => $stdout,
+    );
+    puts! out, 'assign droplet to a project'
   end
 
   def do_exec cmd
     Wco::Log.puts! cmd, '#do_exec', obj: @obj
-
-    stdout, stderr, status = Open3.capture3(cmd)
-    status = status.to_s.split.last.to_i
-    Wco::Log.puts! stdout, 'stdout', obj: @obj
-    Wco::Log.puts! stderr, 'stderr', obj: @obj
-    Wco::Log.puts! status, 'status', obj: @obj
+    IO.popen(cmd).each do |line|
+      Wco::Log.puts line, obj: @obj
+    end
   end
 
-  def self.list
-    [[nil,nil]] + all.map { |s| [s.name, s.id] }
-    # all.map { |s| [s.name, s.id] }
+  def to_s
+    "<Serverhost name=#{name} next_port=#{next_port} ssh_host=#{ssh_host} />"
   end
+
 end

data/app/models/wco_hosting/{subdomain.rb → subdomain.rb-bk}

@@ -1,4 +1,8 @@
 
+##
+## Subdomain is not an object b/c domain.appliances is like the same thing.
+##
+
 class WcoHosting::Subdomain
   include Mongoid::Document
   include Mongoid::Timestamps

data/app/views/wco/leadsets/_form.haml

@@ -3,32 +3,52 @@
 
 = form_for leadset, :as => :leadset, :url => url do |f|
 
-  .input-field
+  .field
     = f.label :company_url
     = f.text_field :company_url
 
-  .input-field
+  .field
     = f.label :email
     = f.text_field :email
   .field
     %label mangle_subject
     = f.check_box :mangle_subject
 
-  .input-field
+  .field
     = f.label :next_invoice_number
     = f.text_field :next_invoice_number
 
+  .field
+    %label tags
+    .d-flex.flex-wrap
+      - @tags.each do |tag|
+        .descr
+          = check_box_tag 'leadset[tag_ids][]', tag.id, leadset.tags.include?(tag)
+          %label= tag
+
+  .header
+    %h5.title Hosting
+
   .field
     %label serverhosts
-    = f.select :serverhost_ids, options_for_select(@serverhosts_list, selected: leadset.serverhost_ids), {}, { multiple: true }
+    .d-flex.flex-wrap
+      - @serverhosts.each do |opt|
+        .descr
+          = check_box_tag 'leadset[serverhost_ids][]', opt.id, leadset.serverhost_ids.include?(opt.id)
+          %label= opt.name
 
-  -# .input-field
-  -#   %label Stripe customer_id
-  -#   = f.text_field :customer_id
+  .field
+    %label Stripe customer_id
+    = f.text_field :customer_id
 
   .field
-    %label tags
-    = f.select :tag_ids, options_for_select(@tags_list, selected: leadset.tag_ids), {}, { multiple: true }
+    %label appliance tmpl prices
+    .d-flex.flex-wrap
+      - @appliance_tmpl_prices_list.each do |price|
+        .descr
+          = check_box_tag 'leadset[appliance_tmpl_ids][]', price.id, leadset.appliance_tmpls.include?(price)
+          %label= price.product.name
+
 
   .actions
     = f.submit

data/app/views/wco/leadsets/show.haml

@@ -5,86 +5,90 @@
       %h2.title
         Leadset `#{@leadset.company_url}`
         = link_to '[~]', edit_leadset_path( @leadset )
+    .row
+      .col-6.border-right
+        %ul
+          %li <b>Email:</b> #{@leadset.email}
+          %li <b>company_url</b>: #{@leadset.company_url}
+          %li <b>customer_id</b>: #{@leadset.customer_id}
+      -# tags
+      .col-6
+        Tags:
+        = render '/wco/tags/index_chips', tags: @leadset.tags
 
-    %ul
-      %li <b>Email:</b> #{@leadset.email}
-      %li <b>company_url</b>: #{@leadset.company_url}
-      %li <b>customer_id</b>: #{@leadset.customer_id}
     %hr
+    .row
+      -# serverhosts
+      .col-6.border-right
+        = render 'wco_hosting/serverhosts/list', serverhosts: @leadset.serverhosts
+      .col-6
+        &nbsp;
 
-  .row
-    .col-md-6
-      %h5 Appliance Tmpls (prices)
-      %table.bordered.data-table
-        %thead
-          %td &nbsp;
-          %td Appliance Tmpl
-          %td Amount Cents
-          %td Interval
-        - @appliance_tmpls.each do |tmpl|
-          %tr
-            - price   = @leadset.appliance_tmpl_prices.where( product: tmpl ).first
-            - price ||= Wco::Price.new({ product: tmpl, appliance_tmpl_leadset: @leadset })
-            - url     = price.new_record? ? wco.prices_path : wco.price_path(price)
-            - if !price.new_record?
-              %td
-                = button_to 'x', wco.price_path(price), method: :delete, data: { confirm: 'Are you sure?' }
-            - else
-              %td
-            = form_for price, url: url do |f|
-              = hidden_field_tag 'price[product_id]',   price.product_id
-              = hidden_field_tag 'price[product_type]', price.product_type
-              = hidden_field_tag 'price[appliance_tmpl_leadset_id]', @leadset.id
-              %td
-                %b= tmpl
-              %td
-                = f.number_field :amount_cents
-              %td
-                = f.select :interval, options_for_select( Wco::Price::INTERVALS, selected: price.interval ), class: 'select2'
-                = f.submit '>'
-                &nbsp;
-                %br
-                .gray= price.price_id || 'nil'
+    %hr
+    .row
+      -# appliance templates (prices)
+      .col-md-6.border-right
+        .header
+          %h5.title Appliance Tmpls (prices) (#{@leadset.appliance_tmpls.length})
+        = render 'wco/prices/form_table'
 
-    .col-md-6
-      %h5.collapse-expand#subscriptionsList
-        Subscriptions (#{@subscriptions.length})
-        = link_to '[+wco]', new_subscription_path({ customer_id: @leadset.customer_id })
-      %table.bordered
-        %thead
-          %tr
-            %th Name
-            %th Price
-        - @subscriptions.each do |i|
-          %tr
-            %td= i.product.name
-            %td= i.price
-  %hr
+      -# environments
+      .col-md-6
+        - if defined?( wco_hosting )
+          .header
+            %h5.title Environments (#{@leadset.environments.length}) #{link_to '[+]', wco_hosting.new_environment_path({ leadset_id: @leadset.id }) }
+          %ul
+            - @leadset.environments.each do |env|
+              %li= env
+    %hr
+    .row
+      -# appliances
+      .col-md-6.border-right
+        .header
+          %h5.title Appliances (#{@leadset.appliances.length})
 
-  .row.maxwidth
-    .col-md-6
-      %h5.collapse-expand#invoicesList
-        Invoices  (#{@leadset.invoices.length})
-        = link_to '[+stripe]', new_invoice_stripe_path({ leadset_id: @leadset.id })
-        = link_to '[+pdf]', new_invoice_pdf_path({ leadset_id: @leadset.id })
+      -# subscriptions
+      .col-md-6
+        .header
+          %h5.title.collapse-expand#subscriptionsList
+            Subscriptions (#{@subscriptions.length})
+          = link_to '[+wco]', new_subscription_path({ customer_id: @leadset.customer_id })
+        %table.bordered
+          %thead
+            %tr
+              %th Name
+              %th Price
+          - @subscriptions.each do |i|
+            %tr
+              %td= i.product.name
+              %td= i.price
 
-      = render '/wco/invoices/index_list', invoices: @invoices
+    %hr
+    .row
+      -# invoices
+      .col-md-12
+        .header
+          %h5.title.collapse-expand#invoicesList
+            Invoices  (#{@leadset.invoices.length})
+            = link_to '[+stripe]', new_invoice_stripe_path({ leadset_id: @leadset.id })
+            = link_to '[+pdf]', new_invoice_pdf_path({ leadset_id: @leadset.id })
 
-      %p Next invoice number: #{@leadset.next_invoice_number}
+        = render '/wco/invoices/index_list', invoices: @invoices
 
-      = form_tag create_monthly_invoice_for_leadset_path({ leadset_id: @leadset.id }) do
-        %label Create invoice for month
-        = text_field_tag 'month_on', nil, placeholder: 'YYYY-MM-DD'
-        %label (replace ?)
-        = check_box_tag 'replace'
-        = submit_tag 'Go >', data: { confirm: 'Are you sure?' }
-  %hr
+        %p Next invoice number: #{@leadset.next_invoice_number}
 
-  .row
-    .col-6
-      %h5.collapse-expand#leads Leads
-      = render '/wco/leads/index', leads: @leads
-    .col-6
-      Tags:
-      = render '/wco/tags/index_chips', tags: @leadset.tags
+        = form_tag create_monthly_invoice_for_leadset_path({ leadset_id: @leadset.id }) do
+          %label Create invoice for month
+          = text_field_tag 'month_on', nil, placeholder: 'YYYY-MM-DD'
+          %label (replace ?)
+          = check_box_tag 'replace'
+          = submit_tag 'Go >', data: { confirm: 'Are you sure?' }
+
+    %hr
+    .row
+      -# leads
+      .col-12
+        .header
+          %h5.title.collapse-expand#leads Leads
+        = render '/wco/leads/index', leads: @leads
 

data/app/views/wco/prices/_form_mini.haml

@@ -0,0 +1,18 @@
+
+-# - url = price.new_record? ? prices_path : price_path( price )
+.prices--form
+
+  = form_for price, as: :price, html: { class: 'flex-row' } do |f|
+    = hidden_field_tag 'price[product_id]',   price.product_id
+    = hidden_field_tag 'price[product_type]', price.product_type
+
+    .field
+      %label amount cents
+      = f.number_field :amount_cents
+
+    .field
+      %label interval
+      = f.select :interval, options_for_select( Wco::Price::INTERVALS, selected: price.interval ), class: 'select2'
+
+    .actions
+    = f.submit '>'

data/app/views/wco/prices/_form_table.haml

@@ -0,0 +1,50 @@
+
+.prices--form-table
+
+  -# %label New price (app tmpl leadset):
+
+  %table.bordered
+    %thead
+      %tr
+        %th
+        %th tmpl
+        %th price
+        %th interval
+        %th
+    %tbody
+      - @appliance_tmpls_list.each do |tmpl|
+        - price   = @leadset.appliance_tmpls.where( product: tmpl ).first
+        - price ||= Wco::Price.new({ product: tmpl, leadset: @leadset })
+        - url     = price.new_record? ? wco.prices_path : wco.price_path(price)
+        - if !price.new_record?
+          %tr
+            %td
+            %td
+              %b= tmpl
+            %td
+              = price.amount_cents
+              cents
+            %td
+              = price.interval
+            %td
+              = button_to 'x', wco.price_path(price), method: :delete, data: { confirm: 'Are you sure?' }
+        - else
+          = form_for price, url: url do |f|
+            %tr
+              %td
+                .d-flex.flex-column.hide
+                  product_id
+                  = text_field_tag 'price[product_id]',   price.product_id
+                  product_type
+                  = text_field_tag 'price[product_type]', price.product_type
+                  leadset_id
+                  = text_field_tag 'price[leadset_id]', @leadset.id
+              %td
+                %b= tmpl
+              %td
+                = f.number_field :amount_cents
+              %td
+                = f.select :interval, options_for_select( Wco::Price::INTERVALS, selected: price.interval ), class: 'select2'
+              %td
+                = f.submit '>'
+

data/app/views/wco/prices/new.haml

@@ -0,0 +1,22 @@
+
+.maxwidth
+  .header
+    %h5.title New Price
+
+  - price = @price
+  = form_for price, as: :price do |f|
+    .field
+      %label Product
+      = f.select :product_id, options_for_select(@products_list, selected: price.product_id)
+
+    .field
+      %label amount cents
+      = f.number_field :amount_cents
+
+    .field
+      %label interval
+      = f.select :interval, options_for_select( Wco::Price::INTERVALS, selected: price.interval ), class: 'select2'
+
+    .actions
+      = f.submit 'Create'
+

data/app/views/wco/products/index.haml

@@ -1,5 +1,5 @@
 
-.products-index.maxwidth
+.products-index.padded
 
   .a
     %h5 New Product:

data/app/views/wco/profiles/_form.haml

@@ -19,5 +19,11 @@
       %label schwab_id_token
       = f.text_field :schwab_id_token
 
+    %hr
+
+    .field
+      %label leadset
+      = f.select :leadset, options_for_select(Wco::Leadset.list, selected: profile.leadset )
+
     .actions
       = f.submit 'Go'

data/app/views/wco/profiles/edit.haml

@@ -1,6 +1,6 @@
 
 .profiles-edit.maxwidth
   .header
-    .title edit profile
+    %h3.title edit profile
 
   = render 'form', profile: @profile

data/app/views/wco/profiles/index.haml

@@ -8,3 +8,4 @@
       %li
         = link_to '[~]', edit_profile_path(profile)
         = profile.email
+        <b>Leadset:</b> #{link_to profile.leadset, leadset_path(profile.leadset)}

data/app/views/wco_hosting/serverhosts/_list.haml

@@ -0,0 +1,15 @@
+
+.serverhosts--list
+  - if !defined?( wco_hosting )
+    .header
+      %h5.title wco_hosting is not included
+  - else
+    .header
+      %h5.title
+        Serverhosts for `#{@leadset}`
+        = link_to '[+]', wco_hosting.new_serverhost_path({ leadset_id: @leadset.id })
+    %ul
+      - serverhosts.each do |s|
+        %li
+          = link_to '[~]', wco_hosting.edit_serverhost_path(s)
+          = s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.201
+  version: 3.1.0.203
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-12 00:00:00.000000000 Z
+date: 2025-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ahoy_matey
@@ -459,6 +459,7 @@ files:
 - app/models/ability.rb
 - app/models/ahoy/event.rb
 - app/models/ahoy/visit.rb
+- app/models/do/dns_record.rb-txt
 - app/models/iro/alert.rb
 - app/models/iro/datapoint.rb
 - app/models/iro/date.rb
@@ -475,6 +476,7 @@ files:
 - app/models/wco/invoice.rb
 - app/models/wco/lead.rb
 - app/models/wco/leadset.rb
+- app/models/wco/leadset_appliance_tmpl.rb
 - app/models/wco/log.rb
 - app/models/wco/newsitem.rb
 - app/models/wco/obfuscated_redirect.rb
@@ -516,7 +518,7 @@ files:
 - app/models/wco_hosting/file.rb
 - app/models/wco_hosting/runner.rb
 - app/models/wco_hosting/serverhost.rb
-- app/models/wco_hosting/subdomain.rb
+- app/models/wco_hosting/subdomain.rb-bk
 - app/models/wco_hosting/task.rb
 - app/models/wco_hosting/task_tmpl.rb
 - app/views/layouts/wco/application.haml
@@ -618,6 +620,9 @@ files:
 - app/views/wco/photos/show.haml
 - app/views/wco/photos/without_gallery.haml
 - app/views/wco/prices/_form.haml
+- app/views/wco/prices/_form_mini.haml
+- app/views/wco/prices/_form_table.haml
+- app/views/wco/prices/new.haml
 - app/views/wco/products/_form.haml
 - app/views/wco/products/_header.haml
 - app/views/wco/products/_index.haml
@@ -714,6 +719,7 @@ files:
 - app/views/wco_hosting/ecs_task_definitions/hw1.json
 - app/views/wco_hosting/scripts/create_volume.erb
 - app/views/wco_hosting/scripts/nginx_site.conf.erb
+- app/views/wco_hosting/serverhosts/_list.haml
 - config/initializers/00_s3.rb
 - config/initializers/00_s3.rb-example
 - config/initializers/08_integrations.rb