spree_frontend 3.5.0 → 3.6.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +5 -5
  2. data/app/assets/javascripts/spree/frontend/cart.js.coffee +1 -1
  3. data/app/assets/javascripts/spree/frontend/checkout/address.js.coffee +1 -1
  4. data/app/assets/javascripts/spree/frontend/checkout/payment.js.coffee +2 -2
  5. data/app/controllers/spree/orders_controller.rb +1 -1
  6. data/app/views/spree/orders/_line_item.html.erb +1 -1
  7. data/app/views/spree/products/_thumbnails.html.erb +2 -2
  8. data/app/views/spree/shared/_order_details.html.erb +1 -1
  9. data/spree_frontend.gemspec +1 -1
  10. metadata +11 -11
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: e4cb8934e356210eaa11fd6614168d833a0a92ad
4
- data.tar.gz: 59df0fb78d8ce256911352537364f30fa57abd52
2
+ SHA256:
3
+ metadata.gz: d541f194c1bc8a4ed754c76dcbc032bb1b77351e9c1848884d39e83db5e5c8d3
4
+ data.tar.gz: 587c926ede2b7aced59e6bc41e43996854089a7026bc774dc54054fece9edb61
5
5
  SHA512:
6
- metadata.gz: 2369395c3a5584b1d7f934c1a516014d10da7f6391e1e2320a1d7b17a725eafe04ffa3f51bdbd97f004d2dd27a286b74f43cdafc04d70c578bd71e845f5a6434
7
- data.tar.gz: 8c142a3ff8b0641e42eaf2a6917537d50c91c6f33376612984839524b1722cc70dbeca88046f53e494134dca224d404f00d7064212e4b9fd9cde4571a24e7fed
6
+ metadata.gz: f4a004c6782340f2312dc97c3f57f43c02061ca90c05b98bc8c205020f03258d64be274f682311c037291177494528b3d2a40a40c5b52347da989cbf6d20c613
7
+ data.tar.gz: 9c492217908bb2348f5c6f5c1708466b397558327ecb57f64ad41f01bc724b1949872983ebc6fbfe9bfbd6a3866efcce766d9770fa1619d9c2c3a244b18d6a55
data/app/assets/javascripts/spree/frontend/cart.js.coffee CHANGED
@@ -1,7 +1,7 @@
1
1
  #= require spree/frontend/coupon_manager
2
2
 
3
3
  Spree.ready ($) ->
4
- if ($ 'form#update-cart').is('*')
4
+ if ($ 'form#update-cart').length
5
5
  ($ 'form#update-cart a.delete').show().one 'click', ->
6
6
  ($ this).parents('.line-item').first().find('input.line_item_quantity').val 0
7
7
  ($ this).parents('form').first().submit()
data/app/assets/javascripts/spree/frontend/checkout/address.js.coffee CHANGED
@@ -1,6 +1,6 @@
1
1
  Spree.ready ($) ->
2
2
  Spree.onAddress = () ->
3
- if ($ '#checkout_form_address').is('*')
3
+ if ($ '#checkout_form_address').length
4
4
  getCountryId = (region) ->
5
5
  $('#' + region + 'country select').val()
6
6
 
data/app/assets/javascripts/spree/frontend/checkout/payment.js.coffee CHANGED
@@ -1,9 +1,9 @@
1
1
  #= require spree/frontend/coupon_manager
2
2
  Spree.ready ($) ->
3
3
  Spree.onPayment = () ->
4
- if ($ '#checkout_form_payment').is('*')
4
+ if ($ '#checkout_form_payment').length
5
5
 
6
- if ($ '#existing_cards').is('*')
6
+ if ($ '#existing_cards').length
7
7
  ($ '#payment-method-fields').hide()
8
8
  ($ '#payment-methods').hide()
9
9
 
data/app/controllers/spree/orders_controller.rb CHANGED
@@ -75,7 +75,7 @@ module Spree
75
75
  end
76
76
 
77
77
  def empty
78
- @order.empty! if @order = current_order
78
+ current_order.try(:empty!)
79
79
 
80
80
  redirect_to spree.cart_path
81
81
  end
data/app/views/spree/orders/_line_item.html.erb CHANGED
@@ -6,7 +6,7 @@
6
6
  <% if variant.images.length == 0 %>
7
7
  <%= link_to small_image(variant.product), variant.product %>
8
8
  <% else %>
9
- <%= link_to image_tag(variant.images.first.attachment.url(:small)), variant.product %>
9
+ <%= link_to image_tag(main_app.url_for(variant.images.first.url(:small))), variant.product %>
10
10
  <% end %>
11
11
  </td>
12
12
  <td class="cart-item-description" data-hook="cart_item_description">
data/app/views/spree/products/_thumbnails.html.erb CHANGED
@@ -3,7 +3,7 @@
3
3
  <ul id="product-thumbnails" class="thumbnails list-inline" data-hook>
4
4
  <% @product.images.each do |i| %>
5
5
  <li class='tmb-all tmb-<%= i.viewable.id %>'>
6
- <%= link_to(image_tag(i.attachment.url(:mini), class: "thumbnail"), i.attachment.url(:product)) %>
6
+ <%= link_to(image_tag(main_app.url_for(i.url(:mini)), class: "thumbnail"), main_app.url_for(i.url(:product))) %>
7
7
  </li>
8
8
  <% end %>
9
9
 
@@ -11,7 +11,7 @@
11
11
  <% @product.variant_images.each do |i| %>
12
12
  <% next if @product.images.include?(i) %>
13
13
  <li class='vtmb tmb-<%= i.viewable.id %>'>
14
- <%= link_to(image_tag(i.attachment.url(:mini), class: "thumbnail"), i.attachment.url(:product)) %>
14
+ <%= link_to(image_tag(main_app.url_for(i.url(:mini)), class: "thumbnail"), main_app.url_for(i.url(:product))) %>
15
15
  </li>
16
16
  <% end %>
17
17
  <% end %>
data/app/views/spree/shared/_order_details.html.erb CHANGED
@@ -60,7 +60,7 @@
60
60
  <% if item.variant.images.length == 0 %>
61
61
  <%= link_to small_image(item.variant.product), item.variant.product %>
62
62
  <% else %>
63
- <%= link_to image_tag(item.variant.images.first.attachment.url(:small)), item.variant.product %>
63
+ <%= link_to image_tag(main_app.url_for(item.variant.images.first.url(:small))), item.variant.product %>
64
64
  <% end %>
65
65
  </td>
66
66
  <td data-hook="order_item_description">
data/spree_frontend.gemspec CHANGED
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
23
23
  s.add_dependency 'spree_core', s.version
24
24
 
25
25
  s.add_dependency 'bootstrap-sass', '>= 3.3.5.1', '< 3.4'
26
- s.add_dependency 'canonical-rails', '~> 0.2.0'
26
+ s.add_dependency 'canonical-rails', '~> 0.2.3'
27
27
  s.add_dependency 'jquery-rails', '~> 4.3'
28
28
 
29
29
  s.add_development_dependency 'capybara-accessible'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_frontend
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.5.0
4
+ version: 3.6.0.rc1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-06-12 00:00:00.000000000 Z
11
+ date: 2018-05-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: spree_api
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 3.5.0
19
+ version: 3.6.0.rc1
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 3.5.0
26
+ version: 3.6.0.rc1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: spree_core
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 3.5.0
33
+ version: 3.6.0.rc1
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 3.5.0
40
+ version: 3.6.0.rc1
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bootstrap-sass
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -64,14 +64,14 @@ dependencies:
64
64
  requirements:
65
65
  - - "~>"
66
66
  - !ruby/object:Gem::Version
67
- version: 0.2.0
67
+ version: 0.2.3
68
68
  type: :runtime
69
69
  prerelease: false
70
70
  version_requirements: !ruby/object:Gem::Requirement
71
71
  requirements:
72
72
  - - "~>"
73
73
  - !ruby/object:Gem::Version
74
- version: 0.2.0
74
+ version: 0.2.3
75
75
  - !ruby/object:Gem::Dependency
76
76
  name: jquery-rails
77
77
  requirement: !ruby/object:Gem::Requirement
@@ -242,13 +242,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
242
242
  version: 2.2.7
243
243
  required_rubygems_version: !ruby/object:Gem::Requirement
244
244
  requirements:
245
- - - ">="
245
+ - - ">"
246
246
  - !ruby/object:Gem::Version
247
- version: '0'
247
+ version: 1.3.1
248
248
  requirements:
249
249
  - none
250
250
  rubyforge_project:
251
- rubygems_version: 2.6.14
251
+ rubygems_version: 2.7.6
252
252
  signing_key:
253
253
  specification_version: 4
254
254
  summary: Frontend e-commerce functionality for the Spree project.