wco_models 3.1.0.158 → 3.1.0.159

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee76b07543560bf87e0fcb7bedeb3ea1d7e6757fcd19f2ec32a4ac483fd04ba4
-  data.tar.gz: 842db59465941e06a296e602130f541a15045412cb80b172ce917ee654a225d7
+  metadata.gz: 631a19b5362a0b67eb43d6883e89f2aa554cea9c0de5a35ab641c466f71350ec
+  data.tar.gz: b4aed0740e389a30eaa7f2b84d4a0802f251ff6c057f7436246575cc3e479ca6
 SHA512:
-  metadata.gz: 10ac16fc0d8a4a34ee9511dff6d8c9afa34154a53bcb73eaedd3f140cf047625fe9d8a4e4db75d8ebb2818b60f58949a26ac08328aeced1bcc3e08a8acdebe24
-  data.tar.gz: b7a3b725b47b2ff7936be1059ec2caae5440e20a8f75dde373cd55553a457974beed2dd74dad51b7af9d89eda0dc515191bf1a0017a681230c9a1d7135baecc1
+  metadata.gz: a525a6eabe3ac69ab09c789166ab875d9da4e075243216de90cd3aa2f2a8a6e1ca2132f218f61c5d571219bbf28886a431561b6e818e66496c3deaed583d3848
+  data.tar.gz: 3779643f6dc60f1212abe5c25d0b190a1f726ca3a58975b6510d06752287ac11eb28fac215989b4e577134877f859b5c17aeeebd64d2e0399fefb56d6d0fafb6

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

@@ -42,8 +42,10 @@ table.bordered {
   // border-bottom: 0;
   // border-right: 0;
 
-  th {
+
+  th, thead {
     background: #ddd;
+    font-weight: bold;
   }
 
   td {
@@ -184,8 +186,10 @@ textarea.monospace {
 .padded {
   // border: 1px solid green;
 
-  margin: 0.5em;
-  width: calc( 100% - 1em );
+  // margin: 0.5em;
+  // width: calc( 100% - 1em );
+
+  margin: 15px; // bootstrap has 15px gutters
 }
 
 /* R */
@@ -211,6 +215,16 @@ label.required {
 
 /* W */
 
+.w-2em {
+  width: 2em;
+}
+.w-3em {
+  width: 3em;
+}
+
+.w-10px {
+  width: 10px;
+}
 .w-20px {
   width: 20px;
 }

data/app/controllers/wco/api/obfuscated_redirects_controller.rb

@@ -0,0 +1,24 @@
+
+class Wco::Api::ObfuscatedRedirectsController < Wco::ApiController
+
+  def show
+    @obf = Wco::ObfuscatedRedirect.find params[:id]
+    # puts! @obf, '@obf'
+    authorize! :show, @obf
+
+    visit_time = Time.now
+    @obf.update_attributes({
+      visited_at: visit_time,
+      visits:    @obf.visits + [ visit_time ],
+    })
+
+    if DEBUG
+      render and return
+    end
+
+    redirect_to @obf.to
+  end
+
+end
+
+

data/app/controllers/wco/invoices_controller.rb

@@ -70,13 +70,26 @@ class Wco::InvoicesController < Wco::ApplicationController
     end
   end
 
+  def edit
+    @invoice = Wco::Invoice.find params[:id]
+    authorize! :edit, @invoice
+  end
+
+  def email_send
+    @invoice = Wco::Invoice.find params[:id]
+    authorize! :send_email, @invoice
+    out = ::IshManager::LeadsetMailer.monthly_invoice( @invoice.id.to_s )
+    Rails.env.production? ? out.deliver_later : out.deliver_now
+    flash_notice "Scheduled to send an email."
+    redirect_to controller: :leadsets, action: :show, id: @invoice.leadset_id
+  end
+
   def index
     authorize! :index, Wco::Invoice
     @invoices = Wco::Invoice.all
     if params[:leadset_id]
       @invoices = @invoices.where( leadset_id: params[:leadset_id] )
     end
-    @invoices = @invoices.includes( :payments )
   end
 
   def new_pdf
@@ -91,15 +104,6 @@ class Wco::InvoicesController < Wco::ApplicationController
     @products_list = Wco::Product.list
   end
 
-  def email_send
-    @invoice = Wco::Invoice.find params[:id]
-    authorize! :send_email, @invoice
-    out = ::IshManager::LeadsetMailer.monthly_invoice( @invoice.id.to_s )
-    Rails.env.production? ? out.deliver_later : out.deliver_now
-    flash_notice "Scheduled to send an email."
-    redirect_to controller: :leadsets, action: :show, id: @invoice.leadset_id
-  end
-
   def send_stripe
     @invoice = Wco::Invoice.find params[:id]
     authorize! :send_stripe, @invoice

data/app/controllers/wco/obfuscated_redirects_controller.rb

@@ -0,0 +1,53 @@
+
+class Wco::ObfuscatedRedirectsController < Wco::ApplicationController
+
+  def create
+    @obf = Wco::Obf.new params[:obf].permit!
+    authorize! :create, @obf
+
+    if @obf.save
+      flash_notice 'ok'
+    else
+      flash_alert @obf
+    end
+    redirect_to action: :index
+  end
+
+  def edit
+    @obf = Wco::Obf.find params[:id]
+    authorize! :edit, @obf
+  end
+
+  def index
+    @obfs = Wco::ObfuscatedRedirect.all
+    authorize! :index, Wco::ObfuscatedRedirect
+  end
+
+  def new
+    authorize! :new, @new_obf
+  end
+
+  def update
+    @obf = Wco::Obf.find params[:id]
+    authorize! :create, @obf
+
+    if @obf.update params[:obf].permit!
+      flash_notice 'ok'
+    else
+      flash_alert @obf
+    end
+    redirect_to action: :index
+  end
+
+  ##
+  ## private
+  ##
+  private
+
+  def set_lists
+    super
+    @new_obf = Wco::ObfuscatedRedirect.new
+  end
+
+end
+

data/app/models/ability.rb

@@ -17,6 +17,7 @@ class Ability
     end
 
     can [ :open_permission ], Wco
+    can [ :show ], Wco::ObfuscatedRedirect
     # can [ :open_permission ], WcoEmail
 
   end

data/app/models/ahoy/event.rb

@@ -0,0 +1,15 @@
+
+class Ahoy::Event
+  include Mongoid::Document
+
+  # associations
+  belongs_to :visit, class_name: "Ahoy::Visit", index: true
+  belongs_to :user, index: true, optional: true
+
+  # fields
+  field :name, type: String
+  field :properties, type: Hash
+  field :time, type: Time
+
+  index({name: 1, time: 1})
+end

data/app/models/ahoy/visit.rb

@@ -0,0 +1,50 @@
+
+class Ahoy::Visit
+  include Mongoid::Document
+
+  # associations
+  has_many :events, class_name: "Ahoy::Event"
+  belongs_to :user, index: true, optional: true
+
+  # required
+  field :visit_token, type: String
+  field :visitor_token, type: String
+
+  # the rest are recommended but optional
+  # simply remove the columns you don't want
+
+  # standard
+  field :ip, type: String
+  field :user_agent, type: String
+  field :referrer, type: String
+  field :referring_domain, type: String
+  field :landing_page, type: String
+
+  # technology
+  field :browser, type: String
+  field :os, type: String
+  field :device_type, type: String
+
+  # location
+  field :country, type: String
+  field :region, type: String
+  field :city, type: String
+  field :latitude, type: Float
+  field :longitude, type: Float
+
+  # utm parameters
+  field :utm_source, type: String
+  field :utm_medium, type: String
+  field :utm_term, type: String
+  field :utm_content, type: String
+  field :utm_campaign, type: String
+
+  # native apps
+  field :app_version, type: String
+  field :os_version, type: String
+  field :platform, type: String
+
+  field :started_at, type: Time
+
+  index({visit_token: 1}, {unique: true})
+end

data/app/models/wco/invoice.rb

@@ -22,7 +22,7 @@ class Wco::Invoice
 
   belongs_to :leadset, class_name: 'Wco::Leadset'
 
-  field :number, type: Integer
+  field :number, type: Integer, default: 100
 
   field :month_on, type: Date
 
@@ -32,8 +32,6 @@ class Wco::Invoice
     "invoice-#{number}.pdf"
   end
 
-  # field :amount_cents, type: Integer
-
   field :description, type: String
   field :items,       type: Array   # used by stripe
 

data/app/models/wco/obfuscated_redirect.rb

@@ -0,0 +1,21 @@
+
+class Wco::ObfuscatedRedirect
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Paranoia
+  store_in collection: 'office_obfuscated_redirects'
+
+  field :slug, type: :string
+
+  field :to_link,     type: :string
+  validates :to_link, presence: true
+
+  field :visited_at, type: DateTime
+  field :visits, type: :array, default: []
+
+  def obf_link
+    "https://email.wasya.co/api/obf/#{self.id}"
+  end
+
+end
+Wco::Obf ||= Wco::ObfuscatedRedirect

data/app/models/wco_email/context.rb

@@ -117,7 +117,8 @@ class WcoEmail::Context
   end
 
   def config
-    OpenStruct.new JSON.parse( tmpl[:config_json] )
+    @config ||= OpenStruct.new JSON.parse( tmpl[:config_json] )
+    @config
   end
 
   def utm_tracking_str

data/app/models/wco_email/email_action_template.rb

@@ -13,8 +13,6 @@ class WcoEmail::EmailActionTemplate
   validates :slug, uniqueness: true, allow_nil: true
   index({ slug: 1 }, { unique: true, name: "slug_idx" })
 
-  # field :from_email ## this is in email_template
-
   belongs_to :email_template, class_name: 'EmailTemplate'
 
   has_many :email_actions, class_name: 'EmailAction'

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

@@ -0,0 +1,5 @@
+
+.invoices--form
+  = form_for invoice do |f|
+    .actions
+      = f.submit 'Go'

data/app/views/wco/invoices/_index_table.haml

@@ -12,9 +12,13 @@
     %tbody
       - invoices.each do |i|
         %tr
-          %td= link_to "View", invoice_path( i )
+          %td
+            = link_to "View", invoice_path(i)
+            = link_to '[~]', edit_invoice_path(i)
           %td= i.email
           %td= i.number
-          %td= i.amount_cents
-          %td= i.paid_amount_cents
+          %td
+            -# = i.prices.map &:amount_cents
+          %td
+            -# = i.paid_amount_cents
           %td= i.created_at.to_s[0..10]

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

@@ -0,0 +1,5 @@
+
+.invoices-edit.maxwidth
+  .header
+    %h5.title Edit invoice `#{link_to @invoice, invoice_path(@invoice)}`
+  = render 'form', invoice: @invoice

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

@@ -1,3 +1,6 @@
 
 .invoices-index.maxwidth
+  .header
+    %h5.title Invoices
+
   = render 'index_table', invoices: @invoices

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

@@ -0,0 +1,11 @@
+
+.obf--form
+  = form_for obf, as: :obf do |f|
+    .field
+      %label slug
+      = f.text_field :slug
+    .field
+      %label to_link
+      = f.text_field :to_link
+    .actions
+      = f.submit 'Go'

data/app/views/wco/obfuscated_redirects/_header.haml

@@ -0,0 +1,6 @@
+
+= link_to "Obfuscated Redirects (#{Wco::ObfuscatedRedirect.all.length})", wco.obfuscated_redirects_path
+-# .inline-search
+-#   = form_tag wco.invoices_path, method: :get do
+-#     = text_field_tag :q
+= link_to '[+]', wco.new_obfuscated_redirect_path

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

@@ -0,0 +1,5 @@
+
+.obf-new.maxwidth
+  .header
+    .title Edit obf redir
+  = render '/wco/obfuscated_redirects/form', obf: @obf

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

@@ -0,0 +1,27 @@
+
+.obf-redirects.maxwidth
+  .header
+    %h5.title
+      obf redirs
+    = link_to '[+]', wco.new_obfuscated_redirect_path
+
+  %ul
+    - @obfs.each do |obf|
+      %li
+        .a
+          .d-inline-block= button_to 'x', wco.obfuscated_redirect_path(obf), method: :delete, data: { confirm: 'Are you sure?' }
+          = link_to '[~]', wco.edit_obfuscated_redirect_path(obf)
+          <b>slug:</b>
+          = link_to obf.slug, wco.obfuscated_redirect_path(obf)
+          <b>id:</b>
+          .mini.gray= obf.id
+        .a
+          <b>To_link:</b>
+          = obf.to_link
+        .collapse-expand#collapseExpand
+          <b>Visits (#{obf.visits.length}): <></b>
+        .hide
+          .d-flex.flex-wrap
+            - obf.visits.each do |vis|
+              .descr= pp_date vis
+

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

@@ -0,0 +1,5 @@
+
+.obf-new.maxwidth
+  .header
+    .title New obf redir
+  = render '/wco/obfuscated_redirects/form', obf: @new_obf

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

@@ -39,5 +39,4 @@
       %h5.collapse-expand#wcoProducts
         Wco::Product`s (#{@wco_products.length}):
       = render 'table', products: @wco_products
-      -# = render 'list', products: @wco_products
 

data/app/views/wco_email/email_layouts/_piousbox_roundborders.html.erb

@@ -908,9 +908,7 @@ h4 {
                     <![endif]-->
 
                             <div style="border: 2px solid #999; border-radius: 4px; padding: 1em; margin-bottom: 1em;">
-                              <!-- herehere -->
                               <%== ERB.new(@tmpl.body).result((@ctx||@tmpl).get_binding) %>
-
                             </div>
 
                     <!--[if mso]>

data/app/views/wco_email/email_layouts/_wasyaco_roundborders.html.erb

@@ -16,9 +16,9 @@
   <title><%= @ctx&.preview_str.presence || @tmpl&.preview_str %></title>
 
 <style type="text/css">
-  .mcnTextBlock {
-    color: #999;
-  }
+.mcnTextBlock {
+  color: #999;
+}
 
 p {
   margin: 10px 0;
@@ -520,7 +520,6 @@ h4 {
 }
 </style>
 </head>
-
 <body>
 
 
@@ -534,8 +533,6 @@ h4 {
   <tr>
     <td align="center" valign="top" id="bodyCell">
 
-      <!-- BEGIN TEMPLATE // -->
-
       <!--[if (gte mso 9)|(IE)]>
       <table align="center" border="0" cellspacing="0" cellpadding="0" width="600" style="width:600px;">
       <tr>
@@ -589,9 +586,11 @@ h4 {
                     <td valign="top" width="299" style="width:299px;">
                     <![endif]-->
 
-                            <div style="border: 2px solid #999; border-radius: 4px; padding: 1em; margin-bottom: 1em;">
-                              <%== ERB.new( @ctx&.body.presence || @tmpl&.body ).result %>
-                            </div>
+                      <div style="border: 2px solid #999; border-radius: 4px; padding: 1em; margin-bottom: 1em;">
+                        <%-# == ERB.new( @ctx&.body.presence || @tmpl&.body ).result((@ctx||@tmpl).get_binding) %>
+                        <%-# = ERB.new( @ctx.body ).result %>
+                        <%= @renderer.render( inline: @ctx&.body.presence || @tmpl&.body ) %>
+                      </div>
 
                     <!--[if mso]>
                     </td>
@@ -671,16 +670,16 @@ h4 {
           </td>
         </tr>
       </table>
+
       <!--[if (gte mso 9)|(IE)]>
       </td>
       </tr>
       </table>
       <![endif]-->
-      <!-- // END TEMPLATE -->
+
     </td>
   </tr>
 </table>
 </center>
-</body>
 
-</html>
+</body></html>

data/config/initializers/ahoy.rb

@@ -0,0 +1,12 @@
+
+
+class Ahoy::Store < Ahoy::DatabaseStore
+end
+
+# set to true for JavaScript tracking
+Ahoy.api = true
+
+# set to true for geocoding (and add the geocoder gem to your Gemfile)
+# we recommend configuring local geocoding as well
+# see https://github.com/ankane/ahoy#geocoding
+Ahoy.geocode = false

data/config/routes.rb

@@ -4,6 +4,8 @@ Wco::Engine.routes.draw do
 
   namespace :api do
     get 'leads/index_hash', to: 'leads#index_hash'
+
+    get '/obf/:id', to: 'obfuscared_redirects#show'
   end
 
   get 'application/tinymce', to: 'application#tinymce'
@@ -36,6 +38,8 @@ Wco::Engine.routes.draw do
   delete 'logs/bulkop', to: 'logs#bulkop', as: :logs_bulkop
   resources :logs
 
+  resources :obfuscated_redirects
+
   post 'office_action_templates', to: 'office_action_templates#update'
   resources :office_action_templates
   resources :office_actions

data/lib/tasks/migrate_tasks.rake

@@ -0,0 +1,20 @@
+
+
+namespace :migrate do
+
+  desc 'obf to->to_link'
+  task :obf_to_to_link => :environment do
+    Wco::ObfuscatedRedirect.all.map do |obf|
+      if !obf[:to_link] && obf[:to]
+        obf[:to_link] = obf[:to]
+        if obf.save
+          print '^'
+        else
+          puts obf.errors.full_messages
+        end
+      end
+    end
+    puts 'ok'
+  end
+
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.158
+  version: 3.1.0.159
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-08 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ahoy_matey
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
@@ -411,6 +425,7 @@ files:
 - app/assets/stylesheets/wco/utils.scss
 - app/assets/stylesheets/wco/videos.scss
 - app/controllers/wco/api/leads_controller.rb
+- app/controllers/wco/api/obfuscated_redirects_controller.rb
 - app/controllers/wco/api_controller.rb
 - app/controllers/wco/application_controller.rb
 - app/controllers/wco/galleries_controller.rb
@@ -419,6 +434,7 @@ files:
 - app/controllers/wco/leads_controller.rb
 - app/controllers/wco/leadsets_controller.rb
 - app/controllers/wco/logs_controller.rb
+- app/controllers/wco/obfuscated_redirects_controller.rb
 - app/controllers/wco/office_action_templates_controller.rb
 - app/controllers/wco/office_actions_controller.rb
 - app/controllers/wco/photos_controller.rb
@@ -437,6 +453,8 @@ files:
 - app/mailers/wco_email/application_mailer.rb
 - app/mailers/wco_email/application_mailer.rb-trash
 - app/models/ability.rb
+- app/models/ahoy/event.rb
+- app/models/ahoy/visit.rb
 - app/models/wco/asset.rb
 - app/models/wco/gallery.rb
 - app/models/wco/headline.rb
@@ -445,6 +463,7 @@ files:
 - app/models/wco/leadset.rb
 - app/models/wco/log.rb
 - app/models/wco/newsitem.rb
+- app/models/wco/obfuscated_redirect.rb
 - app/models/wco/office_action.rb
 - app/models/wco/office_action_template.rb
 - app/models/wco/office_action_template_tie.rb
@@ -514,9 +533,11 @@ files:
 - app/views/wco/headlines/_index.haml
 - app/views/wco/headlines/edit.haml
 - app/views/wco/headlines/new.haml
+- app/views/wco/invoices/_form.haml
 - app/views/wco/invoices/_header.haml
 - app/views/wco/invoices/_index_list.haml
 - app/views/wco/invoices/_index_table.haml
+- app/views/wco/invoices/edit.haml
 - app/views/wco/invoices/index.haml
 - app/views/wco/invoices/new_pdf.haml
 - app/views/wco/invoices/new_stripe.haml
@@ -531,7 +552,7 @@ files:
 - app/views/wco/leads/_form.haml
 - app/views/wco/leads/_form_import.haml
 - app/views/wco/leads/_header.haml
-- app/views/wco/leads/_list.haml
+- app/views/wco/leads/_index.haml
 - app/views/wco/leads/_table.haml
 - app/views/wco/leads/edit.haml
 - app/views/wco/leads/index.haml
@@ -549,6 +570,11 @@ files:
 - app/views/wco/logs/_index.haml
 - app/views/wco/logs/edit.haml
 - app/views/wco/logs/new.haml
+- app/views/wco/obfuscated_redirects/_form.haml
+- app/views/wco/obfuscated_redirects/_header.haml
+- app/views/wco/obfuscated_redirects/edit.haml
+- app/views/wco/obfuscated_redirects/index.haml
+- app/views/wco/obfuscated_redirects/new.haml
 - app/views/wco/office_action_templates/_form.haml
 - app/views/wco/office_action_templates/_header.haml
 - app/views/wco/office_action_templates/_ties.haml
@@ -575,7 +601,7 @@ files:
 - app/views/wco/prices/_form.haml
 - app/views/wco/products/_form.haml
 - app/views/wco/products/_header.haml
-- app/views/wco/products/_list.haml
+- app/views/wco/products/_index.haml
 - app/views/wco/products/_table.haml
 - app/views/wco/products/edit.haml
 - app/views/wco/products/index.haml
@@ -667,10 +693,12 @@ 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
+- config/initializers/ahoy.rb
 - config/initializers/assets.rb
 - config/routes.rb
 - lib/shortcuts.rb
 - lib/tasks/db_tasks.rake
+- lib/tasks/migrate_tasks.rake
 - lib/tasks/office_tasks.rake
 - lib/tasks/wp_tasks.rake
 - lib/wco/ai_writer.rb