close #2096 filter order by vendor (#2097)

channainfo · Nov 28, 2024 · 57d1bee · 57d1bee
1 parent bd30198
commit 57d1bee
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/app/models/spree_cm_commissioner/line_item_decorator.rb b/app/models/spree_cm_commissioner/line_item_decorator.rb
@@ -19,7 +19,7 @@ def self.prepended(base) # rubocop:disable Metrics/MethodLength
       base.validate :ensure_not_exceed_max_quantity_per_order, if: -> { variant&.max_quantity_per_order.present? }
 
       base.whitelisted_ransackable_associations |= %w[guests]
-      base.whitelisted_ransackable_attributes |= %w[number to_date from_date]
+      base.whitelisted_ransackable_attributes |= %w[number to_date from_date vendor_id]
 
       base.delegate :delivery_required?, :permanent_stock?, :high_demand,
                     to: :variant

diff --git a/app/models/spree_cm_commissioner/order_decorator.rb b/app/models/spree_cm_commissioner/order_decorator.rb
@@ -17,6 +17,10 @@ def self.prepended(base) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
         )
       }
 
+      base.scope :filter_by_vendor, lambda { |vendor|
+        joins(:line_items).where(spree_line_items: { vendor_id: vendor }).distinct
+      }
+
       base.before_create :link_by_phone_number
       base.before_create :associate_customer
 

diff --git a/app/overrides/spree/admin/orders/_search/vendor_search_field.html.erb.deface b/app/overrides/spree/admin/orders/_search/vendor_search_field.html.erb.deface
@@ -0,0 +1,8 @@
+<!-- insert_before "[data-hook='admin_orders_index_search'] .row:nth-child(5) .col-12.col-lg-4:nth-child(3)" -->
+
+<div class="col-12 col-lg-4">
+  <div class="form-group">
+    <%= label_tag :q_line_items_vendor_id_eq, Spree.t(:vendor) %>
+    <%= f.select :line_items_vendor_id_eq, Spree::Vendor.pluck(:name, :id), { include_blank: true }, class: 'select2-clear js-filterable' %>
+  </div>
+</div>
diff --git a/spec/models/spree/line_item_spec.rb b/spec/models/spree/line_item_spec.rb
@@ -15,7 +15,7 @@
       expect(described_class.whitelisted_ransackable_attributes).to match_array([
         "variant_id", "order_id", "tax_category_id", "quantity", "price", "cost_price", "cost_currency", "adjustment_total",
         "additional_tax_total", "promo_total", "included_tax_total", "pre_tax_amount", "taxable_adjustment_total",
-        "non_taxable_adjustment_total", "number", "to_date", "from_date"
+        "non_taxable_adjustment_total", "number", "to_date", "from_date", "vendor_id"
       ])
     end
   end