wco_models 3.1.0.155 → 3.1.0.157

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7087d1bed892c6923940fc6d1c8ba234ad9e9773e490e4bce6d92808625ad211
-  data.tar.gz: f88b3cb63acf8f2253156ec1fd45b53d1ff6e9d14886a19233142e7e026efc0d
+  metadata.gz: f1d7c8e819f70c838d7784f3c628844e554e86f33b473c78db9552d7a1fbd7b0
+  data.tar.gz: 513a0bcd49ce21e5bdf59c776d97656969b39783d2cb54e946642ca7f0ef6aba
 SHA512:
-  metadata.gz: da0b670caac9e737d49dbbf02633554617cd18c9abdc8def6dc8b65ad20e62038aa984e01f010bed84a2efa1b06b9e31db609acb418d9587b7681d071026813b
-  data.tar.gz: a828cddbe1e4662d249167c24ec8e5c0abf29beb1811deb3c780c10e013b148004884ea9a5fa30ac4756d823ab8bb26b712ea5ec64cc97587b95cb165fb94339
+  metadata.gz: a03e9edbd32ffc5a3844fab246ea8aca3c3b88a206b2aebb65d9b92ab6162cee11bd66d94e54e35503701e0b705578079fb0886e45ab1cc1140826de6725f6c9
+  data.tar.gz: 0ebd890f1f25d37bf40395098185f532d50e0e566e65fffadc9f6e41861ada1e33e388c53b08eebb6f2334ac75209063c881d2de1ac1b0d71a22a79d55dad17f

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

@@ -188,6 +188,16 @@ textarea.monospace {
   width: calc( 100% - 1em );
 }
 
+/* R */
+
+label.required {
+  &:after {
+    content: ' *';
+    color: red;
+  }
+}
+
+
 /* S */
 .spacer-small {
   height: 20px;

data/app/controllers/wco/invoices_controller.rb

@@ -56,32 +56,13 @@ class Wco::InvoicesController < Wco::ApplicationController
     @invoice = Wco::Invoice.new params[:invoice].permit!
     authorize! :create, @invoice
 
-    stripe_invoice = Stripe::Invoice.create({
-      customer:          @invoice.leadset.customer_id,
-      collection_method: 'send_invoice',
-      days_until_due:    0,
-      # collection_method: 'charge_automatically',
-      pending_invoice_items_behavior: 'exclude',
-    })
-    params[:invoice][:items].each do |item|
-      stripe_price = Wco::Price.find( item[:price_id] ).price_id
-      puts! stripe_price, 'stripe_price'
-      invoice_item = Stripe::InvoiceItem.create({
-        customer: @invoice.leadset.customer_id,
-        price:    stripe_price,
-        invoice:  stripe_invoice.id,
-        quantity: item[:quantity],
-      })
-    end
-    Stripe::Invoice.finalize_invoice( stripe_invoice[:id] )
-    if params[:do_send]
-      Stripe::Invoice.send_invoice(stripe_invoice[:id])
-      flash_notice "Scheduled to send the invoice via stripe."
-    end
-    @invoice.update_attributes({ invoice_id: stripe_invoice[:id] })
-
     if @invoice.save
       flash_notice "Created the invoice."
+
+      if params[:do_send]
+        Stripe::Invoice.send_invoice(@invoice[:invoice_id])
+      end
+
       redirect_to action: :show, id: @invoice.id
     else
       flash_alert "Cannot create invoice: #{@invoice.errors.messages}"

data/app/controllers/wco/leads_controller.rb

@@ -1,14 +1,23 @@
 
 class Wco::LeadsController < Wco::ApplicationController
-
   before_action :set_lists
 
   def create
-    params[:lead][:tags].delete ''
-    params[:lead][:leadset] = nil if params[:lead][:leadset].blank?
+    params[:lead][:tag_ids]&.delete ''
+    params[:lead].delete :leadset_id if params[:lead][:leadset_id].blank?
 
     @lead = Wco::Lead.new params[:lead].permit!
     authorize! :create, @lead
+
+    if params[:lead][:photo]
+      photo = Wco::Photo.new photo: params[:lead][:photo]
+      photo.is_public = true
+      if photo.save
+        @lead.photo = photo
+      end
+      params[:lead].delete :photo
+    end
+
     if @lead.save
       flash_notice 'ok'
     else
@@ -26,8 +35,6 @@ class Wco::LeadsController < Wco::ApplicationController
     authorize! :index, Wco::Lead
     @leads = Wco::Lead.all
 
-
-
     if params[:q].present?
       q = params[:q].downcase
       @leads = @leads.any_of(
@@ -41,19 +48,6 @@ class Wco::LeadsController < Wco::ApplicationController
       end
     end
 
-    # if params[:q_tag_ids].present?
-    #   carry = nil
-    #   params[:q_tag_ids].each do |term_id|
-    #     lts = LeadTag.where({ term_id: term_id }).map(&:lead_id)
-    #     if carry
-    #       carry = carry & lts
-    #     else
-    #       carry = lts
-    #     end
-    #   end
-    #   @leads = Lead.where({ :id.in => carry })
-    # end
-
     @leads = @leads.page( params[:leads_page ] ).per( current_profile.per_page )
   end
 
@@ -77,11 +71,21 @@ class Wco::LeadsController < Wco::ApplicationController
   end
 
   def update
-    params[:lead][:tags].delete ''
-    params[:lead].delete :leadset if params[:lead][:leadset].blank?
+    params[:lead][:tag_ids]&.delete ''
+    params[:lead].delete :leadset_id if params[:lead][:leadset_id].blank?
 
     @lead = Wco::Lead.find params[:id]
     authorize! :update, @lead
+
+    if params[:lead][:photo]
+      photo = Wco::Photo.new photo: params[:lead][:photo]
+      photo.is_public = true
+      if photo.save
+        @lead.photo = photo
+      end
+      params[:lead].delete :photo
+    end
+
     if @lead.update params[:lead].permit!
       flash_notice 'ok'
     else

data/app/models/wco/invoice.rb

@@ -14,6 +14,8 @@ class Wco::Invoice
   include Mongoid::Paranoia
   store_in collection: 'ish_invoice'
 
+  attr_accessor :is_stripe
+
   field :email, type: String
 
   field :invoice_id, type: String # stripe
@@ -35,7 +37,29 @@ class Wco::Invoice
   field :description, type: String
   field :items,       type: Array   # used by stripe
 
-
+  before_validation :create_stripe, on: :create
+  def create_stripe
+    if is_stripe
+      stripe_invoice = Stripe::Invoice.create({
+        customer:          leadset.customer_id,
+        collection_method: 'send_invoice',
+        days_until_due:    0,
+        # collection_method: 'charge_automatically',
+        pending_invoice_items_behavior: 'exclude',
+      })
+      items.each do |item|
+        stripe_price = Wco::Price.find( item[:price_id] ).price_id
+        invoice_item = Stripe::InvoiceItem.create({
+          customer: leadset.customer_id,
+          price:    stripe_price,
+          invoice:  stripe_invoice.id,
+          quantity: item[:quantity],
+        })
+      end
+      Stripe::Invoice.finalize_invoice( stripe_invoice[:id] )
+      self.invoice_id = stripe_invoice[:id]
+    end
+  end
 
   ## Prawn/pdf unit of measure is 1/72"
   ## Canvas width: 612, height: 792

data/app/models/wco_game/location.rb

@@ -0,0 +1,257 @@
+
+# require 'ish/premium_item'
+require 'ish/utils'
+
+class WcoGame::Location
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  # include Ish::PremiumItem
+  include Mongoid::Paranoia
+  include Wco::Utils
+  store_in collection: 'gameui_maps'
+
+  field :name
+
+  field :newsitems_page_size, default: 25
+
+  field :slug
+  validates :slug, uniqueness: true, presence: true
+
+  field :description
+
+  has_many :markers,      :class_name => '::Gameui::Marker', inverse_of: :map
+  has_many :from_markers, :class_name => '::Gameui::Marker', inverse_of: :destination
+
+  has_many :newsitems, inverse_of: :map, order: :created_at.desc
+
+  # @TODO: remove field, replace with relation. _vp_ 2022-09-13
+  field :parent_slug
+  belongs_to :parent, class_name: '::Gameui::Map', inverse_of: :childs, optional: true
+  has_many :childs, class_name: '::Gameui::Map', inverse_of: :parent
+
+  has_one :image, class_name: '::Ish::ImageAsset', inverse_of: :location
+  belongs_to :creator_profile, class_name: '::Ish::UserProfile', inverse_of: :my_maps
+
+  has_and_belongs_to_many :bookmarked_profiles, class_name: '::Ish::UserProfile', inverse_of: :bookmarked_location
+
+  # shareable, nonpublic
+  field :is_public, type: Boolean, default: true
+  scope :public, ->{ where( is_public: true ) }
+  has_and_belongs_to_many :shared_profiles, :class_name => 'Ish::UserProfile', :inverse_of => :shared_locations
+
+  field :version, type: String, default: '0.0.0'
+
+  ## @TODO: or self, right? and refactor this, seems N+1. _vp_ 2022-09-13
+  field :map_slug
+  def map
+    ::Gameui::Map.where( slug: map_slug ).first
+  end
+
+  RATED_OPTIONS = [ 'pg-13', 'r', 'nc-17' ]
+  field :rated, default: 'pg-13' # 'r', 'nc-17'
+
+  ## Possible keys: description, map, markers, newsitems,
+  field :labels, type: Object, default: <<~AOL
+    { "description":"Description", "map":"Map", "markers":"Markers", "newsitems":"Newsitems"
+    }
+  AOL
+
+  ## Possible keys:
+  ## config.description.collapsible
+  field :config, type: Object, default: <<~AOL
+    { "map_panel_type": "ThreePanelV1",
+      "studio": { "hasFloor": true, "studioLength": 2500, "studioWidth": 2500 }
+    }
+  AOL
+
+  # @deprecated, dont use!
+  field :img_path
+
+  ## Not used! See config.map_panel_type instead.
+  # MAP_TYPES = [ :map_2d, :map_3d, :map_geospatial, :map_gallery, :map_toc ] ## Mostly not implemented. _vp_ 2022-09-06
+  # field :map_type, default: :map_2d
+
+  ## Make sure to use x,y,z and w,h as appropriate.
+  ## @TODO: abstract this into a module
+  field :x, type: Float
+  field :y, type: Float
+  field :z, type: Float
+
+  ## Make sure to use x,y,z and w,h as appropriate.
+  field :w, type: Integer
+  validates :w, presence: true
+  field :h, type: Integer
+  validates :h, presence: true
+  # @TODO: this is shared between map and marker, move to a concern.
+  before_validation :compute_w_h
+  def compute_w_h
+    return if !image ## @TODO: test this
+
+    begin
+      geo = Paperclip::Geometry.from_file(Paperclip.io_adapters.for(image.image))
+      self.w = geo.width
+      self.h = geo.height
+    rescue Paperclip::Errors::NotIdentifiedByImageMagickError => e
+      puts! e, 'Could not #compute_w_h'
+      # @TODO: do something with this
+    end
+  end
+
+  ORDERING_TYPE_ALPHABETIC = 'alphabetic'
+  ORDERING_TYPE_CUSTOM     = 'custom'
+  ORDERING_TYPE_TIMESTAMP  = 'timestamp'
+  ORDERING_TYPES = [ ORDERING_TYPE_ALPHABETIC, ORDERING_TYPE_CUSTOM, ORDERING_TYPE_TIMESTAMP ]
+  field :ordering_type, type: String, default: 'custom' # timestamp, alphabetic, custom
+  validates :ordering_type, presence: true
+
+  def self.list conditions = { is_trash: false }
+    out = self.order_by( created_at: :desc )
+    [[nil, nil]] + out.map { |item| [ item.name, item.id.to_s ] }
+  end
+
+  def breadcrumbs
+    out = [{ name: self.name, slug: self.slug, link: false }]
+    p = self.parent
+    while p
+      out.push({ name: p.name, slug: p.slug })
+      p = p.parent
+    end
+    out.reverse
+  end
+
+  ##
+  ## @TODO: move the export func, below, to a module. _vp_ 2022-09-20
+  ##
+
+  def empty_export
+    return {
+      galleries: {},
+      image_assets: {},
+      maps: {}, markers: {},
+      newsitems: {},
+      photos: {}, profiles: {},
+      reports: {},
+      videos: {},
+    }
+  end
+  def self.empty_export; Gameui::Map.new.empty_export; end
+
+  def empty_export_arr
+    return {
+      galleries: [],
+      image_assets: [],
+      maps: [], markers: [],
+      newsitems: [],
+      photos: [], profiles: [],
+      reports: [],
+      videos: [],
+    }
+  end
+
+  def export_key_to_class
+    return {
+      galleries: 'Gallery',
+      image_assets: 'Ish::ImageAsset',
+      maps: 'Gameui::Map',
+      markers: 'Gameui::Marker',
+      newsitems: 'Newsitem',
+      photos: 'Photo',
+      profiles: 'Ish::UserProfile',
+      reports: 'Report',
+      videos: 'Video',
+      # 'galleries' => 'Gallery',
+      # 'image_assets' => 'Ish::ImageAsset',
+      # 'maps' => 'Gameui::Map',
+      # 'markers' => 'Gameui::Marker',
+      # 'newsitems' => 'Newsitem',
+      # 'photos' => 'Photo',
+      # 'profiles' => 'Ish::UserProfile',
+      # 'reports' => 'Report',
+      # 'videos' => 'Video',
+    }.with_indifferent_access
+  end
+  def self.export_key_to_class
+    Map.new.export_key_to_class
+  end
+
+  def export_fields
+    %w|
+      creator_profile_id config
+      deleted_at description
+      h
+      is_public
+      labels
+      map_slug
+      name
+      ordering_type
+      parent_slug
+      rated
+      slug
+      version
+      w
+    |
+  end
+
+  ## This is the starting point _vp_ 2022-03-12
+  ##
+  def export_subtree
+    collected = collect(empty_export)
+    exportable = empty_export_arr
+    collected.map do |k, v|
+      if v.present?
+        v.map do |id|
+          id = id[0]
+          item = export_key_to_class[k].constantize.unscoped.find id
+          export = item.export
+          exportable[k].push( export )
+        end
+      end
+    end
+    JSON.pretty_generate exportable
+  end
+
+  def collect export_object
+    map = self
+    export_object[:maps][map.id.to_s] = map.id.to_s
+
+    if map.markers.present?
+      map.markers.map do |marker|
+        id = marker.id.to_s
+        if !export_object[:markers][id]
+          marker.collect( export_object )
+        end
+        export_object[:markers][id] = id
+      end
+    end
+
+    if map.newsitems.present?
+      map.newsitems.map do |newsitem|
+        id = newsitem.id.to_s
+        export_object[:newsitems][id] = id
+        newsitem.collect export_object
+      end
+    end
+
+    ## @TODO: maybe implement this later, maybe not. _vp_ 2022-03-12
+    # if map.childs.present?
+    #   export_object[:maps].push( map.childs.map &:id )
+    #   map.childs.map do |child|
+    #     child.collect export_object
+    #   end
+    # end
+
+    if map.creator_profile.present?
+      export_object[:profiles][map.creator_profile.id.to_s] = map.creator_profile.id.to_s
+    end
+
+    if map.image.present?
+      export_object[:image_assets][map.image.id.to_s] = map.image.id.to_s
+    end
+
+    export_object
+  end
+
+  ## endExport
+
+
+end

data/app/models/wco_game/marker.rb

@@ -0,0 +1,9 @@
+
+class WcoGame::Marker
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Paranoia
+  include Wco::Utils
+  store_in collection: 'gameui_markers'
+
+end

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

@@ -6,8 +6,9 @@
     = f.text_field :name
 
   .field
-    = f.label :email
-    = f.text_field :email
+    %label.required Email
+    = f.text_field :email, required: true
+    .small.gray Required to create a leadset
 
   .field
     = f.label :phone
@@ -19,7 +20,7 @@
 
   .field
     = f.label "Leadset (company)"
-    = f.select :leadset, options_for_select(@leadsets_list, selected: lead.leadset_id), {}, { class: :select2 }
+    = f.select :leadset_id, options_for_select(@leadsets_list, selected: lead.leadset_id), {}, { class: :select2 }
 
   -# .field
   -#   %label Rating
@@ -31,10 +32,10 @@
 
   .field
     = f.label "Tags"
-    = f.select :tags, options_for_select(@tags_list, selected: lead.tag_ids ), {}, { class: :select2, multiple: true }
+    = f.select :tag_ids, options_for_select(@tags_list, selected: lead.tag_ids ), {}, { class: :select2, multiple: true }
 
   .field
-    = f.label :photo
+    %label Photo
     = f.file_field :photo
 
   .actions

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

@@ -0,0 +1,16 @@
+
+%ul.leads--list
+  - leads.each do |lead|
+    %li.item
+      = image_tag lead.photo.photo.url(:thumb)
+      = link_to lead, lead_path(lead)
+      = link_to '[~]', edit_lead_path(lead)
+
+      -# \(#{lead.scheduled_email_actions.length} sch
+      -# %span.expand-next [+]
+      -# .expand-hide= render 'ish_manager/scheduled_actions/form_mini'
+      -# \)
+
+      - if defined?( wco_email )
+        %span.expand-next [reply]
+        .expand-hide= render '/wco_email/contexts/form_reply_mini', lead: lead

data/app/views/wco/leads/{_index.haml → _table.haml}

@@ -39,7 +39,7 @@
               = link_to '[~]', edit_lead_path( lead )
               = link_to "#{lead.name} <#{lead.email}>", lead_path( lead )
             %td
-              = image_tag lead.photo.url(:thumb) if lead.photo
+              = image_tag lead.photo.photo.url(:thumb) if lead.photo
             %td.company
               = lead.leadset.company_url
             %td

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

@@ -14,4 +14,4 @@
         (#{@leads.length})
       = link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
 
-  = render 'index', leads: @leads, search_path: leads_path
+  = render '/wco/leads/table', leads: @leads, search_path: leads_path

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

@@ -22,16 +22,16 @@
           %li Address: #{@lead.address}
         -# - if @lead.comment
         -#   %li Comment: #{raw @lead.comment}
-        - if @lead.photo
-          %li
-            = image_tag Photo.find( @lead.photo_id ).photo.url(:small)
 
     .col-md-6
+      - if @lead.photo
+        = image_tag @lead.photo.photo.url(:thumb2)
+
       %h5 Tags
       %ul
         - @lead.tags.each do |tag|
           %li
-            = link_to tag.name, tag_path(tag)
+            = link_to tag, tag_path(tag)
 
   .row
     .col-md-6.ctxs

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

@@ -10,4 +10,5 @@
         <b>N reports:</b> #{tag.reports.length}
         <b>N videos:</b> #{tag.videos.length}
         <b>N stubs:</b> #{tag.message_stubs.length}
+        <b>N leads:</b> #{tag.leads.length}
         <b>N logs:</b> #{tag.logs.length}

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

@@ -1,7 +1,7 @@
 
 .tags-index.maxwidth
   .header
-    %h5.title Tags
+    %h5.title Tags (#{@tags.length})
 
   = render 'index', tags: @tags
 

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

@@ -14,12 +14,17 @@
         <b>Message Stubs (#{@tag.message_stubs.length}):&nbsp;</b>
         = render '/wco_email/message_stubs/index', stubs: @tag.message_stubs
 
+    %li.d-flex
+      <b>Galleries (#{@galleries.length}):&nbsp;</b>
+      = render 'wco/galleries/index', galleries: @galleries, config: { skip_tags: true }
     %li.d-flex
       <b>Headlines (#{@tag.headlines.length}):&nbsp;</b>
       = render '/wco/headlines/index', headlines: @tag.headlines
+
     %li.d-flex
-      <b>Galleries (#{@galleries.length}):&nbsp;</b>
-      = render 'wco/galleries/index', galleries: @galleries, config: { skip_tags: true }
+      <b>Leads (#{@tag.leads.length}):&nbsp;</b>
+      = render 'wco/leads/list', leads: @tag.leads
+
     %li.d-flex
       <b>Reports (#{@reports.length}):&nbsp;</b>
       = render 'wco/reports/index', reports: @reports, config: { skip_tags: true }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.155
+  version: 3.1.0.157
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-25 00:00:00.000000000 Z
+date: 2024-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -473,6 +473,8 @@ files:
 - app/models/wco_email/message_stub.rb
 - app/models/wco_email/obfuscated_redirect.rb
 - app/models/wco_email/unsubscribe.rb
+- app/models/wco_game/location.rb
+- app/models/wco_game/marker.rb
 - app/models/wco_hosting/appliance.rb
 - app/models/wco_hosting/appliance_tmpl.rb
 - app/models/wco_hosting/domain.rb
@@ -529,8 +531,8 @@ files:
 - app/views/wco/leads/_form.haml
 - app/views/wco/leads/_form_import.haml
 - app/views/wco/leads/_header.haml
-- app/views/wco/leads/_index.haml
-- app/views/wco/leads/_index_rows.haml
+- app/views/wco/leads/_list.haml
+- app/views/wco/leads/_table.haml
 - app/views/wco/leads/edit.haml
 - app/views/wco/leads/index.haml
 - app/views/wco/leads/new.haml
@@ -561,7 +563,7 @@ files:
 - app/views/wco/office_actions/index.haml
 - app/views/wco/office_actions/new.haml
 - app/views/wco/office_actions/show.haml
-- app/views/wco/photos/_form.haml
+- app/views/wco/photos/_form.haml-trash
 - app/views/wco/photos/_index_thumbs.haml
 - app/views/wco/photos/_meta.haml
 - app/views/wco/photos/_meta_manager.haml

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

@@ -1,11 +0,0 @@
-
-.leads--index-rows
-  - leads.each do |lead|
-    .item
-      = link_to lead.email, lead_path(lead)
-      \(#{lead.scheduled_email_actions.length} sch
-      %span.expand-next [+]
-      .expand-hide= render 'ish_manager/scheduled_actions/form_mini'
-      \)
-      %span.expand-next [reply]
-      .expand-hide= render 'ish_manager/email_contexts/form_reply', lead: lead