spree_core 4.2.0.rc3 → 4.2.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e1c991fe1a4f4ffcb163ad34f7db0d399c802a14b09cabae9b6db567db1adbc
-  data.tar.gz: 6d27129f5c12ec9b48941c3001a341d8306e219fdb702b153944645bc1044b72
+  metadata.gz: 661697daa0303090a2d39f0b439929bf8b54e59722ad738cee547487ba27aaf2
+  data.tar.gz: 8de83da0c8c3aa629f8389e40c63c178391d5a51a370da3595f0e1ce6edf431f
 SHA512:
-  metadata.gz: 4627be5137cf9b13ac72562df61b91a6ad0a95eb0119e9b9cf0c9a32b562874799ff35a0187ae8eadec622c88c0c5ee56f10cb21df79512b6524394b2f668fb1
-  data.tar.gz: ecaf570ab3245130d1ea2b521e0201937617e2aa0d308051d56ec17e2757549ce202fc243bb0c9b7609e379dfb7179005773656a8c7cc69632341c9751a26967
+  metadata.gz: 1b2cffe1a5872d559bb2ff7b0361e99c3d2cf6436a57e6ba1779550fb587651316c6c031c019b8e2150feae8df15f5d04ec500ae245585b9886f5584cb89ae2c
+  data.tar.gz: 83bba2eb568b84622dd523b4b943bcfee3cba206bce126ba9cf2a094b671e53d6094e8129edc4b8d620630fccf0783f962e3311fa1d41baf149575155bd7cf4e

data/app/models/spree/ability.rb

@@ -23,55 +23,70 @@ module Spree
     end
 
     def initialize(user)
-      # add cancancan aliasing
-      alias_action :delete, to: :destroy
-      alias_action :create, :update, :destroy, to: :modify
+      alias_cancan_delete_action
 
       user ||= Spree.user_class.new
 
       if user.respond_to?(:has_spree_role?) && user.has_spree_role?('admin')
-        can :manage, :all
+        apply_admin_permissions(user)
       else
-        can :read, Country
-        can :read, OptionType
-        can :read, OptionValue
-        can :create, Order
-        can :show, Order do |order, token|
-          order.user == user || order.token && token == order.token
-        end
-        can :update, Order do |order, token|
-          !order.completed? && (order.user == user || order.token && token == order.token)
-        end
-        can :manage, Address, user_id: user.id
-        can :read, CreditCard, user_id: user.id
-        can :read, Product
-        can :read, ProductProperty
-        can :read, Property
-        can :create, Spree.user_class
-        can [:show, :update, :destroy], Spree.user_class, id: user.id
-        can :read, State
-        can :read, Store
-        can :read, Taxon
-        can :read, Taxonomy
-        can :read, Variant
-        can :read, Zone
+        apply_user_permissions(user)
       end
 
       # Include any abilities registered by extensions, etc.
+      # this is legacy behaviour and should be removed in Spree 5.0
       Ability.abilities.merge(abilities_to_register).each do |clazz|
         merge clazz.new(user)
       end
 
-      # Protect admin role
-      cannot [:update, :destroy], Role, name: ['admin']
+      protect_admin_role
     end
 
-    private
+    protected
 
     # you can override this method to register your abilities
     # this method has to return array of classes
     def abilities_to_register
       []
     end
+
+    def alias_cancan_delete_action
+      alias_action :delete, to: :destroy
+      alias_action :create, :update, :destroy, to: :modify
+    end
+
+    def apply_admin_permissions(user)
+      can :manage, :all
+    end
+
+    def apply_user_permissions(user)
+      can :read, ::Spree::Country
+      can :read, ::Spree::OptionType
+      can :read, ::Spree::OptionValue
+      can :create, ::Spree::Order
+      can :show, ::Spree::Order do |order, token|
+        order.user == user || order.token && token == order.token
+      end
+      can :update, ::Spree::Order do |order, token|
+        !order.completed? && (order.user == user || order.token && token == order.token)
+      end
+      can :manage, ::Spree::Address, user_id: user.id
+      can :read, ::Spree::CreditCard, user_id: user.id
+      can :read, ::Spree::Product
+      can :read, ::Spree::ProductProperty
+      can :read, ::Spree::Property
+      can :create, ::Spree.user_class
+      can [:show, :update, :destroy], ::Spree.user_class, id: user.id
+      can :read, ::Spree::State
+      can :read, ::Spree::Store
+      can :read, ::Spree::Taxon
+      can :read, ::Spree::Taxonomy
+      can :read, ::Spree::Variant
+      can :read, ::Spree::Zone
+    end
+
+    def protect_admin_role
+      cannot [:update, :destroy], ::Spree::Role, name: ['admin']
+    end
   end
 end

data/app/models/spree/app_configuration.rb

@@ -68,8 +68,8 @@ module Spree
     preference :non_expiring_credit_types, :array, default: []
     preference :credit_to_new_allocation, :boolean, default: false
 
-    # Multi currency configurations
-    preference :show_store_currency_selector, :boolean, default: false
+    # Multi store configurations
+    preference :show_store_selector, :boolean, default: false
 
     # searcher_class allows spree extension writers to provide their own Search class
     def searcher_class

data/app/models/spree/line_item.rb

@@ -57,16 +57,13 @@ module Spree
     end
 
     def update_price
-      if Spree::Config.show_store_currency_selector == true
-        currency_price = Spree::Price.where(
-          currency: order.currency,
-          variant_id: variant_id
-        ).first
+      currency_price = variant.price_in(order.currency)
 
-        self.price = currency_price.price_including_vat_for(tax_zone: tax_zone)
-      else
-        self.price = variant.price_including_vat_for(tax_zone: tax_zone)
-      end
+      self.price = if currency_price.amount.present?
+                     currency_price.price_including_vat_for(tax_zone: tax_zone)
+                   else
+                     0
+                   end
     end
 
     def copy_tax_category

data/app/models/spree/store.rb

@@ -59,7 +59,7 @@ module Spree
       if url.match(/http:\/\/|https:\/\//)
         url
       else
-        "https://#{url}"
+        Rails.env.development? ? "http://#{url}" : "https://#{url}"
       end
     end
 

data/config/locales/en.yml

@@ -1582,7 +1582,7 @@ en:
     show_only_considered_risky: Only show risky orders
     show_property: Show Property
     show_rate_in_label: Show rate in label
-    show_store_currency_selector:
+    show_store_selector:
       short: Show Store selector
       long: Display the Store selector in the main nav bar of Storefront and allow users to change Store and Currency
     sign_up: Sign Up

data/db/default/spree/zones.rb

@@ -1,13 +1,16 @@
 eu_vat = Spree::Zone.where(name: 'EU_VAT', description: 'Countries that make up the EU VAT zone.', kind: 'country').first_or_create!
+uk_vat = Spree::Zone.where(name: 'UK_VAT', kind: 'country').first_or_create!
 north_america = Spree::Zone.where(name: 'North America', description: 'USA + Canada', kind: 'country').first_or_create!
 south_america = Spree::Zone.where(name: 'South America', description: 'South America', kind: 'country').first_or_create!
 middle_east = Spree::Zone.where(name: 'Middle East', description: 'Middle East', kind: 'country').first_or_create!
 asia = Spree::Zone.where(name: 'Asia', description: 'Asia', kind: 'country').first_or_create!
 
-%w(PL FI PT RO DE FR SK HU SI IE AT ES IT BE SE LV BG GB LT CY LU MT DK NL EE HR CZ GR).each do |name|
+%w(PL FI PT RO DE FR SK HU SI IE AT ES IT BE SE LV BG LT CY LU MT DK NL EE HR CZ GR).each do |name|
   eu_vat.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
 end
 
+uk_vat.zone_members.where(zoneable: Spree::Country.find_by(iso: 'GB')).first_or_create!
+
 %w(US CA).each do |name|
   north_america.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
 end

data/lib/spree/core/controller_helpers/store.rb

@@ -29,6 +29,10 @@ module Spree
           @current_store ||= Spree::Store.current(request.env['SERVER_NAME'])
         end
 
+        def store_locale
+          current_store.default_locale
+        end
+
         # Return a Hash of things that influence the prices displayed in your shop.
         #
         # By default, the only thing that influences prices that is the current order's +tax_zone+

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.2.0.rc3'
+    '4.2.0.rc4'
   end
 end

data/spree_core.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'acts_as_list', '~> 0.8'
   s.add_dependency 'awesome_nested_set', '>= 3.3.1', '< 4.0'
   s.add_dependency 'carmen', '>= 1.0', '< 1.2'
-  s.add_dependency 'cancancan', '~> 3.0'
+  s.add_dependency 'cancancan', '~> 3.2'
   s.add_dependency 'ffaker', '~> 2.9'
   s.add_dependency 'friendly_id', '>= 5.2.1', '< 5.5.0'
   s.add_dependency 'highline', '~> 2.0.0' # Necessary for the install generator

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.2.0.rc3
+  version: 4.2.0.rc4
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-18 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -85,14 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -1164,9 +1164,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc3
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc4
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc3
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc4
 post_install_message:
 rdoc_options: []
 require_paths: