alchemy_crm 2.0.0 → 2.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/app/helpers/alchemy_crm/mailings_helper.rb +1 -1
  2. data/app/mailers/alchemy_crm/mailings_mailer.rb +2 -2
  3. data/app/views/alchemy_crm/admin/deliveries/_delivery.html.erb +1 -10
  4. data/app/views/alchemy_crm/admin/deliveries/index.html.erb +0 -1
  5. data/lib/alchemy_crm/version.rb +1 -1
  6. metadata +68 -23
data/app/helpers/alchemy_crm/mailings_helper.rb CHANGED
@@ -174,7 +174,7 @@ module AlchemyCrm
174
174
  else
175
175
  port = request.port != 80 ? request.port : nil
176
176
  end
177
- [protocol, current_host, port ? ":#{port}" : nil].join
177
+ [protocol, current_host, port ? ":#{port}" : nil].compact.join
178
178
  end
179
179
 
180
180
  def current_language
data/app/mailers/alchemy_crm/mailings_mailer.rb CHANGED
@@ -3,7 +3,7 @@ module AlchemyCrm
3
3
 
4
4
  default :from => AlchemyCrm::Config.get(:mail_from)
5
5
 
6
- helper "AlchemyCrm::Mailings"
6
+ helper "AlchemyCrm::Mailings", "Application"
7
7
  helper_method :logged_in?, :configuration
8
8
 
9
9
  # Renders the email sent to the mailing recipient
@@ -17,8 +17,8 @@ module AlchemyCrm
17
17
  @contact = @recipient.contact || Contact.new_from_recipient(@recipient)
18
18
 
19
19
  mail(:to => @recipient.mail_to, :subject => mailing.subject) do |format|
20
- format.html { render("layouts/alchemy_crm/mailings.html") }
21
20
  format.text { render("layouts/alchemy_crm/mailings.text") }
21
+ format.html { render("layouts/alchemy_crm/mailings.html") }
22
22
  end
23
23
  end
24
24
 
data/app/views/alchemy_crm/admin/deliveries/_delivery.html.erb CHANGED
@@ -1,16 +1,7 @@
1
1
  <tr class="delivery <%= cycle('even', 'odd') %>">
2
2
  <td>
3
- <%- if delivery.delivered? -%>
4
3
  <%= l(delivery.deliver_at, :format => :deliveries) %>
5
- <%- else -%>
6
- <%= link_to_overlay_window(
7
- l(delivery.deliver_at, :format => :deliveries),
8
- edit_admin_delivery_path(delivery),
9
- {
10
- :title => alchemy_crm_t(:reschedule_delivery),
11
- :size => '420x210'
12
- }
13
- ) %>
4
+ <%- unless delivery.delivered? -%>
14
5
  <%= link_to_confirmation_window(
15
6
  render_icon('destroy'),
16
7
  alchemy_crm_t(:do_you_want_to_cancel_the_delivery?),
data/app/views/alchemy_crm/admin/deliveries/index.html.erb CHANGED
@@ -10,7 +10,6 @@
10
10
  <h1><%= alchemy_crm_t(:this_list_shows_all_deliveries) %></h1>
11
11
  <ol>
12
12
  <li><%= alchemy_crm_t(:you_can_open_statistics_for_delivered_mailings) %></li>
13
- <li><%= alchemy_crm_t(:not_yet_delivered_mailings_can_be_rescheduled) %></li>
14
13
  <li><%= alchemy_crm_t(:not_yet_delivered_mailings_can_be_canceled) %></li>
15
14
  </ol>
16
15
  </div>
data/lib/alchemy_crm/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module AlchemyCrm
2
- VERSION = "2.0.0"
2
+ VERSION = "2.0.1"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alchemy_crm
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0
4
+ version: 2.0.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-03-30 00:00:00.000000000 Z
12
+ date: 2012-05-10 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: alchemy_cms
16
- requirement: &70252795385220 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,15 @@ dependencies:
21
21
  version: 2.1.7
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70252795385220
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ~>
28
+ - !ruby/object:Gem::Version
29
+ version: 2.1.7
25
30
  - !ruby/object:Gem::Dependency
26
31
  name: vcard
27
- requirement: &70252795375960 !ruby/object:Gem::Requirement
32
+ requirement: !ruby/object:Gem::Requirement
28
33
  none: false
29
34
  requirements:
30
35
  - - ~>
@@ -32,10 +37,15 @@ dependencies:
32
37
  version: 0.1.1
33
38
  type: :runtime
34
39
  prerelease: false
35
- version_requirements: *70252795375960
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ~>
44
+ - !ruby/object:Gem::Version
45
+ version: 0.1.1
36
46
  - !ruby/object:Gem::Dependency
37
47
  name: csv_magic
38
- requirement: &70252795375060 !ruby/object:Gem::Requirement
48
+ requirement: !ruby/object:Gem::Requirement
39
49
  none: false
40
50
  requirements:
41
51
  - - ~>
@@ -43,10 +53,15 @@ dependencies:
43
53
  version: 0.2.2
44
54
  type: :runtime
45
55
  prerelease: false
46
- version_requirements: *70252795375060
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
58
+ requirements:
59
+ - - ~>
60
+ - !ruby/object:Gem::Version
61
+ version: 0.2.2
47
62
  - !ruby/object:Gem::Dependency
48
63
  name: delayed_job_active_record
49
- requirement: &70252795374540 !ruby/object:Gem::Requirement
64
+ requirement: !ruby/object:Gem::Requirement
50
65
  none: false
51
66
  requirements:
52
67
  - - ~>
@@ -54,10 +69,15 @@ dependencies:
54
69
  version: 0.3.2
55
70
  type: :runtime
56
71
  prerelease: false
57
- version_requirements: *70252795374540
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - ~>
76
+ - !ruby/object:Gem::Version
77
+ version: 0.3.2
58
78
  - !ruby/object:Gem::Dependency
59
79
  name: acts-as-taggable-on
60
- requirement: &70252795373940 !ruby/object:Gem::Requirement
80
+ requirement: !ruby/object:Gem::Requirement
61
81
  none: false
62
82
  requirements:
63
83
  - - ~>
@@ -65,10 +85,15 @@ dependencies:
65
85
  version: 2.1.0
66
86
  type: :runtime
67
87
  prerelease: false
68
- version_requirements: *70252795373940
88
+ version_requirements: !ruby/object:Gem::Requirement
89
+ none: false
90
+ requirements:
91
+ - - ~>
92
+ - !ruby/object:Gem::Version
93
+ version: 2.1.0
69
94
  - !ruby/object:Gem::Dependency
70
95
  name: rails3-jquery-autocomplete
71
- requirement: &70252795372760 !ruby/object:Gem::Requirement
96
+ requirement: !ruby/object:Gem::Requirement
72
97
  none: false
73
98
  requirements:
74
99
  - - ~>
@@ -76,10 +101,15 @@ dependencies:
76
101
  version: 1.0.4
77
102
  type: :runtime
78
103
  prerelease: false
79
- version_requirements: *70252795372760
104
+ version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
106
+ requirements:
107
+ - - ~>
108
+ - !ruby/object:Gem::Version
109
+ version: 1.0.4
80
110
  - !ruby/object:Gem::Dependency
81
111
  name: magic-localized_country_select
82
- requirement: &70252795371760 !ruby/object:Gem::Requirement
112
+ requirement: !ruby/object:Gem::Requirement
83
113
  none: false
84
114
  requirements:
85
115
  - - ~>
@@ -87,10 +117,15 @@ dependencies:
87
117
  version: 0.2.0
88
118
  type: :runtime
89
119
  prerelease: false
90
- version_requirements: *70252795371760
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ none: false
122
+ requirements:
123
+ - - ~>
124
+ - !ruby/object:Gem::Version
125
+ version: 0.2.0
91
126
  - !ruby/object:Gem::Dependency
92
127
  name: rspec-rails
93
- requirement: &70252795369660 !ruby/object:Gem::Requirement
128
+ requirement: !ruby/object:Gem::Requirement
94
129
  none: false
95
130
  requirements:
96
131
  - - ~>
@@ -98,10 +133,15 @@ dependencies:
98
133
  version: 2.8.0
99
134
  type: :development
100
135
  prerelease: false
101
- version_requirements: *70252795369660
136
+ version_requirements: !ruby/object:Gem::Requirement
137
+ none: false
138
+ requirements:
139
+ - - ~>
140
+ - !ruby/object:Gem::Version
141
+ version: 2.8.0
102
142
  - !ruby/object:Gem::Dependency
103
143
  name: sqlite3
104
- requirement: &70252795351660 !ruby/object:Gem::Requirement
144
+ requirement: !ruby/object:Gem::Requirement
105
145
  none: false
106
146
  requirements:
107
147
  - - ~>
@@ -109,7 +149,12 @@ dependencies:
109
149
  version: 1.3.5
110
150
  type: :development
111
151
  prerelease: false
112
- version_requirements: *70252795351660
152
+ version_requirements: !ruby/object:Gem::Requirement
153
+ none: false
154
+ requirements:
155
+ - - ~>
156
+ - !ruby/object:Gem::Version
157
+ version: 1.3.5
113
158
  description: A fully featured CRM / Newsletter and Mailings Module for Alchemy CMS.
114
159
  Building and sending Newsletters has never been easier!
115
160
  email:
@@ -374,7 +419,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
374
419
  version: '0'
375
420
  segments:
376
421
  - 0
377
- hash: -2719722105629080639
422
+ hash: 2561107724884471677
378
423
  required_rubygems_version: !ruby/object:Gem::Requirement
379
424
  none: false
380
425
  requirements:
@@ -383,10 +428,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
383
428
  version: '0'
384
429
  segments:
385
430
  - 0
386
- hash: -2719722105629080639
431
+ hash: 2561107724884471677
387
432
  requirements: []
388
433
  rubyforge_project:
389
- rubygems_version: 1.8.15
434
+ rubygems_version: 1.8.24
390
435
  signing_key:
391
436
  specification_version: 3
392
437
  summary: A fully featured CRM / Newsletter and Mailings Module for Alchemy CMS.