wco_models 3.1.0.114 → 3.1.0.116

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b9b569a16a9ac875085e8bbb82dab997a96759d476a197a59199ee99d6be21d9
4
- data.tar.gz: 580890aebb83e9c43f2803949466370fc97dc0dc11cf68d3e0b3beb140132957
3
+ metadata.gz: d657bfb25d5c9f72781f9ee48ad366c8e6938ad5178f1ad0f9eaf973df8b4e79
4
+ data.tar.gz: 627d96d0c60e12b4998dc31134230997c82752c24de346aed9373ef890de83d0
5
5
  SHA512:
6
- metadata.gz: 330694e474ee6b97ed590f316bfe77c1f48bf9edfcf94adbf2cdfdc6ae523a21483f087c213ed2fc5367398a736e292d8c0d8ee41c3d0d720d756f97668167ab
7
- data.tar.gz: 32cab1e5fa94860b08e97a8a7be5ebee0613291b349274a6feadf36af3664334631a92cfca0cb8291cbb9ea5bd93d2e654ae9f79cb6a62c7fd36b903d66a0694
6
+ metadata.gz: d71a4ce89f11926ca6ea44cbcf9f24601a82c023378ae6055607c7f597fc85bbad0e7e5fe46d29113cf0c1e6b7bab0cd50db41a362f6a492b57aafabf8e2fe50
7
+ data.tar.gz: ec60ea5ed754bf9c54fcbb7f9fe5986cf1eb0d8fd65b8dc87a2e2da24214c5f5f2796cdba606485feda43bb33880ebaac35d9ffe3678dd71ad5fece3b839f7a2
@@ -83,6 +83,7 @@ class Wco::LeadsetsController < Wco::ApplicationController
83
83
  private
84
84
 
85
85
  def set_lists
86
+ @appliance_tmpls = WcoHosting::ApplianceTmpl.all
86
87
  @serverhosts_list = WcoHosting::Serverhost.list
87
88
  @tags_list = Wco::Tag.list
88
89
  @leads_list = Wco::Lead.all.map { |lead| [ lead.email, lead.id ] }
@@ -131,11 +131,12 @@ class WcoEmail::MessageStub
131
131
  if the_mail.content_type&.include?('text/html')
132
132
  @message.part_html = body
133
133
  elsif the_mail.content_type&.include?('text/plain')
134
- @message.part_txt = body
134
+ @message.part_html = "<pre>#{body}</pre>"
135
135
  elsif the_mail.content_type.blank?
136
- @message.part_txt = body
136
+ @message.part_html = "<pre>#{body}</pre>"
137
137
  else
138
138
  @message.logs.push "mail body of unknown type: #{the_mail.content_type}"
139
+ @message.part_html = "<pre>#{body}</pre>"
139
140
  end
140
141
  @message.save
141
142
  end
@@ -4,15 +4,7 @@
4
4
  -#
5
5
  -# - email_contexts ||= {}
6
6
 
7
- .leads--index.padded
8
- .header
9
- %h2.title
10
- Leads
11
- - if !defined?( skip_pagination ) || !skip_pagination
12
- (#{leads.total_count})
13
- - else
14
- (#{leads.length})
15
- = link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
7
+ .leads--index.container-fluid.padded
16
8
 
17
9
  - if defined?( search_path )
18
10
  .float-right= render 'wco/search', path: search_path
@@ -4,4 +4,14 @@
4
4
  = select_tag :q_tag_ids, options_for_select(@tags_list, selected: params[:q_tag_ids]), { class: :select2, multiple: true }
5
5
  = submit_tag 'tag-search'
6
6
  %hr
7
+
8
+ .header
9
+ %h2.title
10
+ Leads
11
+ - if !defined?( skip_pagination ) || !skip_pagination
12
+ (#{leads.total_count})
13
+ - else
14
+ (#{leads.length})
15
+ = link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
16
+
7
17
  = render 'index', leads: @leads, search_path: leads_path
@@ -1,26 +1,50 @@
1
1
 
2
- .leadsets-show.container
3
- .header
4
- %h2.title
5
- Leadset `#{@leadset.company_url}`
6
- = link_to '[~]', edit_leadset_path( @leadset )
2
+ .leadsets-show.padded
3
+ .maxwidth
4
+ .header
5
+ %h2.title
6
+ Leadset `#{@leadset.company_url}`
7
+ = link_to '[~]', edit_leadset_path( @leadset )
7
8
 
8
- %ul
9
- %li <b>Email:</b> #{@leadset.email}
10
- %li <b>company_url</b>: #{@leadset.company_url}
11
- %li <b>customer_id</b>: #{@leadset.customer_id}
12
-
13
-
14
- %hr
9
+ %ul
10
+ %li <b>Email:</b> #{@leadset.email}
11
+ %li <b>company_url</b>: #{@leadset.company_url}
12
+ %li <b>customer_id</b>: #{@leadset.customer_id}
13
+ %hr
15
14
 
16
15
  .row
17
16
  .col-md-6
18
- %h5 Prices
19
- %ul
20
- - @leadset.appliance_tmpl_prices.each do |price|
21
- %li
22
- .a= price.product
23
- = price
17
+ %h5 Appliance Tmpls (prices)
18
+ %table.bordered.data-table
19
+ %thead
20
+ %td &nbsp;
21
+ %td Appliance Tmpl
22
+ %td Amount Cents
23
+ %td Interval
24
+ - @appliance_tmpls.each do |tmpl|
25
+ %tr
26
+ - price = @leadset.appliance_tmpl_prices.where( product: tmpl ).first
27
+ - price ||= Wco::Price.new({ product: tmpl, appliance_tmpl_leadset: @leadset })
28
+ - url = price.new_record? ? wco.prices_path : wco.price_path(price)
29
+ - if !price.new_record?
30
+ %td
31
+ = button_to 'x', wco.price_path(price), method: :delete, data: { confirm: 'Are you sure?' }
32
+ - else
33
+ %td
34
+ = form_for price, url: url do |f|
35
+ = hidden_field_tag 'price[product_id]', price.product_id
36
+ = hidden_field_tag 'price[product_type]', price.product_type
37
+ = hidden_field_tag 'price[appliance_tmpl_leadset_id]', @leadset.id
38
+ %td
39
+ %b= tmpl
40
+ %td
41
+ = f.number_field :amount_cents
42
+ %td
43
+ = f.select :interval, options_for_select( Wco::Price::INTERVALS, selected: price.interval ), class: 'select2'
44
+ = f.submit '>'
45
+ &nbsp;
46
+ %br
47
+ .gray= price.price_id || 'nil'
24
48
 
25
49
  .col-md-6
26
50
  %h5.collapse-expand#subscriptionsList
@@ -36,7 +60,8 @@
36
60
  %td= i.product.name
37
61
  %td= i.price
38
62
  %hr
39
- .row
63
+
64
+ .row.maxwidth
40
65
  .col-md-6
41
66
  %h5.collapse-expand#invoicesList
42
67
  Invoices (#{@leadset.invoices.length})
@@ -56,6 +81,7 @@
56
81
  %hr
57
82
 
58
83
  .row
59
- %h5.collapse-expand#leads Leads
60
- = render '/wco/leads/index', leads: @leads
84
+ .col-12
85
+ %h5.collapse-expand#leads Leads
86
+ = render '/wco/leads/index', leads: @leads
61
87
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wco_models
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.0.114
4
+ version: 3.1.0.116
5
5
  platform: ruby
6
6
  authors:
7
7
  - Victor Pudeyev
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-02-15 00:00:00.000000000 Z
11
+ date: 2024-02-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aws-sdk-s3