wco_models 3.1.0.50 → 3.1.0.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a17b1b5e607a9bd18dd6f5b6f6b4346e8af8b25460bc07a622fd7c54d1cf928
-  data.tar.gz: c5974d04bbac542b413cf6d444694e5e319271c27a4a399accd8c811a2609166
+  metadata.gz: 9ae41306d1c2d1a86acdc705f296feae8ba6cb9d31dcef4c1794cabaa69d8b2c
+  data.tar.gz: 1d34eb80dc069bb504a62a08ee25da17c92cebb5805399ff570954c8bd163c3e
 SHA512:
-  metadata.gz: f8645a7db623d91cafd9f3a828e2e9ceabea87dcbefecdadfe21cddd74f51cbad6622535466179e9d004b9201d5f89a11157ceeb629bc551def8ea450045fbe2
-  data.tar.gz: 538e2e1e434bd37a7995f8b51b573f424aa76eb483cc196eb34d3c0dc89f18346f238ebbea244c586db976c8cfdf33be1ae6946a6b69aa6fa3f3b7c45bf7eacb
+  metadata.gz: 46d410929c0405cffbd123b8b376a3629fc748e75df699b56bd94d70b9576c22c09358e64c32f3bfea59fc6b1bd7ed471cb70af2c9c4cd60170b75599df4a0d6
+  data.tar.gz: 5b7280694b1ba7790c33e70e1f0c8555733f6d2912e7af2bdaba73516adfe6417e1594384ca84896cf1d7b6ea3f9cdd1dcf419188f38dd19f0fc69ce1f20a37c

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

@@ -11,8 +11,9 @@
   border-left-width: 0;
 }
 
-.pagination {
+ul.pagination {
   border-left: 1px solid #ddd;
+  margin: 1em 0;
 
   li.active {
     padding: 0 14px;

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

@@ -26,6 +26,13 @@ textarea {
   border-right: 1px solid red !important;
 }
 
+.bordered {
+  border: 1px solid gray;
+  border-radius: 5px;
+
+  padding: 0.5em;
+}
+
 table.bordered {
   table-layout:fixed;
   width: 100%;
@@ -94,6 +101,7 @@ textarea.monospace {
 .gray,
 .grey {
   color: grey;
+  display: inline-block;
 }
 
 .green {

data/app/models/wco/leadset.rb

@@ -33,7 +33,7 @@ class Wco::Leadset
   field :customer_id
   def customer_id
     if self[:customer_id].blank?
-      return nil if !email
+      return nil if !email.present?
       existing = Stripe::Customer.search({ query: "email: '#{email}'" })
       # puts! existing, 'existing'
       if existing.data.present?
@@ -47,4 +47,8 @@ class Wco::Leadset
     self[:customer_id]
   end
 
+  def to_s
+    company_url
+  end
+
 end

data/app/models/wco/tag.rb

@@ -20,7 +20,14 @@ class Wco::Tag
   has_and_belongs_to_many :logs
 
   INBOX = 'inbox'
+  def self.inbox
+    find_or_create_by({ slug: INBOX })
+  end
+
   TRASH = 'trash'
+  def self.trash
+    find_or_create_by({ slug: TRASH })
+  end
 
   def self.list
     [[nil,nil]] + all.map { |p| [ p.slug, p.id ] }

data/app/models/wco_email/message.rb

@@ -17,7 +17,9 @@ class WcoEmail::Message
 
   field :in_reply_to_id, type: :string
 
-  field :object_key,  type: :string ## aka 'filename', use with bucket name + prefix. I need this!
+  field     :bucket, default: 'ish-ses'
+
+  field     :object_key ## aka 'filename', use with bucket name + prefix. I need this!
   validates :object_key, presence: true, uniqueness: true
   index({ object_key: 1 }, { unique: true, name: "object_key_idx" })
 

data/app/models/wco_email/message_stub.rb

@@ -17,6 +17,8 @@ class WcoEmail::MessageStub
   field :status, default: STATUS_PENDING
   scope :pending, ->{ where( status: 'status_pending' ) }
 
+  field     :bucket # 'ish-ses', 'ish-ses-2024'
+
   field     :object_key
   validates :object_key, presence: true, uniqueness: true
   index({ object_key: 1 }, { unique: true, name: "object_key_idx" })
@@ -35,14 +37,16 @@ class WcoEmail::MessageStub
     key      = the_mail.message_id || "no-key-#{Time.now.to_i}.#{rand(1000)}"
 
     @stub = WcoEmail::MessageStub.create({
+      bucket:      ::S3_CREDENTIALS[:bucket_ses],
       object_key:  key,
       status:      WcoEmail::MessageStub::STATUS_PENDING,
       tags:        [ @tag ],
     })
     if @stub.persisted?
-      @client.put_object({ bucket: ::S3_CREDENTIALS[:bucket_ses],
-        key: key,
+      @client.put_object({
         body: message,
+        bucket: ::S3_CREDENTIALS[:bucket_ses],
+        key: key,
       })
     else
       msg = @stub.errors.full_messages.join(", ")

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

@@ -1,6 +1,6 @@
 
-.galleries-edit.max-width
-  = render 'title', :gallery => @gallery
-  = render 'form', :gallery => @gallery, :url => gallery_path( @gallery )
-  = render 'thumbs', :gallery => @gallery
-  = render 'wco/photos/multinew', :gallery => @gallery
+.galleries-edit.maxwidth
+  = render 'title', gallery: @gallery
+  = render 'form', gallery: @gallery, :url => gallery_path( @gallery )
+  = render 'thumbs', gallery: @gallery
+  = render 'wco/photos/multinew', gallery: @gallery

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

@@ -1,3 +1,3 @@
 
-.invoices-index.max-width
+.invoices-index.maxwidth
   = render 'index_table', invoices: @invoices

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

@@ -1,5 +1,5 @@
 
-.invoices-new.max-width
+.invoices-new.maxwidth
 
   .row
     .col.s12.col.m6.col-md-offset-3

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

@@ -3,7 +3,7 @@
 - url = invoice.persisted? ? invoice_path( invoice.id ) : create_invoice_stripe_path
 
 
-.invoices-new.max-width
+.invoices-new.maxwidth
 
   .row
     .col.s12.col.m6.col-md-offset-3

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

@@ -1,7 +1,7 @@
 
 - i = @invoice
 
-.invoices-show.max-width
+.invoices-show.maxwidth
   %h5 Invoice ##{i.number}
 
   %ul

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

@@ -1,7 +1,7 @@
 
-.leads-edit.max-width
+.leads-edit.maxwidth
   .header
-    %h2.title Edit lead #{ link_to @lead.name, lead_path(@lead) }
+    %h5.title Edit lead #{ link_to @lead.name, lead_path(@lead) }
 
   = render 'form', :lead => @lead
 

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

@@ -1,5 +1,5 @@
 
-.leads-new.max-width
+.leads-new.maxwidth
   .row
     .col-sm-12.col-md-6
       %h1 New Lead

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

@@ -7,10 +7,6 @@
     = f.label :company_url
     = f.text_field :company_url
 
-  .input-field
-    = f.label :name
-    = f.text_field :name
-
   .input-field
     = f.label :email
     = f.text_field :email

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

@@ -1,4 +1,4 @@
 
-.leadsets-edit.max-width
-  %h1 Edit leadset `#{link_to @leadset.name, leadset_path(@leadset)}`
-  = render 'form', :leadset => @leadset
+.leadsets-edit.maxwidth
+  %h1 Edit leadset `#{link_to @leadset.company_url, leadset_path(@leadset)}`
+  = render 'form', leadset: @leadset

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

@@ -1,5 +1,5 @@
 
-.leadsets-new.max-width
+.leadsets-new.maxwidth
   .row
     .col.s6.col-sm-offset-3
       %h5 New Leadset

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

@@ -1,5 +1,5 @@
 
-.products-edit.max-width
+.products-edit.maxwidth
   %h5 Edit product
 
   = render 'form', product: @product

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

@@ -1,5 +1,5 @@
 
-.products-show.max-width
+.products-show.maxwidth
   %h5
     Show product #{@product.name}
     = link_to '[~]', edit_product_path( @product )

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

@@ -1,7 +1,7 @@
 
 
-.videos-edit.max-width
+.videos-edit.maxwidth
   .header
-    %h3.title Edit Video
+    %h5.title Edit Video
 
   = render 'form', :video => @video

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

@@ -1,5 +1,5 @@
 
-.videos-new.max-width
+.videos-new.maxwidth
   .header
     %h3.title New Video
 

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

@@ -1,7 +1,7 @@
 
 - video ||= @video
 
-.videos-show.max-width
+.videos-show.maxwidth
   .row
     = link_to '[Back]', videos_path
 

data/config/initializers/assets.rb

@@ -1,4 +1,4 @@
 
 Rails.application.config.assets.version = '1.0'
 
-Rails.application.config.assets.precompile += %w( wco/application.js )
+Rails.application.config.assets.precompile += %w( wco/application.js wco/application.css )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.50
+  version: 3.1.0.52
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3