effective_orders 1.1.1 → 1.1.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/app/views/effective/orders/_order_shipping.html.haml +4 -4
  3. data/lib/effective_orders/version.rb +1 -1
  4. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 64e86723c3473d3d0bca002441bd1c647ea2a5fc
4
- data.tar.gz: fd1dd8511158b930cc355a21bdb7f6a7988e67aa
3
+ metadata.gz: 539d0efc31539d807136bcfadf062b27f942f0cb
4
+ data.tar.gz: 55dee53bb8235d31ab41b31e0823f4ffa1d130b6
5
5
  SHA512:
6
- metadata.gz: db881cd38f55a384df925e9a9db65b66a95faedc1c481b3c2ce064761908001be862da3fcc321fc214fb2277052064605476fda639cdf6e0e69d6ea8cb78fcc6
7
- data.tar.gz: 6fcfe833afa1d16b0813ed210e30ac3ac3754d5d666ff693ddf0b0e9ee9b189683511db9c61842e2054a87c3cb366304e3102e296de22d068f20acf706765752
6
+ metadata.gz: 8a8838a34cbfa214a3c6a0954187e8b05adb2208040cab9e00243c97d890dd9b198260a39cb6170524f65a41340bd819a4cd0d15f86b075baf95d3a262673947
7
+ data.tar.gz: cc3d977013a3cfd8bbdbd1be68a71cfe435e331d446e2dcf39540c150f4a69c090ec4a53cf26521f0ac7710ed0a459ef395af3d7f22563d546c85f16f0a1fcaf
data/app/views/effective/orders/_order_shipping.html.haml CHANGED
@@ -7,10 +7,10 @@
7
7
  %tbody
8
8
  %tr
9
9
  %td
10
- - if order.user.to_s != order.user.email
11
- = "#{order.user.to_s} (#{mail_to order.user.email})".html_safe
12
- - else
13
- = mail_to order.user.email
10
+ - if order.user.to_s.start_with?('#<User:') == false && EffectiveAddresses.use_full_name == false
11
+ = order.user.to_s
12
+ %br
13
+ = mail_to order.user.email
14
14
  %br
15
15
  - if order.billing_address.present?
16
16
  = render :partial => 'effective/addresses/address', :locals => {:address => order.billing_address}
data/lib/effective_orders/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EffectiveOrders
2
- VERSION = '1.1.1'.freeze
2
+ VERSION = '1.1.2'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_orders
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.1
4
+ version: 1.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-12-11 00:00:00.000000000 Z
11
+ date: 2014-12-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -100,14 +100,14 @@ dependencies:
100
100
  requirements:
101
101
  - - ">="
102
102
  - !ruby/object:Gem::Version
103
- version: 1.0.1
103
+ version: 1.0.2
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - ">="
109
109
  - !ruby/object:Gem::Version
110
- version: 1.0.1
110
+ version: 1.0.2
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: effective_obfuscation
113
113
  requirement: !ruby/object:Gem::Requirement