spree_admin 5.4.0.beta3 → 5.4.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e25435ab28276f0ca9a78db5d61f4b5485be27fb668ee9c1c381db48812445e
-  data.tar.gz: cc103dc8524c6a0575e367a427e88037647cc22caa9dd5117a0091715df480d6
+  metadata.gz: f45183de9d64006954bcebdd91c2c544994ea85f1f5b574b69a6a35f337f5af4
+  data.tar.gz: 4f3f18d194978187237fa890bd90d6632bbeee79928c8fa228e98a3581e8f328
 SHA512:
-  metadata.gz: 1b5b4a0bd4ee889940ca9826c9f6e2db5337bf1215588e543343be9fab77454ad3e9254f5b903eefcc485f6ef30673d38171fec315f3b3d5a16b463d68a42559
-  data.tar.gz: 5f67328def69057604315c1c79a3bcaae424ce369d98741b7521b1fe98f91f552aff41883534b5df81914d73d6a3d5985430551c8a6392e8caa537411778b44e
+  metadata.gz: 624c5d873b90a4b4a7f2570b263b70f506c80be33549326a3915bfee92479a7de0bd9c85c87654cb16c1202095bb8c09f855e57e485bb7dddc4e4033540dcc46
+  data.tar.gz: 26d013dab76bebf422f1d0ff17b68a21f574d4954ad65bc661b789cce8e75d743d003cf7e1fc844e6ecd877890175b0b4b1b68a00f1b7c746ed938f48ef93f63

data/app/controllers/spree/admin/coupon_codes_controller.rb

@@ -4,6 +4,12 @@ module Spree
       belongs_to 'spree/promotion', find_by: :prefix_id
 
       include PromotionsBreadcrumbConcern
+
+      def index
+        params[:q] ||= {}
+        params[:q][:promotion_id_eq] ||= parent.id
+        super
+      end
     end
   end
 end

data/app/controllers/spree/admin/gift_cards_controller.rb

@@ -6,8 +6,6 @@ module Spree
       before_action :add_breadcrumbs
       before_action :load_orders, only: :show
 
-      helper_method :gift_cards_filter_dropdown_value
-
       private
 
       def permitted_resource_params
@@ -49,19 +47,6 @@ module Spree
         @user = Spree.user_class.find_by_prefix_id(params[:user_id]) if params[:user_id].present?
       end
 
-      def gift_cards_filter_dropdown_value
-        Spree::Deprecation.warn("gift_cards_filter_dropdown_value is deprecated and will be removed in Spree 5.5")
-        if params.dig(:q, :active).present?
-          Spree.t('admin.gift_cards.active')
-        elsif params.dig(:q, :expired).present?
-          Spree.t(:expired)
-        elsif params.dig(:q, :redeemed).present?
-          Spree.t('admin.gift_cards.redeemed')
-        else
-          Spree.t('admin.gift_cards.all_statuses')
-        end
-      end
-
       def add_breadcrumbs
         if @user.present?
           @breadcrumb_icon = 'users'

data/app/controllers/spree/admin/stores_controller.rb

@@ -11,8 +11,6 @@ module Spree
       def edit
         if params[:section] == 'emails'
           add_breadcrumb Spree.t(:emails), spree.edit_admin_store_path(section: params[:section])
-        elsif params[:section] == 'policies'
-          add_breadcrumb Spree.t(:policies), spree.edit_admin_store_path(section: params[:section])
         elsif params[:section] == 'checkout'
           add_breadcrumb Spree.t(:checkout), spree.edit_admin_store_path(section: params[:section])
         else

data/app/helpers/spree/admin/orders_helper.rb

@@ -141,24 +141,6 @@ module Spree
         }
       end
 
-      def order_filter_dropdown_value
-        Spree::Deprecation.warn("order_filter_dropdown_value is deprecated and will be removed in Spree 5.5")
-
-        if params.dig(:q, :shipment_state_not_in) == ['shipped', 'canceled']
-          Spree.t('admin.orders.unfulfilled')
-        elsif params.dig(:q, :shipment_state_eq) == 'shipped'
-          Spree.t('admin.orders.fulfilled')
-        elsif params.dig(:q, :state_in) == ['canceled','partially_canceled']
-          Spree.t('admin.orders.canceled')
-        elsif params.dig(:q, :refunded)&.present?
-          Spree.t('admin.orders.refunded')
-        elsif params.dig(:q, :partially_refunded)&.present?
-          Spree.t('admin.orders.partially_refunded')
-        else
-          Spree.t('admin.orders.all_orders')
-        end
-      end
-
       private
 
       def map_to_tax_line(tax_adjustment, for_shipment: false)

data/app/helpers/spree/admin/products_helper.rb

@@ -76,28 +76,6 @@ module Spree
         category_tree
       end
 
-      def product_filter_status_dropdown_value
-        case params.dig(:q, :status_eq)
-        when 'active'
-          Spree.t('admin.products.active')
-        when 'draft'
-          Spree.t('admin.products.draft')
-        when 'archived'
-          Spree.t('admin.products.archived')
-        else
-          Spree.t('admin.products.all_statuses')
-        end
-      end
-
-      def product_filter_stock_dropdown_value
-        if params.dig(:q, :in_stock) == '1'
-          Spree.t('admin.products.in_stock')
-        elsif params.dig(:q, :out_of_stock) == '1'
-          Spree.t('admin.products.out_of_stock')
-        else
-          Spree.t('admin.products.any_stock')
-        end
-      end
 
       def show_product_status_help_bubble?
         false
@@ -106,11 +84,6 @@ module Spree
       def variant_form_stock_location_options
         options_for_select(available_stock_locations_list)
       end
-
-      def product_list_filters_search_form_path
-        [:admin, @search]
-      end
-
     end
   end
 end

data/app/helpers/spree/admin/promotions_helper.rb

@@ -1,17 +1,6 @@
 module Spree
   module Admin
     module PromotionsHelper
-      def promotion_filter_dropdown_value
-        Spree::Deprecation.warn("promotion_filter_dropdown_value is deprecated and will be removed in Spree 5.5")
-        if params.dig(:q, :expired)
-          Spree.t(:expired)
-        elsif params.dig(:q, :active)
-          Spree.t(:active)
-        else
-          Spree.t(:all)
-        end
-      end
-
       def promotion_status(promotion)
         if promotion.active?
           Spree.t(:active)

data/app/helpers/spree/admin/stores_helper.rb

@@ -17,7 +17,7 @@ module Spree
         Rails.cache.fetch(["#{store.cache_key_with_version}/admin_icon", opts.to_param]) do
           if store.logo&.attached? && store.logo&.variable?
             spree_image_tag(store.logo, class: opts[:class], width: opts[:width], height: opts[:height])
-          elsif store.favicon_image&.attached? && store.favicon_image&.variable?
+          elsif store.respond_to?(:favicon_image) && store.favicon_image&.attached? && store.favicon_image&.variable?
             spree_image_tag(store.favicon_image, class: opts[:class], width: opts[:width], height: opts[:height])
           else
             first_letter_icon(store.name, opts)

data/app/helpers/spree/admin/table_helper.rb

@@ -125,7 +125,7 @@ module Spree
       def render_status_column(value, column)
         return empty_column_placeholder if value.blank?
 
-        css_class = STATUS_BADGE_CLASSES[value.to_s] || 'badge-secondary'
+        css_class = STATUS_BADGE_CLASSES[value.to_s] || 'badge-light'
         content_tag(:span, Spree.t(value, scope: column.key, default: value.to_s.humanize), class: "badge #{css_class}")
       end
 
@@ -222,7 +222,10 @@ module Spree
       # @param column [Spree::Admin::Table::Column] column definition
       # @return [String]
       def column_cell_class(column)
-        column.align.to_s == 'left' ? '' : "text-#{column.align}"
+        [].tap do |classes|
+          classes << "text-#{column.align}" unless column.align.to_s == 'left'
+          classes << (column.wrap ? 'text-wrap' : 'text-nowrap')
+        end.join(' ')
       end
 
       # Build query builder fields JSON for Stimulus controller

data/app/models/spree/admin/table/column.rb

@@ -37,6 +37,7 @@ module Spree
         attribute :method
         attribute :width, :string
         attribute :align, :string, default: 'left'
+        attribute :wrap, :boolean, default: false
         attribute :format, :string
         attribute :condition
         attribute :ransack_attribute, :string

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

@@ -2,13 +2,14 @@
 
 <% content_for :page_actions do %>
   <%= render_admin_partials(:coupon_codes_actions_partials) %>
+  <%= link_to_export_modal %>
 <% end %>
 
 <%= render_admin_partials(:coupon_codes_header_partials) %>
 
 <div class="grid grid-cols-12 gap-6">
   <div class="col-span-12 lg:col-span-8">
-    <%= render 'spree/admin/shared/index_table', new_object_url: nil %>
+    <%= render_table @collection, :coupon_codes, export_type: Spree::Exports::CouponCodes %>
   </div>
 
   <div class="col-span-12 lg:col-span-4">

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

@@ -7,4 +7,4 @@
 
 <%= render_admin_partials(:refund_reasons_header_partials) %>
 
-<%= render 'spree/admin/shared/index_table' %>
+<%= render_table @collection, :refund_reasons %>

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

@@ -7,4 +7,4 @@
 
 <%= render_admin_partials(:reimbursement_types_header_partials) %>
 
-<%= render 'spree/admin/shared/index_table' %>
+<%= render_table @collection, :reimbursement_types %>

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

@@ -7,4 +7,4 @@
 
 <%= render_admin_partials(:return_authorization_reasons_header_partials) %>
 
-<%= render 'spree/admin/shared/index_table' %>
+<%= render_table @collection, :return_authorization_reasons %>

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

@@ -8,4 +8,4 @@
 
 <%= render_admin_partials(:return_authorizations_header_partials) %>
 
-<%= render 'spree/admin/shared/index_table', new_object_url: nil %>
+<%= render_table @collection, :return_authorizations %>

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

@@ -11,4 +11,4 @@
 
 <%= render partial: 'spree/admin/shared/shipping_nav' %>
 
-<%= render 'spree/admin/shared/index_table' %>
+<%= render_table @collection, :shipping_categories %>

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

@@ -17,4 +17,4 @@
 
 <%= render_admin_partials(:shipping_methods_header_partials) %>
 
-<%= render 'spree/admin/shared/index_table' %>
+<%= render_table @collection, :shipping_methods %>

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

@@ -8,4 +8,4 @@
 
 <%= render_admin_partials(:stock_locations_header_partials) %>
 
-<%= render 'spree/admin/shared/index_table' %>
+<%= render_table @collection, :stock_locations %>

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

@@ -10,7 +10,6 @@
       <%= render partial: 'spree/admin/stores/form/basic', locals: { f: f } if params[:section].blank? || params[:section] == 'general-settings' %>
       <%= render partial: 'spree/admin/stores/form/emails', locals: { f: f } if params[:section] == 'emails' %>
       <%= render partial: 'spree/admin/stores/form/checkout', locals: { f: f } if params[:section] == 'checkout' %>
-      <%= render partial: 'spree/admin/stores/form/policies', locals: { f: f } if params[:section] == 'policies' %>
     <% end %>
   </div>
 </div>

data/app/views/spree/admin/stores/form/_checkout.html.erb

@@ -20,30 +20,3 @@
     <%= f.spree_check_box :preferred_special_instructions_enabled, label: Spree.t('admin.checkout_settings.special_instructions.label'), help: Spree.t('admin.checkout_settings.special_instructions.description') %>
   </div>
 </div>
-
-<div class="card mb-6">
-  <div class="card-header">
-    <h5 class="card-title"><%= Spree.t(:checkout_message) %></h5>
-  </div>
-
-  <div class="card-body">
-    <%= f.spree_rich_text_area :checkout_message, label: false, help: Spree.t('admin.checkout_settings.checkout_message_description') %>
-  </div>
-</div>
-
-<% if current_store.respond_to?(:links) %>
-  <div class="card mb-6">
-    <div class="card-header">
-      <h5 class="card-title"><%= Spree.t('admin.checkout_settings.checkout_links.label') %></h5>
-    </div>
-
-    <div class="card-body">
-      <div class="alert alert-info">
-        <div>
-          <%= Spree.t('admin.checkout_settings.checkout_links.description') %>
-        </div>
-      </div>
-      <%= render 'spree/admin/stores/form/checkout_links' %>
-    </div>
-  </div>
-<% end %>

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

@@ -11,4 +11,4 @@
 
 <%= render 'spree/admin/shared/tax_nav' %>
 
-<%= render 'spree/admin/shared/index_table' %>
+<%= render_table @collection, :tax_categories %>

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

@@ -11,4 +11,4 @@
 
 <%= render 'spree/admin/shared/tax_nav' %>
 
-<%= render 'spree/admin/shared/index_table' %>
+<%= render_table @collection, :tax_rates %>

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

@@ -9,4 +9,4 @@
 
 <%= render_admin_partials(:taxonomies_header_partials) %>
 
-<%= render 'spree/admin/shared/index_table', sortable: true %>
+<%= render_table @collection, :taxonomies, sortable: true %>

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

@@ -15,4 +15,4 @@
 
 <%= render_admin_partials(:zones_header_partials) %>
 
-<%= render 'spree/admin/shared/index_table' %>
+<%= render_table @collection, :zones %>