spree_admin 5.1.0.beta4 → 5.1.0.rc1

data/app/views/spree/admin/taxonomies/edit.html.erb

@@ -7,14 +7,12 @@
   <%= link_to_edit_translations(@taxonomy) %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>
-
 <div class="row">
-  <div class="col-lg-6">
+  <div class="col-lg-6 offset-lg-3">
     <%= form_for [:admin, @taxonomy] do |f| %>
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>
       <div class="card mb-4">
         <div class="card-body">
-          <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>
           <div class="form-group">
             <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
             <%= f.text_field :name, class: 'form-control' %>

data/app/views/spree/admin/taxonomies/new.html.erb

@@ -2,11 +2,11 @@
   <%= page_header_back_button spree.admin_taxonomies_path %>
   <%= Spree.t(:new_taxonomy) %>
 <% end %>
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>
 
 <div class="row">
-  <div class="col-lg-6">
+  <div class="col-lg-6 offset-lg-3">
     <%= form_for [:admin, @taxonomy] do |f| %>
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>
       <div class="card mb-4">
         <div class="card-body">
           <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>

data/app/views/spree/admin/translations/edit.html.erb

@@ -1,6 +1,6 @@
 <% content_for :page_title do %>
   <%= page_header_back_button @back_path %>
-  <span class="mr-3"><%= Spree.t(:translations_for, resource_name: @resource_name) %></span>
+  <span class="mr-3"><%= Spree.t(:translations_for, resource_name: @resource.try(:name)) %></span>
 <% end %>
 <% if @locales.any?%>
   <% if @locales.many? %>
@@ -18,7 +18,7 @@
         <thead>
           <tr>
             <th scope="col" class="text-center"><%= Spree.t(:field) %></th>
-            <th scope="col" class="text-center" style="width: 40%;"><%= Spree.t('i18n.this_file_language', locale: :en) %> (<%= Spree.t(:default) %>)</th>
+            <th scope="col" class="text-center" style="width: 40%;"><%= Spree.t('i18n.this_file_language', locale: @default_locale) %> (<%= Spree.t(:default) %>)</th>
             <th scope="col" class="text-center"><%= Spree.t('i18n.this_file_language', locale: @selected_translation_locale) %></th>
           </tr>
         </thead>

data/app/views/spree/admin/translations/stores/_form.html.erb

@@ -14,6 +14,8 @@
           <div class="trix-container mb-0">
             <%= rich_text_area_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field), { contenteditable: !readonly } %>
           </div>
+        <% when :address %>
+          <%= text_area_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field), class: 'form-control', readonly: readonly, data: { controller: 'textarea-autogrow'} %>
         <% else %>
           <%= text_field_tag "translation[#{field}][#{translation_locale}]", resource.get_field_with_locale(translation_locale, field), class: 'form-control', readonly: readonly %>
         <% end %>

data/app/views/spree/admin/users/_details.html.erb

@@ -12,6 +12,7 @@
           <%= Spree.t(:email) %>
           <span>
             <%= @user.email %>
+            <%= clipboard_component(@user.email) %>
           </span>
         </li>
         <li class="list-group-item d-flex justify-content-between align-items-center">

data/app/views/spree/admin/users/index.html.erb

@@ -10,7 +10,7 @@
   
   <%= render 'extra_actions' %>
 
-  <%= link_to_with_icon 'plus', Spree.t(:create_customer), spree.new_admin_user_path, class: "btn btn-primary" if can? :create, Spree::user_class %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_customer), spree.new_admin_user_path, class: "btn btn-primary" if can? :create, Spree::user_class %>
 <% end %>
 
 <div class="card-lg">

data/app/views/spree/admin/users/new.html.erb

@@ -4,11 +4,15 @@
 <% end %>
 
 <%= form_for [:admin, @user], url: spree.admin_users_path, method: :post do |f| %>
-  <div class="card mb-4">
-    <div class="card-body">
-      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @user } %>
-      <%= render 'form', f: f %>
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <div class="card mb-4">
+        <div class="card-body">
+          <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @user } %>
+          <%= render 'form', f: f %>
+        </div>
+      </div>
+      <%= render 'spree/admin/shared/new_resource_links' %>
     </div>
   </div>
-  <%= render 'spree/admin/shared/new_resource_links' %>
 <% end %>

data/app/views/spree/admin/users/show.html.erb

@@ -1,15 +1,15 @@
 <% content_for :page_title do %>
   <%= page_header_back_button spree.admin_users_path, @user %>
   <%= customer_full_name(@user) || @user.email %>
-  <span class="font-size-base font-weight-normal ml-3">
+  <span class="font-size-base font-weight-normal">
     <%= customer_location_flag(@user) %>
     <%= customer_location(@user) %>
   </span>
 <% end %>
 
 <% content_for(:page_actions_dropdown) do %>
-  <% if spree.respond_to?(:new_admin_user_gift_card_path) && can?(:create, Spree::GiftCard) %>
-    <%= link_to_with_icon 'plus', Spree.t(:issue_gift_card), spree.new_admin_user_gift_card_path(@user), class: 'text-left dropdown-item' %>
+  <% if can?(:create, Spree::GiftCard) %>
+    <%= link_to_with_icon 'plus', Spree.t(:add_gift_card), spree.new_admin_user_gift_card_path(@user), class: 'text-left dropdown-item' %>
   <% end %>
 
   <% if can?(:create, Spree::StoreCredit) %>

data/app/views/spree/admin/variants/form/_inventory.html.erb

@@ -38,7 +38,7 @@
         <% end %>
       </tbody>
     </table>
-    <div class="card-footer border-toptext-center bg-gray-25 text-muted">
+    <div class="card-footer border-top text-center bg-gray-25 text-muted">
       <%= Spree.t('admin.variants_form.stock_locations_link', link: spree.admin_stock_locations_path).html_safe %>
     </div>
   </div>

data/app/views/spree/admin/zones/_form.html.erb

@@ -1,48 +1,44 @@
-<div class="row">
-  <div class="col-12 col-lg-6">
-    <div class="card mb-4">
-      <div class="card-header">
-        <h5 class="card-title"><%= Spree.t(:general_settings) %></h5>
-      </div>
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title"><%= Spree.t(:general_settings) %></h5>
+  </div>
 
-      <div class="card-body">
-        <div class="form-group">
-          <%= zone_form.label :name, Spree.t(:name) %>
-          <%= zone_form.text_field :name, class: 'form-control' %>
-          <%= zone_form.error_message_on :name %>
-        </div>
+  <div class="card-body">
+    <div class="form-group">
+      <%= zone_form.label :name, Spree.t(:name) %>
+      <%= zone_form.text_field :name, class: 'form-control' %>
+      <%= zone_form.error_message_on :name %>
+    </div>
 
-        <div class="form-group">
-          <%= zone_form.label :description, Spree.t(:description) %>
-          <%= zone_form.text_field :description, class: 'form-control' %>
-        </div>
+    <div class="form-group">
+      <%= zone_form.label :description, Spree.t(:description) %>
+      <%= zone_form.text_field :description, class: 'form-control' %>
+    </div>
 
-        <div class="form-group">
-          <div class="custom-control custom-checkbox">
-            <%= zone_form.check_box :default_tax, class: 'custom-control-input' %>
-            <%= zone_form.label :default_tax, Spree.t(:default_tax_zone), class: 'custom-control-label' %>
-          </div>
-        </div>
+    <div class="form-group">
+      <div class="custom-control custom-checkbox">
+        <%= zone_form.check_box :default_tax, class: 'custom-control-input' %>
+        <%= zone_form.label :default_tax, Spree.t(:default_tax_zone), class: 'custom-control-label' %>
+      </div>
+    </div>
 
-        <div class="form-group">
-          <strong><%= Spree.t(:type) %></strong>
-          <div class="custom-control custom-radio my-2">
-            <%= zone_form.radio_button :kind, :country, id: 'country_based', class: 'custom-control-input', data: { action: 'auto-submit#submit' } %>
-            <%= label_tag :country_based, Spree.t(:country_based), class: 'custom-control-label' %>
-          </div>
-          <div class="custom-control custom-radio my-2">
-            <%= zone_form.radio_button :kind, :state, id: 'state_based', class: 'custom-control-input', data: { action: 'auto-submit#submit' } %>
-            <%= label_tag :state_based, Spree.t(:state_based), class: 'custom-control-label' %>
-          </div>
-        </div>
+    <div class="form-group">
+      <strong><%= Spree.t(:type) %></strong>
+      <div class="custom-control custom-radio my-2">
+        <%= zone_form.radio_button :kind, :country, id: 'country_based', class: 'custom-control-input', data: { action: 'auto-submit#submit' } %>
+        <%= label_tag :country_based, Spree.t(:country_based), class: 'custom-control-label' %>
+      </div>
+      <div class="custom-control custom-radio my-2">
+        <%= zone_form.radio_button :kind, :state, id: 'state_based', class: 'custom-control-input', data: { action: 'auto-submit#submit' } %>
+        <%= label_tag :state_based, Spree.t(:state_based), class: 'custom-control-label' %>
       </div>
     </div>
   </div>
-  <div class="col-12 col-lg-6">
-    <% if @zone.country? %>
-      <%= render partial: 'country_members', locals: { zone_form: zone_form } %>
-    <% else %>
-      <%= render partial: 'state_members', locals: { zone_form: zone_form } %>
-    <% end %>
-  </div>
 </div>
+
+<% if @zone.country? %>
+  <%= render partial: 'country_members', locals: { zone_form: zone_form } %>
+<% else %>
+  <%= render partial: 'state_members', locals: { zone_form: zone_form } %>
+<% end %>
+

data/app/views/spree/admin/zones/edit.html.erb

@@ -3,10 +3,12 @@
   <%= @zone.name %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @zone } %>
-
 <%= form_for [:admin, @zone], data: {controller: 'auto-submit'} do |f| %>
-  <%= render 'form', zone_form: f %>
-
-  <%= render 'spree/admin/shared/edit_resource_links', f: f %>
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @zone } %>
+      <%= render 'form', zone_form: f %>
+      <%= render 'spree/admin/shared/edit_resource_links', f: f %>
+    </div>
+  </div>
 <% end %>

data/app/views/spree/admin/zones/new.html.erb

@@ -3,9 +3,12 @@
   <%= Spree.t(:new_market) %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @zone } %>
-
 <%= form_for [:admin, @zone], data: {controller: 'auto-submit'} do |zone_form| %>
-  <%= render partial: 'form', locals: { zone_form: zone_form } %>
-  <%= render 'spree/admin/shared/new_resource_links' %>
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @zone } %>
+      <%= render partial: 'form', locals: { zone_form: zone_form } %>
+      <%= render 'spree/admin/shared/new_resource_links' %>
+    </div>
+  </div>
 <% end %>

data/config/locales/en.yml

@@ -77,6 +77,17 @@ en:
       export_only_filtered_records: Export only filtered records, matching the search criteria
       filters: Filters
       getting_started: Getting started
+      gift_card_batches:
+        codes_count: Codes count
+        new_gift_card_batch: New Gift Card Batch
+        prefix: Prefix
+      gift_cards:
+        active: Active
+        all: All
+        all_statuses: All statuses
+        code_help_text: If you leave it blank, we will generate code for you
+        redeemed: Redeemed
+        usage: Usage
       integrations:
         invalid_integration_type: This integration is not allowed
         page_subtitle: Connect your store to third-party services to enhance customer experience.
@@ -144,7 +155,6 @@ en:
         maximum_products_to_show: Maximum products to show
         nav_centered: Nav centered
         not_set: Not set
-        posts_to_show: Posts to show
         separated: Separated
         show_more_button: Show explore category button
         show_taxon_image: Show taxon image
@@ -184,6 +194,7 @@ en:
           choose_stores: Choose which stores this product should be available in
         variants:
           option_types_link: To add more option types please go to <a href="%{link}">Option Types</a>
+      recommended_size: Recommended size
       report_created: Your report is being generated. You will receive an email with a download link when it is ready!
       reset_digital_link_download_limits: Reset download limits
       response_code: Response Code

data/config/routes.rb

@@ -54,7 +54,7 @@ Spree::Core::Engine.add_routes do
 
     # orders
     resources :checkouts, only: %i[index]
-    resources :orders, only: [:index, :edit, :create] do
+    resources :orders, only: [:index, :edit, :create, :destroy] do
       member do
         post :resend
         put :cancel
@@ -97,6 +97,7 @@ Spree::Core::Engine.add_routes do
       resources :store_credits
       resources :orders, only: [:index]
       resources :checkouts, only: [:index]
+      resources :gift_cards
 
       collection do
         get :bulk_modal
@@ -116,7 +117,12 @@ Spree::Core::Engine.add_routes do
       resources :promotion_rules, as: :rules, except: [:index, :show]
       resources :coupon_codes, only: :index
     end
-    get 'promotion_rules/option_values_search', defaults: { format: :json }
+    get 'search/option_values', defaults: { format: :json }, to: 'search#option_values'
+
+    # gift cards
+    resources :gift_cards
+    # gift card batches
+    resources :gift_card_batches, only: [:new, :create]
 
     # returns
     resources :return_authorizations, only: [:index, :destroy] do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.1.0.beta4
+  version: 5.1.0.rc1
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-04 00:00:00.000000000 Z
+date: 2025-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta4
+        version: 5.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta4
+        version: 5.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta4
+        version: 5.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta4
+        version: 5.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -349,6 +349,8 @@ files:
 - app/controllers/spree/admin/digital_assets_controller.rb
 - app/controllers/spree/admin/errors_controller.rb
 - app/controllers/spree/admin/exports_controller.rb
+- app/controllers/spree/admin/gift_card_batches_controller.rb
+- app/controllers/spree/admin/gift_cards_controller.rb
 - app/controllers/spree/admin/integrations_controller.rb
 - app/controllers/spree/admin/invitations_controller.rb
 - app/controllers/spree/admin/line_items_controller.rb
@@ -388,6 +390,7 @@ files:
 - app/controllers/spree/admin/return_items_controller.rb
 - app/controllers/spree/admin/role_users_controller.rb
 - app/controllers/spree/admin/roles_controller.rb
+- app/controllers/spree/admin/search_controller.rb
 - app/controllers/spree/admin/shipments_controller.rb
 - app/controllers/spree/admin/shipping_categories_controller.rb
 - app/controllers/spree/admin/shipping_methods_controller.rb
@@ -477,6 +480,7 @@ files:
 - app/javascript/spree/admin/controllers/seo_form_controller.js
 - app/javascript/spree/admin/controllers/slug_form_controller.js
 - app/javascript/spree/admin/controllers/sortable_tree_controller.js
+- app/javascript/spree/admin/controllers/sticky_controller.js
 - app/javascript/spree/admin/controllers/stock_transfer_controller.js
 - app/javascript/spree/admin/controllers/store_form_controller.js
 - app/javascript/spree/admin/controllers/unit_system_controller.js
@@ -559,6 +563,18 @@ files:
 - app/views/spree/admin/exports/create.turbo_stream.erb
 - app/views/spree/admin/exports/index.html.erb
 - app/views/spree/admin/exports/new.html.erb
+- app/views/spree/admin/gift_card_batches/_form.html.erb
+- app/views/spree/admin/gift_card_batches/new.html.erb
+- app/views/spree/admin/gift_cards/_filters.html.erb
+- app/views/spree/admin/gift_cards/_form.html.erb
+- app/views/spree/admin/gift_cards/_gift_card.html.erb
+- app/views/spree/admin/gift_cards/_list.html.erb
+- app/views/spree/admin/gift_cards/_table_filter_dropdown.html.erb
+- app/views/spree/admin/gift_cards/edit.html.erb
+- app/views/spree/admin/gift_cards/index.csv.erb
+- app/views/spree/admin/gift_cards/index.html.erb
+- app/views/spree/admin/gift_cards/new.html.erb
+- app/views/spree/admin/gift_cards/show.html.erb
 - app/views/spree/admin/integrations/_integration.html.erb
 - app/views/spree/admin/integrations/edit.html.erb
 - app/views/spree/admin/integrations/index.html.erb
@@ -973,11 +989,14 @@ files:
 - app/views/spree/admin/store_credit_categories/edit.html.erb
 - app/views/spree/admin/store_credit_categories/index.html.erb
 - app/views/spree/admin/store_credit_categories/new.html.erb
+- app/views/spree/admin/store_credit_events/_store_credit_event.html.erb
 - app/views/spree/admin/store_credits/_form.html.erb
 - app/views/spree/admin/store_credits/_list.html.erb
+- app/views/spree/admin/store_credits/_store_credit.html.erb
 - app/views/spree/admin/store_credits/edit.html.erb
 - app/views/spree/admin/store_credits/index.html.erb
 - app/views/spree/admin/store_credits/new.html.erb
+- app/views/spree/admin/store_credits/show.html.erb
 - app/views/spree/admin/storefront/edit.html.erb
 - app/views/spree/admin/stores/create.turbo_stream.erb
 - app/views/spree/admin/stores/edit.html.erb
@@ -1119,9 +1138,9 @@ licenses:
 - AGPL-3.0-or-later
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.0.beta4
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.0.rc1
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.beta4
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.rc1
 post_install_message:
 rdoc_options: []
 require_paths: