spree_admin 5.2.2 → 5.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: face48f54a962293be126505c2328b277401dc0ae0ff7a70d173351bfe4d65aa
-  data.tar.gz: b20b6a1edc0a2fe3527f724dd50037cd827160cb8747d6c37c57b199ab5f6804
+  metadata.gz: 5177ccf868e9028112abe40a50bd111c1fe985b8b1b6830383f4050b5be3f53a
+  data.tar.gz: c0beb911d0f70f98c62ac5dad7e0539ff0463a4415bdfa3f98fc0153714184f8
 SHA512:
-  metadata.gz: 8e7b3b0ebee0e1cf35091854389587b29be905bc20ab001806834d37e3389a3bec79ac37214d0b70530df2e394497c4fcdc4bf1eb7a29fe1518f5479f0e20f00
-  data.tar.gz: b7d991eaf8b89482653e51fa2c7e4dd4121bc46fee08c15bf413e9e295114ad1d5331053a1793902f2199a0c0b60ce46605bc0953be8f8483b0f0fdbb53d4af6
+  metadata.gz: fe80c378126af76654774bb6e5cce0b5478a4223ae9267c59411ddd1faf7335ca571ecd8392ed847b52e2b9002228776829c34d7171021060e080549b3997412
+  data.tar.gz: 7f968a6f96c14d51db8287213f74bdb2691c6fbf3d1569f349d9d8c4edbc6cec268563228954a4dab1276b4e7ca62c940f039be4cbb717bc6b7906d078a1dfe6

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

@@ -50,7 +50,7 @@ dialog {
   overflow-x: hidden;
 }
 dialog:open {
-  display: block;
+  display: flex;
 }
 
 .drawer {
@@ -119,6 +119,10 @@ dialog:open {
     background-color: $gray-25;
   }
 }
+// safari fix
+.drawer[open] {
+  display: flex;
+}
 
 // Native Dialog component (centered modal replacement)
 .dialog {
@@ -159,9 +163,9 @@ dialog:open {
   > turbo-frame:not(#dialog_alerts), turbo-frame > form {
     display: flex;
     width: 100%;
-    height: 100%;
+    flex: 1 1 auto;
+    min-height: 0;
     flex-direction: column;
-    justify-content: space-between;
   }
 
   .dialog-header {
@@ -200,3 +204,7 @@ dialog:open {
     }
   }
 }
+// safari fix
+.dialog[open] {
+  display: flex;
+}

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

@@ -7,6 +7,7 @@ module Spree
       add_breadcrumb Spree.t(:reports), :admin_reports_path
 
       before_action :set_user, only: [:new, :create]
+      before_action :load_report_line_items, only: [:new, :create]
 
       def show
         redirect_to @object.attachment.url, status: :see_other, allow_other_host: true
@@ -18,6 +19,10 @@ module Spree
         @object.user = try_spree_current_user
       end
 
+      def load_report_line_items
+        @report_line_items = @object.line_items
+      end
+
       def create_turbo_stream_enabled?
         true
       end
@@ -31,30 +36,31 @@ module Spree
       end
 
       def build_resource
-        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])
+        report_resource = 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]
+        )
+        report_resource.vendor_id = params[:vendor_id] if defined?(Spree::Vendor)
+        report_resource
       end
 
       def model_class
-        @model_class = if params[:type].present?
-                         # Find the actual class from allowed types rather than using constantize
-                         report_type = "Spree::Reports::#{params[:type].classify}"
-                         report_class = allowed_report_types.find { |type| type == report_type }
+        report_type = params[:type] || params.dig(:report, :type)
+        @model_class = if report_type.present?
+                         report_class = find_report_class(report_type)
+                         raise "Unknown report type: #{report_type}" if report_class.blank?
 
-                         if report_class
-                           Object.const_get(report_class)
-                         else
-                           raise 'Unknown report type'
-                         end
+                         report_class
                        else
                          Spree::Report
                        end
       end
 
-      def allowed_report_types
-        Spree.reports.map(&:to_s)
+      def find_report_class(report_type)
+        prefixed_type = "Spree::Reports::#{report_type.classify}"
+        Spree.reports.find { |klass| [report_type, prefixed_type].include?(klass.to_s) }
       end
 
       def permitted_resource_params

data/app/views/spree/admin/reports/_no_report_data.html.erb

@@ -0,0 +1,6 @@
+<div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center flex-column">
+  <%= icon 'map-search', class: 'mb-3 opacity-50', style: 'font-size: 2rem;' %>
+  <p>
+    <%= Spree.t(:no_report_data) %>
+  </p>
+</div>

data/app/views/spree/admin/reports/_report.html.erb

@@ -1,22 +1,30 @@
+<% if @report.try(:summary_partial_name) %>
+  <%= render "spree/admin/reports/summaries/#{@report.summary_partial_name}", report: @report %>
+<% end %>
+
 <div class="card-lg">
   <div class="table-responsive">
-    <table class="table">
-      <thead>
-        <tr>
-          <% @report.line_item_class.headers.each do |header| %>
-            <th scope="col"><%= header[:label] %></th>
-          <% end %>
-        </tr>
-      </thead>
-      <tbody>
-        <% @report.line_items.each do |line_item| %>
+    <% if @report_line_items.any? %>
+      <table class="table">
+        <thead>
           <tr>
-            <% line_item.class.attribute_types.keys.each do |key| %>
-              <td><%= line_item.send(key) %></td>
+            <% @report.line_item_class.headers.each do |header| %>
+              <th scope="col"><%= header[:label] %></th>
             <% end %>
           </tr>
-        <% end %>
-      </tbody>
-    </table>
+        </thead>
+        <tbody>
+          <% @report_line_items.each do |line_item| %>
+            <tr>
+              <% line_item.class.attribute_types.keys.each do |key| %>
+                <td><%= line_item.send(key) %></td>
+              <% end %>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    <% else %>
+      <%= render @report.no_report_data_partial_path %>
+    <% end %>
   </div>
-</div>
+</div>

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

@@ -18,13 +18,13 @@
         </tr>
       </thead>
       <tbody>
-        <% Spree.t(:report_names).keys.each do |report_type| %>
+        <% Spree.reports.each do |report_class| %>
           <tr data-controller="row-link">
             <td class="cursor-pointer w-90" data-action="click->row-link#openLink">
-              <%= Spree.t("report_names.#{report_type}") %>
+              <%= Spree.t("report_names.#{report_class.report_type}") %>
             </td>
             <td class="text-right w-10">
-              <%= link_to Spree.t(:show_report), spree.new_admin_report_path(type: report_type), class: 'btn btn-light btn-sm', data: { row_link_target: :link, turbo_frame: '_top' } %>
+              <%= link_to Spree.t(:show_report), spree.new_admin_report_path(type: report_class.report_type), class: 'btn btn-light btn-sm', data: { row_link_target: :link, turbo_frame: '_top' } %>
             </td>
           </tr>
         <% end %>

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

@@ -9,6 +9,11 @@
     <%= f.hidden_field :date_from %>
     <%= f.hidden_field :date_to %>
     <%= f.hidden_field :currency %>
+
+    <% if defined?(Spree::Vendor) %>
+      <%= f.hidden_field :vendor_id %>
+    <% end %>
+
     <button class="btn btn-primary" data-controller="tooltip">
       <%= icon('table-export') %>
       <%= Spree.t(:export) %>
@@ -33,6 +38,16 @@
           class: 'custom-select bg-transparent',
           data: { action: 'change->auto-submit#submit' } %>
       </div>
+
+      <% if defined?(Spree::Vendor) %>
+        <div class="form-group">
+          <%= select_tag :vendor_id,
+            options_for_select(Spree::Vendor.pluck(:name, :id), @report.vendor_id),
+            include_blank: "-- #{Spree.t(:select_vendor)} --",
+            class: 'custom-select bg-transparent',
+            data: { action: 'change->auto-submit#submit' } %>
+        </div>
+      <% end %>
     </div>
   <% end %>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_admin
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.2.3
 platform: ruby
 authors:
 - Vendo Connect Inc.
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: 5.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: 5.2.3
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: 5.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: 5.2.3
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -931,6 +931,7 @@ files:
 - app/views/spree/admin/reimbursement_types/new.html.erb
 - app/views/spree/admin/reimbursements/edit.html.erb
 - app/views/spree/admin/reimbursements/show.html.erb
+- app/views/spree/admin/reports/_no_report_data.html.erb
 - app/views/spree/admin/reports/_report.html.erb
 - app/views/spree/admin/reports/create.turbo_stream.erb
 - app/views/spree/admin/reports/index.html.erb
@@ -1271,9 +1272,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.2.2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.2.3
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.2.2
+  source_code_uri: https://github.com/spree/spree/tree/v5.2.3
 rdoc_options: []
 require_paths:
 - lib