Skip to content

Commit

Permalink
Merge pull request #5864 from solidusio/backport/v4.3/pr-5863
Browse files Browse the repository at this point in the history
[v4.3] Format date with #to_fs
  • Loading branch information
tvdeyen authored Oct 9, 2024
2 parents bb60ce1 + 4ca325e commit 6215b2b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
4 changes: 1 addition & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ commands:
setup:
steps:
- checkout
- browser-tools/install-chrome:
chrome-version: "118.0.5993.70"
replace-existing: true
- browser-tools/install-chrome
- run:
name: Check chrome version
command: |
Expand Down
2 changes: 1 addition & 1 deletion backend/app/views/spree/admin/tax_rates/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<td><%= tax_rate.amount %></td>
<td><%= tax_rate.included_in_price? ? t('spree.say_yes') : t('spree.say_no') %></td>
<td><%= tax_rate.show_rate_in_label? ? t('spree.say_yes') : t('spree.say_no') %></td>
<td><%= tax_rate.expires_at.to_date.to_s(:short_date) if tax_rate.expires_at %></td>
<td><%= tax_rate.expires_at.to_date.to_fs(:short_date) if tax_rate.expires_at %></td>
<td><%= tax_rate.calculator && tax_rate.calculator.class.model_name.human %></td>
<td class="actions">
<% if can?(:update, tax_rate) %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
click_link "Tax Rates"
click_link "New Tax Rate"
fill_in "Rate", with: "0.05"
fill_in "Expiration Date", with: "2050-01-01"
click_button "Create"
expect(page).to have_content("Tax Rate has been successfully created!")
end
Expand Down

0 comments on commit 6215b2b

Please sign in to comment.