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

add space between date and time in order listing page on admin end #7552

Merged
merged 3 commits into from
Aug 26, 2016
Merged

add space between date and time in order listing page on admin end #7552

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ebbca9
add space between date and time in order listing page on admin end
nimish13 Aug 24, 2016
682fdaa
fix time helper method
nimish13 Aug 25, 2016
c600fcd
Merge branch 'master' into time-dsiplay-fix
nimish13 Aug 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/app/helpers/spree/admin/base_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ def plural_resource_name(resource_class)
end

def order_time(time)
[I18n.l(time.to_date), time.strftime("%l:%M %p")].join('')
[I18n.l(time.to_date), time.strftime("%l:%M %p").strip].join(' ')
end
end
end
Expand Down