wco_models 3.1.0.113 → 3.1.0.115

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4158c0482b28448ec901d1f7acf5add01d2bcc4bececc4cc726f76753d87148c
-  data.tar.gz: fb83c6ff40fe289f8059123a4347eb763ef833416e4a7c155a83d528a54e30b9
+  metadata.gz: d70a4892d30e5a9b9c0770cfaffdd6ee5c88bf57b5af541eba11c322f8e5d2ce
+  data.tar.gz: ba8e775b3c215866039f00c458c2405b3b35084300f46543f9190047fb55d3c3
 SHA512:
-  metadata.gz: 8d91c3749a77326adbf809850bf18fa5ff9e4ae09c6b305726ed8fbc0acbe3a8e06067ad490219135fac0c22b96087e21185945b80024d81100a61fb18c14b07
-  data.tar.gz: e25ac611e88c6bcbc8fda228708f73dbda55d244fd6f2e9208afc03e2b78748d2e4f3229d09ee540988c4c39d9cd2e8cfda8402485c7120b0d3b813232702c60
+  metadata.gz: 2f2e8846418c1b9ac3e3d9318915028a8b558b6249edfda6f7d7767dc1a2d92f1ec6971d41dee3b27b698b72ab3d1017f77112ff6f3519a5f96ce0e548c08bc4
+  data.tar.gz: '06229f19a036feb27e63c48fa7beb7540a282dbc85b5f205e2388b8d191825e1d8a0bd1741b45f4ab509b6d3af5e651cefa16e64e06e2948099d224f289ad38a'

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/leadsets_controller.rb

@@ -83,6 +83,7 @@ class Wco::LeadsetsController < Wco::ApplicationController
   private
 
   def set_lists
+    @appliance_tmpls      = WcoHosting::ApplianceTmpl.all
     @serverhosts_list     = WcoHosting::Serverhost.list
     @tags_list            = Wco::Tag.list
     @leads_list           = Wco::Lead.all.map { |lead| [ lead.email, lead.id ] }

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/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
+

data/app/views/wco/leads/_index.haml

@@ -4,15 +4,7 @@
 -#
 -# - email_contexts ||= {}
 
-.leads--index.padded
-  .header
-    %h2.title
-      Leads
-      - if !defined?( skip_pagination ) || !skip_pagination
-        (#{leads.total_count})
-      - else
-        (#{leads.length})
-      = link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
+.leads--index.container-fluid.padded
 
   - if defined?( search_path )
     .float-right= render 'wco/search', path: search_path

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

@@ -4,4 +4,14 @@
     = select_tag :q_tag_ids, options_for_select(@tags_list, selected: params[:q_tag_ids]), { class: :select2, multiple: true }
     = submit_tag 'tag-search'
   %hr
+
+  .header
+    %h2.title
+      Leads
+      - if !defined?( skip_pagination ) || !skip_pagination
+        (#{leads.total_count})
+      - else
+        (#{leads.length})
+      = link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
+
   = render 'index', leads: @leads, search_path: leads_path

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

@@ -1,26 +1,50 @@
 
-.leadsets-show.container
-  .header
-    %h2.title
-      Leadset `#{@leadset.company_url}`
-      = link_to '[~]', edit_leadset_path( @leadset )
+.leadsets-show.padded
+  .maxwidth
+    .header
+      %h2.title
+        Leadset `#{@leadset.company_url}`
+        = link_to '[~]', edit_leadset_path( @leadset )
 
-  %ul
-    %li <b>Email:</b> #{@leadset.email}
-    %li <b>company_url</b>: #{@leadset.company_url}
-    %li <b>customer_id</b>: #{@leadset.customer_id}
-
-
-  %hr
+    %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
     .col-md-6
-      %h5 Prices
-      %ul
-        - @leadset.appliance_tmpl_prices.each do |price|
-          %li
-            .a= price.product
-            = price
+      %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'
 
     .col-md-6
       %h5.collapse-expand#subscriptionsList
@@ -36,7 +60,8 @@
             %td= i.product.name
             %td= i.price
   %hr
-  .row
+
+  .row.maxwidth
     .col-md-6
       %h5.collapse-expand#invoicesList
         Invoices  (#{@leadset.invoices.length})
@@ -56,6 +81,7 @@
   %hr
 
   .row
-    %h5.collapse-expand#leads Leads
-    = render '/wco/leads/index', leads: @leads
+    .col-12
+      %h5.collapse-expand#leads Leads
+      = render '/wco/leads/index', leads: @leads
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.113
+  version: 3.1.0.115
 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