wco_models 3.1.0.142 → 3.1.0.144
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/wco/galleries_controller.rb +1 -1
- data/app/controllers/wco/tags_controller.rb +1 -1
- data/app/mailers/wco_email/application_mailer.rb +42 -1
- data/app/models/wco/leadset.rb +1 -0
- data/app/models/wco/tag.rb +1 -1
- data/app/views/wco/galleries/edit.haml +1 -1
- data/app/views/wco/leads/show.haml +3 -1
- data/app/views/wco/leadsets/_form.haml +3 -0
- data/app/views/wco/tags/_list_mini.haml +4 -3
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3ac3f962e8a2701de1e5f29148ad7baf1198615d3eae56984c5a2f10e4827723
|
|
4
|
+
data.tar.gz: 712d87019f0cb104fd52c07ae7c36cecc6e8f00a1f84a3cf572483668fa9ceff
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 194877b762a6e20543f83584f1c9d686c28e10d8b63b71497b4f0ca3b49635236da90aecfd92abe36071214ee5b7de23053d3436f514360324164c6910fcd7bc
|
|
7
|
+
data.tar.gz: dd9bdf1543a32b8c6a853c82d97d9bdcff8126ae5ee0f4b3c44e1c687f05f383c7da601699ba81ed622de10bd35f845a29caf62e3fd9755dcc4243258851e036
|
|
@@ -44,7 +44,7 @@ class Wco::GalleriesController < Wco::ApplicationController
|
|
|
44
44
|
@page_title = 'Galleries'
|
|
45
45
|
@galleries = Wco::Gallery.all.order_by( :created_at => :desc )
|
|
46
46
|
|
|
47
|
-
@tags = Wco::Tag.all
|
|
47
|
+
@tags = Wco::Tag.all.order_by( slug: :asc )
|
|
48
48
|
|
|
49
49
|
if params[:q]
|
|
50
50
|
q = URI.decode(params[:q])
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
# encoding: utf-8
|
|
1
2
|
|
|
2
3
|
class WcoEmail::ApplicationMailer < ActionMailer::Base
|
|
3
4
|
|
|
@@ -49,15 +50,55 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
|
|
|
49
50
|
@ctx = Ctx.find ctx_id
|
|
50
51
|
@renderer = self.class.renderer ctx: @ctx
|
|
51
52
|
rendered_str = @renderer.render_to_string("/wco_email/email_layouts/_#{@ctx.tmpl.layout}")
|
|
53
|
+
|
|
54
|
+
|
|
55
|
+
|
|
56
|
+
rendered_subject = ERB.new( @ctx.subject ).result( @ctx.get_binding )
|
|
57
|
+
if @ctx.lead.leadset.mangle_subject
|
|
58
|
+
## From: https://www.fileformat.info/info/unicode/char/a.htm
|
|
59
|
+
## From: https://stackoverflow.com/questions/7019034/utf-8-encoding-in-ruby-using-a-variable
|
|
60
|
+
## From: https://stackoverflow.com/questions/52654509/random-generate-a-valid-unicode-character-in-ruby
|
|
61
|
+
## latin
|
|
62
|
+
# n1 = 0x192
|
|
63
|
+
# n2 = 0x687
|
|
64
|
+
##
|
|
65
|
+
## weird punctuation
|
|
66
|
+
# n1 = 0x133
|
|
67
|
+
# n2 = 0x255
|
|
68
|
+
|
|
69
|
+
# random_utf8 = Enumerator.new do |yielder|
|
|
70
|
+
# loop do
|
|
71
|
+
# yielder << ( rand(n2-n1)+n1 ).chr('UTF-8')
|
|
72
|
+
# rescue RangeError
|
|
73
|
+
# end
|
|
74
|
+
# end
|
|
75
|
+
# rendered_subject = "#{rendered_subject} #{ random_utf8.next }#{ random_utf8.next }"
|
|
76
|
+
|
|
77
|
+
## From: https://www.ascii-code.com/
|
|
78
|
+
n1 = 33
|
|
79
|
+
n2 = 64
|
|
80
|
+
ch1 = ( rand(n2-n1)+n1 ).chr # ('UTF-8')
|
|
81
|
+
ch2 = ( rand(n2-n1)+n1 ).chr
|
|
82
|
+
|
|
83
|
+
if rendered_subject.last.ord >= n1 &&
|
|
84
|
+
rendered_subject.last.ord <= n2
|
|
85
|
+
space_idx = rendered_subject.rindex(/ /)
|
|
86
|
+
rendered_subject = rendered_subject[0...space_idx]
|
|
87
|
+
end
|
|
88
|
+
|
|
89
|
+
rendered_subject = "#{rendered_subject} #{ ch1 }#{ ch2 }"
|
|
90
|
+
end
|
|
91
|
+
|
|
52
92
|
@ctx.update({
|
|
53
93
|
rendered_str: rendered_str,
|
|
94
|
+
subject: rendered_subject,
|
|
54
95
|
})
|
|
55
96
|
|
|
56
97
|
mail( from: @ctx.from_email,
|
|
57
98
|
to: @ctx.to_email,
|
|
58
99
|
cc: @ctx.cc,
|
|
59
100
|
bcc: "poxlovibb1@gmail.com",
|
|
60
|
-
subject:
|
|
101
|
+
subject: rendered_subject,
|
|
61
102
|
body: rendered_str,
|
|
62
103
|
content_type: "text/html" )
|
|
63
104
|
end
|
data/app/models/wco/leadset.rb
CHANGED
|
@@ -31,6 +31,7 @@ class Wco::Leadset
|
|
|
31
31
|
|
|
32
32
|
|
|
33
33
|
field :next_invoice_number, type: :integer, default: 100
|
|
34
|
+
field :mangle_subject, type: :boolean, default: false
|
|
34
35
|
|
|
35
36
|
has_and_belongs_to_many :serverhosts, class_name: '::WcoHosting::Serverhost' # , inverse_of: :leadset
|
|
36
37
|
def next_serverhost
|
data/app/models/wco/tag.rb
CHANGED
|
@@ -12,7 +12,9 @@
|
|
|
12
12
|
%li Name: #{@lead.name}
|
|
13
13
|
%li Email: #{@lead.email}
|
|
14
14
|
%li
|
|
15
|
-
Leadset:
|
|
15
|
+
Leadset:
|
|
16
|
+
= link_to @lead.leadset.company_url, leadset_path(@lead.leadset)
|
|
17
|
+
= link_to '[~]', edit_leadset_path(@lead.leadset)
|
|
16
18
|
-# %li Rating: #{@lead.rating}
|
|
17
19
|
- if @lead.phone
|
|
18
20
|
%li Phone: #{@lead.phone}
|
|
@@ -12,7 +12,8 @@
|
|
|
12
12
|
.mini.d-inline-block= button_to 'x', remove_tag_from_path(id: tag.id, resource: resource.class, resource_id: resource.id, ), method: 'delete', data: { confirm: 'Are you sure?' }
|
|
13
13
|
|
|
14
14
|
- if defined? resource
|
|
15
|
-
|
|
16
|
-
=
|
|
17
|
-
|
|
15
|
+
.d-inline-block
|
|
16
|
+
= form_tag add_tag_to_path( resource: resource.class, resource_id: resource.id ) do
|
|
17
|
+
.d-inline-block= select_tag :id, options_for_select( @tags_list ), class: 'select2'
|
|
18
|
+
= submit_tag '+Tag', data: { confirm: 'Are you sure?' }
|
|
18
19
|
|