spree_core 5.0.3 → 5.1.0.beta

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/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

data/app/views/spree/invitation_mailer/invitation_accepted.html.erb

@@ -0,0 +1,12 @@
+<h1>
+  <%= Spree.t('invitation_mailer.greeting', user_name: @invitation.inviter.first_name) %>
+</h1>
+<p>
+  <%= Spree.t('invitation_mailer.invitation_accepted.body', invitee_name: @invitation.invitee&.name, resource_name: @invitation.resource.name) %>
+</p>
+
+<p>
+  <%= Spree.t('invitation_mailer.thanks') %><br />
+  <%= current_store.name %>
+</p>
+

data/app/views/spree/invitation_mailer/invitation_email.html.erb

@@ -0,0 +1,21 @@
+<h1>
+  <%= Spree.t('invitation_mailer.greeting', user_name: @invitation.invitee&.first_name || @invitation.email) %>
+</h1>
+<p>
+  <%= Spree.t('invitation_mailer.invitation_email.body', inviter_name: @invitation.inviter.name, resource_name: @invitation.resource.name) %>
+</p>
+<p>
+  <%= Spree.t('invitation_mailer.invitation_email.link_description') %>
+</p>
+
+<% if spree.respond_to?(:admin_invitation_url) %>
+  <p>
+    <%= link_to Spree.t('invitation_mailer.invitation_email.link_text'), spree.admin_invitation_url(@invitation, token: @invitation.token, host: @invitation.store.formatted_url) %>
+  </p>
+<% end %>
+
+<p>
+  <%= Spree.t('invitation_mailer.thanks') %><br />
+  <%= current_store.name %>
+</p>
+

data/config/locales/en.yml

@@ -52,6 +52,9 @@ en:
         year: Year
       spree/inventory_unit:
         state: State
+      spree/invitation:
+        expires_at: Expires at
+        inviter: Inviter
       spree/line_item:
         price: Price
         quantity: Quantity
@@ -194,6 +197,10 @@ en:
       spree/zone:
         description: Description
         name: Name
+      user:
+        current_sign_in: Current sign in at
+        last_sign_in: Last sign in at
+        sign_in_count: Sign in count
     errors:
       messages:
         blank: can't be blank
@@ -334,6 +341,9 @@ en:
       spree/export:
         one: Export
         other: Exports
+      spree/integration:
+        one: Integration
+        other: Integrations
       spree/inventory_unit:
         one: Inventory Unit
         other: Inventory Units
@@ -349,6 +359,18 @@ en:
       spree/order:
         one: Order
         other: Orders
+      spree/page:
+        one: Page
+        other: Pages
+      spree/page_block:
+        one: Page Block
+        other: Page Blocks
+      spree/page_link:
+        one: Page Link
+        other: Page Links
+      spree/page_section:
+        one: Page Section
+        other: Page Sections
       spree/payment:
         one: Payment
         other: Payments
@@ -526,7 +548,6 @@ en:
     accepts_email_marketing: Accepts email marketing
     account: Account
     account_info: Account info
-    account_members: Team
     action: Action
     actions:
       approve: Approve
@@ -546,6 +567,7 @@ en:
       receive: Mark as received
       refund: Refund
       reject: Reject
+      resend: Resend
       resolve: Mark as resolved
       save: Save
       select_file: Select file
@@ -784,6 +806,7 @@ en:
     continue_as_guest: Continue as a guest
     continue_selling_when_out_of_stock: Continue selling when out of stock
     continue_shopping: Continue shopping
+    continue_without_logging_in: Continue without logging in
     copy: Copy
     copy_id: Copy ID
     copy_link: Copy link
@@ -819,14 +842,13 @@ en:
     coupon_codes: Coupon codes
     create: Create
     create_a_new_account: Create a new account
-    create_account: Create account
     create_customer: Create customer
     create_new: Create new
     create_new_order: Create new order
     create_new_team: Create new team
     create_reimbursement: Create reimbursement
-    created_at: Created At
-    created_by: Created By
+    created_at: Created at
+    created_by: Created by
     credit: Credit
     credit_allowed: Credit allowed
     credit_card: Credit Card
@@ -1122,6 +1144,7 @@ en:
     internationalization: Internationalization
     invalid_credit_card: Invalid credit card.
     invalid_exchange_variant: Invalid exchange variant.
+    invalid_or_expired_invitation: Invalid or expired invitation
     invalid_payment_provider: Invalid payment provider.
     invalid_promotion_action: Invalid promotion action.
     invalid_promotion_rule: Invalid promotion rule.
@@ -1129,6 +1152,20 @@ en:
     inventory_adjustment: Inventory Adjustment
     inventory_error_flash_for_insufficient_quantity: An item in your cart has become unavailable.
     inventory_state: Inventory State
+    invitation_accepted: Invitation accepted!
+    invitation_mailer:
+      greeting: Hi %{user_name},
+      invitation_accepted:
+        body: "%{invitee_name} has accepted your invitation to join %{resource_name}"
+        subject: "%{invitee_name} has accepted your invitation to join %{resource_name}"
+      invitation_email:
+        body: "%{inviter_name} has invited you to join %{resource_name}"
+        link_description: 'To accept this invitation, please click the link below:'
+        subject: Invitation to join %{resource_name}
+      thanks: Thank you,
+    invitation_resent: Invitation resent!
+    invitations: Invitations
+    invited_by: Invited by
     is_not_available_to_shipment_address: is not available to shipment address
     iso: ISO Alpha-2
     iso3: ISO Alpha-3
@@ -1164,7 +1201,6 @@ en:
     list: List
     live: Live
     loading: Loading
-    loading_tree: Loading tree. Please wait…
     locale_changed: Locale Changed
     location: Location
     lock: Lock
@@ -1179,7 +1215,6 @@ en:
     login_failed: Login authentication failed.
     login_name: Login
     logo: Logo
-    logo_alt: Brand logo
     logout: Logout
     logs: Logs
     look_for_similar_items: Look for similar items
@@ -1233,7 +1268,7 @@ en:
     new_billing_address: New Billing Address
     new_country: New Country
     new_custom_domain: New Custom Domain
-    new_customer: Create new account
+    new_customer: New Customer
     new_customer_return: New Customer Return
     new_digital_asset: New digital asset
     new_domain: New domain
@@ -1429,6 +1464,9 @@ en:
       newsletter_form:
         button_text_default: Submit
         placeholder_default: Enter your email
+      products:
+        buy_buttons:
+          display_name: Add To Cart
     page_not_found: Sorry! Page you are looking can’t be found.
     page_sections:
       announcement_bar:
@@ -1459,7 +1497,6 @@ en:
       video:
         heading_1_default: Why I recommend it?
         heading_2_default: There's nothing like a soft hint of blush to add dimension and color to your look.
-    page_settings: Page settings
     pages: Pages
     pages_defaults:
       homepage:
@@ -1517,6 +1554,7 @@ en:
     percent: Percent
     percent_per_item: Percent Per Item
     permalink: Permalink
+    permissions: Permissions
     personal_details: Personal details
     phone: Phone
     place_order: Place Order
@@ -2119,6 +2157,7 @@ en:
     translations_for: "%{resource_name} translations"
     tree: Tree
     true_label: 'TRUE'
+    try_removing_filters: Try removing some filters to see more products
     twitter: Twitter
     type: Type
     type_to_search: Type to search
@@ -2139,7 +2178,7 @@ en:
     update_billing_address: Update billing address
     update_contact_information: Update contact information
     update_shipping_address: Update shipping address
-    updated: Updated
+    updated_at: Updated at
     updating: Updating
     upload_image: Upload image
     url: URL

data/db/migrate/20250407085228_create_spree_integrations.rb

@@ -0,0 +1,12 @@
+class CreateSpreeIntegrations < ActiveRecord::Migration[7.2]
+  def change
+    create_table :spree_integrations, if_not_exists: true do |t|
+      t.references :store, null: false, index: true
+      t.string :type, null: false, index: true
+      t.text :preferences
+      t.boolean :active, default: false, null: false, index: true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250410061306_create_spree_invitations.rb

@@ -0,0 +1,20 @@
+class CreateSpreeInvitations < ActiveRecord::Migration[7.2]
+  def change
+    create_table :spree_invitations do |t|
+      t.string :email, index: true, null: false
+      t.string :token, index: { unique: true }, null: false
+      t.string :status, null: false, index: true
+
+      t.references :resource, polymorphic: true, index: true, null: false # eg. Store, Vendor, Account
+      t.references :inviter, polymorphic: true, index: true, null: false
+      t.references :invitee, polymorphic: true, index: true
+      t.references :role, null: false
+
+      t.datetime :accepted_at
+      t.datetime :expires_at, index: true
+      t.datetime :deleted_at, index: true
+
+      t.timestamps
+    end
+  end
+end