spree_admin 5.1.0.beta4 → 5.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f5759966c4d6a61b9c2b51e85b01e209cefabf35fb2ec0934623d21f1937e23
-  data.tar.gz: '0994653a7d251af2746bde91daf82e7ea397063821f4f8019face626deb733d6'
+  metadata.gz: bfb0755ba829d1de51777fd66fa98729eb800e9e16987ac363aa681234e7e753
+  data.tar.gz: 45e85e834bd1d24a4b06c326c67da0cf3ba4e8e6d659aab47092274545e37c4b
 SHA512:
-  metadata.gz: 55e5ffcfc30c9238cbe32909defe509b7a9dd919d80589cafcc24031acbd6559bd05c56aea57bd62dbbc06ae496b6787a087b3ac9a5306b141924884b6e5896a
-  data.tar.gz: 838eba52a5b8bc939c4c7ac5a541cc621f1f347f43f0354a591c973a13c33fea7a2cc79ea18e88f1f1bf0d41c4e34a27bebf418640bc1e5a8a4cb5fdbe3f1748
+  metadata.gz: d80798a2622f42da2419e1fc3d97ad57a7f54f15464179200a27ac445c4ffdb6f154b08ea735d21b542e85583aa0e4bd2c2cc90cecb273a07e25d3bd4ea4c456
+  data.tar.gz: b0028cb04dbfa94bc254045ab7316effbf0b9b4f23a1c3923ce7bf570b873a122091f82f016052a7d3d1e45eb1e58eda9d49b1081f935604e432a7a3d8df462b

data/app/assets/stylesheets/spree/admin/components/_badges.scss

@@ -34,6 +34,7 @@
 .badge-approved,
 .badge-resolved,
 .badge-reimbursed,
+.badge-allocation,
 .bg-success {
   border: 1px solid rgba($success, 0.05);
   background-color: #C6F6D5 !important;
@@ -89,6 +90,8 @@
 .badge-draft,
 .badge-onboarding,
 .badge-light,
+.badge-authorize,
+.badge-eligible,
 .badge-invited {
   @extend .bg-white;
   @extend .text-muted;
@@ -104,6 +107,7 @@
 .badge-notice,
 .badge-update,
 .badge-partial,
+.badge-capture,
 .badge-info {
   border: 1px solid rgba($info, 0.05);
   background-color: #E0EFFE;

data/app/assets/stylesheets/spree/admin/components/_buttons.scss

@@ -68,7 +68,7 @@ button[disabled]        .show-when-enabled { display: none; }
 
 .hover-light {
   &:hover, &:focus {
-    background-color: $dropdown-link-hover-bg;
+    background-color: $gray-25;
     text-decoration: none;
   }
 }
@@ -148,7 +148,7 @@ button[disabled]        .show-when-enabled { display: none; }
   color: $gray-700;
 
   &:hover, &:focus {
-    border-color: $gray-100;
+    border-color: $border-color;
     background-color: $gray-25;
     color: $gray-900;
   }
@@ -174,6 +174,17 @@ button[disabled]        .show-when-enabled { display: none; }
   }
 }
 
+.btn-clipboard {
+  @extend .btn-light;
+  @extend .btn-sm;
+  @extend .px-1;
+  @extend .ml-2;
+  @extend .font-size-sm;
+
+  min-width: 24px;
+  height: 24px;
+}
+
 .page-link {
   @extend .btn;
   @extend .btn-sm;

data/app/assets/stylesheets/spree/admin/components/_filters.scss

@@ -1,10 +1,17 @@
 .filter-wrap {
   padding: 0.5rem;
-  border-bottom: 1px solid $border-color;
+  border-bottom: 1px solid $gray-50;
   gap: 0.5rem;
+  position: sticky;
+  top: $header-height;
+  z-index: 1000;
+  background-color: $card-bg;
+  border-top-left-radius: $border-radius-lg;
+  border-top-right-radius: $border-radius-lg;
 
   .btn {
     height: 2.125rem;
+    border-style: dashed;
   }
 }
 

data/app/assets/stylesheets/spree/admin/components/_main.scss

@@ -6,6 +6,19 @@
   height: 70px;
   display: flex;
   align-items: center;
+  background-color: $body-bg;
+  padding-left: 1.5rem;
+  padding-right: 1.5rem;
+  border-bottom: 1px solid $border-color;
+  margin-bottom: 1rem;
+
+  &.sticky-top {
+    padding-left: 1rem;
+    padding-right: 1rem;
+    animation: slideDown 0.3s ease-out;
+    height: $header-height;
+    border-bottom: 1px solid $border-color;
+  }
 }
 
 .page-header-title {
@@ -76,7 +89,6 @@
   background-color: $sidebar-bg;
   box-shadow: inset -1px 0 0 $border-color;
   height: calc(100vh - $header-height);
-  overflow-y: auto;
   overflow-x: hidden;
   position: fixed;
   top: $header-height;

data/app/assets/stylesheets/spree/admin/components/_media_form.scss

@@ -6,7 +6,7 @@
   align-items: center;
   overflow: hidden;
   border-radius: $border-radius-lg;
-  border: 1px dashed $gray-100;
+  border: 1px dashed $border-color;
   background-color: rgba($gray-25, 0.5);
   padding: 0.5rem;
   cursor: pointer;

data/app/assets/stylesheets/spree/admin/components/_modals.scss

@@ -14,9 +14,11 @@ body.modal-open {
 
 .modal-header {
   @extend .align-items-center;
+  border-color: $gray-50;
 
   .modal-title {
     margin-bottom: 0;
+    font-weight: $font-weight-bold;
   }
 
   .btn-close {
@@ -28,7 +30,7 @@ body.modal-open {
   justify-content: end;
   padding: $modal-inner-padding;
   background-color: $gray-25;
-  border-top: 1px solid $border-color;
+  border-top: 1px solid $gray-50;
 
   .btn {
     display: inline-flex ;

data/app/assets/stylesheets/spree/admin/components/_navbar.scss

@@ -1,6 +1,6 @@
 #header {
   height: $header-height;
-  background-color: $body-bg;
+  background-color: $header-bg;
 
   box-shadow: inset 0 -1px 0 $border-color;
 }

data/app/assets/stylesheets/spree/admin/components/_tables.scss

@@ -2,16 +2,6 @@
   color: $gray-800;
 }
 
-.filter-wrap {
-  padding: 0.5rem;
-  border-bottom: 1px solid $border-color;
-  gap: 0.5rem;
-
-  .btn {
-    height: 2.375rem;
-  }
-}
-
 #filters-search-bar {
   max-width: 300px;
   margin-right: auto;
@@ -215,3 +205,9 @@ td.actions {
     }
   }
 }
+
+.pagination-container {
+  border-top: 1px solid $gray-50;
+  padding-top: 0.5rem;
+  padding-bottom: 0.5rem;
+}

data/app/assets/stylesheets/spree/admin/components/_variants_form.scss

@@ -181,7 +181,7 @@
         display: flex;
         gap: 0.25rem;
 
-        border-bottom: 1px solid $border-color;
+        border-bottom: 1px solid $table-border-color;
 
         &.nested {
           .column-checkbox,

data/app/assets/stylesheets/spree/admin/global/_variables.scss

@@ -1,8 +1,8 @@
 // https://github.com/twbs/bootstrap/blob/v4.6.2/scss/_variables.scss
 
-$gray-25: #FAFAFA;
+$gray-25: #F8F8F9;
 $gray-50: #F3F3F3;
-$gray-100: #EAEAEA !default;
+$gray-100: #E3E3E3 !default;
 $gray-200: #D5D5D5 !default;
 $gray-300: #B3B3B3 !default;
 $gray-400: #999999 !default;
@@ -27,7 +27,7 @@ $container-max-widths: (
   sm: 540px,
   md: 720px,
   lg: 960px,
-  xl: 1272px
+  xl: 1260px
 ) !default;
 $grid-gutter-width: 16px !default;
 
@@ -81,7 +81,7 @@ $list-group-active-border-color: $action-border !default;
 
 $thumbnail-border-color: $border-color !default;
 $hr-border-color: $border-color !default;
-$table-border-color: $border-color !default;
+$table-border-color: $gray-50 !default;
 $card-border-color: $border-color !default;
 $input-btn-focus-width: 0.18rem !default;
 
@@ -92,7 +92,7 @@ $component-active-bg:         $blue !default;
 
 $input-placeholder-color: $gray-500;
 $input-padding-y:         .5rem !default;
-$input-disabled-bg: $gray-50 !default;
+$input-disabled-bg: $gray-25 !default;
 $input-focus-border-color: $blue !default;
 $input-box-shadow: none !default;
 $btn-box-shadow: $input-box-shadow !default;
@@ -170,6 +170,7 @@ $dropdown-padding-y:    0.25rem !default;
 $dropdown-divider-bg: $gray-50 !default;
 $dropdown-divider-margin-y: 0.25rem !default;
 $dropdown-header-color: $gray-500 !default;
+$zindex-dropdown: 1050;
 
 $modal-backdrop-bg:                 $body-bg !default;
 $modal-backdrop-opacity:            0.8 !default;
@@ -207,10 +208,14 @@ $embed-responsive-aspect-ratios: (
 $table-cell-padding: .75rem .50rem !default;
 
 $code-color: $gray-600 !default;
+$code-bg: $gray-25 !default;
 
 $list-group-bg: transparent !default;
 $list-group-item-padding-x:         1rem !default;
 
-$header-height: 52px !default;
+$header-bg: $gray-25 !default;
+$header-height: 60px !default;
 $sidebar-width: 220px !default;
-$sidebar-bg: $body-bg !default;
+$sidebar-bg: $gray-25 !default;
+
+$progress-bar-bg: $blue !default;

data/app/assets/stylesheets/spree/admin/shared/_base.scss

@@ -720,3 +720,8 @@ div.uppy-Root {
   }
 }
 
+code {
+  background-color: $code-bg;
+  border-radius: $border-radius-sm;
+  padding: 0.25rem 0.5rem;
+}

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

@@ -0,0 +1,23 @@
+module Spree
+  module Admin
+    class GiftCardBatchesController < ResourceController
+      add_breadcrumb_icon 'discount'
+      add_breadcrumb Spree.t(:promotions), :admin_promotions_path
+      add_breadcrumb Spree.t(:gift_cards), :admin_gift_cards_path
+
+      private
+
+      def location_after_save
+        spree.admin_gift_cards_path(q: { batch_prefix_eq: @object.prefix })
+      end
+
+      def collection_url
+        spree.admin_gift_cards_path
+      end
+
+      def permitted_resource_params
+        params.require(:gift_card_batch).permit(permitted_gift_card_batch_attributes)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,94 @@
+module Spree
+  module Admin
+    class GiftCardsController < ResourceController
+      before_action :load_user
+      before_action :add_breadcrumbs
+      before_action :load_orders, only: :show
+
+      helper_method :gift_cards_filter_dropdown_value
+
+      private
+
+      def permitted_resource_params
+        @permitted_resource_params ||= begin
+          params_hash = params.require(:gift_card).permit(permitted_gift_card_attributes)
+
+          if @user.present?
+            params_hash.merge(user_id: @user.id)
+          else
+            params_hash
+          end
+        end
+      end
+
+      def collection
+        return @collection if @collection.present?
+
+        @collection = super
+
+        params[:q] ||= {}
+        params[:q][:s] ||= 'created_at desc'
+        params[:q][:user_id_eq] = params[:user_id] if params[:user_id].present?
+
+        @search = @collection
+
+        @search = @search.expired if params[:q][:status_eq] == 'expired'
+        @search = @search.active if params[:q][:status_eq] == 'active'
+        @search = @search.redeemed if params[:q][:status_eq] == 'redeemed'
+
+        @search = @search.ransack(params[:q])
+
+        @collection = @search.result.includes(:user, :created_by)
+
+        @collection = @collection.page(params[:page]).per(params[:per_page]) if params[:format] != 'csv'
+
+        @collection
+      end
+
+      def location_after_destroy
+        if @user.present?
+          spree.admin_user_path(@user)
+        else
+          spree.admin_gift_cards_path
+        end
+      end
+
+      def location_after_save
+        spree.admin_gift_card_path(@object.id)
+      end
+
+      def load_user
+        @user = Spree.user_class.find_by(id: params[:user_id]) if params[:user_id].present?
+      end
+
+      def gift_cards_filter_dropdown_value
+        case params.dig(:q, :status_eq)
+        when 'active'
+          Spree.t('admin.gift_cards.active')
+        when 'expired'
+          Spree.t(:expired)
+        when 'redeemed'
+          Spree.t('admin.gift_cards.redeemed')
+        else
+          Spree.t('admin.gift_cards.all')
+        end
+      end
+
+      def add_breadcrumbs
+        if @user.present?
+          @breadcrumb_icon = 'users'
+          add_breadcrumb Spree.t(:customers), :admin_users_path
+          add_breadcrumb @user.name, spree.admin_user_path(@user)
+        else
+          @breadcrumb_icon = 'discount'
+          add_breadcrumb Spree.t(:promotions), :admin_promotions_path
+          add_breadcrumb Spree.t(:gift_cards), :admin_gift_cards_path
+        end
+      end
+
+      def load_orders
+        @orders = @object.orders.includes(:user).order(created_at: :desc)
+      end
+    end
+  end
+end

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

@@ -6,18 +6,20 @@ module Spree
       include Spree::Admin::OrderBreadcrumbConcern
 
       before_action :initialize_order_events
-      before_action :load_order, only: %i[edit cancel resend]
+      before_action :load_order, only: %i[edit cancel resend destroy]
       before_action :load_order_items, only: :edit
       before_action :load_user, only: [:index]
 
       helper_method :model_class
 
+      # POST /admin/orders
       def create
         @order = Spree::Order.create(created_by: try_spree_current_user, store: current_store)
 
         redirect_to spree.edit_admin_order_path(@order)
       end
 
+      # GET /admin/orders/:id/edit
       def edit
         unless @order.completed?
           add_breadcrumb Spree.t(:draft_orders), :admin_checkouts_path
@@ -26,6 +28,7 @@ module Spree
         add_breadcrumb @order.number, spree.edit_admin_order_path(@order)
       end
 
+      # GET /admin/orders
       def index
         params[:q] ||= {}
         params[:q][:s] ||= 'completed_at desc'
@@ -33,12 +36,14 @@ module Spree
         load_orders
       end
 
+      # PUT /admin/orders/:id/cancel
       def cancel
         @order.canceled_by(try_spree_current_user)
         flash[:success] = Spree.t(:order_canceled)
         redirect_back fallback_location: spree.edit_admin_order_url(@order)
       end
 
+      # POST /admin/orders/:id/resend
       def resend
         @order.deliver_order_confirmation_email
         if @order.errors.any?
@@ -50,6 +55,18 @@ module Spree
         redirect_back fallback_location: spree.edit_admin_order_url(@order)
       end
 
+      # DELETE /admin/orders/:id
+      def destroy
+        @order.destroy
+        flash[:success] = flash_message_for(@order, :successfully_removed)
+
+        if @order.completed?
+          redirect_to spree.admin_orders_path
+        else
+          redirect_to spree.admin_checkouts_path
+        end
+      end
+
       private
 
       def scope
@@ -79,7 +96,7 @@ module Spree
         @payments = @order.payments.includes(:payment_method, :source).order(:created_at)
         @refunds = @order.refunds
 
-        @return_authorizations = @order.return_authorizations
+        @return_authorizations = @order.return_authorizations.includes(:return_items)
         @customer_returns = @order.customer_returns.distinct
       end
 

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

@@ -1,6 +1,8 @@
 module Spree
   module Admin
     class PaymentsController < Spree::Admin::ResourceController
+      include Spree::Admin::OrderBreadcrumbConcern
+
       belongs_to 'spree/order', find_by: :number
 
       before_action :load_data
@@ -116,6 +118,7 @@ module Spree
       def load_data
         @payment_methods = @order.collect_backend_payment_methods
         @store_credits = @order.available_store_credits if @payment_methods.any?(&:store_credit?)
+        add_breadcrumb @order.number, spree.edit_admin_order_path(@order)
       end
     end
   end

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

@@ -173,17 +173,17 @@ module Spree
           joins(option_type: :product_option_types).
           includes(option_type: :option_values).
           merge(@product.product_option_types).
-          reorder('spree_product_option_types.position').
+          reorder("#{Spree::ProductOptionType.table_name}.position").
           uniq.group_by(&:option_type).each_with_index do |option, index|
             option_type, option_values = option
 
             @product_options[option_type.id.to_s] = {
               name: option_type.presentation,
               position: index + 1,
-              values: option_values.pluck(:name, :presentation).uniq.map { |name, presentation| { value: name, text: presentation } }
+              values: option_values.map { |ov| { value: ov.name, text: ov.presentation } }.uniq
             }
 
-            @product_available_options[option_type.id.to_s] = option_type.option_values.pluck(:name, :presentation).uniq.map { |name, presentation| { id: name, name: presentation } }
+            @product_available_options[option_type.id.to_s] = option_type.option_values.map { |ov| { id: ov.name, name: ov.presentation } }.uniq
           end
 
         @product_stock = {}

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

@@ -44,7 +44,11 @@ module Spree
       end
 
       def permitted_resource_params
-        params.require(:reimbursement).permit(permitted_reimbursement_attributes)
+        if params[:build_from_customer_return_id].present?
+          params.permit()
+        else
+          params.require(:reimbursement).permit(permitted_reimbursement_attributes)
+        end
       end
     end
   end

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

@@ -49,6 +49,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
 
   def create
     invoke_callbacks(:create, :before)
+    set_created_by
     @object.attributes = permitted_resource_params
     if @object.save
       invoke_callbacks(:create, :after)
@@ -60,7 +61,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
         end
         format.html do
           flash[:success] = message_after_create
-          redirect_to location_after_save, status: :see_other
+          redirect_to location_after_create, status: :see_other
         end
       end
     else
@@ -226,6 +227,10 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     collection_url
   end
 
+  def location_after_create
+    location_after_save
+  end
+
   def location_after_save
     edit_object_url(@object)
   end
@@ -244,6 +249,12 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     ensure_current_store(@object)
   end
 
+  def set_created_by
+    return if @object.nil?
+
+    @object.created_by = try_spree_current_user if @object.respond_to?(:created_by_id)
+  end
+
   def set_currency
     return if @object.nil?
 

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

@@ -0,0 +1,22 @@
+module Spree
+  module Admin
+    class SearchController < BaseController
+      def option_values
+        query = params[:q]&.strip
+
+        if query.present?
+          json = Spree::OptionValue.includes(:option_type).search_by_name(query).map do |ov|
+            {
+              id: ov.id,
+              name: ov.display_presentation
+            }
+          end
+
+          render json: json
+        else
+          render json: []
+        end
+      end
+    end
+  end
+end

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

@@ -4,16 +4,21 @@ module Spree
 
     class StoreCreditsController < Spree::Admin::BaseController
       before_action :load_user
-      before_action :load_store_credit, only: [:new, :edit, :update]
+      before_action :load_store_credit, only: [:new, :edit, :update, :destroy]
       before_action :ensure_unused_store_credit, only: [:update]
 
       def index
-        @store_credits = scope.includes(:category).order(created_at: :desc)
+        @store_credits = scope.includes(:created_by).order(created_at: :desc)
         @store_credits = @store_credits.page(params[:page]).per(params[:per_page])
 
         @collection = @store_credits
       end
 
+      def show
+        @store_credit = scope.find(params[:id])
+        @store_credit_events = @store_credit.store_credit_events.reverse_chronological.includes(:originator, :order)
+      end
+
       def create
         @store_credit = @user.store_credits.build(
           permitted_store_credit_params.merge(
@@ -34,11 +39,10 @@ module Spree
 
       def update
         @store_credit.assign_attributes(permitted_store_credit_params)
-        @store_credit.created_by = try_spree_current_user
 
         if @store_credit.save
           flash[:success] = flash_message_for(@store_credit, :successfully_updated)
-          redirect_to spree.admin_user_path(@user)
+          redirect_to spree.admin_user_store_credit_path(@user, @store_credit)
         else
           flash[:error] = Spree.t('store_credit.errors.unable_to_update')
           render :edit, status: :unprocessable_entity
@@ -46,7 +50,6 @@ module Spree
       end
 
       def destroy
-        @store_credit = @user.store_credits.for_store(current_store).find(params[:id])
         ensure_unused_store_credit
 
         if @store_credit.destroy