raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-13 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7712 from guidoDutra/1861-enable-shopfront-sorting-by-producer

Browse Source 
Enable sorting by producer in shopfront
This commit is contained in:
Andy Brett
2021-07-06 09:27:42 -07:00
committed by GitHub
parent ff3784ad3f 0f2fd47ca0
commit 46cd05c54a
14 changed files with 176 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/enterprise.rb
View File

@@ -9,8 +9,10 @@ class Enterprise < ApplicationRecord
preference :shopfront_message, :text, default: ""
preference :shopfront_closed_message, :text, default: ""
preference :shopfront_taxon_order, :string, default: ""
preference :shopfront_producer_order, :string, default: ""
preference :shopfront_order_cycle_order, :string, default: "orders_close_at"
preference :show_customer_names_to_suppliers, :boolean, default: false
preference :shopfront_product_sorting_method, :string, default: "by_category"
# Allow hubs to restrict visible variants to only those in their inventory
preference :product_selection_from_inventory_only, :boolean, default: false
@@ -95,6 +97,7 @@ class Enterprise < ApplicationRecord
validates :owner, presence: true
validates :permalink, uniqueness: true, presence: true
validate :shopfront_taxons
validate :shopfront_producers
validate :enforce_ownership_limit, if: lambda { owner_id_changed? && !owner_id.nil? }
before_validation :initialize_permalink, if: lambda { permalink.nil? }
@@ -458,6 +461,12 @@ class Enterprise < ApplicationRecord
end
end
def shopfront_producers
unless preferred_shopfront_producer_order =~ /\A((\d+,)*\d+)?\z/
errors.add(:shopfront_category_ordering, "must contain a list of producers.")
end
end
def restore_permalink
# If the permalink has errors, reset it to it's original value, so we can update the form
self.permalink = permalink_was if permalink_changed? && errors[:permalink].present?