spree_admin 5.1.1 → 5.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccc54cd595d9baf8f9e0f76c71b4682977fcac768b4ac6f5fe911fdd24c5d373
-  data.tar.gz: 969cf056d3745ae281b89421893ccef0ade5f41bcabacd5bc81254cc8404aa7b
+  metadata.gz: edab2a99241e4db5473957b6cc3294ee86cd82c5d5c09b96c1674b88b74570b8
+  data.tar.gz: 8ae3514c6c648be6fd26e42c0bd8811f0dfd2a38a4cb06448791ad1b45e24db8
 SHA512:
-  metadata.gz: 1dbf7da3b5c957af7f63e69425516a4ecf45901cba3364db52356e63d00ced386a9031863025c67a68a5519d93ad904a1f6af4c2facd6ef4544e8c8104733846
-  data.tar.gz: bc6c07589f1aef8e58de7c5f025f98155cfa65a7bc6f0db41661ccd156cebf46d1134ff37192cbe9df8d77b66292ff7e0e6f21e0b3b205039f7098b25b38a2d6
+  metadata.gz: 1ce82d6b487a7a5db6e39c32e2b8da9e66a77331e2f79c22a1b402283ab7bb7b8bb105666c76c74c937e8f3a923d630cda21ddd1cd246b2b6ea89e5368ab12e8
+  data.tar.gz: 63efa374a215c5b3ccc8756e2ce0d0dc3397f4896cb899f47d494d3987b7fddf8792e367e28d814f95b6e9279a6b834258a438986f78cb61714a92fbeb49d1a3

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

@@ -3,14 +3,59 @@
   align-items: center;
   border-radius: $border-radius-lg;
   background-color: $white;
-  padding: 0.5rem;
   box-shadow: $dropdown-box-shadow;
   animation: bounceInUp;
   animation-duration: 0.5s;
-  gap: 0.5rem;
 
   .btn {
-    height: 2rem;
+    border-width: 0;
+    padding-top: 0;
+    padding-bottom: 0;
+    height: 2.75rem;
+    border-radius: 0;
+  }
+
+  > * {
+    height: 2.75rem;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    &:first-child {
+      border-top-left-radius: $border-radius-lg;
+      border-bottom-left-radius: $border-radius-lg;
+
+      .btn {
+        border-top-left-radius: $border-radius-lg;
+        border-bottom-left-radius: $border-radius-lg;
+      }
+    }
+
+    &:last-child {
+      border-top-right-radius: $border-radius-lg;
+      border-bottom-right-radius: $border-radius-lg;
+
+      .btn {
+        border-top-right-radius: $border-radius-lg;
+        border-bottom-right-radius: $border-radius-lg;
+      }
+    }
+
+    &:after {
+      content: '';
+      display: block;
+      width: 1px;
+      height: 100%;
+      background-color: $gray-50;
+    }
+
+    &:last-child:after {
+      display: none;
+    }
+  }
+
+  .btn-close {
+    width: 2.5rem;
   }
 }
 
@@ -38,11 +83,14 @@
 }
 
 .bulk-operations-counter {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  gap: 0.25rem;
-  margin-left: 1rem;
-  margin-right: 1rem;
-  border-left: 1px solid $gray-50;
+  padding-left: 1rem;
+  padding-right: 0;
+
+  .bulk-operations-counter-label {
+    margin-right: 1rem;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 0.5rem;
+  }
 }

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

@@ -131,7 +131,7 @@ button[disabled]        .show-when-enabled { display: none; }
 
   &:hover {
     opacity: 0.8 !important;
-    background-color: $gray-100 !important;
+    background-color: $gray-50 !important;
   }
 }
 
@@ -184,18 +184,3 @@ button[disabled]        .show-when-enabled { display: none; }
   min-width: 24px;
   height: 24px;
 }
-
-.page-link {
-  @extend .btn;
-  @extend .btn-sm;
-  @extend .btn-light;
-  @extend .ml-1;
-  @extend .p-2;
-
-  .ti {
-    @extend .mr-0;
-  }
-}
-.page-link.disabled {
-  cursor: not-allowed;
-}

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

@@ -1,6 +1,6 @@
 .filter-wrap {
   padding: 0.5rem;
-  border-bottom: 1px solid $gray-50;
+  border-bottom: 1px solid $table-border-color;
   gap: 0.5rem;
   position: sticky;
   top: $header-height;

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

@@ -25,6 +25,37 @@
   font-size: 1.25rem;
 }
 
+#page-tabs {
+  border-bottom: 1px solid $border-color;
+  margin-bottom: 1rem;
+  padding-left: 1.5rem;
+  padding-right: 1.5rem;
+  margin-top: -1rem;
+
+  .nav {
+    gap: 1rem;
+    display: flex;
+    flex-wrap: nowrap;
+    overflow-x: auto;
+    padding-left: 0;
+    margin-bottom: -1px;
+
+    .nav-link {
+      border-radius: 0;
+      padding-bottom: 1rem;
+      padding-top: 1rem;
+      padding-left: 0rem;
+      padding-right: 0rem;
+  
+      &.active {
+        background-color: transparent;
+        color: theme-color('primary');
+        font-weight: 600;
+      }
+    }
+  }
+}
+
 .store-dropdown {
   display: flex;
   align-items: center;
@@ -245,6 +276,21 @@
   }
 }
 
+#updater-notice {
+  background-color: $white;
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  gap: 1rem;
+  justify-content: flex-start;
+  align-items: center;
+  padding: 0.5rem 0.5rem;
+  border: 1px solid $border-color;
+  border-radius: $border-radius-lg;
+  box-shadow: $box-shadow-xs;
+}
+
+
 .documentation-link-container {
   font-size: $font-size-sm;
   text-align: center;

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

@@ -207,7 +207,30 @@ td.actions {
 }
 
 .pagination-container {
-  border-top: 1px solid $gray-50;
+  border-top: 1px solid $table-border-color;
   padding-top: 0.5rem;
   padding-bottom: 0.5rem;
+
+  position: sticky;
+  bottom: 0;
+  background-color: $card-bg;
+  z-index: 100;
+  border-bottom-left-radius: $border-radius-lg;
+  border-bottom-right-radius: $border-radius-lg;
+
+  .page-link {
+    @extend .btn;
+    @extend .btn-sm;
+    @extend .btn-light;
+    @extend .ml-1;
+    @extend .p-2;
+  
+    .ti {
+      @extend .mr-0;
+    }
+  }
+  .page-item.disabled {
+    cursor: not-allowed;
+    opacity: 0.2;
+  }
 }

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

@@ -720,4 +720,11 @@ code {
   background-color: $code-bg;
   border-radius: $border-radius-sm;
   padding: 0.25rem 0.5rem;
+}
+
+kbd {
+  @extend .badge;
+  @extend .badge-light;
+  text-transform: lowercase;
+  box-shadow: $box-shadow-xs;
 }

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

@@ -64,6 +64,12 @@ module Spree
         redirect_back(fallback_location: spree.admin_dashboard_path)
       end
 
+      # PATCH /admin/dashboard/dismiss_updater_notice
+      def dismiss_updater_notice
+        session[:spree_updater_notice_dismissed] = { value: true, expires_at: 7.days.from_now }
+        redirect_back(fallback_location: spree.admin_dashboard_path)
+      end
+
       private
 
       def load_vendor

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

@@ -46,6 +46,7 @@ module Spree
       end
 
       def add_breadcrumbs
+        add_breadcrumb @product.name, spree.edit_admin_product_path(@product)
         add_breadcrumb Spree.t(:digital_assets), spree.admin_product_digital_assets_path(@product)
       end
     end

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

@@ -20,6 +20,15 @@ module Spree
       def permitted_resource_params
         params.require(:option_value).permit(permitted_option_value_attributes)
       end
+
+      # for select_options action, we only require read permission
+      def authorize_admin
+        if action == :select_options
+          authorize! :read, Spree::OptionValue
+        else
+          super
+        end
+      end
     end
   end
 end

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

@@ -31,7 +31,10 @@ module Spree
       end
 
       def build_resource
-        model_class.new(store: current_store, date_from: params[:date_from], date_to: params[:date_to], currency: params[:currency])
+        model_class.new(store: current_store,
+                        date_from: parse_date_param(params[:date_from]),
+                        date_to: parse_date_param(params[:date_to])&.end_of_day,
+                        currency: params[:currency])
       end
 
       def model_class
@@ -55,7 +58,16 @@ module Spree
       end
 
       def permitted_resource_params
-        params.require(:report).permit(permitted_report_attributes)
+        attributes = params.require(:report).permit(permitted_report_attributes)
+        attributes[:date_from] = parse_date_param(attributes[:date_from]) if attributes[:date_from].present?
+        attributes[:date_to] = parse_date_param(attributes[:date_to])&.end_of_day if attributes[:date_to].present?
+        attributes
+      end
+
+      def parse_date_param(date_string)
+        return if date_string.blank?
+
+        date_string.to_date&.in_time_zone(current_timezone)
       end
     end
   end

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

@@ -29,7 +29,7 @@ module Spree
           :meta_description, :meta_title, :meta_keywords, :seo_robots,
           :facebook, :twitter, :instagram, :linkedin, :youtube, :tiktok, :pinterest,
           :storefront_custom_code_head, :storefront_custom_code_body_start,
-          :storefront_custom_code_body_end, :storefront_password
+          :storefront_custom_code_body_end, :storefront_password, :spotify, :discord
         )
       end
 

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

@@ -13,6 +13,7 @@ module Spree
         defined?(SpreeEnterprise)
       end
 
+      # @return [Spree::Admin::Updater] the spree updater
       def spree_updater
         @spree_updater ||= Spree::Admin::Updater
       end
@@ -21,6 +22,15 @@ module Spree
         @spree_update_available ||= !Rails.env.test? && spree_updater.update_available?
       end
 
+      def updater_notice_dismissed?
+        dismissal_data = session[:spree_updater_notice_dismissed]
+        dismissal_data.is_a?(Hash) && dismissal_data['expires_at'].to_time > Time.current
+      end
+
+      def show_spree_updater_notice?
+        Spree::Admin::RuntimeConfig.admin_updater_enabled && can?(:manage, current_store) && spree_update_available? && !updater_notice_dismissed?
+      end
+
       # check if the current controller is a settings controller
       # this is used to display different sidebar navigation for settings pages
       # @return [Boolean]

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

@@ -82,9 +82,11 @@ module Spree
       # render a counter for the bulk operations
       # @return [String]
       def bulk_operations_counter
-        content_tag(:span, class: 'bulk-operations-counter') do
-          content_tag(:strong, '', data: { bulk_operation_target: 'counter' }) +
-          Spree.t("admin.selected")
+        content_tag(:div, class: 'bulk-operations-counter') do
+          content_tag(:span, class: 'bulk-operations-counter-label') do
+            content_tag(:strong, '', data: { bulk_operation_target: 'counter' }) +
+            Spree.t("admin.selected")
+          end
         end
       end
     end

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

@@ -41,7 +41,7 @@ module Spree
           button_tag(raw(selected_option), class: 'btn btn-light btn-sm', data: { toggle: 'dropdown', expanded: false }) +
             content_tag(:div, class: 'dropdown-menu') do
               per_page_options.map do |option|
-                link_to option, per_page_dropdown_params(option), class: "dropdown-item #{'active' if option == selected_option}"
+                link_to option, per_page_dropdown_params(option), class: "dropdown-item #{'active' if option.to_i == selected_option.to_i}"
               end.join.html_safe
             end
         end

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

@@ -14,7 +14,8 @@ module Spree
 
         if search_params[:created_at_gt].present?
           search_params[:created_at_gt] = begin
-                                            Time.zone.parse(search_params[:created_at_gt]).beginning_of_day
+                                            # Firstly we parse to date to avoid issues with timezones because frontend sends time in local timezone
+                                            search_params[:created_at_gt].to_date&.in_time_zone(current_timezone)
                                           rescue StandardError
                                             ''
                                           end
@@ -22,7 +23,7 @@ module Spree
 
         if search_params[:created_at_lt].present?
           search_params[:created_at_lt] = begin
-                                            Time.zone.parse(search_params[:created_at_lt]).end_of_day
+                                            search_params[:created_at_lt].to_date&.in_time_zone(current_timezone)&.end_of_day
                                           rescue StandardError
                                             ''
                                           end
@@ -30,7 +31,7 @@ module Spree
 
         if search_params[:completed_at_gt].present?
           search_params[:completed_at_gt] = begin
-                                            Time.zone.parse(search_params[:completed_at_gt]).beginning_of_day
+                                            search_params[:completed_at_gt].to_date&.in_time_zone(current_timezone)
                                           rescue StandardError
                                             ''
                                           end
@@ -38,7 +39,7 @@ module Spree
 
         if search_params[:completed_at_lt].present?
           search_params[:completed_at_lt] = begin
-                                            Time.zone.parse(search_params[:completed_at_lt]).end_of_day
+                                            search_params[:completed_at_lt].to_date&.in_time_zone(current_timezone)&.end_of_day
                                           rescue StandardError
                                             ''
                                           end

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

@@ -124,7 +124,7 @@ module Spree
       end
 
       def sorted_product_properties(product)
-        product.product_properties.includes(:property).sort_by { |product_property| product_property.property.position }
+        product.product_properties.sort_by { |product_property| product_property.property.position }
       end
     end
   end

data/app/javascript/spree/admin/application.js

@@ -43,6 +43,7 @@ import Sortable from 'stimulus-sortable'
 import { Tabs } from 'tailwindcss-stimulus-components'
 
 import ActiveStorageUpload from 'spree/admin/controllers/active_storage_upload_controller'
+import AdminController from 'spree/admin/controllers/admin_controller'
 import AssetUploaderController from 'spree/admin/controllers/asset_uploader_controller'
 import AutocompleteSelectController from 'spree/admin/controllers/autocomplete_select_controller'
 import BetterSliderController from 'spree/admin/controllers/better_slider_controller'
@@ -87,6 +88,7 @@ import EnableButtonController from 'spree/core/controllers/enable_button_control
 application.register('active-storage-upload', ActiveStorageUpload)
 application.register('address-autocomplete', AddressAutocompleteController)
 application.register('address-form', AddressFormController)
+application.register('admin', AdminController)
 application.register('asset-uploader', AssetUploaderController)
 application.register('auto-submit', AutoSubmit)
 application.register('autocomplete-select', AutocompleteSelectController)

data/app/javascript/spree/admin/controllers/admin_controller.js

@@ -0,0 +1,18 @@
+import { Controller } from '@hotwired/stimulus'
+
+export default class extends Controller {
+  static targets = ['close', 'save']
+
+  close() {
+    if (this.hasCloseTarget) {
+      window.Turbo.visit(this.closeTarget.href)
+    }
+  }
+
+  save(event) {
+    if (this.hasSaveTarget) {
+      event.preventDefault()
+      this.saveTarget.click()
+    }
+  }
+}

data/app/models/spree/admin/updater.rb

@@ -5,7 +5,7 @@ require 'uri'
 module Spree
   module Admin
     class Updater
-      SPREE_CLOUD_UPDATES_URL = 'https://spreecloud.io/updates.json'
+      SPREE_CLOUD_UPDATES_URL = 'https://spreecloud.io/updates.json'.freeze
 
       @updates = nil
 
@@ -13,14 +13,18 @@ module Spree
         fetch_updates.any?
       end
 
-      def self.latest_version
-        @latest_version ||= fetch_updates.first&.dig('version')
+      def self.latest_release
+        @latest_release ||= fetch_updates.first
+      end
+
+      def self.current_release
+        @current_release ||= Spree.version
       end
 
       def self.fetch_updates
-        @updates ||= Rails.cache.fetch("spree/admin/updater/fetch_updates/#{Spree.version}", expires_in: 1.day) do
+        @updates ||= Rails.cache.fetch("spree/admin/updater/fetch_updates/#{current_release}", expires_in: 1.day) do
           uri = URI(SPREE_CLOUD_UPDATES_URL)
-          params = { version: Spree.version, environment: Rails.env, url: Spree::Store.current.url_or_custom_domain }
+          params = { version: current_release, environment: Rails.env, url: Spree::Store.current.url_or_custom_domain }
           uri.query = URI.encode_www_form(params)
 
           http = Net::HTTP.new(uri.host, uri.port)

data/app/views/kaminari/admin-twitter-bootstrap-4/_first_page.html.erb

@@ -6,8 +6,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote -%>
 
-<% unless current_page.first? %>
-  <li class="first page-item">
-    <%= link_to_unless current_page.first?, icon('double-chevron-left', class: 'mb-0'), url, remote: remote, class: 'page-link', 'aria-label': 'First page' %>
-  </li>
-<% end %>
+<li class="first page-item <%= current_page.first? ? 'disabled' : '' %>">
+  <%= link_to icon('double-chevron-left', class: 'text-dark'), url, remote: remote, class: 'page-link', 'aria-label': 'First page' %>
+</li>

data/app/views/kaminari/admin-twitter-bootstrap-4/_last_page.html.erb

@@ -6,8 +6,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote -%>
 
-<% unless current_page.last? %>
-  <li class="last next page-item"><%# "next" class present for border styling in twitter bootstrap %>
-    <%= link_to_unless current_page.last?, icon('double-chevron-right', class: 'mb-0'), url, remote: remote, class: 'page-link', 'aria-label': 'Last page' %>
-  </li>
-<% end %>
+<li class="last next page-item <%= current_page.last? ? 'disabled' : '' %>">
+  <%= link_to icon('double-chevron-right', class: 'text-dark'), url, remote: remote, class: 'page-link', 'aria-label': 'Last page' %>
+</li>

data/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erb

@@ -6,8 +6,7 @@
     per_page:      number of items to fetch per page
     remote:        data-remote -%>
 
-<% unless current_page.last? %>
-  <li class="next_page page-item">
-    <%= link_to_unless current_page.last?, icon('chevron-right', class: 'text-dark'), url, rel: 'next', remote: remote, class: 'page-link', 'aria-label': 'Next page' %>
-  </li>
-<% end %>
+<li class="next page-item <%= current_page.last? ? 'disabled' : '' %>">
+  <%= link_to icon('chevron-right', class: 'text-dark'), url, rel: 'next', remote: remote, class: 'page-link', 'aria-label': 'Next page' %>
+</li>
+

data/app/views/kaminari/admin-twitter-bootstrap-4/_paginator.html.erb

@@ -12,6 +12,6 @@
   <ul class="pagination d-inline-flex <%= pagination_class %> mb-0">
 
     <%= prev_page_tag %>
-    <%= next_page_tag unless current_page.last? %>
+    <%= next_page_tag %>
   </ul>
 <% end %>

data/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb

@@ -6,8 +6,7 @@
     per_page:      number of items to fetch per page
     remote:        data-remote -%>
 
-<% unless current_page.first? %>
-  <li class="prev page-item">
-    <%= link_to_unless current_page.first?, icon('chevron-left', class: 'text-dark'), url, rel: 'prev', remote: remote, class: 'page-link', 'aria-label': 'Previous page' %>
-  </li>
-<% end %>
+<li class="prev page-item <%= current_page.first? ? 'disabled' : '' %>">
+  <%= link_to icon('chevron-left', class: 'text-dark'), url, rel: 'prev', remote: remote, class: 'page-link', 'aria-label': 'Previous page' %>
+</li>
+

data/app/views/layouts/spree/admin.html.erb

@@ -5,7 +5,10 @@
     <%= render "spree/admin/shared/custom_head" %>
   </head>
 
-  <body class="admin min-vh-100 <%= controller_name %> <%= action_name %>">
+  <body class="admin min-vh-100 <%= controller_name %> <%= action_name %>"
+    data-controller="admin"
+    data-action="keydown.esc->admin#close keydown.ctrl+s->admin#save keydown.meta+s->admin#save"
+  >
     <%= render_admin_partials(:body_start_partials) %>
 
     <%= render "spree/admin/shared/header" %>

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

@@ -13,7 +13,7 @@
       <div class="card-header">
         <h5 class="card-title">
           <%= icon 'history', class: 'mr-1' %>
-          <%= Spree.t(:audit_log) %>
+          <%= Spree.t('admin.audit_log') %>
         </h5>
       </div>
       <div class="card-body">
@@ -37,6 +37,7 @@
               <%= Spree.t(:email) %>
               <span>
                 <%= @admin_user.email %>
+                <%= clipboard_component(@admin_user.email) %>
               </span>
             </li>
             <li class="list-group-item d-flex justify-content-between align-items-center">
@@ -101,7 +102,7 @@
               <li class="list-group-item d-flex justify-content-between align-items-center">
                 <%= Spree.t(:invited_by) %>
                 <span>
-                <%= @admin_user.invited_by.name %>
+                  <%= link_to @admin_user.invited_by.email, spree.admin_admin_user_path(@admin_user.invited_by), class: 'text-decoration-none', data: { turbo_frame: '_top' } %>
                 </span>
               </li>
             <% end %>

data/app/views/spree/admin/dashboard/_updater.html.erb

@@ -1,9 +1,19 @@
-<% if Spree::Admin::RuntimeConfig.admin_updater_enabled && can?(:manage, current_store) && spree_update_available? %>
-  <div class="alert alert-info">
-    <div>
-      <p class="mb-1">There's a newer version of Spree available.</p>
+<% if show_spree_updater_notice? %>
+  <div id="updater-notice" class="mb-3">
+    <%= image_tag 'favicon_256x256.png', alt: 'Spree', width: 32, height: 32 %>
+    <div class="d-flex flex-column">
+      <p class="mb-1">
+        <strong>Spree <%= spree_updater.latest_release['name'] %></strong> is available.
+        <br />Your current version is <strong>Spree <%= spree_updater.current_release %></strong>. 
+      </p>
 
-      <%= link_to_with_icon 'settings-up', 'Update now', 'https://spreecommerce.org/docs/developer/upgrades', target: '_blank', class: 'btn btn-light btn-sm' %>
+      <% if spree_updater.latest_release['url'] %>
+        <div>
+          <%= external_link_to "View release notes", spree_updater.latest_release['url'], target: '_blank', class: 'btn btn-sm btn-link' %>
+        </div>
+      <% end %>
     </div>
+
+    <%= link_to '', spree.admin_dismiss_updater_notice_path, data: { turbo_method: :patch }, class: 'btn-close ml-auto' %>
   </div>
 <% end %>

data/app/views/spree/admin/dashboard/getting_started.html.erb

@@ -1,5 +1,5 @@
 <div class="row pt-3">
-  <div class="col-lg-8 mb-4">
+  <div class="col-lg-8 offset-lg-2 mb-4">
     <h2 class="page-header-title">
       <%= Spree.t('admin.getting_started') %>
     </h2>
@@ -17,6 +17,4 @@
       <% end %>
     <% end %>
   </div>
-  <div class="col-lg-4">
-  </div>
 </div>

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

@@ -15,8 +15,8 @@
       <%= form_tag spree.admin_dashboard_analytics_path, method: :get, data: { turbo_frame: :analytics } do %>
         <%= hidden_field_tag :vendor_id, @vendor.id if @vendor.present? %>
         <%= render 'spree/admin/shared/calendar_range_picker',
-          date_from_value: params[:date_from] || 1.month.ago.beginning_of_month,
-          date_to_value: params[:date_to] || 1.month.ago.end_of_month,
+          date_from_value: params[:date_from] || 1.month.ago.end_of_day,
+          date_to_value: params[:date_to] || Time.zone.now.beginning_of_day,
           css_classes: "btn btn-sm border rounded-lg hover-light d-inline-flex align-items-center h-100 dropdown-toggle" %>
       <% end %>
     </div>