spree_admin 5.4.0.beta3 → 5.4.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e25435ab28276f0ca9a78db5d61f4b5485be27fb668ee9c1c381db48812445e
-  data.tar.gz: cc103dc8524c6a0575e367a427e88037647cc22caa9dd5117a0091715df480d6
+  metadata.gz: 1f1d8c530824612fafa6bee61bd81e11c8a27d10668ff0512d14dee8ee649f41
+  data.tar.gz: 7e24c349b1c6136b14535cf442e2163c1a31370aeea04dea34ce84d03e60026c
 SHA512:
-  metadata.gz: 1b5b4a0bd4ee889940ca9826c9f6e2db5337bf1215588e543343be9fab77454ad3e9254f5b903eefcc485f6ef30673d38171fec315f3b3d5a16b463d68a42559
-  data.tar.gz: 5f67328def69057604315c1c79a3bcaae424ce369d98741b7521b1fe98f91f552aff41883534b5df81914d73d6a3d5985430551c8a6392e8caa537411778b44e
+  metadata.gz: faae4901098806713ce09f1c0d3a7a0b06b2223434be9b9e8a934a14c350b8a65ba13e89d6745ea848d16abeb7ba9422d56ff95970a9eb3ac7cdb2d3a88ad7ac
+  data.tar.gz: fab2b2fb0c56d78347092ac9459e69a3d990c66ec4c17d668a580abd52e47e37c449a0625d17ceebf5f647af106249462d5b8b38dbf850d3622280f67e0e4f12

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/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/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/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 %>

data/config/initializers/spree_admin_tables.rb

@@ -1614,4 +1614,388 @@ Rails.application.config.after_initialize do
                                        sortable: true,
                                        default: true,
                                        position: 40
+
+  # ==========================================
+  # Register Coupon Codes table
+  # ==========================================
+  Spree.admin.tables.register(:coupon_codes, model_class: Spree::CouponCode, search_param: :code_i_cont, new_resource: false)
+
+  Spree.admin.tables.coupon_codes.add :code,
+                                            label: :code,
+                                            type: :string,
+                                            sortable: true,
+                                            filterable: true,
+                                            default: true,
+                                            position: 10,
+                                            method: ->(coupon_code) { coupon_code.display_code }
+
+  Spree.admin.tables.coupon_codes.add :state,
+                                            label: :status,
+                                            type: :status,
+                                            filter_type: :select,
+                                            sortable: true,
+                                            filterable: true,
+                                            default: true,
+                                            position: 20,
+                                            value_options: [
+                                              { value: 'unused', label: 'Unused' },
+                                              { value: 'used', label: 'Used' }
+                                            ]
+
+  Spree.admin.tables.coupon_codes.add :created_at,
+                                            label: :created_at,
+                                            type: :datetime,
+                                            sortable: true,
+                                            filterable: false,
+                                            default: true,
+                                            position: 30
+
+  # ==========================================
+  # Register Shipping Categories table
+  # ==========================================
+  Spree.admin.tables.register(:shipping_categories, model_class: Spree::ShippingCategory, search_param: :name_cont)
+
+  Spree.admin.tables.shipping_categories.add :name,
+                                             label: :name,
+                                             type: :link,
+                                             sortable: true,
+                                             filterable: true,
+                                             default: true,
+                                             position: 10
+
+  # ==========================================
+  # Register Refund Reasons table
+  # ==========================================
+  Spree.admin.tables.register(:refund_reasons, model_class: Spree::RefundReason, search_param: :name_cont)
+
+  Spree.admin.tables.refund_reasons.add :name,
+                                        label: :name,
+                                        type: :link,
+                                        sortable: true,
+                                        filterable: true,
+                                        default: true,
+                                        position: 10
+
+  Spree.admin.tables.refund_reasons.add :active,
+                                        label: :status,
+                                        type: :status,
+                                        sortable: false,
+                                        default: true,
+                                        position: 20,
+                                        method: ->(r) { r.active? ? 'active' : 'inactive' }
+
+  Spree.admin.tables.refund_reasons.add :mutable,
+                                        label: :mutable,
+                                        type: :boolean,
+                                        sortable: false,
+                                        default: true,
+                                        position: 30
+
+  # ==========================================
+  # Register Return Authorization Reasons table
+  # ==========================================
+  Spree.admin.tables.register(:return_authorization_reasons, model_class: Spree::ReturnAuthorizationReason, search_param: :name_cont)
+
+  Spree.admin.tables.return_authorization_reasons.add :name,
+                                                      label: :name,
+                                                      type: :link,
+                                                      sortable: true,
+                                                      filterable: true,
+                                                      default: true,
+                                                      position: 10
+
+  Spree.admin.tables.return_authorization_reasons.add :active,
+                                                      label: :status,
+                                                      type: :status,
+                                                      sortable: false,
+                                                      default: true,
+                                                      position: 20,
+                                                      method: ->(r) { r.active? ? 'active' : 'inactive' }
+
+  # ==========================================
+  # Register Reimbursement Types table
+  # ==========================================
+  Spree.admin.tables.register(:reimbursement_types, model_class: Spree::ReimbursementType, search_param: :name_cont)
+
+  Spree.admin.tables.reimbursement_types.add :name,
+                                             label: :name,
+                                             type: :link,
+                                             sortable: true,
+                                             filterable: true,
+                                             default: true,
+                                             position: 10,
+                                             method: ->(rt) { rt.name.humanize }
+
+  Spree.admin.tables.reimbursement_types.add :type,
+                                             label: :type,
+                                             type: :string,
+                                             sortable: false,
+                                             default: true,
+                                             position: 20,
+                                             method: ->(rt) { rt.type.demodulize }
+
+  Spree.admin.tables.reimbursement_types.add :active,
+                                             label: :status,
+                                             type: :status,
+                                             sortable: false,
+                                             default: true,
+                                             position: 30,
+                                             method: ->(r) { r.active? ? 'active' : 'inactive' }
+
+  Spree.admin.tables.reimbursement_types.add :mutable,
+                                             label: :mutable,
+                                             type: :boolean,
+                                             sortable: false,
+                                             default: true,
+                                             position: 40
+
+  # ==========================================
+  # Register Zones table
+  # ==========================================
+  Spree.admin.tables.register(:zones, model_class: Spree::Zone, search_param: :name_cont)
+
+  Spree.admin.tables.zones.add :name,
+                               label: :name,
+                               type: :link,
+                               sortable: true,
+                               filterable: true,
+                               default: true,
+                               position: 10
+
+  Spree.admin.tables.zones.add :description,
+                               label: :description,
+                               type: :string,
+                               sortable: true,
+                               default: true,
+                               position: 20
+
+  Spree.admin.tables.zones.add :default_tax,
+                               label: :default_tax_zone,
+                               type: :boolean,
+                               sortable: false,
+                               default: true,
+                               position: 30
+
+  # ==========================================
+  # Register Tax Categories table
+  # ==========================================
+  Spree.admin.tables.register(:tax_categories, model_class: Spree::TaxCategory, search_param: :name_cont)
+
+  Spree.admin.tables.tax_categories.add :name,
+                                        label: :name,
+                                        type: :link,
+                                        sortable: true,
+                                        filterable: true,
+                                        default: true,
+                                        position: 10
+
+  Spree.admin.tables.tax_categories.add :tax_code,
+                                        label: :tax_code,
+                                        type: :string,
+                                        sortable: true,
+                                        filterable: true,
+                                        default: true,
+                                        position: 20
+
+  Spree.admin.tables.tax_categories.add :description,
+                                        label: :description,
+                                        type: :string,
+                                        sortable: false,
+                                        default: true,
+                                        position: 30
+
+  Spree.admin.tables.tax_categories.add :is_default,
+                                        label: :default,
+                                        type: :boolean,
+                                        sortable: false,
+                                        default: true,
+                                        position: 40
+
+  # ==========================================
+  # Register Tax Rates table
+  # ==========================================
+  Spree.admin.tables.register(:tax_rates, model_class: Spree::TaxRate, search_param: :name_cont)
+
+  Spree.admin.tables.tax_rates.add :name,
+                                   label: :name,
+                                   type: :link,
+                                   sortable: true,
+                                   filterable: true,
+                                   default: true,
+                                   position: 10
+
+  Spree.admin.tables.tax_rates.add :tax_category,
+                                   label: :tax_category,
+                                   type: :string,
+                                   sortable: false,
+                                   default: true,
+                                   position: 20,
+                                   method: ->(tr) { tr.tax_category&.name }
+
+  Spree.admin.tables.tax_rates.add :zone,
+                                   label: :zone,
+                                   type: :string,
+                                   sortable: false,
+                                   default: true,
+                                   position: 30,
+                                   method: ->(tr) { tr.zone&.name }
+
+  Spree.admin.tables.tax_rates.add :amount,
+                                   label: :amount,
+                                   type: :string,
+                                   sortable: true,
+                                   default: true,
+                                   position: 40,
+                                   method: ->(tr) { number_to_percentage(tr.amount * 100) }
+
+  Spree.admin.tables.tax_rates.add :included_in_price,
+                                   label: :included_in_price,
+                                   type: :boolean,
+                                   sortable: false,
+                                   default: true,
+                                   position: 50
+
+  Spree.admin.tables.tax_rates.add :show_rate_in_label,
+                                   label: :show_rate_in_label,
+                                   type: :boolean,
+                                   sortable: false,
+                                   default: true,
+                                   position: 60
+
+  # ==========================================
+  # Register Taxonomies table
+  # ==========================================
+  Spree.admin.tables.register(:taxonomies, model_class: Spree::Taxonomy, search_param: :name_cont)
+
+  Spree.admin.tables.taxonomies.add :name,
+                                    label: :name,
+                                    type: :link,
+                                    sortable: true,
+                                    filterable: true,
+                                    default: true,
+                                    position: 10
+
+  Spree.admin.tables.taxonomies.add :taxons_count,
+                                    label: :taxons,
+                                    type: :string,
+                                    sortable: false,
+                                    default: true,
+                                    position: 20,
+                                    method: ->(taxonomy) { taxonomy.taxons.count - 1 }
+
+  # ==========================================
+  # Register Stock Locations table
+  # ==========================================
+  Spree.admin.tables.register(:stock_locations, model_class: Spree::StockLocation, search_param: :name_cont)
+
+  Spree.admin.tables.stock_locations.add :name,
+                                         label: :name,
+                                         type: :link,
+                                         sortable: true,
+                                         filterable: true,
+                                         default: true,
+                                         position: 10,
+                                         method: ->(sl) { sl.display_name }
+
+  Spree.admin.tables.stock_locations.add :country,
+                                         label: :country,
+                                         type: :string,
+                                         sortable: false,
+                                         default: true,
+                                         position: 20,
+                                         method: ->(sl) { sl.country_name }
+
+  Spree.admin.tables.stock_locations.add :active,
+                                         label: :active,
+                                         type: :boolean,
+                                         sortable: false,
+                                         default: true,
+                                         position: 30
+
+  Spree.admin.tables.stock_locations.add :default,
+                                         label: :default,
+                                         type: :boolean,
+                                         sortable: false,
+                                         default: true,
+                                         position: 40
+
+  # ==========================================
+  # Register Return Authorizations table
+  # ==========================================
+  Spree.admin.tables.register(:return_authorizations, model_class: Spree::ReturnAuthorization, search_param: :number_cont, new_resource: false)
+
+  Spree.admin.tables.return_authorizations.add :number,
+                                               label: :number,
+                                               type: :string,
+                                               sortable: true,
+                                               filterable: true,
+                                               default: true,
+                                               position: 10
+
+  Spree.admin.tables.return_authorizations.add :created_at,
+                                               label: :created_at,
+                                               type: :datetime,
+                                               sortable: true,
+                                               default: true,
+                                               position: 20
+
+  Spree.admin.tables.return_authorizations.add :state,
+                                               label: :status,
+                                               type: :status,
+                                               sortable: false,
+                                               default: true,
+                                               position: 30
+
+  # ==========================================
+  # Register Shipping Methods table
+  # ==========================================
+  Spree.admin.tables.register(:shipping_methods, model_class: Spree::ShippingMethod, search_param: :name_cont)
+
+  Spree.admin.tables.shipping_methods.add :name,
+                                          label: :name,
+                                          type: :link,
+                                          sortable: true,
+                                          filterable: true,
+                                          default: true,
+                                          position: 10
+
+  Spree.admin.tables.shipping_methods.add :admin_name,
+                                          label: :admin_name,
+                                          type: :string,
+                                          sortable: false,
+                                          default: true,
+                                          position: 20
+
+  Spree.admin.tables.shipping_methods.add :zones,
+                                          label: :zones,
+                                          type: :string,
+                                          sortable: false,
+                                          default: true,
+                                          position: 30,
+                                          wrap: true,
+                                          method: ->(sm) { sm.zones.map(&:name).join(', ') }
+
+  Spree.admin.tables.shipping_methods.add :delivery_range,
+                                          label: :estimated_delivery_time,
+                                          type: :string,
+                                          sortable: false,
+                                          default: true,
+                                          position: 40,
+                                          method: ->(sm) { sm.delivery_range.present? ? Spree.t(:display_delivery_range, delivery_range: sm.delivery_range) : nil }
+
+  Spree.admin.tables.shipping_methods.add :estimated_price,
+                                          label: :amount,
+                                          type: :string,
+                                          sortable: false,
+                                          default: true,
+                                          position: 50,
+                                          method: ->(sm) { sm.display_estimated_price }
+
+  Spree.admin.tables.shipping_methods.add :display_on,
+                                          label: :visibility,
+                                          type: :status,
+                                          sortable: false,
+                                          default: true,
+                                          position: 60,
+                                          method: ->(sm) { sm.display_on.presence || 'both' }
 end