spree_frontend 4.2.0.rc4 → 4.2.0.rc5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (69) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/spree/frontend/checkout/shipment.js +15 -2
  3. data/app/assets/stylesheets/spree/frontend/views/spree/checkout/confirm.scss +27 -22
  4. data/app/assets/stylesheets/spree/frontend/views/spree/orders/show.scss +3 -0
  5. data/app/controllers/spree/products_controller.rb +1 -3
  6. data/app/controllers/spree/store_controller.rb +0 -8
  7. data/app/helpers/spree/frontend_helper.rb +10 -4
  8. data/app/helpers/spree/navigation_helper.rb +1 -1
  9. data/app/models/spree/frontend_configuration.rb +1 -1
  10. data/app/views/kaminari/twitter-bootstrap-4/_first_page.html.erb +2 -2
  11. data/app/views/kaminari/twitter-bootstrap-4/_gap.html.erb +2 -2
  12. data/app/views/kaminari/twitter-bootstrap-4/_last_page.html.erb +2 -2
  13. data/app/views/kaminari/twitter-bootstrap-4/_next_page.html.erb +2 -2
  14. data/app/views/kaminari/twitter-bootstrap-4/_page.html.erb +2 -2
  15. data/app/views/kaminari/twitter-bootstrap-4/_paginator.html.erb +2 -2
  16. data/app/views/kaminari/twitter-bootstrap-4/_prev_page.html.erb +2 -2
  17. data/app/views/spree/address/_form.html.erb +15 -16
  18. data/app/views/spree/addresses/edit.html.erb +2 -2
  19. data/app/views/spree/addresses/new.html.erb +2 -2
  20. data/app/views/spree/checkout/_address.html.erb +2 -2
  21. data/app/views/spree/checkout/_confirm.html.erb +1 -33
  22. data/app/views/spree/checkout/_credit_card.html.erb +2 -2
  23. data/app/views/spree/checkout/_delivery_informations.html.erb +43 -36
  24. data/app/views/spree/checkout/_summary.html.erb +3 -5
  25. data/app/views/spree/checkout/payment/_gateway.html.erb +1 -1
  26. data/app/views/spree/home/index.html.erb +21 -22
  27. data/app/views/spree/orders/_coupon_code.html.erb +2 -3
  28. data/app/views/spree/orders/_line_item.html.erb +1 -1
  29. data/app/views/spree/orders/_line_item_data.html.erb +1 -1
  30. data/app/views/spree/orders/edit.html.erb +2 -3
  31. data/app/views/spree/orders/show.html.erb +1 -71
  32. data/app/views/spree/products/_cart_form.html.erb +2 -3
  33. data/app/views/spree/products/_color_option_type.html.erb +1 -2
  34. data/app/views/spree/products/_filters_desktop.html.erb +1 -2
  35. data/app/views/spree/products/_gallery.html.erb +4 -6
  36. data/app/views/spree/products/_gallery_modal.html.erb +3 -5
  37. data/app/views/spree/products/_option_type.html.erb +1 -2
  38. data/app/views/spree/products/_sort_mobile.html.erb +4 -4
  39. data/app/views/spree/products/related.html.erb +11 -5
  40. data/app/views/spree/products/show.html.erb +1 -2
  41. data/app/views/spree/shared/_carousel_4_products.html.erb +6 -12
  42. data/app/views/spree/shared/_change_store.html.erb +3 -3
  43. data/app/views/spree/shared/_color_select.html.erb +3 -3
  44. data/app/views/spree/shared/_delete_address_popup.html.erb +1 -2
  45. data/app/views/spree/shared/_error_messages.html.erb +2 -2
  46. data/app/views/spree/shared/_footer.html.erb +1 -1
  47. data/app/views/spree/shared/_head.html.erb +1 -1
  48. data/app/views/spree/shared/_header.html.erb +1 -1
  49. data/app/views/spree/shared/_main_nav_bar.html.erb +1 -1
  50. data/app/views/spree/shared/_mobile_change_store.html.erb +3 -3
  51. data/app/views/spree/shared/_mobile_navigation.html.erb +1 -1
  52. data/app/views/spree/shared/_nav_bar.html.erb +4 -4
  53. data/app/views/spree/shared/_no_product_available.html.erb +1 -1
  54. data/app/views/spree/shared/_option_values.html.erb +1 -1
  55. data/app/views/spree/shared/_order_details.html.erb +117 -174
  56. data/app/views/spree/shared/_payment.html.erb +2 -2
  57. data/app/views/spree/shared/_payment_sources.html.erb +2 -2
  58. data/app/views/spree/shared/_product_added_modal.html.erb +1 -1
  59. data/app/views/spree/shared/_search.html.erb +1 -2
  60. data/app/views/spree/shared/_translations.html.erb +6 -6
  61. data/app/views/spree/shared/carousel/_single.html.erb +5 -10
  62. data/app/views/spree/shared/carousel/_thumbnails.html.erb +5 -11
  63. data/app/views/spree/users/_address_controls.html.erb +1 -2
  64. data/app/views/spree/users/show.html.erb +3 -3
  65. data/config/routes.rb +0 -1
  66. data/spree_frontend.gemspec +1 -1
  67. metadata +10 -12
  68. data/app/views/spree/shared/forbidden.html.erb +0 -0
  69. data/app/views/spree/shared/unauthorized.html.erb +0 -0
@@ -6,7 +6,7 @@
6
6
  <%= Spree.t(:ending_in) %> <%= source.last_digits %>
7
7
  <% end %>
8
8
  </span>
9
- <br />
9
+ <br>
10
10
  <span class="full-name"><%= source.name %></span>
11
11
  <% else %>
12
12
  <%= content_tag(:span, payment.payment_method.name) %>
@@ -14,4 +14,4 @@
14
14
 
15
15
  <span class="payment-amount">(<%= payment.display_amount %>)</span>
16
16
 
17
- <br />
17
+ <br>
@@ -1,8 +1,8 @@
1
1
  <td>
2
2
  <% payment_sources.each do |payment_source| %>
3
3
  <%= payment_source.class.to_s.underscore.split('/').second.humanize.titleize %>
4
- <br/>
4
+ <br>
5
5
  <%= payment_source.last_digits.rjust(16, '*') %>
6
- <br/>
6
+ <br>
7
7
  <% end %>
8
8
  </td>
@@ -1,5 +1,5 @@
1
1
  <div class="modal product-added-modal" tabindex="-1" role="dialog" aria-hidden="true">
2
- <div class="modal-dialog modal-lg" role="document" >
2
+ <div class="modal-dialog modal-lg" role="document">
3
3
  <div class="modal-content">
4
4
  <div class="modal-header pb-0 px-4 pt-4 border-0">
5
5
  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
@@ -5,8 +5,7 @@
5
5
  title: Spree.t(:search),
6
6
  autofocus: true,
7
7
  'aria-label': Spree.t(:search),
8
- class: " border-0 p-3"
9
- %>
8
+ class: " border-0 p-3" %>
10
9
  <button type="submit" class="btn border-0 p-0" aria-label="Submit">
11
10
  <%= icon(name: 'search',
12
11
  classes: 'd-inline',
@@ -1,11 +1,11 @@
1
1
  <script>
2
2
  window.addEventListener('turbolinks:load', function() {
3
3
  Spree.translations = <%==
4
- {
5
- coupon_code_applied: Spree.t(:coupon_code_applied),
6
- coupon_code_removed: Spree.t(:coupon_code_removed),
7
- coupon_code_error_icon: image_path('error.svg')
8
- }.to_json
9
- %>
4
+ {
5
+ coupon_code_applied: Spree.t(:coupon_code_applied),
6
+ coupon_code_removed: Spree.t(:coupon_code_removed),
7
+ coupon_code_error_icon: image_path('error.svg')
8
+ }.to_json
9
+ %>
10
10
  });
11
11
  </script>
@@ -4,15 +4,13 @@
4
4
  data-product-carousel-group-identifier="<%= group_id %>"
5
5
  data-variant-change-trigger-identifier="<%= trigger_id %>"
6
6
  data-interval="false"
7
- data-hook
8
- >
7
+ data-hook>
9
8
  <% if images.length > 1 %>
10
9
  <a
11
10
  class="d-none d-md-flex h-100 justify-content-center align-items-center product-carousel-control position-absolute product-carousel-control--previous"
12
11
  href="#<%= id %>"
13
12
  role="button"
14
- data-slide="prev"
15
- >
13
+ data-slide="prev">
16
14
  <span class="d-flex justify-content-center align-items-center product-carousel-control-rounded" aria-hidden="true">
17
15
  <%= icon(name: 'arrow-right',
18
16
  classes: 'spree-icon-arrow spree-icon-arrow-left',
@@ -26,8 +24,7 @@
26
24
  class="d-none d-md-flex h-100 justify-content-center align-items-center product-carousel-control position-absolute product-carousel-control--next"
27
25
  href="#<%= id %>"
28
26
  role="button"
29
- data-slide="next"
30
- >
27
+ data-slide="next">
31
28
  <span class="d-flex justify-content-center align-items-center product-carousel-control-rounded" aria-hidden="true">
32
29
  <%= icon(name: 'arrow-right',
33
30
  classes: 'spree-icon-arrow spree-icon-arrow-right',
@@ -47,8 +44,7 @@
47
44
  <div
48
45
  class="carousel-item product-carousel-item<%= ' active' if imageIndex == 0 %>"
49
46
  data-variant-is-master="<%= image.viewable_id == @product.master_id %>"
50
- data-variant-id="<%= image.viewable_id %>"
51
- >
47
+ data-variant-id="<%= image.viewable_id %>">
52
48
  <div class="product-carousel-item-squared <%= 'product-carousel-item-squared-only' if images.length == 1 %>">
53
49
  <% image_attrs = {
54
50
  src: main_app.url_for(image.url(zoomed ? :zoomed : :large)),
@@ -68,8 +64,7 @@
68
64
  <li
69
65
  data-target="#<%= id %>"
70
66
  data-slide-to="<%= imageIndex %>"
71
- class="product-carousel-indicators-indicator product-carousel-indicators-indicator--visible<%= ' active' if imageIndex == 0 %>"
72
- >
67
+ class="product-carousel-indicators-indicator product-carousel-indicators-indicator--visible<%= ' active' if imageIndex == 0 %>">
73
68
  <%= lazy_image(
74
69
  src: main_app.url_for(image.url(:pdp_thumbnail)),
75
70
  class: 'd-block w-100',
@@ -6,8 +6,7 @@
6
6
  data-product-carousel-per-page="<%= per_page %>"
7
7
  data-product-carousel-is-slave="true"
8
8
  data-interval="false"
9
- data-hook
10
- >
9
+ data-hook>
11
10
  <div class="carousel-inner order-1 h-100">
12
11
  <% images.each_with_index do |image, image_index| %>
13
12
  <% if image_index % per_page == 0 %>
@@ -19,16 +18,13 @@
19
18
  class="product-thumbnails-carousel-item-single product-thumbnails-carousel-item-single--visible"
20
19
  data-product-carousel-to-slide="<%= image_index %>"
21
20
  data-variant-is-master="<%= image.viewable_id == @product.master_id %>"
22
- data-variant-id="<%= image.viewable_id %>"
23
- >
21
+ data-variant-id="<%= image.viewable_id %>">
24
22
  <%= lazy_image(
25
23
  src: main_app.url_for(image.url(:pdp_thumbnail)),
26
24
  class: 'd-block w-100',
27
25
  alt: image.alt || @product.name,
28
26
  width: 57,
29
- height: 70
30
- )
31
- %>
27
+ height: 70) %>
32
28
  </div>
33
29
  <% if (image_index + 1) % per_page == 0 || (image_index + 1) == images.length %>
34
30
  </div>
@@ -42,8 +38,7 @@
42
38
  class="d-none d-sm-flex order-0 justify-content-center w-100 product-thumbnails-carousel-previous"
43
39
  href="#<%= id %>"
44
40
  role="button"
45
- data-slide="prev"
46
- >
41
+ data-slide="prev">
47
42
  <span aria-hidden="true">
48
43
  <%= icon(name: 'arrow-right',
49
44
  classes: 'spree-icon-arrow spree-icon-arrow-up',
@@ -56,8 +51,7 @@
56
51
  class="d-none d-sm-flex order-2 justify-content-center w-100 product-thumbnails-carousel-next"
57
52
  href="#<%= id %>"
58
53
  role="button"
59
- data-slide="next"
60
- >
54
+ data-slide="next">
61
55
  <span aria-hidden="true">
62
56
  <%= icon(name: 'arrow-right',
63
57
  classes: 'spree-icon-arrow spree-icon-arrow-down',
@@ -6,6 +6,5 @@
6
6
  <%= icon(name: 'garbage_2',
7
7
  classes: '',
8
8
  width: 24,
9
- height: 24)
10
- %>
9
+ height: 24) %>
11
10
  <% end %>
@@ -1,5 +1,5 @@
1
1
  <div class="container account-page">
2
- <h3 class="text-uppercase spree-mb-large spree-mt-large spree-header" ><%= accurate_title %></h3>
2
+ <h3 class="text-uppercase spree-mb-large spree-mt-large spree-header"><%= accurate_title %></h3>
3
3
 
4
4
  <div class="row">
5
5
  <div class="col-xs-12 col-lg-4">
@@ -41,7 +41,7 @@
41
41
  </div>
42
42
 
43
43
  <div data-hook="account_my_orders" class="account-page-orders" id="account-my-orders">
44
- <h3 class="text-uppercase spree-mb-medium spree-mt-medium spree-header" ><%= Spree.t(:my_orders) %></h3>
44
+ <h3 class="text-uppercase spree-mb-medium spree-mt-medium spree-header"><%= Spree.t(:my_orders) %></h3>
45
45
  <% if @orders.present? %>
46
46
  <table>
47
47
  <thead class="active">
@@ -73,7 +73,7 @@
73
73
  <% else %>
74
74
  <p class="text-center"><%= Spree.t(:you_have_no_orders_yet) %></p>
75
75
  <% end %>
76
- <br />
76
+ <br>
77
77
  </div>
78
78
  <div id="delete-address-popup" class="delete-address-popup-dropdown hide-on-esc">
79
79
  <%= render 'spree/shared/delete_address_popup' %>
data/config/routes.rb CHANGED
@@ -26,7 +26,6 @@ Spree::Core::Engine.add_routes do
26
26
  get '/t/*id', to: 'taxons#show', as: :nested_taxons
27
27
  get '/product_carousel/:id', to: 'taxons#product_carousel'
28
28
 
29
- get '/unauthorized', to: 'home#unauthorized', as: :unauthorized
30
29
  get '/content/cvv', to: 'content#cvv', as: :cvv
31
30
  get '/content/test', to: 'content#test'
32
31
  get '/cart_link', to: 'store#cart_link', as: :cart_link
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
28
28
  s.add_dependency 'spree_api', s.version
29
29
  s.add_dependency 'spree_core', s.version
30
30
 
31
- s.add_dependency 'bootstrap', '>= 4.3.1', '< 4.6.0'
31
+ s.add_dependency 'bootstrap', '>= 4.3.1', '< 4.7.0'
32
32
  s.add_dependency 'glyphicons', '~> 1.0.2'
33
33
  s.add_dependency 'canonical-rails', '~> 0.2.10'
34
34
  s.add_dependency 'inline_svg', '~> 1.5'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_frontend
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.2.0.rc4
4
+ version: 4.2.0.rc5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2021-01-20 00:00:00.000000000 Z
12
+ date: 2021-02-04 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: spree_api
@@ -17,28 +17,28 @@ dependencies:
17
17
  requirements:
18
18
  - - '='
19
19
  - !ruby/object:Gem::Version
20
- version: 4.2.0.rc4
20
+ version: 4.2.0.rc5
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
25
  - - '='
26
26
  - !ruby/object:Gem::Version
27
- version: 4.2.0.rc4
27
+ version: 4.2.0.rc5
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: spree_core
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
32
  - - '='
33
33
  - !ruby/object:Gem::Version
34
- version: 4.2.0.rc4
34
+ version: 4.2.0.rc5
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
39
  - - '='
40
40
  - !ruby/object:Gem::Version
41
- version: 4.2.0.rc4
41
+ version: 4.2.0.rc5
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: bootstrap
44
44
  requirement: !ruby/object:Gem::Requirement
@@ -48,7 +48,7 @@ dependencies:
48
48
  version: 4.3.1
49
49
  - - "<"
50
50
  - !ruby/object:Gem::Version
51
- version: 4.6.0
51
+ version: 4.7.0
52
52
  type: :runtime
53
53
  prerelease: false
54
54
  version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
58
58
  version: 4.3.1
59
59
  - - "<"
60
60
  - !ruby/object:Gem::Version
61
- version: 4.6.0
61
+ version: 4.7.0
62
62
  - !ruby/object:Gem::Dependency
63
63
  name: glyphicons
64
64
  requirement: !ruby/object:Gem::Requirement
@@ -756,8 +756,6 @@ files:
756
756
  - app/views/spree/shared/_user_form.html.erb
757
757
  - app/views/spree/shared/carousel/_single.html.erb
758
758
  - app/views/spree/shared/carousel/_thumbnails.html.erb
759
- - app/views/spree/shared/forbidden.html.erb
760
- - app/views/spree/shared/unauthorized.html.erb
761
759
  - app/views/spree/taxons/_header.html.erb
762
760
  - app/views/spree/taxons/_subcategories.html.erb
763
761
  - app/views/spree/taxons/product_carousel.html.erb
@@ -784,9 +782,9 @@ licenses:
784
782
  - BSD-3-Clause
785
783
  metadata:
786
784
  bug_tracker_uri: https://github.com/spree/spree/issues
787
- changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc4
785
+ changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc5
788
786
  documentation_uri: https://guides.spreecommerce.org/
789
- source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc4
787
+ source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc5
790
788
  post_install_message:
791
789
  rdoc_options: []
792
790
  require_paths:
File without changes
File without changes