shopify_app 4.2.1 → 4.2.2

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.
data/README.md CHANGED
@@ -141,4 +141,4 @@ http://api.shopify.com <= Read up on the possible API calls!
141
141
 
142
142
  http://ecommerce.shopify.com/c/shopify-apis-and-technology <= Ask questions!
143
143
 
144
- http://wiki.shopify.com/Shopify_App_Development <= Edit the docs!
144
+ http://docs.shopify.com/api/the-basics/getting-started <= Read the docs!
@@ -1,3 +1,9 @@
1
1
  module HomeHelper
2
2
 
3
+ def customer_name(order)
4
+ name = ''
5
+ name += [order.customer.first_name, order.customer.last_name].join(" ") if order.respond_to?(:customer)
6
+ name.strip
7
+ end
8
+
3
9
  end
@@ -83,7 +83,7 @@
83
83
  <% @orders.each do |order| %>
84
84
  <tr>
85
85
  <td><%= link_to order.name, "https://#{shop_session.url}/admin/orders/#{order.id}", :target => 'blank' %></td>
86
- <td><%= order.billing_address.name %></td>
86
+ <td><%= customer_name(order) %></td>
87
87
  <td>
88
88
  <span class="label <% if order.financial_status == 'paid' %>label-success<% end %> <% if order.financial_status == 'pending' %>label-warning<% end %> <% if order.financial_status == 'refunded' %>label-important<% end %>"><%= order.financial_status %>
89
89
  </span>
@@ -1,3 +1,3 @@
1
1
  module ShopifyApp
2
- VERSION = "4.2.1"
2
+ VERSION = "4.2.2"
3
3
  end
@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
17
17
  s.add_runtime_dependency('rails', '>= 3.1', '< 5.0')
18
18
  s.add_runtime_dependency('shopify_api', '~> 3.0.0')
19
19
  s.add_runtime_dependency('omniauth-shopify-oauth2', '1.1.0')
20
- s.add_runtime_dependency('less-rails-bootstrap', '>0')
21
-
20
+ s.add_runtime_dependency('less-rails-bootstrap', '~> 2.0')
21
+
22
22
  s.add_development_dependency('rake')
23
23
  s.add_development_dependency('minitest')
24
24
  s.add_development_dependency('mocha')
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: shopify_app
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.2.1
4
+ version: 4.2.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-09-27 00:00:00.000000000 Z
12
+ date: 2013-10-09 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -70,17 +70,17 @@ dependencies:
70
70
  requirement: !ruby/object:Gem::Requirement
71
71
  none: false
72
72
  requirements:
73
- - - ! '>'
73
+ - - ~>
74
74
  - !ruby/object:Gem::Version
75
- version: '0'
75
+ version: '2.0'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  none: false
80
80
  requirements:
81
- - - ! '>'
81
+ - - ~>
82
82
  - !ruby/object:Gem::Version
83
- version: '0'
83
+ version: '2.0'
84
84
  - !ruby/object:Gem::Dependency
85
85
  name: rake
86
86
  requirement: !ruby/object:Gem::Requirement