Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fixed numerous bugs, missing translations, and so on

Damian Legawiec1bfa814ba63c
diff --git a/admin/app/assets/stylesheets/spree/admin/plugins/_trix_custom.scss b/admin/app/assets/stylesheets/spree/admin/plugins/_trix_custom.scss
index 42b21ce207..d537bc9d1c 100644
--- a/admin/app/assets/stylesheets/spree/admin/plugins/_trix_custom.scss
+++ b/admin/app/assets/stylesheets/spree/admin/plugins/_trix_custom.scss
@@ -13,6 +13,7 @@ trix-toolbar {
}
.trix-button-group {
+ @extend .gap-1;
margin-left: 0 !important;
}
diff --git a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss b/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
index d49ffd85a9..583b05c7dd 100644
--- a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
+++ b/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
@@ -342,6 +342,10 @@ small,
width: 20%;
}
+.gap-1 {
+ gap: calc($spacer / 4);
+}
+
.gap-2 {
gap: calc($spacer / 2);
}
diff --git a/admin/app/controllers/spree/admin/dashboard_controller.rb b/admin/app/controllers/spree/admin/dashboard_controller.rb
index 4e39331686..f06fa7a4e8 100644
--- a/admin/app/controllers/spree/admin/dashboard_controller.rb
+++ b/admin/app/controllers/spree/admin/dashboard_controller.rb
@@ -79,7 +79,7 @@ module Spree
return if product_ids.empty?
- products = current_store.products.with_deleted.includes(:vendor).where(id: product_ids)
+ products = current_store.products.with_deleted.where(id: product_ids)
@top_products = line_items_grouped.map do |li|
product = products.find { |p| p.id == li.variant_product_id }
diff --git a/admin/app/helpers/spree/admin/base_helper.rb b/admin/app/helpers/spree/admin/base_helper.rb
index ea2c4f0c9d..bd61781844 100644
--- a/admin/app/helpers/spree/admin/base_helper.rb
+++ b/admin/app/helpers/spree/admin/base_helper.rb
@@ -4,7 +4,7 @@ module Spree
include Spree::ImagesHelper
def enterprise_edition?
- false
+ defined?(Vendo)
end
def spree_update_available?
diff --git a/admin/app/helpers/spree/admin/navigation_helper.rb b/admin/app/helpers/spree/admin/navigation_helper.rb
index be6b25e717..a1e4fb3881 100644
--- a/admin/app/helpers/spree/admin/navigation_helper.rb
+++ b/admin/app/helpers/spree/admin/navigation_helper.rb
@@ -197,13 +197,17 @@ module Spree
end
end
- def external_link_to(label, url, opts = {})
+ def external_link_to(label, url, opts = {}, &block)
opts[:target] ||= :blank
opts[:rel] ||= :nofollow
opts[:class] = "d-inline-flex align-items-center #{opts[:class]}"
- link_to url, opts do
- (label + icon('external-link', class: 'ml-1 mr-0 small')).html_safe
+ if block_given?
+ link_to url, opts, &block
+ else
+ link_to url, opts do
+ (label + icon('external-link', class: 'ml-1 mr-0 small')).html_safe
+ end
end
end
diff --git a/admin/app/helpers/spree/admin/products_helper.rb b/admin/app/helpers/spree/admin/products_helper.rb
index 98be99859f..cca3f82e9f 100644
--- a/admin/app/helpers/spree/admin/products_helper.rb
+++ b/admin/app/helpers/spree/admin/products_helper.rb
@@ -12,7 +12,7 @@ module Spree
def display_inventory(product_or_variant)
if product_or_variant.total_on_hand == BigDecimal::INFINITY
content_tag :span, class: 'text-muted' do
- Spree.t(:not_tracking_inventory)
+ Spree.t('admin.not_tracking_inventory')
end
else
stock = if product_or_variant.total_on_hand.positive?
@@ -21,7 +21,7 @@ module Spree
content_tag(:span, "0 #{Spree.t(:in_stock).downcase}", class: 'text-danger')
end
if product_or_variant.respond_to?(:variants) && product_or_variant.variants.size.positive?
- stock += " #{Spree.t(:for)} #{product_or_variant.variants.size} #{Spree.t(:variants).downcase}"
+ stock += " - #{product_or_variant.variants.size} #{Spree.t(:variants).downcase}"
end
stock
end
diff --git a/admin/app/views/spree/admin/dashboard/_setup_progress.html.erb b/admin/app/views/spree/admin/dashboard/_setup_progress.html.erb
index 8b77598230..a22f5d41d5 100644
--- a/admin/app/views/spree/admin/dashboard/_setup_progress.html.erb
+++ b/admin/app/views/spree/admin/dashboard/_setup_progress.html.erb
@@ -2,7 +2,11 @@
<div class="card-body">
<div class="mb-3">
Your overall setup progress
- <span class="float-right text-muted">
+ <span class="float-right badge badge-<%= current_store.setup_completed? ? 'success' : 'light' %>">
+ <% if current_store.setup_completed? %>
+ <%= icon('check', class: 'text-success') %>
+ <% end %>
+
<%= current_store.setup_tasks_done %> of <%= current_store.setup_tasks_total %> steps done
</span>
</div>
diff --git a/admin/app/views/spree/admin/dashboard/_store_preview.html.erb b/admin/app/views/spree/admin/dashboard/_store_preview.html.erb
index b5e02547e7..de5fd46f49 100644
--- a/admin/app/views/spree/admin/dashboard/_store_preview.html.erb
+++ b/admin/app/views/spree/admin/dashboard/_store_preview.html.erb
@@ -4,7 +4,7 @@
<div class="position-absolute w-100 h-100 align-items-center justify-content-center overlay-background store-preview-actions">
<button class="btn btn-outline-primary">
<%= icon('tools') %>
- <%= Spree.t(:edit_theme) %>
+ <%= Spree.t('admin.edit_theme') %>
</button>
</div>
<% if current_store.default_theme.screenshot.attached? && current_store.default_theme.screenshot.variable? %>
@@ -46,7 +46,7 @@
<%= link_to spree.edit_admin_theme_path(current_store.default_theme), class: 'btn btn-light w-50' do %>
<%= icon 'tools', class: 'mr-1' %>
&nbsp;
- <%= Spree.t(:edit_theme) %>
+ <%= Spree.t('admin.edit_theme') %>
<% end %>
</div>
</div>
diff --git a/admin/app/views/spree/admin/dashboard/_top_products.html.erb b/admin/app/views/spree/admin/dashboard/_top_products.html.erb
index 35d49cde7b..fd32aee6b7 100644
--- a/admin/app/views/spree/admin/dashboard/_top_products.html.erb
+++ b/admin/app/views/spree/admin/dashboard/_top_products.html.erb
@@ -41,7 +41,7 @@
<%= product.name %>
<% end %>
</td>
- <% unless @vendor %>
+ <% if enterprise_edition? && defined?(vendor_logo_link) && !@vendor %>
<td>
<%= vendor_logo_link(product.vendor) if product.vendor.present? %>
</td>
diff --git a/admin/app/views/spree/admin/orders/_payments.html.erb b/admin/app/views/spree/admin/orders/_payments.html.erb
index 0b5dcc81ae..3343f26b6b 100644
--- a/admin/app/views/spree/admin/orders/_payments.html.erb
+++ b/admin/app/views/spree/admin/orders/_payments.html.erb
@@ -54,15 +54,18 @@
<div class="card-body">
<div class="d-flex mb-3 w-100 gap-3">
<%= link_to_with_icon 'plus', Spree.t(:new_payment), spree.new_admin_order_payment_path(@order), class: 'btn btn-primary' %>
- <%= link_to_with_icon 'send', Spree.t(:send_payment_link), spree.admin_order_payment_links_path(@order), data: { turbo_method: :post }, class: 'btn btn-light with-tip', title: Spree.t(:send_payment_link_title) %>
- <div data-controller="clipboard">
- <input type="hidden" value="<%= spree.checkout_state_url(@order.token, :payment, host: current_store.url_or_custom_domain) %>" readonly data-clipboard-target="source">
- <button class="btn btn-light" type="button" data-action="click->clipboard#copy">
- <%= icon('copy') %>
- <%= Spree.t(:copy_payment_link) %>
- </button>
- </div>
+ <% if spree.respond_to?(:checkout_state_url) %>
+ <%= link_to_with_icon 'send', Spree.t('admin.send_payment_link'), spree.admin_order_payment_links_path(@order), data: { turbo_method: :post }, class: 'btn btn-light with-tip', title: Spree.t(:send_payment_link_title) %>
+
+ <div data-controller="clipboard">
+ <input type="hidden" value="<%= spree.checkout_state_url(@order.token, :payment, host: current_store.url_or_custom_domain) %>" readonly data-clipboard-target="source">
+ <button class="btn btn-light" type="button" data-action="click->clipboard#copy">
+ <%= icon('copy') %>
+ <%= Spree.t('admin.copy_payment_link') %>
+ </button>
+ </div>
+ <% end %>
</div>
</div>
</div>
diff --git a/admin/app/views/spree/admin/posts/_post.html.erb b/admin/app/views/spree/admin/posts/_post.html.erb
index 55a6f2adca..c4f196f82a 100644
--- a/admin/app/views/spree/admin/posts/_post.html.erb
+++ b/admin/app/views/spree/admin/posts/_post.html.erb
@@ -1,8 +1,8 @@
<tr data-controller="row-link" id="<%= dom_id(post) %>">
<td>
- <%= link_to spree.edit_admin_post_path(post), class: 'text-decoration-none d-flex align-items-center font-weight-bold text-dark', data: { row_link_target: :link, 'turbo-frame': '_top' } do %>
+ <%= link_to spree.edit_admin_post_path(post), class: 'text-decoration-none d-flex align-items-center font-weight-bold text-dark gap-3', data: { row_link_target: :link, 'turbo-frame': '_top' } do %>
<% if post.image.attached? && post.image.variable? %>
- <div class="admin-product-image-container mr-3">
+ <div class="admin-product-image-container">
<%= image_tag(
main_app.cdn_image_url(
post.image.variant(
diff --git a/admin/app/views/spree/admin/products/form/_inventory.html.erb b/admin/app/views/spree/admin/products/form/_inventory.html.erb
index 04b7dc78e5..5f73a7886d 100644
--- a/admin/app/views/spree/admin/products/form/_inventory.html.erb
+++ b/admin/app/views/spree/admin/products/form/_inventory.html.erb
@@ -3,7 +3,7 @@
<h5 class="card-title"><%= Spree.t(:inventory) %></h5>
<% if can?(:manage, Spree::StockLocation) %>
- <%= link_to_with_icon 'adjustments', Spree.t(:manage_stock_locations), spree.admin_stock_locations_path, class: 'btn btn-sm btn-light' %>
+ <%= link_to_with_icon 'adjustments', Spree.t('admin.manage_stock_locations'), spree.admin_stock_locations_path, class: 'btn btn-sm btn-light' %>
<% end %>
</div>
<div class="card-body">
diff --git a/admin/app/views/spree/admin/products/form/_properties.html.erb b/admin/app/views/spree/admin/products/form/_properties.html.erb
index 5a876bbc6d..e38aefe3b4 100644
--- a/admin/app/views/spree/admin/products/form/_properties.html.erb
+++ b/admin/app/views/spree/admin/products/form/_properties.html.erb
@@ -3,7 +3,7 @@
<h5 class="card-title"><%= Spree.t(:properties) %></h5>
<% if can?(:manage, Spree::Property) %>
- <%= link_to_with_icon 'adjustments', Spree.t(:manage_properties), spree.admin_properties_path, class: 'btn btn-sm btn-light' %>
+ <%= link_to_with_icon 'adjustments', Spree.t('admin.manage_properties'), spree.admin_properties_path, class: 'btn btn-sm btn-light' %>
<% end %>
</div>
<div class="card-body p-0">
diff --git a/admin/app/views/spree/admin/shared/_audit_nav.html.erb b/admin/app/views/spree/admin/shared/_audit_nav.html.erb
index 1e0e39085c..2498741227 100644
--- a/admin/app/views/spree/admin/shared/_audit_nav.html.erb
+++ b/admin/app/views/spree/admin/shared/_audit_nav.html.erb
@@ -1,3 +1,3 @@
<% content_for :page_title do %>
- <%= Spree.t(:audit_trail) %>
+ <%= Spree.t('admin.audit_log') %>
<% end %>
diff --git a/admin/app/views/spree/admin/shared/_footer.html.erb b/admin/app/views/spree/admin/shared/_footer.html.erb
index 23a3c3d27d..6210b52691 100644
--- a/admin/app/views/spree/admin/shared/_footer.html.erb
+++ b/admin/app/views/spree/admin/shared/_footer.html.erb
@@ -1,14 +1,2 @@
-<div
- class="
- mt-auto font-size-sm text-muted pt-0 pb-3 pt-lg-5 d-none d-lg-flex
- align-items-center justify-content-end w-100
- "
->
- <div class="bg-light rounded-lg p-2 ml-3">
- <%= Spree.t(:powered_by) %>
- <%= link_to 'https://www.spreecommerce.org', target: '_blank', class: 'text-dark' do %>
- Spree
- <%= Spree.version %>
- <% end %>
- </div>
-</div>
+<footer class="text-muted py-3 text-center">
+</footer>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/shared/_no_resource_found.html.erb b/admin/app/views/spree/admin/shared/_no_resource_found.html.erb
index 45f87d56e4..028440bfd4 100644
--- a/admin/app/views/spree/admin/shared/_no_resource_found.html.erb
+++ b/admin/app/views/spree/admin/shared/_no_resource_found.html.erb
@@ -1,4 +1,4 @@
-<% resource_name = model_class.name.underscore.humanize %>
+<% resource_name ||= model_class.name.demodulize.underscore.humanize %>
<div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
<%= Spree.t(:no_resource_found, resource: resource_name) %>
diff --git a/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb b/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb
index a5e7638cca..090078dc8d 100644
--- a/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb
+++ b/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb
@@ -20,7 +20,7 @@
<% end %>
<%= link_to spree.edit_admin_theme_path(current_store.default_theme), class: 'dropdown-item' do %>
<%= icon 'tools' %>
- <%= Spree.t(:edit_theme) %>
+ <%= Spree.t('admin.edit_theme') %>
<% end if current_store.default_theme %>
<div class="dropdown-divider"></div>
diff --git a/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb
index 0031cb7b5e..5535c725d5 100644
--- a/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb
+++ b/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb
@@ -56,9 +56,18 @@
<li class="nav-item">
<%= active_link_to_with_icon('map-pin', Spree.t(:stock_locations), spree.admin_stock_locations_path, class: 'nav-link') %>
</li>
- <% if spree.respond_to?(:admin_audits_path) %>
+ <% if enterprise_edition? %>
<li class="nav-item">
- <%= active_link_to_with_icon('history', Spree.t(:audit_trail), spree.admin_audits_path, class: 'nav-link w-auto', active: %w[audits exports imports].include?(controller_name)) %>
+ <%= active_link_to_with_icon('history', Spree.t('admin.audit_log'), spree.admin_audits_path, class: 'nav-link w-auto', active: %w[audits exports imports].include?(controller_name)) %>
+ </li>
+ <% else %>
+ <li class="nav-item">
+ <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link d-flex align-items-center w-100' do %>
+ <%= icon 'history' %>
+ <%= Spree.t('admin.audit_log') %>
+
+ <span class="badge badge-dark ml-auto with-tip rounded-pill" title="This feature is part of the Enterprise Edition.">Enterprise</span>
+ <% end %>
</li>
<% end %>
<li class="nav-item">
@@ -85,7 +94,18 @@
<%= render 'spree/admin/shared/sidebar/orders_nav' %>
<%= render 'spree/admin/shared/sidebar/products_nav' %>
- <%= render 'spree/admin/shared/sidebar/vendors_nav' if defined?(Vendo) %>
+ <% if enterprise_edition? %>
+ <%= render 'spree/admin/shared/sidebar/vendors_nav' %>
+ <% else%>
+ <li class="nav-item">
+ <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link d-flex align-items-center w-100' do %>
+ <%= icon 'heart-handshake' %>
+ <%= Spree.t(:vendors) %>
+
+ <span class="badge badge-dark ml-auto with-tip rounded-pill" title="This feature is part of the Enterprise Edition.">Enterprise</span>
+ <% end %>
+ </li>
+ <% end %>
<% if can?(:manage, Spree.user_class) %>
<li class="nav-item">
@@ -97,7 +117,7 @@
<% end %>
<% if can?(:manage, Spree::Promotion) %>
- <% discounts_active = %w[promotions gift_cards gift_card_batches].include?(controller_name) %>
+ <% discounts_active = %w[promotions gift_cards gift_card_batches coupon_codes].include?(controller_name) %>
<li class="nav-item">
<%= active_link_to spree.admin_promotions_path, class: 'nav-link', active: discounts_active do %>
<%= icon 'discount' %>
@@ -134,7 +154,17 @@
<%= active_link_to_with_icon('send', Spree.t(:emails), spree.admin_emails_path, class: 'nav-link') %>
</li>
<% end %>
- <%= render 'spree/admin/shared/sidebar/integrations_nav' if defined?(Spree::Integration) %>
+ <% if defined?(Spree::Integration) %>
+ <%= render 'spree/admin/shared/sidebar/integrations_nav' %>
+ <% else %>
+ <li class="nav-item">
+ <span class="nav-link d-flex align-items-center pr-1 cursor-default with-tip" title="Connect your store to third-party services to automate your business processes.">
+ <%= icon 'plug' %>
+ <span><%= Spree.t(:integrations) %></span>
+ <span class="badge badge-dark ml-auto rounded-pill">Coming soon!</span>
+ </span>
+ </li>
+ <% end %>
</ul>
<ul class="nav nav-dark flex-column mt-auto mb-3" id="settings-nav" data-turbo-permanent>
@@ -156,7 +186,7 @@
<% if can?(:manage, current_store) && !enterprise_edition? %>
<div class="nav nav-dark flex-column mt-2" id="plan-nav" data-turbo-permanent>
<div class="bg-transparent border-top border-dark pt-2 pl-1 d-flex align-items-center justify-content-between">
- <span class="font-weight-light font-size-sm text-white">Community Edition</span>
+ <span class="font-weight-light font-size-sm text-white with-tip" title="Spree v<%= Spree.version %>">Community Edition</span>
<%= link_to_with_icon 'bolt', 'Upgrade', 'https://spreecommerce.org/pricing/', class: 'btn btn-sm btn-dark with-tip', target: '_blank', title: 'Upgrade to Enterprise Edition to access more features, such as multi-store management, B2B, multi-vendor marketplace, and more.' %>
</div>
</div>
diff --git a/admin/app/views/spree/admin/shipping_methods/_form.html.erb b/admin/app/views/spree/admin/shipping_methods/_form.html.erb
index cf9f6e3b25..7754331d08 100644
--- a/admin/app/views/spree/admin/shipping_methods/_form.html.erb
+++ b/admin/app/views/spree/admin/shipping_methods/_form.html.erb
@@ -51,7 +51,7 @@
<%= Spree.t(:zones) %>
</h5>
- <%= link_to_with_icon('adjustments', Spree.t(:manage_zones), spree.admin_zones_path, class: 'btn btn-sm btn-light ml-auto h-100') if can?(:manage, Spree::Zone) %>
+ <%= link_to_with_icon('adjustments', Spree.t('admin.manage_zones'), spree.admin_zones_path, class: 'btn btn-sm btn-light ml-auto h-100') if can?(:manage, Spree::Zone) %>
</div>
<div class="card-body">
diff --git a/admin/app/views/spree/admin/stores/form/_basic.html.erb b/admin/app/views/spree/admin/stores/form/_basic.html.erb
index 042d0c058a..5d4ffb5655 100644
--- a/admin/app/views/spree/admin/stores/form/_basic.html.erb
+++ b/admin/app/views/spree/admin/stores/form/_basic.html.erb
@@ -12,7 +12,7 @@
<div class="card-header">
<h5 class="card-title"><%= Spree.t(:name) %> & <%= Spree.t(:logo) %></h5>
</div>
- <div class="card-body">
+ <div class="card-body pb-0">
<p class="text-muted">
This is the name of your store. It will be displayed in the header and in the footer.
</p>
@@ -68,7 +68,7 @@
This determines which vendors you can connect with and what customers see on your store.
</p>
<div class="form-group">
- <%= f.label :default_currency, Spree.t(:currency) %>
+ <%= f.label :default_currency %>
<%= f.currency_select :default_currency, preferred_currencies, {}, data: { controller: 'autocomplete-select' } %>
<%= f.error_message_on :default_currency %>
</div>
@@ -82,8 +82,8 @@
</div>
<div class="form-group">
- <%= f.label :default_country_iso, Spree.t('i18n.country') %>
- <%= f.collection_select :default_country_iso, Spree::Country.pluck(:iso, :name), :first, :last, {}, { data: { controller: 'autocomplete-select' } } %>
+ <%= f.label :default_country_iso, Spree.t(:default_country) %>
+ <%= f.collection_select :default_country_iso, Spree::Country.pluck(:iso, :name), :first, :last, { include_blank: false }, { data: { controller: 'autocomplete-select' } } %>
<%= f.error_message_on :default_country_iso %>
</div>
<div class="form-group">
@@ -91,7 +91,7 @@
<%= f.select :checkout_zone_id, options_for_select(@zones, @store.checkout_zone_id), { }, { data: { controller: 'autocomplete-select' } } %>
<small class="form-text text-muted mt-2">
Zone will limit to which Countries or States products are shipped.
- <%= link_to Spree.t(:manage_zones), spree.admin_zones_path %>
+ <%= link_to Spree.t('admin.manage_zones'), spree.admin_zones_path %>
</small>
<%= f.error_message_on :checkout_zone_id %>
</div>
diff --git a/admin/app/views/spree/admin/taxonomies/_taxonomy.html.erb b/admin/app/views/spree/admin/taxonomies/_taxonomy.html.erb
index 764d617a14..78ea0db7da 100644
--- a/admin/app/views/spree/admin/taxonomies/_taxonomy.html.erb
+++ b/admin/app/views/spree/admin/taxonomies/_taxonomy.html.erb
@@ -10,7 +10,7 @@
<%= taxonomy.taxons.count - 1 %>
</td>
<td class="w-10 actions">
- <%= link_to_with_icon 'list-tree', Spree.t(:manage_taxons), spree.admin_taxonomy_path(taxonomy), class: 'btn btn-light btn-sm' %>
+ <%= link_to_with_icon 'list-tree', Spree.t('admin.manage_taxons'), spree.admin_taxonomy_path(taxonomy), class: 'btn btn-light btn-sm' %>
<%= link_to_edit(taxonomy, class: 'btn btn-light btn-sm') if can?(:edit, taxonomy) %>
</td>
</tr>
\ No newline at end of file
diff --git a/admin/app/views/spree/admin/variants/form/_dimensions.html.erb b/admin/app/views/spree/admin/variants/form/_dimensions.html.erb
index f36610a2b4..6a6cb891dd 100644
--- a/admin/app/views/spree/admin/variants/form/_dimensions.html.erb
+++ b/admin/app/views/spree/admin/variants/form/_dimensions.html.erb
@@ -19,7 +19,7 @@
<div class="form-group mb-3">
<%= f.label :dimensions_unit, Spree.t(:unit) %>
- <%= f.select :dimensions_unit, options_for_select(dimension_units(current_store), f.object.dimensions_unit), { include_blank: false }, { class: 'form-control' } %>
+ <%= f.select :dimensions_unit, options_for_select(dimension_units(current_store), f.object.dimensions_unit), { include_blank: false }, { class: 'custom-select' } %>
</div>
</div>
</div>
diff --git a/admin/app/views/spree/admin/variants/form/_pricing.html.erb b/admin/app/views/spree/admin/variants/form/_pricing.html.erb
index f1e95bb816..02da4f1114 100644
--- a/admin/app/views/spree/admin/variants/form/_pricing.html.erb
+++ b/admin/app/views/spree/admin/variants/form/_pricing.html.erb
@@ -5,7 +5,7 @@
</h5>
<% if can?(:manage, Spree::Store) %>
- <%= link_to_with_icon 'adjustments', Spree.t(:manage_currencies), spree.edit_admin_store_path, class: 'btn btn-sm btn-light' %>
+ <%= link_to_with_icon 'adjustments', Spree.t('admin.manage_currencies'), spree.edit_admin_store_path, class: 'btn btn-sm btn-light' %>
<% end %>
</div>
<div class="card-body p-0">
diff --git a/admin/config/locales/en.yml b/admin/config/locales/en.yml
index f43c92b044..48b31e6dae 100644
--- a/admin/config/locales/en.yml
+++ b/admin/config/locales/en.yml
@@ -2,6 +2,7 @@ en:
spree:
admin:
add_tracking_details: Add tracking details
+ audit_log: Audit Log
url: URL
active: Active
name: Name
@@ -42,6 +43,7 @@ en:
edit_contact_information: Edit contact information
edit_shipping_address: Edit shipping address
edit_billing_address: Edit billing address
+ edit_theme: Edit theme
getting_started: Getting started
linkable:
search_for_a_page: Search for a page
@@ -130,6 +132,14 @@ en:
is_not_equal_to: is not equal to
contains: contains
does_not_contain: does not contain
+ manage_stock_locations: Manage Stock Locations
+ manage_properties: Manage Properties
+ manage_currencies: Manage Currencies
+ manage_zones: Manage Zones
+ manage_taxons: Manage Taxons
+ not_tracking_inventory: Not tracking inventory
+ send_payment_link: Send Payment Link
+ copy_payment_link: Copy Payment Link
order:
changing_store_warning: If you change the store this order belongs to, the order will be reset.
once_an_order_is_complete_you_can_not_change_store: 'Sorry, once an order is complete, you can no longer change the store that the order belongs to.'
diff --git a/core/app/services/spree/seeds/admin_user.rb b/core/app/services/spree/seeds/admin_user.rb
index f11b451cce..fd9b2d1f47 100644
--- a/core/app/services/spree/seeds/admin_user.rb
+++ b/core/app/services/spree/seeds/admin_user.rb
@@ -8,7 +8,9 @@ module Spree
user = Spree.admin_user_class.create!(
password: 'spree123',
- password_confirmation: 'spree123'
+ password_confirmation: 'spree123',
+ first_name: 'Spree',
+ last_name: 'Admin'
)
user.spree_roles << Spree::Role.find_or_create_by(name: :admin)
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index d9a6287f2d..6156da1a07 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -764,6 +764,7 @@ en:
current: Current
current_promotion_usage: ! 'current usage: %{count}'
customer: Customer
+ customers: Customers
customer_details: Customer Details
customer_details_updated: Customer Details Updated
customer_return: Customer Return
@@ -792,6 +793,7 @@ en:
default_refund_amount: Default Refund Amount
default_tax: Default Tax
default_tax_zone: Default Tax Zone
+ default_theme_name: Default
default_wishlist_name: Wishlist
delete: Delete
deleted: Deleted
@@ -981,6 +983,7 @@ en:
insufficient_stock: Insufficient stock available, only %{on_hand} remaining
insufficient_stock_item_quantity: Insufficient stock quantity available
insufficient_stock_lines_present: Some line items in this order have insufficient quantity.
+ integrations: Integrations
intercept_email_address: Intercept Email Address
intercept_email_instructions: Override email recipient and replace with this address.
internal_name: Internal Name
@@ -1020,6 +1023,7 @@ en:
learn_more: Learn More
lifetime_stats: Lifetime Stats
limit_usage_to: Limit usage to
+ line_item: Line Item
line_item_adjustments: "Line item adjustments"
list: List
loading: Loading
@@ -1389,6 +1393,7 @@ en:
promotionable: Promotable
promotion_cloned: Promotion has been cloned
promotion_not_cloned: "Promotion has not been cloned. Reason: %{error}"
+ promotion_already_used: "You can not destroy promotion that was already applied"
promotion_action: Promotion Action
promotion_action_types:
create_adjustment:
@@ -1431,7 +1436,7 @@ en:
description: Order includes specified product(s)
name: Product(s)
user:
- description: Available only to the specified users
+ description: Available only to the specified customers
name: User
user_logged_in:
description: Available only to logged in users
@@ -1638,6 +1643,7 @@ en:
including_tax: "%{price} (incl. %{tax_amount} %{tax_rate_name})"
excluding_tax: "%{price} (+ %{tax_amount} %{tax_rate_name})"
shipping_total: Shipping total
+ shipping_zone: Shipping Zone
shop_by_taxonomy: Shop by %{taxonomy}
shopping_cart: Shopping Cart
show: Show
@@ -1707,6 +1713,7 @@ en:
status: Status
stock: Stock
default_stock_location_name: Shop location
+ default_country: Default Country
stock_location: Stock Location
stock_location_info: Stock location info
stock_locations: Stock Locations
@@ -1889,7 +1896,7 @@ en:
used: Used
user: User
user_rule:
- choose_users: Choose users
+ choose_users: 'Input the full email address of a registered customer(s) in the search field to whom this discount should apply:'
users: Users
validation:
unpaid_amount_not_zero: "Amount was not fully reimbursed. Still due: %{amount}"