spree_core 5.0.5 → 5.1.0.beta

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

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/app/views/spree/shared/_payment.html.erb

@@ -30,15 +30,6 @@
     <div class="flex-shrink-0">
       <%= payment_method_icon_tag source.class.to_s.demodulize.downcase, height: 30 %>
     </div>
-    <div>
-      <% if payment.payment_method.respond_to?(:source_partial_name) %>
-        <%= render partial: "spree/payment_sources/#{payment.payment_method.source_partial_name}", locals: { payment: payment, source: source } %>
-      <% elsif source.respond_to?(:name) %>
-        <%= source.name %>
-      <% else %>
-        <%= source.class.to_s.demodulize.downcase %>
-      <% end %>
-    </div>
   <% else %>
     <div class="flex-shrink-0">
       <%= payment_method_icon_tag payment.payment_method.payment_icon_name %>