c80_order_form 0.1.0.10 → 0.1.0.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 39279e5b9f94743fe52ad5fdb8c5401ea7ec089a
|
|
4
|
+
data.tar.gz: 4ce56480bc0641d526b03ed47a43561e0ecb949c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0fca7c848a93a345575f916ddbe3e025ae54d826c93d8bebe1253ab2dd42edd94856f57b066f93932f1c1efe59bd0072556826ac2ecf296aff8201f101cfbc94
|
|
7
|
+
data.tar.gz: 5f620319056f8a693818b1359a71dcc77486fd460dd121f85f164a520c2d2cbf453a4925fe70731653be6a44e3073bede3f80e871a5521f0f0005822683e1ac5
|
|
@@ -5,6 +5,7 @@ module C80OrderForm
|
|
|
5
5
|
to: Proc.new { SiteProp.first.mail_to }
|
|
6
6
|
|
|
7
7
|
def send_mess(message, subject)
|
|
8
|
+
Rails.logger.debug "<send_message> #{message.as_json}"
|
|
8
9
|
@message = format_message(message)
|
|
9
10
|
|
|
10
11
|
puts "<MessageOrderMailer.send_mess> Отправляем сообщение."
|
|
@@ -18,12 +19,37 @@ module C80OrderForm
|
|
|
18
19
|
# private
|
|
19
20
|
|
|
20
21
|
def format_message(message)
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
22
|
+
|
|
23
|
+
tmp = Settings.first.message_text
|
|
24
|
+
if tmp.present?
|
|
25
|
+
m = tmp
|
|
26
|
+
end
|
|
27
|
+
Rails.logger.debug "<format_message> m: #{m}"
|
|
28
|
+
|
|
29
|
+
tmp = m.gsub!('{name}',message.name)
|
|
30
|
+
if tmp.present?
|
|
31
|
+
m = tmp
|
|
32
|
+
end
|
|
33
|
+
Rails.logger.debug "<format_message> m: #{m}"
|
|
34
|
+
|
|
35
|
+
tmp = m.gsub!('{email_or_phone}',message.email_or_phone)
|
|
36
|
+
if tmp.present?
|
|
37
|
+
m = tmp
|
|
38
|
+
end
|
|
39
|
+
Rails.logger.debug "<format_message> m: #{m}"
|
|
40
|
+
|
|
41
|
+
tmp = m.gsub!('{comment}',message.comment)
|
|
42
|
+
if tmp.present?
|
|
43
|
+
m = tmp
|
|
44
|
+
end
|
|
45
|
+
Rails.logger.debug "<format_message> m: #{m}"
|
|
46
|
+
|
|
47
|
+
tmp = m.gsub!('{subj_id}',message.subj_id.to_s)
|
|
48
|
+
if tmp.present?
|
|
49
|
+
m = tmp
|
|
50
|
+
end
|
|
51
|
+
Rails.logger.debug "<format_message> m: #{m}"
|
|
52
|
+
|
|
27
53
|
message.update(:comment => m)
|
|
28
54
|
m
|
|
29
55
|
end
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
# rake db:seed:103_fill_order_form_settings
|
|
2
|
+
|
|
3
|
+
C80OrderForm::Settings.delete_all
|
|
4
|
+
C80OrderForm::Settings.create!({
|
|
5
|
+
:order_form_title => "Заявка на бронирование",
|
|
6
|
+
:order_form_label_name => "Имя",
|
|
7
|
+
:order_form_label_email_or_phone => "Email или телефон",
|
|
8
|
+
:order_form_label_comment => "Комментарий",
|
|
9
|
+
:order_form_label_button_send => "Отправить",
|
|
10
|
+
:order_form_label_button_sending => "Отправляется...",
|
|
11
|
+
:ok_text => "Мы свяжемся с Вами в ближайшее время",
|
|
12
|
+
:ok_text_title => "Ваша заявка отправлена",
|
|
13
|
+
:admin_label_menu => "Заявки на бронирование",
|
|
14
|
+
:message_letter_subj => "Заявка на бронирование",
|
|
15
|
+
:message_text => " • Имя: {name}<br>" +
|
|
16
|
+
" • Email или телефон: {email_or_phone}<br>" +
|
|
17
|
+
" • Сообщение: {comment}<br>" +
|
|
18
|
+
" --------------------------------------<br>" +
|
|
19
|
+
" Бронируемая площадь: <a href='http://new.bc-acond.ru/areas/{subj_id}'>http://new.bc-acond.ru/areas/{subj_id}</a><br>" +
|
|
20
|
+
" Бронируемая площадь в админке: <a href='http://new.bc-acond.ru/admin/areas/{subj_id}/edit'>http://new.bc-acond.ru/admin/areas/{subj_id}</a><br>"
|
|
21
|
+
})
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: c80_order_form
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.0.
|
|
4
|
+
version: 0.1.0.11
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- C80609A
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-
|
|
11
|
+
date: 2016-11-03 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|
|
@@ -97,6 +97,7 @@ files:
|
|
|
97
97
|
- db/migrate/20151229234343_create_c80_order_form_settings.rb
|
|
98
98
|
- db/migrate/20151230023030_change_c80_order_form_message_order_comment.rb
|
|
99
99
|
- db/migrate/20160609210000_change_c80_order_form_message_subj_id_type.rb
|
|
100
|
+
- db/seeds/103_fill_c80_order_form_settings.rb.example
|
|
100
101
|
- lib/c80_order_form.rb
|
|
101
102
|
- lib/c80_order_form/engine.rb
|
|
102
103
|
- lib/c80_order_form/version.rb
|