spree_core 6.0.0.beta3 → 6.0.0.rc1

data/app/workflows/spree/stock_transfers/close.rb

@@ -8,7 +8,7 @@ module Spree
     # destination counted in, records why the rest never arrived, and leaves
     # the outstanding count on each line as the record of the loss.
     class Close < Spree::Workflow
-      include Spree::Receivables::IncomingCounter
+      include Spree::Receivables::ClosingShort
 
       hooks :validate, :after_close
 
@@ -18,39 +18,12 @@ module Spree
       # @param reason [String, nil] what happened to the balance
       def perform(stock_transfer:, reason: nil)
         super
-
-        stock_transfer.with_lock do
-          step :ensure_closable
-          run_hooks :validate
-          step :uncount_awaited_units
-          step :close_short
-        end
-
-        run_hooks :after_close
-        stock_transfer.publish_event('stock_transfer.received')
-        success(stock_transfer.reload)
+        close
       end
 
       private
 
-      def ensure_closable
-        return if stock_transfer.partially_received?
-
-        failure(stock_transfer, Spree.t('stock_transfer.errors.not_partially_received'))
-      end
-
-      # The missing units are not going to turn up, so the destination stops
-      # expecting them; each line's outstanding count keeps the record.
-      def uncount_awaited_units
-        uncount_incoming(stock_transfer)
-      end
-
-      def close_short
-        now = Time.current
-        attributes = { status: 'received', received_at: now, closed_short_at: now, close_reason: reason.presence }
-
-        failure(stock_transfer) unless stock_transfer.update(attributes)
-      end
+      def receivable = stock_transfer
     end
   end
 end

data/app/workflows/spree/stock_transfers/mark_draft.rb

@@ -30,7 +30,7 @@ module Spree
       def ensure_returnable
         return if stock_transfer.ready_to_ship?
 
-        failure(stock_transfer, Spree.t('stock_transfer.errors.not_ready_to_ship'))
+        failure(stock_transfer, I18n.t('spree.stock_transfer.errors.not_ready_to_ship'))
       end
 
       def return_to_draft

data/app/workflows/spree/stock_transfers/mark_in_transit.rb

@@ -46,9 +46,9 @@ module Spree
 
       def ensure_shippable
         unless stock_transfer.draft? || stock_transfer.ready_to_ship?
-          failure(stock_transfer, Spree.t('stock_transfer.errors.not_shippable'))
+          failure(stock_transfer, I18n.t('spree.stock_transfer.errors.not_shippable'))
         end
-        failure(stock_transfer, Spree.t('stock_transfer.errors.must_have_variant')) if stock_transfer.items.empty?
+        failure(stock_transfer, I18n.t('spree.stock_transfer.errors.must_have_variant')) if stock_transfer.items.empty?
       end
 
       # Every line needs enough available stock for the quantity being moved,
@@ -65,7 +65,7 @@ module Spree
         return if unavailable_items.empty?
 
         failure(stock_transfer,
-                Spree.t('stock_transfer.errors.variants_unavailable', stock: source.name))
+                I18n.t('spree.stock_transfer.errors.variants_unavailable', stock: source.name))
       end
 
       def write_shipped_movements

data/app/workflows/spree/stock_transfers/mark_ready.rb

@@ -24,8 +24,8 @@ module Spree
       private
 
       def ensure_draft
-        failure(stock_transfer, Spree.t('stock_transfer.errors.not_draft')) unless stock_transfer.draft?
-        failure(stock_transfer, Spree.t('stock_transfer.errors.must_have_variant')) if stock_transfer.items.empty?
+        failure(stock_transfer, I18n.t('spree.stock_transfer.errors.not_draft')) unless stock_transfer.draft?
+        failure(stock_transfer, I18n.t('spree.stock_transfer.errors.must_have_variant')) if stock_transfer.items.empty?
       end
 
       def mark_ready

data/app/workflows/spree/stock_transfers/receive.rb

@@ -46,7 +46,7 @@ module Spree
       def ensure_receivable
         return if stock_transfer.in_flight?
 
-        failure(stock_transfer, Spree.t('stock_transfer.errors.not_in_transit'))
+        failure(stock_transfer, I18n.t('spree.stock_transfer.errors.not_in_transit'))
       end
 
       def line_belongs?(line)

data/app/workflows/spree/stock_transfers/update.rb

@@ -4,6 +4,8 @@ module Spree
     # matter of record, so this refuses anything past `draft` rather than
     # quietly rewriting a document the warehouse is already acting on.
     class Update < Spree::Workflow
+      include Spree::Receivables::DraftEditing
+
       hooks :validate, :after_update
 
       # @param stock_transfer [Spree::StockTransfer]
@@ -13,43 +15,13 @@ module Spree
       #   replacing the current lines; nil leaves them alone
       def perform(stock_transfer:, attributes: {}, items: nil)
         super
-
-        step :ensure_editable
-        run_hooks :validate
-
-        ApplicationRecord.transaction do
-          step :apply_changes
-          step :save_transfer
-        end
-
-        run_hooks :after_update
-        success(stock_transfer.reload)
+        edit
       end
 
       private
 
-      def ensure_editable
-        return if stock_transfer.editable?
-
-        failure(stock_transfer, Spree.t('stock_transfer.errors.not_editable'))
-      end
-
-      # A whole-list replacement rather than a per-line diff: a draft's lines
-      # are what the merchant is still deciding, and sending the list they
-      # want is simpler for a client than working out which rows to delete.
-      def apply_changes
-        stock_transfer.assign_attributes(attributes) if attributes.present?
-        return if items.nil?
-
-        stock_transfer.items.destroy_all
-        Array(items).each do |item|
-          stock_transfer.items.build(variant: item[:variant], quantity_shipped: item[:quantity_shipped])
-        end
-      end
-
-      def save_transfer
-        failure(stock_transfer) unless stock_transfer.save
-      end
+      def receivable = stock_transfer
+      def item_attributes = %i[quantity_shipped]
     end
   end
 end

data/config/i18n-tasks.yml

@@ -14,11 +14,13 @@ data:
   # adapter: I18n::Tasks::Data::FileSystem
 
   # Locale files or `Dir.glob` patterns where translations are read from:
+  ## This one config checks every Spree gem: core's keys are used from all of
+  ## them, and their own keys from core.
   read:
-    ## Default:
-    # - config/locales/%{locale}.yml
-    ## More files:
-    # - config/locales/**/*.%{locale}.yml
+    - config/locales/%{locale}.yml
+<% %w[api emails].map { |gem| "../#{gem}" }.concat(Dir['../providers/*']).each do |gem| %>
+    - "<%= File.expand_path("#{gem}/config/locales", Dir.pwd) %>/%{locale}.yml"
+<% end %>
 
   # Locale files to write new keys to, based on a list of key pattern => file rules. Matched from top to bottom:
   # `i18n-tasks normalize -p` will force move the keys according to these rules
@@ -52,9 +54,14 @@ data:
 
 # Find translate calls
 search:
-  ## Paths or `Find.find` patterns to search in:
-  # paths:
-  #  - app/
+  ## Paths or `Find.find` patterns to search in. Core keys are read by every
+  ## Spree gem, so all of them are searched.
+  paths:
+    - app/
+    - lib/
+<% (%w[api emails dashboard opentelemetry].map { |gem| "../#{gem}" } + Dir['../providers/*']).product(%w[app lib]).each do |gem, folder| %>
+    - "<%= File.expand_path("#{gem}/#{folder}", Dir.pwd) %>"
+<% end %>
 
   ## Root directories for relative keys resolution.
   # relative_roots:
@@ -143,12 +150,18 @@ ignore_missing:
   - 'unauthorized.default'
 
 ## Consider these keys used:
-# ignore_unused:
-# - 'activerecord.attributes.*'
-# - '{devise,kaminari,will_paginate}.*'
-# - 'simple_form.{yes,no}'
-# - 'simple_form.{placeholders,hints,labels}.*'
-# - 'simple_form.{error_notification,required}.:'
+ignore_unused:
+  # Read by Rails itself (model names, attribute names, validation messages, formats).
+  - 'activerecord.*'
+  - 'activemodel.*'
+  - 'errors.*'
+  - 'number.*'
+  # Keys built with interpolation, which the scanner cannot follow.
+  - 'spree.reporting.*'
+  - 'spree.permissions_catalog.*'
+  # Spree::TypeLabels reads <family>_types.<api_type>.{name,description}.
+  - 'spree.{collection_rule,commission_rule,delivery_method_rule,order_routing_rule,promotion_action,promotion_rule,seller_requirement}_types.*'
+  - 'spree.i18n.this_file_language'
 
 ## Exclude these keys from the `i18n-tasks eq-base' report:
 # ignore_eq_base:
@@ -172,8 +185,9 @@ ignore_missing:
 # <%# I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',
 #       only: %w(*.html.haml *.html.slim),
 #       patterns: [['= title\b', '.page_title']] %>
-#
-# The PatternMapper can also match key literals via a special %{key} interpolation, e.g.:
-#
-# <%# I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',
-#       patterns: [['\bSpree\.t[( ]\s*%{key}', 'spree.%{key}']] %>
+
+# Email templates translate Spree keys with Liquid's `t` filter, and shared
+# partials take a key to translate (`label: 'some.key', translate: true`).
+<% I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',
+      only: %w(*.liquid),
+      patterns: [['%{key}\s*\|\s*t\b', 'spree.%{key}'], ['\blabel:\s*%{key}', 'spree.%{key}']] %>

data/config/initializers/alba.rb

@@ -0,0 +1,7 @@
+Alba.backend = :oj_rails
+Alba.inflector = :active_support
+
+# Custom types
+Alba.register_type :iso8601, converter: ->(time) { time&.iso8601(3) }, auto_convert: true
+# Decimals and money rendered as their exact string form instead of JSON numbers
+Alba.register_type :string, check: ->(value) { value.is_a?(String) }, converter: ->(value) { value.to_s }, auto_convert: true

data/config/language_names.csv

@@ -0,0 +1,264 @@
+aa,Afar,Afar
+ab,Abkhazian,Аҧсуа
+af,Afrikaans,Afrikaans
+ak,Akan,Akana
+als,Alemannic,Alemannisch
+am,Amharic,አማርኛ
+an,Aragonese,Aragonés
+ang,Angal,Angal Heneng
+ang,Anglo-Saxon / Old English,Englisc
+ar,Arabic,العربية
+arc,Aramaic,ܣܘܪܬ
+as,Assamese,অসমীয়া
+ast,Asturian,Asturianu
+av,Avar,Авар
+awa,Awadhi,Awadhi
+ay,Aymara,Aymar
+az,Azerbaijani,Azərbaycanca / آذربايجان
+ba,Bashkir,Башҡорт
+bar,Bavarian,Boarisch
+bat-smg,Samogitian,Žemaitėška
+bcl,Bikol,Bikol Central
+be,Belarusian,Беларуская
+be-x-old,Belarusian (Taraškievica),Беларуская (тарашкевіца)
+bg,Bulgarian,Български
+bh,Bihari,भोजपुरी
+bi,Bislama,Bislama
+bm,Bambara,Bamanankan
+bn,Bengali,বাংলা
+bo,Tibetan,བོད་ཡིག / Bod skad
+bpy,Bishnupriya Manipuri,ইমার ঠার/বিষ্ণুপ্রিয়া মণিপুরী
+br,Breton,Brezhoneg
+brx,Boro,बड़
+bs,Bosnian,Bosanski
+bug,Buginese,ᨅᨔ ᨕᨘᨁᨗ / Basa Ugi
+bxr,Buriat (Russia),Буряад хэлэн
+ca,Catalan,Català
+cdo,Min Dong Chinese,Mìng-dĕ̤ng-ngṳ̄ / 閩東語
+ce,Chechen,Нохчийн
+ceb,Cebuano,Sinugboanong Binisaya
+ch,Chamorro,Chamoru
+cho,Choctaw,Choctaw
+chr,Cherokee,ᏣᎳᎩ
+chy,Cheyenne,Tsetsêhestâhese
+ckb,Kurdish (Sorani),کوردی
+co,Corsican,Corsu
+cr,Cree,Nehiyaw
+cs,Czech,Česky
+csb,Kashubian,Kaszëbsczi
+cu,Old Church Slavonic / Old Bulgarian,словѣньскъ / slověnĭskŭ
+cv,Chuvash,Чăваш
+cy,Welsh,Cymraeg
+da,Danish,Dansk
+de,German,Deutsch
+diq,Dimli,Zazaki
+dsb,Lower Sorbian,Dolnoserbski
+dv,Divehi,ދިވެހިބަސް
+dz,Dzongkha,ཇོང་ཁ
+ee,Ewe,Ɛʋɛ
+el,Greek,Ελληνικά
+en,English,English
+eo,Esperanto,Esperanto
+es,Spanish,Español
+et,Estonian,Eesti
+eu,Basque,Euskara
+ext,Extremaduran,Estremeñu
+fa,Persian,فارسی
+ff,Peul,Fulfulde
+fi,Finnish,Suomi
+fiu-vro,Võro,Võro
+fj,Fijian,Na Vosa Vakaviti
+fo,Faroese,Føroyskt
+fr,French,Français
+frp,Arpitan / Franco-Provençal,Arpitan / francoprovençal
+fur,Friulian,Furlan
+fy,West Frisian,Frysk
+ga,Irish,Gaeilge
+gan,Gan Chinese,贛語
+gbm,Garhwali,गढ़वळी
+gd,Scottish Gaelic,Gàidhlig
+gil,Gilbertese,Taetae ni kiribati
+gl,Galician,Galego
+gn,Guarani,Avañe'ẽ
+got,Gothic,gutisk
+gu,Gujarati,ગુજરાતી
+gv,Manx,Gaelg
+ha,Hausa,هَوُسَ
+hak,Hakka Chinese,客家語/Hak-kâ-ngî
+haw,Hawaiian,Hawai`i
+he,Hebrew,עברית
+hi,Hindi,हिन्दी
+ho,Hiri Motu,Hiri Motu
+hr,Croatian,Hrvatski
+ht,Haitian,Krèyol ayisyen
+hu,Hungarian,Magyar
+hy,Armenian,Հայերեն
+hz,Herero,Otsiherero
+ia,Interlingua,Interlingua
+id,Indonesian,Bahasa Indonesia
+ie,Interlingue,Interlingue
+ig,Igbo,Igbo
+ii,Sichuan Yi,ꆇꉙ / 四川彝语
+ik,Inupiak,Iñupiak
+ilo,Ilokano,Ilokano
+inh,Ingush,ГӀалгӀай
+io,Ido,Ido
+is,Icelandic,Íslenska
+it,Italian,Italiano
+iu,Inuktitut,ᐃᓄᒃᑎᑐᑦ
+ja,Japanese,日本語
+jbo,Lojban,Lojban
+jv,Javanese,Basa Jawa
+ka,Georgian,ქართული
+kg,Kongo,KiKongo
+ki,Kikuyu,Gĩkũyũ
+kj,Kuanyama,Kuanyama
+kk,Kazakh,Қазақша
+kl,Greenlandic,Kalaallisut
+km,Cambodian,ភាសាខ្មែរ
+kn,Kannada,ಕನ್ನಡ
+khw,Khowar,کھوار
+ko,Korean,한국어
+kr,Kanuri,Kanuri
+ks,Kashmiri,कॉशुर / کٲشُر
+ksh,Ripuarian,Ripoarisch
+ku,Kurdish (Kurmanji),Kurdî
+kv,Komi,Коми
+kw,Cornish,Kernewek
+ky,Kirghiz,Kırgızca / Кыргызча
+la,Latin,Latina
+lad,Ladino / Judeo-Spanish,Dzhudezmo / Djudeo-Espanyol
+lan,Lango,Leb Lango / Luo
+lb,Luxembourgish,Lëtzebuergesch
+lg,Ganda,Luganda
+li,Limburgian,Limburgs
+lij,Ligurian,Líguru
+lmo,Lombard,Lumbaart
+ln,Lingala,Lingála
+lo,Laotian,ລາວ / Pha xa lao
+lzz,Laz,Lazuri / ლაზური
+lt,Lithuanian,Lietuvių
+lv,Latvian,Latviešu
+map-bms,Banyumasan,Basa Banyumasan
+mg,Malagasy,Malagasy
+man,Mandarin,官話/官话
+mh,Marshallese,Kajin Majel / Ebon
+mi,Māori,Māori
+min,Minangkabau,Minangkabau
+mk,Macedonian,Македонски
+ml,Malayalam,മലയാളം
+mn,Mongolian,Монгол
+mo,Moldovan,Moldovenească
+mr,Marathi,मराठी
+mrh,Mara,Mara
+ms,Malay,Bahasa Melayu
+mt,Maltese,bil-Malti
+mus,Creek / Muskogee,Mvskoke
+mwl,Mirandese,Mirandés
+my,Burmese,Myanmasa
+na,Nauruan,Dorerin Naoero
+nah,Nahuatl,Nahuatl
+nap,Neapolitan,Nnapulitano
+nd,North Ndebele,Sindebele
+nds,Low German / Low Saxon,Plattdüütsch
+nds-nl,Dutch Low Saxon,Nedersaksisch
+ne,Nepali,नेपाली
+new,Newar,नेपालभाषा / Newah Bhaye
+ng,Ndonga,Oshiwambo
+nl,Dutch,Nederlands
+nn,Norwegian Nynorsk,Norsk (nynorsk)
+no,Norwegian,Norsk (bokmål / riksmål)
+nr,South Ndebele,isiNdebele
+nso,Northern Sotho,Sesotho sa Leboa / Sepedi
+nrm,Norman,Nouormand / Normaund
+nv,Navajo,Diné bizaad
+ny,Chichewa,Chi-Chewa
+oc,Occitan,Occitan
+oj,Ojibwa,ᐊᓂᔑᓈᐯᒧᐎᓐ / Anishinaabemowin
+om,Oromo,Oromoo
+or,Oriya,ଓଡ଼ିଆ
+os,Ossetian / Ossetic,Иронау
+pa,Panjabi / Punjabi,ਪੰਜਾਬੀ / پنجابی
+pag,Pangasinan,Pangasinan
+pam,Kapampangan,Kapampangan
+pap,Papiamentu,Papiamentu
+pdc,Pennsylvania German,Deitsch
+pi,Pali,Pāli / पाऴि
+pih,Norfolk,Norfuk
+pl,Polish,Polski
+pms,Piedmontese,Piemontèis
+ps,Pashto,پښتو
+pt,Portuguese,Português
+qu,Quechua,Runa Simi
+rm,Raeto Romance,Rumantsch
+rmy,Romani,Romani / रोमानी
+rn,Kirundi,Kirundi
+ro,Romanian,Română
+roa-rup,Aromanian,Armâneashti
+ru,Russian,Русский
+rw,Rwandi,Kinyarwandi
+sa,Sanskrit,संस्कृतम्
+sc,Sardinian,Sardu
+scn,Sicilian,Sicilianu
+sco,Scots,Scots
+sd,Sindhi,सिंधी / سنڌي‎
+se,Northern Sami,Davvisámegiella
+sg,Sango,Sängö
+sh,Serbo-Croatian,Srpskohrvatski / Српскохрватски
+si,Sinhalese,සිංහල
+simple,Simple English,Simple English
+sk,Slovak,Slovenčina
+sl,Slovenian,Slovenščina
+sm,Samoan,Gagana Samoa
+sn,Shona,chiShona
+so,Somalia,Soomaaliga
+sq,Albanian,Shqip
+sr,Serbian,Српски
+ss,Swati,SiSwati
+st,Southern Sotho,Sesotho
+su,Sundanese,Basa Sunda
+sv,Swedish,Svenska
+sw,Swahili,Kiswahili
+ta,Tamil,தமிழ்
+te,Telugu,తెలుగు
+tet,Tetum,Tetun
+tg,Tajik,Тоҷикӣ
+th,Thai,ไทย / Phasa Thai
+ti,Tigrinya,ትግርኛ
+tk,Turkmen,Туркмен / تركمن
+tl,Tagalog,Tagalog / ᜆᜄᜎᜓᜄ᜔
+tlh,Klingon,tlhIngan-Hol
+tn,Tswana,Setswana
+to,Tonga,Lea Faka-Tonga
+tpi,Tok Pisin,Tok Pisin
+tr,Turkish,Türkçe
+ts,Tsonga,Xitsonga
+tt,Tatar,Tatarça
+tum,Tumbuka,chiTumbuka
+tw,Twi,Twi
+ty,Tahitian,Reo Mā`ohi
+udm,Udmurt,Удмурт кыл
+ug,Uyghur,Uyƣurqə / ئۇيغۇرچە
+uk,Ukrainian,Українська
+ur,Urdu,اردو
+uz,Uzbek,Ўзбек
+uz_AF,Uzbeki Afghanistan,اوزبیکی
+ve,Venda,Tshivenḓa
+vi,Vietnamese,Việtnam
+vec,Venetian,Vèneto
+vls,West Flemish,West-Vlaoms
+vo,Volapük,Volapük
+wa,Walloon,Walon
+war,Waray / Samar-Leyte Visayan,Winaray / Binisaya Lineyte-Samarnon
+wo,Wolof,Wollof
+xal,Kalmyk,Хальмг
+xh,Xhosa,isiXhosa
+xmf,Megrelian,მარგალური
+yi,Yiddish,ייִדיש
+yo,Yoruba,Yorùbá
+za,Zhuang,Cuengh / Tôô / 壮语
+zh,Chinese,中文
+zh-classical,Classical Chinese,文言
+zh-min-nan,Minnan,Bân-lâm-gú
+zh-yue,Cantonese,粵語 / 粤语
+zu,Zulu,isiZulu