wco_models 3.1.0.114 → 3.1.0.116

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9b569a16a9ac875085e8bbb82dab997a96759d476a197a59199ee99d6be21d9
-  data.tar.gz: 580890aebb83e9c43f2803949466370fc97dc0dc11cf68d3e0b3beb140132957
+  metadata.gz: d657bfb25d5c9f72781f9ee48ad366c8e6938ad5178f1ad0f9eaf973df8b4e79
+  data.tar.gz: 627d96d0c60e12b4998dc31134230997c82752c24de346aed9373ef890de83d0
 SHA512:
-  metadata.gz: 330694e474ee6b97ed590f316bfe77c1f48bf9edfcf94adbf2cdfdc6ae523a21483f087c213ed2fc5367398a736e292d8c0d8ee41c3d0d720d756f97668167ab
-  data.tar.gz: 32cab1e5fa94860b08e97a8a7be5ebee0613291b349274a6feadf36af3664334631a92cfca0cb8291cbb9ea5bd93d2e654ae9f79cb6a62c7fd36b903d66a0694
+  metadata.gz: d71a4ce89f11926ca6ea44cbcf9f24601a82c023378ae6055607c7f597fc85bbad0e7e5fe46d29113cf0c1e6b7bab0cd50db41a362f6a492b57aafabf8e2fe50
+  data.tar.gz: ec60ea5ed754bf9c54fcbb7f9fe5986cf1eb0d8fd65b8dc87a2e2da24214c5f5f2796cdba606485feda43bb33880ebaac35d9ffe3678dd71ad5fece3b839f7a2

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/models/wco_email/message_stub.rb

@@ -131,11 +131,12 @@ class WcoEmail::MessageStub
       if the_mail.content_type&.include?('text/html')
         @message.part_html = body
       elsif the_mail.content_type&.include?('text/plain')
-        @message.part_txt = body
+        @message.part_html = "<pre>#{body}</pre>"
       elsif the_mail.content_type.blank?
-        @message.part_txt = body
+        @message.part_html = "<pre>#{body}</pre>"
       else
         @message.logs.push "mail body of unknown type: #{the_mail.content_type}"
+        @message.part_html = "<pre>#{body}</pre>"
       end
       @message.save
     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.114
+  version: 3.1.0.116
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-15 00:00:00.000000000 Z
+date: 2024-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3