spree_core 5.0.6 → 5.1.0.beta

data/app/models/spree/reports/sales_total.rb

@@ -2,12 +2,16 @@ module Spree
   module Reports
     class SalesTotal < Spree::Report
       def line_items_scope
-        store.line_items.where(
+        scope = store.line_items.where(
           order: Spree::Order.complete.where(
             currency: currency,
             completed_at: (date_from.to_time.beginning_of_day)..(date_to.to_time.end_of_day)
           )
         ).includes(:order, variant: :product)
+
+        scope = scope.where(vendor_id: vendor.id) if defined?(vendor) && vendor.present?
+
+        scope
       end
     end
   end

data/app/models/spree/role.rb

@@ -4,8 +4,24 @@ module Spree
 
     ADMIN_ROLE = 'admin'
 
+    #
+    # Associations
+    #
     has_many :role_users, class_name: 'Spree::RoleUser', dependent: :destroy
     has_many :users, through: :role_users, source: :user, source_type: Spree.user_class.to_s
     has_many :admin_users, through: :role_users, source: :user, source_type: Spree.admin_user_class.to_s
+    has_many :invitations, class_name: 'Spree::Invitation', dependent: :destroy
+
+    #
+    # Scopes
+    #
+    scope :admin, -> { where(name: ADMIN_ROLE) }
+
+    #
+    # Class Methods
+    #
+    def self.default_admin_role
+      find_or_create_by(name: ADMIN_ROLE)
+    end
   end
 end

data/app/models/spree/role_user.rb

@@ -1,6 +1,37 @@
 module Spree
   class RoleUser < Spree.base_class
-    belongs_to :role, class_name: 'Spree::Role'
+    #
+    # Associations
+    #
+    belongs_to :role, class_name: 'Spree::Role', foreign_key: :role_id
     belongs_to :user, polymorphic: true
+    belongs_to :resource, polymorphic: true
+    belongs_to :invitation, class_name: 'Spree::Invitation', optional: true
+
+    #
+    # Validations
+    #
+    validates :role, presence: true
+    validates :user, presence: true
+    validates :resource, presence: true
+    validates :role_id, uniqueness: { scope: [:user_id, :resource_id, :user_type, :resource_type] }
+
+    #
+    # Delegations
+    #
+    delegate :name, to: :user
+
+    #
+    # Callbacks
+    #
+    before_validation :set_default_resource
+
+    private
+
+    # Set the default resource to the default store if the resource is not set
+    # this will allow a graceful migration from the old roles system to the new one
+    def set_default_resource
+      self.resource ||= Spree::Store.current
+    end
   end
 end

data/app/models/spree/shipment_handler.rb

@@ -1,6 +1,7 @@
 module Spree
   class ShipmentHandler
     include Spree::Shipment::Emails
+    include Spree::IntegrationsConcern
 
     class << self
       def factory(shipment)

data/app/models/spree/shipping_method.rb

@@ -50,7 +50,7 @@ module Spree
     def include?(address)
       return false unless address
 
-      zones.includes(:zone_members).any? do |zone|
+      zones.includes(zone_members: :zoneable).any? do |zone|
         zone.include?(address)
       end
     end
@@ -93,7 +93,7 @@ module Spree
       if estimated_transit_business_days_min == estimated_transit_business_days_max
         estimated_transit_business_days_min.to_s
       else
-        [estimated_transit_business_days_min, estimated_transit_business_days_max].compact.join("-")
+        "#{estimated_transit_business_days_min}-#{estimated_transit_business_days_max}"
       end
     end
 

data/app/models/spree/store.rb

@@ -13,6 +13,7 @@ module Spree
     include Spree::Stores::Socials
     include Spree::Webhooks::HasWebhooks if defined?(Spree::Webhooks::HasWebhooks)
     include Spree::Security::Stores if defined?(Spree::Security::Stores)
+    include Spree::UserManagement
 
     #
     # Magic methods
@@ -100,8 +101,10 @@ module Spree
     has_many :custom_domains, class_name: 'Spree::CustomDomain', dependent: :destroy
     has_one :default_custom_domain, -> { where(default: true) }, class_name: 'Spree::CustomDomain'
 
-    has_many :posts
-    has_many :post_categories
+    has_many :posts, class_name: 'Spree::Post'
+    has_many :post_categories, class_name: 'Spree::PostCategory'
+
+    has_many :integrations, class_name: 'Spree::Integration'
 
     #
     # Page Builder associations
@@ -342,7 +345,7 @@ module Spree
     # @return [Spree::StockLocation]
     def default_stock_location
       @default_stock_location ||= begin
-        stock_location_scope = Spree::StockLocation.order_default
+        stock_location_scope = Spree::StockLocation.where(default: true)
         stock_location_scope.first || ActiveRecord::Base.connected_to(role: :writing) do
           stock_location_scope.create(default: true, name: Spree.t(:default_stock_location_name), country: default_country)
         end
@@ -350,7 +353,9 @@ module Spree
     end
 
     def admin_users
-      @admin_users ||= Spree.admin_user_class.joins(:spree_roles).where(spree_roles: { name: :admin })
+      Spree::Deprecation.warn('Store#admin_users is deprecated and will be removed in Spree 6.0. Please use Store#users instead.')
+
+      users
     end
 
     def favicon

data/app/models/spree/store_credit_category.rb

@@ -28,6 +28,10 @@ module Spree
       end
     end
 
+    def can_be_deleted?
+      !store_credit_category_used?
+    end
+
     class << self
       def default_reimbursement_category(_options = {})
         Spree::StoreCreditCategory.first

data/app/models/spree/taxon.rb

@@ -1,4 +1,3 @@
-# TODO: let friendly id take care of sanitizing the url
 require 'stringex'
 
 module Spree
@@ -96,9 +95,11 @@ module Spree
       if Spree.use_translations?
         joins(:taxonomy).
           join_translation_table(Taxonomy).
-          where(["LOWER(#{Taxonomy.translation_table_alias}.name) = ?", taxonomy_name.downcase.strip])
+          where(
+            Taxonomy.arel_table_alias[:name].lower.matches(taxonomy_name.downcase.strip)
+          )
       else
-        joins(:taxonomy).where(["LOWER(#{Spree::Taxonomy.table_name}.name) = ?", taxonomy_name.downcase.strip])
+        joins(:taxonomy).where(Spree::Taxonomy.arel_table[:name].lower.matches(taxonomy_name.downcase.strip))
       end
     }
 
@@ -153,10 +154,6 @@ module Spree
       sort_order == 'manual'
     end
 
-    def page_builder_image
-      square_image.presence || image
-    end
-
     def active_products_with_descendants
       @active_products_with_descendants ||= store.products.
                                             joins(:classifications).

data/app/models/spree/theme.rb

@@ -155,7 +155,7 @@ module Spree
       end
     end
 
-    # Returns an array of available layout section classes for the theme, eg. header, footer, newsletter, etc.
+    # Returns an array of available layout section classes for the theme
     #
     # @return [Array<Class>]
     def available_layout_sections

data/app/models/spree/wishlist.rb

@@ -36,13 +36,6 @@ module Spree
       @wished_items_count ||= variant_ids.count
     end
 
-    # returns the variant ids in the wishlist
-    #
-    # @return [Array<Integer>]
-    def variant_ids
-      @variant_ids ||= wished_items.pluck(:variant_id)
-    end
-
     def self.get_by_param(param)
       find_by(token: param)
     end

data/app/services/spree/country_to_timezone.rb

@@ -0,0 +1,273 @@
+module Spree
+  class CountryToTimezone
+    prepend Spree::ServiceModule::Base
+
+    CAPITAL_CITIES = {
+      "AD"=>"Andorra la Vella",
+     "AE"=>"Abu Dhabi",
+     "AF"=>"Kabul",
+     "AG"=>"Saint John's",
+     "AI"=>"The Valley",
+     "AL"=>"Tirana",
+     "AM"=>"Yerevan",
+     "AN"=>"Willemstad",
+     "AO"=>"Luanda",
+     "AQ"=>nil,
+     "AR"=>"Buenos Aires",
+     "AS"=>"Pago Pago",
+     "AT"=>"Vienna",
+     "AU"=>"Canberra",
+     "AW"=>"Oranjestad",
+     "AZ"=>"Baku",
+     "BA"=>"Sarajevo",
+     "BB"=>"Bridgetown",
+     "BD"=>"Dhaka",
+     "BE"=>"Brussels",
+     "BF"=>"Ouagadougou",
+     "BG"=>"Sofia",
+     "BH"=>"Manama",
+     "BI"=>"Bujumbura",
+     "BJ"=>"Porto-Novo",
+     "BL"=>"Gustavia",
+     "BM"=>"Hamilton",
+     "BN"=>"Bandar Seri Begawan",
+     "BO"=>"La Paz",
+     "BR"=>"Brasilia",
+     "BS"=>"Nassau",
+     "BT"=>"Thimphu",
+     "BV"=>nil,
+     "BW"=>"Gaborone",
+     "BY"=>"Minsk",
+     "BZ"=>"Belmopan",
+     "CA"=>"Ottawa",
+     "CC"=>"West Island",
+     "CD"=>"Kinshasa",
+     "CF"=>"Bangui",
+     "CG"=>"Brazzaville",
+     "CH"=>"Bern",
+     "CI"=>"Yamoussoukro",
+     "CK"=>"Avarua",
+     "CL"=>"Santiago",
+     "CM"=>"Yaounde",
+     "CN"=>"Beijing",
+     "CO"=>"Bogota",
+     "CR"=>"San Jose",
+     "CU"=>"Havana",
+     "CV"=>"Praia",
+     "CX"=>"The Settlement",
+     "CY"=>"Nicosia",
+     "CZ"=>"Prague",
+     "DE"=>"Berlin",
+     "DJ"=>"Djibouti",
+     "DK"=>"Copenhagen",
+     "DM"=>"Roseau",
+     "DO"=>"Santo Domingo",
+     "DZ"=>"Algiers",
+     "EC"=>"Quito",
+     "EE"=>"Tallinn",
+     "EG"=>"Cairo",
+     "EH"=>nil,
+     "ER"=>"Asmara",
+     "ES"=>"Madrid",
+     "ET"=>"Addis Ababa",
+     "FI"=>"Helsinki",
+     "FJ"=>"Suva",
+     "FK"=>"Stanley",
+     "FM"=>"Palikir",
+     "FO"=>"Torshavn",
+     "FR"=>"Paris",
+     "GA"=>"Libreville",
+     "GB"=>"London",
+     "GD"=>"Saint George's",
+     "GE"=>"T'bilisi",
+     "GG"=>"Saint Peter Port",
+     "GH"=>"Accra",
+     "GI"=>"Gibraltar",
+     "GL"=>"Nuuk",
+     "GM"=>"Banjul",
+     "GN"=>"Conakry",
+     "GQ"=>"Malabo",
+     "GR"=>"Athens",
+     "GT"=>"Guatemala City",
+     "GU"=>"Hagatna",
+     "GW"=>"Bissau",
+     "GY"=>"Georgetown",
+     "HK"=>"Hong Kong",
+     "HM"=>nil,
+     "HN"=>"Tegucigalpa",
+     "HR"=>"Zagreb",
+     "HT"=>"Port-au-Prince",
+     "HU"=>"Budapest",
+     "ID"=>"Jakarta",
+     "IE"=>"Dublin",
+     "IL"=>"Jerusalem",
+     "IM"=>"Douglas",
+     "IN"=>"New Delhi",
+     "IO"=>nil,
+     "IQ"=>"Baghdad",
+     "IR"=>"Tehran",
+     "IS"=>"Reykjavik",
+     "IT"=>"Rome",
+     "JE"=>"Saint Helier",
+     "JM"=>"Kingston",
+     "JO"=>"Amman",
+     "JP"=>"Tokyo",
+     "KE"=>"Nairobi",
+     "KG"=>"Bishkek",
+     "KH"=>"Phnom Penh",
+     "KI"=>"Tarawa",
+     "KM"=>"Moroni",
+     "KN"=>"Basseterre",
+     "KP"=>"Pyongyang",
+     "KR"=>"Seoul",
+     "KW"=>"Kuwait City",
+     "KY"=>"George Town",
+     "KZ"=>"Astana",
+     "LA"=>"Vientiane",
+     "LB"=>"Beirut",
+     "LC"=>"Castries",
+     "LI"=>"Vaduz",
+     "LK"=>"Colombo",
+     "LR"=>"Monrovia",
+     "LS"=>"Maseru",
+     "LT"=>"Vilnius",
+     "LU"=>"Luxembourg",
+     "LV"=>"Riga",
+     "LY"=>"Tripoli",
+     "MA"=>"Rabat",
+     "MC"=>"Monaco",
+     "MD"=>"Chisinau",
+     "ME"=>"Podgorica",
+     "MF"=>"Marigot",
+     "MG"=>"Antananarivo",
+     "MH"=>"Majuro",
+     "MK"=>"Skopje",
+     "ML"=>"Bamako",
+     "MM"=>"Rangoon",
+     "MN"=>"Ulaanbaatar",
+     "MO"=>nil,
+     "MP"=>"Saipan",
+     "MR"=>"Nouakchott",
+     "MS"=>"Plymouth",
+     "MT"=>"Valletta",
+     "MU"=>"Port Louis",
+     "MV"=>"Male",
+     "MW"=>"Lilongwe",
+     "MX"=>"Mexico City",
+     "MY"=>"Kuala Lumpur",
+     "MZ"=>"Maputo",
+     "NA"=>"Windhoek",
+     "NC"=>"Noumea",
+     "NE"=>"Niamey",
+     "NF"=>"Kingston",
+     "NG"=>"Abuja",
+     "NI"=>"Managua",
+     "NL"=>"Amsterdam",
+     "NO"=>"Oslo",
+     "NP"=>"Kathmandu",
+     "NR"=>nil,
+     "NU"=>"Alofi",
+     "NZ"=>"Wellington",
+     "OM"=>"Muscat",
+     "PA"=>"Panama City",
+     "PE"=>"Lima",
+     "PF"=>"Papeete",
+     "PG"=>"Port Moresby",
+     "PH"=>"Manila",
+     "PK"=>"Islamabad",
+     "PL"=>"Warsaw",
+     "PM"=>"Saint-Pierre",
+     "PN"=>"Adamstown",
+     "PR"=>"San Juan",
+     "PS"=>nil,
+     "PT"=>"Lisbon",
+     "PW"=>"Melekeok",
+     "PY"=>"Asuncion",
+     "QA"=>"Doha",
+     "RO"=>"Bucharest",
+     "RS"=>"Belgrade",
+     "RU"=>"Moscow",
+     "RW"=>"Kigali",
+     "SA"=>"Riyadh",
+     "SB"=>"Honiara",
+     "SC"=>"Victoria",
+     "SD"=>"Khartoum",
+     "SE"=>"Stockholm",
+     "SG"=>"Singapore",
+     "SH"=>"Jamestown",
+     "SI"=>"Ljubljana",
+     "SJ"=>"Longyearbyen",
+     "SK"=>"Bratislava",
+     "SL"=>"Freetown",
+     "SM"=>"San Marino",
+     "SN"=>"Dakar",
+     "SO"=>"Mogadishu",
+     "SR"=>"Paramaribo",
+     "ST"=>"Sao Tome",
+     "SV"=>"San Salvador",
+     "SY"=>"Damascus",
+     "SZ"=>"Mbabane",
+     "TC"=>"Grand Turk",
+     "TD"=>"N'Djamena",
+     "TF"=>nil,
+     "TG"=>"Lome",
+     "TH"=>"Bangkok",
+     "TJ"=>"Dushanbe",
+     "TK"=>nil,
+     "TL"=>"Dili",
+     "TM"=>"Ashgabat",
+     "TN"=>"Tunis",
+     "TO"=>"Nuku'alofa",
+     "TR"=>"Ankara",
+     "TT"=>"Port-of-Spain",
+     "TV"=>"Funafuti",
+     "TW"=>"Taipei",
+     "TZ"=>"Dar es Salaam",
+     "UA"=>"Kyiv",
+     "UG"=>"Kampala",
+     "US"=>"Washington, DC",
+     "UY"=>"Montevideo",
+     "UZ"=>"Tashkent",
+     "VA"=>"Vatican City",
+     "VC"=>"Kingstown",
+     "VE"=>"Caracas",
+     "VG"=>"Road Town",
+     "VI"=>"Charlotte Amalie",
+     "VN"=>"Hanoi",
+     "VU"=>"Port-Vila",
+     "WF"=>"Mata-Utu",
+     "WS"=>"Apia",
+     "YE"=>"Sanaa",
+     "YT"=>"Mamoudzou",
+     "ZA"=>"Pretoria",
+     "ZM"=>"Lusaka",
+     "ZW"=>"Harare"}.freeze
+
+    def call(code:)
+      case code
+      when 'US', 'CA'
+        success('Central Time (US & Canada)')
+      else
+        success(from_timezone_helper(code))
+      end
+    end
+
+    private
+
+    def from_timezone_helper(code)
+      timezones = ActiveSupport::TimeZone.country_zones(code)
+      return 'Central Time (US & Canada)' if timezones.empty?
+
+      timezones.first.name if timezones.size == 1
+
+      # If there is more than one timezone for the country, then we'll use the capital city
+      # to determine the timezone
+      # eg GB has London and Edinburgh
+      capital_city = CAPITAL_CITIES[code]
+      capital_city_time_zone = timezones.find{ |tz| tz.name.match(capital_city) }
+      return capital_city_time_zone.name if capital_city_time_zone.present?
+
+      timezones.first.name
+    end
+  end
+end

data/app/services/spree/products/prepare_nested_attributes.rb

@@ -136,15 +136,8 @@ module Spree
             o.position = opt[:position]
             o.save!
           end
-
-          option_value_identificator = if opt[:option_value_name].present?
-                                         opt[:option_value_name]
-                                       else
-                                         opt[:option_value_presentation].parameterize
-                                       end
-
-          option_value = option_type.option_values.where(name: option_value_identificator).first_or_initialize do |o|
-            o.name = o.presentation = opt[:option_value_presentation]
+          option_value = option_type.option_values.where(name: opt[:value].parameterize).first_or_initialize do |o|
+            o.name = o.presentation = opt[:value]
             o.save!
           end
 

data/app/services/spree/seeds/admin_user.rb

@@ -12,9 +12,11 @@ module Spree
             first_name: 'Spree',
             last_name: 'Admin'
           )
-
-          user.spree_roles << Spree::Role.find_or_create_by(name: :admin)
           user.save!
+
+          Spree::Store.all.each do |store|
+            store.add_user(user)
+          end
         end
       end
     end

data/app/services/spree/seeds/all.rb

@@ -14,9 +14,11 @@ module Spree
           Roles.call
 
           # additional data
-          DefaultReimbursementTypes.call
+          ReturnsEnvironment.call
           ShippingCategories.call
           StoreCreditCategories.call
+          TaxCategories.call
+          DigitalDelivery.call
 
           # store & stock location
           Stores.call

data/app/services/spree/seeds/digital_delivery.rb

@@ -0,0 +1,20 @@
+module Spree
+  module Seeds
+    class DigitalDelivery
+      prepend Spree::ServiceModule::Base
+
+      def call
+        digital_shipping_category = Spree::ShippingCategory.find_or_create_by!(name: 'Digital')
+        zones = Spree::Zone.all
+
+        digital_shipping_method = Spree::ShippingMethod.find_or_initialize_by(name: Spree.t('digital.digital_delivery'))
+
+        digital_shipping_method.display_on = 'both'
+        digital_shipping_method.shipping_categories = [digital_shipping_category]
+        digital_shipping_method.calculator ||= Spree::Calculator::Shipping::DigitalDelivery.create!
+        digital_shipping_method.zones = zones
+        digital_shipping_method.save!
+      end
+    end
+  end
+end

data/app/services/spree/seeds/returns_environment.rb

@@ -0,0 +1,27 @@
+module Spree
+  module Seeds
+    class ReturnsEnvironment
+      prepend Spree::ServiceModule::Base
+
+      def call
+        Spree::RefundReason.find_or_create_by!(name: 'Return processing', mutable: false)
+        [
+          'Better price available',
+          'Missed estimated delivery date',
+          'Missing parts or accessories',
+          'Damaged/Defective',
+          'Different from what was ordered',
+          'Different from description',
+          'No longer needed/wanted',
+          'Accidental order',
+          'Unauthorized purchase',
+        ].each do |name|
+          Spree::ReturnAuthorizationReason.find_or_create_by!(name: name)
+        end
+        Spree::ReimbursementType.find_or_create_by!(name: 'Store Credit', type: 'Spree::ReimbursementType::StoreCredit')
+        Spree::ReimbursementType.find_or_create_by!(name: 'Exchange', type: 'Spree::ReimbursementType::Exchange')
+        Spree::ReimbursementType.find_or_create_by!(name: 'Original payment', type: 'Spree::ReimbursementType::OriginalPayment')
+      end
+    end
+  end
+end

data/app/services/spree/seeds/tax_categories.rb

@@ -0,0 +1,12 @@
+module Spree
+  module Seeds
+    class TaxCategories
+      prepend Spree::ServiceModule::Base
+
+      def call
+        Spree::TaxCategory.find_or_create_by(name: 'Default', is_default: true)
+        Spree::TaxCategory.find_or_create_by(name: 'Non-taxable')
+      end
+    end
+  end
+end

data/app/services/spree/stores/settings_defaults_by_country.rb

@@ -0,0 +1,38 @@
+module Spree
+  module Stores
+    class SettingsDefaultsByCountry
+      prepend Spree::ServiceModule::Base
+
+      IMPERIAL = %w[US GB LR MM].freeze
+
+      def call(code:)
+        default_unit_system = unit_system(code)
+
+        success(
+          unit_system: default_unit_system,
+          weight_unit: weight_unit(default_unit_system),
+          timezone: timezone(code)
+        )
+      end
+
+      private
+
+      def unit_system(code)
+        IMPERIAL.include?(code) ? :imperial : :metric
+      end
+
+      def weight_unit(unit_system)
+        unit_system.to_s == 'metric' ? 'kg' : 'lb'
+      end
+
+      def timezone(code)
+        case code
+        when 'US', 'CA'
+          'Central Time (US & Canada)'
+        else
+          Spree::CountryToTimezone.call(code: code).value
+        end
+      end
+    end
+  end
+end

data/app/services/spree/tags/bulk_add.rb

@@ -16,7 +16,19 @@ module Spree
 
         record_class = records.first.class
 
-        taggings_to_upsert = records.pluck(:id).map do |record_id|
+        taggings_to_upsert = taggings_attributes(tags, records, context: context, record_class: record_class)
+
+        return if taggings_to_upsert.empty?
+
+        ActsAsTaggableOn::Tagging.insert_all(taggings_to_upsert)
+
+        record_class.where(id: records.pluck(:id)).touch_all
+      end
+
+      private
+
+      def taggings_attributes(tags, records, context:, record_class:)
+        records.pluck(:id).map do |record_id|
           tags.map do |tag|
             {
               taggable_id: record_id,
@@ -26,12 +38,6 @@ module Spree
             }
           end
         end.flatten.compact
-
-        return if taggings_to_upsert.empty?
-
-        ActsAsTaggableOn::Tagging.insert_all(taggings_to_upsert)
-
-        record_class.where(id: records.pluck(:id)).touch_all
       end
     end
   end