wco_models 3.1.0.107 → 3.1.0.109

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: c3ea371527036dc70b4d67a868a0d00320523c405412afb08dedc302b19d994d
4
- data.tar.gz: df53ba3276a02c375d9e5b637d5004c1867b0d6f6e4b7348ef5f6ea25944aac5
3
+ metadata.gz: 37b37970773835266ab919f13e32f7dc28659fc9929db71df595e735ad5e8bdc
4
+ data.tar.gz: 46f1f5f4850afd23ae1549cca304f628fbdc28fdb7ce0401883a18a7f2a0525c
5
5
  SHA512:
6
- metadata.gz: 529093e15f230b453518b48f480a155b40d27a5f3637dfec831ad57624f11fe91f4402a357131cda21b8367f284ac90ad2e6f03e3f42a9579ada33e1bb1f4d35
7
- data.tar.gz: 2107595669a99af9834468e5096c1456ecf5066f401d2b149c46e8fadbc26216493579873ffada5a2d0bcdfa0400189c2a80027f0f17d9ca96cec6a4dac76c6c
6
+ metadata.gz: e0bf67a1ac39c5603e7ed0e6049c20a8be45cd3296eb78872d63076eb9985b90ea43dc0b775d3ac0abda792dbe13c30623c455c509f7a400e5186e9db6bb6649
7
+ data.tar.gz: db920aa78f0603c6fb9b815211cae7900cd5c6dc447b03b31bd759236cbc7236cb698fcfd608418154fa9181eded24f88c6e19f6141cabcdc6e5d14c7e5efb17
@@ -9,9 +9,7 @@
9
9
  font-weight: bold;
10
10
  }
11
11
 
12
- .select2 {
13
- min-width: 200px;
14
- }
12
+
15
13
 
16
14
  .main-footer {
17
15
  border-top: 2px solid #6395b9;
@@ -28,3 +26,11 @@
28
26
  }
29
27
  }
30
28
  }
29
+
30
+ .select2 {
31
+ min-width: 200px;
32
+ }
33
+
34
+ td.tags {
35
+ min-width: 200px;
36
+ }
@@ -8,6 +8,7 @@ class Wco::LeadsetsController < Wco::ApplicationController
8
8
  ## alphabetized : )
9
9
 
10
10
  def create
11
+ params[:leadset][:serverhost_ids].delete ''
11
12
  @leadset = Leadset.new params[:leadset].permit!
12
13
  authorize! :create, @leadset
13
14
  if @leadset.save
@@ -65,6 +66,7 @@ class Wco::LeadsetsController < Wco::ApplicationController
65
66
  end
66
67
 
67
68
  def update
69
+ params[:leadset][:serverhost_ids].delete ''
68
70
  @leadset = Leadset.find params[:id]
69
71
  authorize! :update, @leadset
70
72
  if @leadset.update_attributes params[:leadset].permit!
@@ -81,9 +83,10 @@ class Wco::LeadsetsController < Wco::ApplicationController
81
83
  private
82
84
 
83
85
  def set_lists
84
- @tags_list = Wco::Tag.list
85
- @leads_list = Wco::Lead.all.map { |lead| [ lead.email, lead.id ] }
86
- @templates_list = WcoEmail::EmailTemplate.all.map { |t| [ t.slug, t.id ] }
86
+ @serverhosts_list = WcoHosting::Serverhost.list
87
+ @tags_list = Wco::Tag.list
88
+ @leads_list = Wco::Lead.all.map { |lead| [ lead.email, lead.id ] }
89
+ @templates_list = WcoEmail::EmailTemplate.all.map { |t| [ t.slug, t.id ] }
87
90
  @email_campaigns_list = WcoEmail::Campaign.list
88
91
  end
89
92
 
@@ -68,10 +68,7 @@
68
68
 
69
69
 
70
70
  .row
71
- .col-md-12.msgs
71
+ .col-md-12.conversations
72
72
  %h5 Email Conversations (#{@lead.convs.length})
73
- %ul
74
- - @lead.convs.each do |conv|
75
- %li
76
- = link_to conv.subject, wco_email.conversation_path( conv )
73
+ = render 'wco_email/conversations/table', convs: @lead.convs
77
74
 
@@ -15,6 +15,10 @@
15
15
  = f.label :next_invoice_number
16
16
  = f.text_field :next_invoice_number
17
17
 
18
+ .field
19
+ %label serverhosts
20
+ = f.select :serverhost_ids, options_for_select(@serverhosts_list, selected: leadset.serverhost_ids), {}, { multiple: true }
21
+
18
22
  -# .input-field
19
23
  -# %label Stripe customer_id
20
24
  -# = f.text_field :customer_id
@@ -0,0 +1,37 @@
1
+
2
+ .conversations--table
3
+ %table.bordered.data-table
4
+ %thead
5
+ %th.select-all.nosort
6
+ .a
7
+ = check_box_tag :select_all
8
+ .n-selected -
9
+ %th.leads leads
10
+ %th.subject subject, preview
11
+ %th.tags Tags
12
+ %th.latest-at latest_at
13
+ - convs.each_with_index do |conv, idx|
14
+ %tr
15
+ %td.select-all
16
+ .gray= idx+1
17
+ = check_box_tag 'conversation_ids[]', conv.id.to_s, nil, { class: 'i-sel' }
18
+ %td.leads.mini
19
+ -# - conv.from_emails.each do |from|
20
+ -# = link_to from, wco.lead_path( from )
21
+ -# %hr
22
+ - conv.leads.each do |lead|
23
+ = link_to lead.email, wco.lead_path( lead )
24
+ %td.subject
25
+ - if conv.unread?
26
+ <b>#{link_to conv.subject, wco_email.conversation_path(conv)}</b>
27
+ - else
28
+ = link_to conv.subject, wco_email.conversation_path(conv)
29
+ <b>(#{conv.messages.length})</b>
30
+ %span.gray= conv.preview
31
+ %td.tags.mini
32
+ - conv.tags.each do |tag|
33
+ .mb-1
34
+ .Chip= tag.slug
35
+ %td.latest-at
36
+ = pp_date conv.latest_at
37
+ = pp_time conv.latest_at
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wco_models
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.0.107
4
+ version: 3.1.0.109
5
5
  platform: ruby
6
6
  authors:
7
7
  - Victor Pudeyev
@@ -594,6 +594,7 @@ files:
594
594
  - app/views/wco_email/application_mailer/_footer_unsubscribe.html.erb
595
595
  - app/views/wco_email/application_mailer/_header_logo.html.erb
596
596
  - app/views/wco_email/application_mailer/forwarder_notify.html.erb
597
+ - app/views/wco_email/conversations/_table.haml
597
598
  - app/views/wco_email/email_layouts/_m20221201react.html.erb
598
599
  - app/views/wco_email/email_layouts/_m20221222merryxmas.html.erb
599
600
  - app/views/wco_email/email_layouts/_m202309_feedback.html.erb