Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[v4.3] Show "Unavailable" status for products with a future Available On date #5743

Merged
merged 2 commits into from
May 8, 2024
Merged

[v4.3] Show "Unavailable" status for products with a future Available On date #5743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
956319a
Products that are not available shouldn't show Available status
forkata Apr 11, 2024
ba3b251
Provide formatted date values to field component
forkata Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions admin/app/components/solidus_admin/products/show/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,20 @@

<%= page_with_sidebar_aside do %>
<%= render component('ui/panel').new(title: "Publishing") do %>
<%= render component("ui/forms/field").text_field(f, :available_on, hint: t(".available_on_html"), type: :date) %>
<%= render component("ui/forms/field").text_field(f, :discontinue_on, hint: t(".discontinue_on_html"), type: :date) %>

<%= render component("ui/forms/field").text_field(
f,
:available_on,
hint: t(".available_on_html"),
type: :date,
value: f.object.available_on&.to_date
) %>
<%= render component("ui/forms/field").text_field(
f,
:discontinue_on,
hint: t(".discontinue_on_html"),
type: :date,
value: f.object.discontinue_on&.to_date
) %>
<label class="flex gap-2 items-center">
<%= render component("ui/forms/checkbox").new(
name: "#{f.object_name}[promotionable]",
Expand Down
5 changes: 4 additions & 1 deletion admin/app/components/solidus_admin/products/status/component.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ class SolidusAdmin::Products::Status::Component < SolidusAdmin::BaseComponent
available: :green,
discontinued: :yellow,
deleted: :red,
unavailable: :yellow
}.freeze

def self.from_product(product)
Expand All @@ -13,8 +14,10 @@ def self.from_product(product)
:deleted
elsif product.discontinued?
:discontinued
else
elsif product.available?
:available
else
:unavailable
end

new(status: status)
Expand Down
1 change: 1 addition & 0 deletions admin/app/components/solidus_admin/products/status/component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ en:
available: 'Available'
discontinued: 'Discontinued'
deleted: 'Deleted'
unavailable: 'Unavailable'
6 changes: 6 additions & 0 deletions admin/spec/components/solidus_admin/ui/forms/input/component_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,11 @@

expect(page).to have_css("input[type='number'][name='name'][value='value']")
end

it "renders a date input" do
render_inline(described_class.new(type: :date, name: "name", value: "2020-01-01"))

expect(page).to have_css("input[type='date'][name='name'][value='2020-01-01']")
end
end
end
Loading