spree_frontend 4.2.0.rc3 → 4.2.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (105) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/spree/frontend.js +38 -5
  3. data/app/assets/javascripts/spree/frontend/account.js +1 -1
  4. data/app/assets/javascripts/spree/frontend/cart.js +1 -1
  5. data/app/assets/javascripts/spree/frontend/checkout/address.js +1 -1
  6. data/app/assets/javascripts/spree/frontend/checkout/shipment.js +15 -2
  7. data/app/assets/javascripts/spree/frontend/coupon_manager.js +1 -1
  8. data/app/assets/javascripts/spree/frontend/currency.js +43 -0
  9. data/app/assets/javascripts/spree/frontend/locale.js +13 -0
  10. data/app/assets/stylesheets/spree/frontend/application.scss +0 -3
  11. data/app/assets/stylesheets/spree/frontend/variables/bootstrap-overrides.scss +1 -0
  12. data/app/assets/stylesheets/spree/frontend/variables/helper-variables.scss +1 -0
  13. data/app/assets/stylesheets/spree/frontend/variables/variables.scss +54 -0
  14. data/app/assets/stylesheets/spree/frontend/views/spree/checkout/confirm.scss +27 -22
  15. data/app/assets/stylesheets/spree/frontend/views/spree/orders/show.scss +3 -0
  16. data/app/controllers/concerns/spree/locale_urls.rb +21 -0
  17. data/app/controllers/spree/checkout_controller.rb +8 -8
  18. data/app/controllers/spree/currency_controller.rb +9 -9
  19. data/app/controllers/spree/home_controller.rb +5 -1
  20. data/app/controllers/spree/locale_controller.rb +23 -6
  21. data/app/controllers/spree/orders_controller.rb +2 -2
  22. data/app/controllers/spree/products_controller.rb +6 -5
  23. data/app/controllers/spree/store_controller.rb +11 -15
  24. data/app/controllers/spree/taxons_controller.rb +3 -2
  25. data/app/helpers/spree/addresses_helper.rb +9 -2
  26. data/app/helpers/spree/cache_helper.rb +7 -0
  27. data/app/helpers/spree/frontend_helper.rb +15 -23
  28. data/app/helpers/spree/navigation_helper.rb +6 -1
  29. data/app/helpers/spree/store_helper.rb +39 -0
  30. data/app/helpers/spree/taxons_helper.rb +1 -1
  31. data/app/models/spree/frontend_configuration.rb +2 -1
  32. data/app/views/kaminari/twitter-bootstrap-4/_first_page.html.erb +2 -2
  33. data/app/views/kaminari/twitter-bootstrap-4/_gap.html.erb +2 -2
  34. data/app/views/kaminari/twitter-bootstrap-4/_last_page.html.erb +2 -2
  35. data/app/views/kaminari/twitter-bootstrap-4/_next_page.html.erb +2 -2
  36. data/app/views/kaminari/twitter-bootstrap-4/_page.html.erb +2 -2
  37. data/app/views/kaminari/twitter-bootstrap-4/_paginator.html.erb +2 -2
  38. data/app/views/kaminari/twitter-bootstrap-4/_prev_page.html.erb +2 -2
  39. data/app/views/spree/address/_form.html.erb +15 -16
  40. data/app/views/spree/addresses/edit.html.erb +2 -2
  41. data/app/views/spree/addresses/new.html.erb +2 -2
  42. data/app/views/spree/checkout/_address.html.erb +4 -6
  43. data/app/views/spree/checkout/_confirm.html.erb +1 -33
  44. data/app/views/spree/checkout/_credit_card.html.erb +2 -2
  45. data/app/views/spree/checkout/_delivery_informations.html.erb +43 -36
  46. data/app/views/spree/checkout/_summary.html.erb +3 -5
  47. data/app/views/spree/checkout/payment/_gateway.html.erb +1 -1
  48. data/app/views/spree/home/index.html.erb +21 -22
  49. data/app/views/spree/locale/index.html.erb +1 -0
  50. data/app/views/spree/orders/_coupon_code.html.erb +2 -3
  51. data/app/views/spree/orders/_line_item.html.erb +2 -2
  52. data/app/views/spree/orders/_line_item_data.html.erb +1 -1
  53. data/app/views/spree/orders/edit.html.erb +2 -3
  54. data/app/views/spree/orders/show.html.erb +1 -71
  55. data/app/views/spree/products/_cart_form.html.erb +2 -3
  56. data/app/views/spree/products/_color_option_type.html.erb +2 -3
  57. data/app/views/spree/products/_filters_desktop.html.erb +1 -2
  58. data/app/views/spree/products/_gallery.html.erb +4 -6
  59. data/app/views/spree/products/_gallery_modal.html.erb +3 -5
  60. data/app/views/spree/products/_option_type.html.erb +1 -2
  61. data/app/views/spree/products/_sort_mobile.html.erb +4 -4
  62. data/app/views/spree/products/related.html.erb +11 -5
  63. data/app/views/spree/products/show.html.erb +1 -2
  64. data/app/views/spree/shared/_carousel_4_products.html.erb +6 -12
  65. data/app/views/spree/shared/_color_select.html.erb +3 -3
  66. data/app/views/spree/shared/_currency_dropdown.html.erb +13 -0
  67. data/app/views/spree/shared/_delete_address_popup.html.erb +1 -2
  68. data/app/views/spree/shared/_error_messages.html.erb +2 -2
  69. data/app/views/spree/shared/_footer.html.erb +2 -2
  70. data/app/views/spree/shared/_head.html.erb +2 -1
  71. data/app/views/spree/shared/_header.html.erb +1 -1
  72. data/app/views/spree/shared/_internationalization_options.html.erb +31 -0
  73. data/app/views/spree/shared/_line_item.html.erb +2 -2
  74. data/app/views/spree/shared/_link_to_account.html.erb +5 -5
  75. data/app/views/spree/shared/_locale_and_currency.html.erb +6 -0
  76. data/app/views/spree/shared/_locale_dropdown.html.erb +13 -0
  77. data/app/views/spree/shared/_login.html.erb +1 -1
  78. data/app/views/spree/shared/_main_nav_bar.html.erb +1 -1
  79. data/app/views/spree/shared/_mobile_internationalization_options.html.erb +37 -0
  80. data/app/views/spree/shared/_mobile_navigation.html.erb +3 -6
  81. data/app/views/spree/shared/_nav_bar.html.erb +5 -5
  82. data/app/views/spree/shared/_no_product_available.html.erb +1 -1
  83. data/app/views/spree/shared/_option_values.html.erb +1 -1
  84. data/app/views/spree/shared/_order_details.html.erb +117 -174
  85. data/app/views/spree/shared/_payment.html.erb +2 -2
  86. data/app/views/spree/shared/_payment_sources.html.erb +2 -2
  87. data/app/views/spree/shared/_product_added_modal.html.erb +3 -3
  88. data/app/views/spree/shared/_search.html.erb +1 -2
  89. data/app/views/spree/shared/_translations.html.erb +6 -6
  90. data/app/views/spree/shared/carousel/_single.html.erb +6 -11
  91. data/app/views/spree/shared/carousel/_thumbnails.html.erb +5 -11
  92. data/app/views/spree/users/_address_controls.html.erb +1 -2
  93. data/app/views/spree/users/show.html.erb +4 -4
  94. data/config/initializers/canonical_rails.rb +1 -1
  95. data/config/routes.rb +26 -30
  96. data/lib/generators/spree/frontend/copy_storefront/copy_storefront_generator.rb +1 -7
  97. data/lib/generators/spree/frontend/install/install_generator.rb +34 -0
  98. data/lib/generators/spree/frontend/install/templates/config/initializers/spree_storefront.rb +1 -0
  99. data/lib/generators/spree/frontend/install/templates/config/spree_storefront.yml +99 -0
  100. data/spree_frontend.gemspec +1 -1
  101. metadata +26 -16
  102. data/app/views/spree/shared/_change_store.html.erb +0 -25
  103. data/app/views/spree/shared/_mobile_change_store.html.erb +0 -30
  104. data/app/views/spree/shared/forbidden.html.erb +0 -0
  105. data/app/views/spree/shared/unauthorized.html.erb +0 -0
@@ -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.rc3
4
+ version: 4.2.2
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-18 00:00:00.000000000 Z
12
+ date: 2021-04-26 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.rc3
20
+ version: 4.2.2
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.rc3
27
+ version: 4.2.2
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.rc3
34
+ version: 4.2.2
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.rc3
41
+ version: 4.2.2
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
@@ -547,6 +547,8 @@ files:
547
547
  - app/assets/javascripts/spree/frontend/components-bootstrap/.gitkeep
548
548
  - app/assets/javascripts/spree/frontend/components-custom/.gitkeep
549
549
  - app/assets/javascripts/spree/frontend/coupon_manager.js
550
+ - app/assets/javascripts/spree/frontend/currency.js
551
+ - app/assets/javascripts/spree/frontend/locale.js
550
552
  - app/assets/javascripts/spree/frontend/login.js
551
553
  - app/assets/javascripts/spree/frontend/main_nav_bar.js
552
554
  - app/assets/javascripts/spree/frontend/multi_currency.js
@@ -637,6 +639,7 @@ files:
637
639
  - app/assets/stylesheets/spree/frontend/views/spree/user_sessions/new.scss
638
640
  - app/assets/stylesheets/spree/frontend/views/spree/users/show.scss
639
641
  - app/controllers/concerns/spree/checkout/address_book.rb
642
+ - app/controllers/concerns/spree/locale_urls.rb
640
643
  - app/controllers/spree/addresses_controller.rb
641
644
  - app/controllers/spree/checkout_controller.rb
642
645
  - app/controllers/spree/content_controller.rb
@@ -648,9 +651,11 @@ files:
648
651
  - app/controllers/spree/store_controller.rb
649
652
  - app/controllers/spree/taxons_controller.rb
650
653
  - app/helpers/spree/addresses_helper.rb
654
+ - app/helpers/spree/cache_helper.rb
651
655
  - app/helpers/spree/frontend_helper.rb
652
656
  - app/helpers/spree/navigation_helper.rb
653
657
  - app/helpers/spree/orders_helper.rb
658
+ - app/helpers/spree/store_helper.rb
654
659
  - app/helpers/spree/structured_data_helper.rb
655
660
  - app/helpers/spree/taxons_helper.rb
656
661
  - app/models/spree/frontend_configuration.rb
@@ -685,6 +690,7 @@ files:
685
690
  - app/views/spree/home/index.html.erb
686
691
  - app/views/spree/layouts/checkout.html.erb
687
692
  - app/views/spree/layouts/spree_application.html.erb
693
+ - app/views/spree/locale/index.html.erb
688
694
  - app/views/spree/orders/_adjustment_row.html.erb
689
695
  - app/views/spree/orders/_adjustments.html.erb
690
696
  - app/views/spree/orders/_coupon_code.html.erb
@@ -719,22 +725,25 @@ files:
719
725
  - app/views/spree/shared/_breadcrumbs.html.erb
720
726
  - app/views/spree/shared/_carousel_4_products.html.erb
721
727
  - app/views/spree/shared/_cart.html.erb
722
- - app/views/spree/shared/_change_store.html.erb
723
728
  - app/views/spree/shared/_checkout_header.html.erb
724
729
  - app/views/spree/shared/_color_select.html.erb
725
730
  - app/views/spree/shared/_copyright.html.erb
731
+ - app/views/spree/shared/_currency_dropdown.html.erb
726
732
  - app/views/spree/shared/_delete_address_popup.html.erb
727
733
  - app/views/spree/shared/_error_messages.html.erb
728
734
  - app/views/spree/shared/_flashes.html.erb
729
735
  - app/views/spree/shared/_footer.html.erb
730
736
  - app/views/spree/shared/_head.html.erb
731
737
  - app/views/spree/shared/_header.html.erb
738
+ - app/views/spree/shared/_internationalization_options.html.erb
732
739
  - app/views/spree/shared/_line_item.html.erb
733
740
  - app/views/spree/shared/_link_to_account.html.erb
734
741
  - app/views/spree/shared/_link_to_cart.html.erb
742
+ - app/views/spree/shared/_locale_and_currency.html.erb
743
+ - app/views/spree/shared/_locale_dropdown.html.erb
735
744
  - app/views/spree/shared/_login.html.erb
736
745
  - app/views/spree/shared/_main_nav_bar.html.erb
737
- - app/views/spree/shared/_mobile_change_store.html.erb
746
+ - app/views/spree/shared/_mobile_internationalization_options.html.erb
738
747
  - app/views/spree/shared/_mobile_navigation.html.erb
739
748
  - app/views/spree/shared/_nav_bar.html.erb
740
749
  - app/views/spree/shared/_no_product_available.html.erb
@@ -755,8 +764,6 @@ files:
755
764
  - app/views/spree/shared/_user_form.html.erb
756
765
  - app/views/spree/shared/carousel/_single.html.erb
757
766
  - app/views/spree/shared/carousel/_thumbnails.html.erb
758
- - app/views/spree/shared/forbidden.html.erb
759
- - app/views/spree/shared/unauthorized.html.erb
760
767
  - app/views/spree/taxons/_header.html.erb
761
768
  - app/views/spree/taxons/_subcategories.html.erb
762
769
  - app/views/spree/taxons/product_carousel.html.erb
@@ -769,6 +776,9 @@ files:
769
776
  - config/initializers/canonical_rails.rb
770
777
  - config/routes.rb
771
778
  - lib/generators/spree/frontend/copy_storefront/copy_storefront_generator.rb
779
+ - lib/generators/spree/frontend/install/install_generator.rb
780
+ - lib/generators/spree/frontend/install/templates/config/initializers/spree_storefront.rb
781
+ - lib/generators/spree/frontend/install/templates/config/spree_storefront.yml
772
782
  - lib/spree/frontend.rb
773
783
  - lib/spree/frontend/engine.rb
774
784
  - lib/spree/frontend/middleware/seo_assist.rb
@@ -783,9 +793,9 @@ licenses:
783
793
  - BSD-3-Clause
784
794
  metadata:
785
795
  bug_tracker_uri: https://github.com/spree/spree/issues
786
- changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc3
796
+ changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.2
787
797
  documentation_uri: https://guides.spreecommerce.org/
788
- source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc3
798
+ source_code_uri: https://github.com/spree/spree/tree/v4.2.2
789
799
  post_install_message:
790
800
  rdoc_options: []
791
801
  require_paths:
@@ -797,9 +807,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
797
807
  version: 2.5.0
798
808
  required_rubygems_version: !ruby/object:Gem::Requirement
799
809
  requirements:
800
- - - ">"
810
+ - - ">="
801
811
  - !ruby/object:Gem::Version
802
- version: 1.3.1
812
+ version: '0'
803
813
  requirements:
804
814
  - none
805
815
  rubygems_version: 3.1.4
@@ -1,25 +0,0 @@
1
- <% if Spree::Config.show_store_currency_selector && stores.size > 1 %>
2
- <li class="d-none d-xl-block change-store">
3
- <div class="dropdown navbar-right-dropdown">
4
- <button id="stores-button" type="button" data-toggle="dropdown" class="navbar-right-dropdown-toggle" aria-label="<%= Spree.t('nav_bar.change_country')%>">
5
- <%= icon(name: 'global',
6
- classes: 'd-none d-xl-inline-block',
7
- width: 41,
8
- height: 36) %>
9
- <%= icon(name: 'arrow-down',
10
- classes: 'd-inline-block d-xl-none',
11
- width: 15,
12
- height: 15) %>
13
- </button>
14
-
15
- <div id="stores_list" class="dropdown-menu dropdown-menu-right text-right">
16
- <% stores.each do |store| %>
17
- <div class="pl-3 d-flex justify-content-between align-items-center <%= 'active' if store.id == current_store.id %>">
18
- <span class="flag-icon flag-icon-<%= store_country_iso(store) %>"></span>
19
- <%= link_to "#{store.default_country&.name} (#{store_currency_symbol(store)})", "//#{store.url}", class: 'dropdown-item text-uppercase' %>
20
- </div>
21
- <% end %>
22
- </div>
23
- </div>
24
- </li>
25
- <% end %>
@@ -1,30 +0,0 @@
1
- <% if stores.size > 1 %>
2
- <li class="d-flex justify-content-between align-items-center mobile-navigation-list-item">
3
- <span class="w-75"><%= Spree.t('nav_bar.change_country')%></span>
4
- <a class="w-25 text-right mobile-navigation-category-link" data-category="countries" href="#" aria-label="<%= Spree.t('nav_bar.change_country')%>">
5
- <%= icon(name: 'arrow-right',
6
- classes: 'd-sm-none spree-icon-arrow spree-icon-arrow-right',
7
- width: 16,
8
- height: 16) %>
9
- <%= icon(name: 'arrow-right',
10
- classes: 'd-none d-sm-inline spree-icon-arrow spree-icon-arrow-right',
11
- width: 14,
12
- height: 27) %>
13
- </a>
14
-
15
- <ul class="list-unstyled position-absolute mobile-navigation-sublist" data-category="countries">
16
- <li class="text-center font-weight-bold mobile-navigation-sublist-header">
17
- <%= Spree.t('nav_bar.change_country')%>
18
- </li>
19
- <% stores.each do |store| %>
20
- <li class="d-flex justify-content-between align-items-center mobile-navigation-list-item">
21
- <span class="flag-icon flag-icon-<%= store_country_iso(store) %>"></span>
22
- <%= link_to "//#{store.url}", class: 'dropdown-item text-uppercase d-flex' do %>
23
- <span><%= store.default_country&.name %></span>
24
- <span class="text-right w-100"><%= store_currency_symbol(store) %></span>
25
- <% end %>
26
- </li>
27
- <% end %>
28
- </ul>
29
- </li>
30
- <% end %>
File without changes
File without changes