Skip to content

clean up checkout address page #3

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

Open
zacksiri wants to merge 2 commits into
base: master
Choose a base branch
from
Open

clean up checkout address page #3

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
f0dee37
clean up checkout address page
Jun 20, 2016
3aa48f6
clean up error messages and tweak checkout_progress helper
Jun 20, 2016
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
137 changes: 70 additions & 67 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,28 +41,27 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
acts_as_list (0.7.2)
acts_as_list (0.7.4)
activerecord (>= 3.0)
addressable (2.4.0)
arel (6.0.3)
autoprefixer-rails (6.3.1)
autoprefixer-rails (6.3.6.2)
execjs
json
awesome_nested_set (3.0.3)
activerecord (>= 4.0.0, < 5)
bcrypt (3.1.10)
bcrypt (3.1.11)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.3.6)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
bourbon (4.2.6)
bourbon (4.2.7)
sass (~> 3.4)
thor (~> 0.19)
builder (3.2.2)
byebug (8.2.1)
byebug (9.0.5)
camertron-eprun (1.1.0)
cancancan (1.13.1)
cancancan (1.15.0)
canonical-rails (0.0.11)
rails (>= 3.1, < 5.0)
carmen (1.0.2)
Expand All @@ -72,7 +71,7 @@ GEM
activesupport (>= 3.0)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
coderay (1.1.0)
coderay (1.1.1)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
Expand All @@ -81,16 +80,16 @@ GEM
execjs
coffee-script-source (1.10.0)
colorize (0.7.7)
concurrent-ruby (1.0.0)
css_parser (1.3.7)
concurrent-ruby (1.0.2)
css_parser (1.4.2)
addressable
debug_inspector (0.0.2)
deface (1.0.2)
colorize (>= 0.5.8)
nokogiri (~> 1.6.0)
polyglot
rails (>= 3.1)
devise (3.5.3)
devise (3.5.10)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
Expand All @@ -100,10 +99,10 @@ GEM
devise-encryptable (0.1.2)
devise (>= 2.1.0)
erubis (2.7.0)
execjs (2.6.0)
execjs (2.7.0)
ffaker (1.32.1)
font-awesome-rails (4.5.0.0)
railties (>= 3.2, < 5.0)
font-awesome-rails (4.6.3.0)
railties (>= 3.2, < 5.1)
friendly_id (5.1.0)
activerecord (>= 4.0.0)
globalid (0.3.6)
Expand All @@ -116,35 +115,38 @@ GEM
highline (1.6.21)
htmlentities (4.3.4)
i18n (0.7.0)
jbuilder (2.4.0)
jbuilder (2.5.0)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jquery-rails (4.1.0)
rails-dom-testing (~> 1.0)
jquery-rails (4.1.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.5)
railties (>= 3.2.16)
json (1.8.3)
kaminari (0.16.3)
kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mail (2.6.4)
mime-types (>= 1.16, < 4)
method_source (0.8.2)
mime-types (2.99)
mini_portile2 (2.0.0)
minitest (5.8.4)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.9.0)
monetize (1.4.0)
money (~> 6.7)
money (6.7.0)
money (6.7.1)
i18n (>= 0.6.4, <= 0.7.0)
sixarm_ruby_unaccent (>= 1.1.1, < 2)
multi_json (1.11.2)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
multi_json (1.12.1)
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
orm_adapter (0.5.0)
paperclip (4.2.4)
activemodel (>= 3.2.0)
Expand All @@ -154,14 +156,15 @@ GEM
paranoia (2.1.5)
activerecord (~> 4.0)
pg (0.18.4)
pkg-config (1.1.7)
polyamorous (1.3.0)
activerecord (>= 3.0)
polyglot (0.3.5)
premailer (1.8.6)
css_parser (>= 1.3.6)
htmlentities (>= 4.0.0)
premailer-rails (1.9.0)
actionmailer (>= 3, < 5)
premailer-rails (1.9.3)
actionmailer (>= 3, < 6)
premailer (~> 1.7, >= 1.7.9)
pry (0.10.3)
coderay (~> 1.1.0)
Expand Down Expand Up @@ -198,17 +201,18 @@ GEM
activesupport (= 4.2.5)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.5.0)
rake (11.2.2)
ransack (1.6.6)
actionpack (>= 3.0)
activerecord (>= 3.0)
activesupport (>= 3.0)
i18n
polyamorous (~> 1.2)
rdoc (4.2.1)
responders (2.1.1)
rdoc (4.2.2)
json (~> 1.4)
responders (2.2.0)
railties (>= 4.2.0, < 5.1)
sass (3.4.21)
sass (3.4.22)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
Expand All @@ -222,32 +226,32 @@ GEM
thor (~> 0.14)
sixarm_ruby_unaccent (1.1.1)
slop (3.6.0)
solidus (1.2.0)
solidus_api (= 1.2.0)
solidus_backend (= 1.2.0)
solidus_core (= 1.2.0)
solidus_frontend (= 1.2.0)
solidus_sample (= 1.2.0)
solidus_api (1.2.0)
solidus (1.2.2)
solidus_api (= 1.2.2)
solidus_backend (= 1.2.2)
solidus_core (= 1.2.2)
solidus_frontend (= 1.2.2)
solidus_sample (= 1.2.2)
solidus_api (1.2.2)
rabl (>= 0.9.4.pre1, < 0.12.0)
solidus_core (= 1.2.0)
solidus_core (= 1.2.2)
versioncake (~> 2.3.1)
solidus_auth_devise (1.3.0)
solidus_auth_devise (1.4.0)
deface (~> 1.0.0)
devise (~> 3.5.1)
devise-encryptable (= 0.1.2)
json
multi_json
solidus_core (>= 1.1.0.alpha, < 2)
solidus_backend (1.2.0)
solidus_core (>= 1.0.6, < 2)
solidus_backend (1.2.2)
bourbon (>= 4, < 6)
handlebars_assets (~> 0.23)
jquery-rails
jquery-ui-rails (~> 5.0.0)
select2-rails (= 3.5.9.1)
solidus_api (= 1.2.0)
solidus_core (= 1.2.0)
solidus_core (1.2.0)
solidus_api (= 1.2.2)
solidus_core (= 1.2.2)
solidus_core (1.2.2)
activemerchant (~> 1.48.0)
acts_as_list (~> 0.3)
awesome_nested_set (~> 3.0.1)
Expand All @@ -270,53 +274,52 @@ GEM
stringex (~> 1.5.1)
truncate_html (= 0.9.2)
twitter_cldr (~> 3.0)
solidus_frontend (1.2.0)
solidus_frontend (1.2.2)
canonical-rails (~> 0.0.4)
jquery-rails
solidus_api (= 1.2.0)
solidus_core (= 1.2.0)
solidus_sample (1.2.0)
solidus_core (= 1.2.0)
spring (1.6.2)
sprockets (3.5.2)
solidus_api (= 1.2.2)
solidus_core (= 1.2.2)
solidus_sample (1.2.2)
solidus_core (= 1.2.2)
spring (1.7.1)
sprockets (3.6.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.1)
sprockets-rails (3.0.4)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
state_machines (0.4.0)
state_machines-activemodel (0.3.0)
activemodel (~> 4.1)
state_machines-activemodel (0.4.0)
activemodel (>= 4.1, < 5.1)
state_machines (>= 0.4.0)
state_machines-activerecord (0.3.0)
activerecord (~> 4.1)
state_machines-activerecord (0.4.0)
activerecord (>= 4.1, < 5.1)
state_machines-activemodel (>= 0.3.0)
stringex (1.5.1)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.2)
tilt (2.0.5)
truncate_html (0.9.2)
turbolinks (2.5.3)
coffee-rails
twitter_cldr (3.2.1)
twitter_cldr (3.3.0)
camertron-eprun
cldr-plurals-runtime-rb (~> 1.0.0)
json
tzinfo
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
uglifier (3.0.0)
execjs (>= 0.3.0, < 3)
versioncake (2.3.1)
actionpack (>= 3.2)
activesupport (>= 3.2)
railties (>= 3.2)
tzinfo
warden (1.2.4)
warden (1.2.6)
rack (>= 1.0)
web-console (2.2.1)
web-console (2.3.0)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
Expand Down Expand Up @@ -344,4 +347,4 @@ DEPENDENCIES
web-console (~> 2.0)

BUNDLED WITH
1.11.2
1.12.3
26 changes: 26 additions & 0 deletions app/assets/stylesheets/spree/frontend/base.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,29 @@ a
footer.footer
> div
padding: 20px 0px 20px 0px

// Flash
.alert-error
background-color: #f2dede
border-color: #eed3d7
color: #b94a48
text-align: left

.alert-alert
background-color: #f2dede
border-color: #eed3d7
color: #b94a48
text-align: left


.alert-success
background-color: #dff0d8
border-color: #d6e9c6
color: #468847
text-align: left

.alert-notice
background-color: #dff0d8
border-color: #d6e9c6
color: #468847
text-align: left
11 changes: 11 additions & 0 deletions app/helpers/spree/base_helper_decorator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ def layout_partial
end
end

def flash_messages(opts = {})
ignore_types = ["order_completed"].concat(Array(opts[:ignore_types]).map(&:to_s) || [])

flash.each do |msg_type, text|
unless ignore_types.include?(msg_type)
concat(content_tag :div, text, class: "flash alert alert-#{msg_type}")
end
end
nil
end

def logo(image_path=Spree::Config[:logo], img_options: {}, link_options: {})
link_to image_tag(image_path, img_options), spree.root_path, link_options
end
Expand Down
28 changes: 28 additions & 0 deletions app/helpers/spree/checkout_helper_decorator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
module Spree::CheckoutHelper
def checkout_progress
states = checkout_states
items = states.map do |state|
text = Spree.t("order_state.#{state}").titleize

css_classes = ['disabled']
current_index = states.index(@order.state)
state_index = states.index(state)

if state_index < current_index
css_classes = []
css_classes << 'completed'
text = link_to text, checkout_state_path(state)
else
text = link_to text, '#'
end

css_classes << 'next' if state_index == current_index + 1
css_classes << 'active' if state == @order.state
css_classes << 'first' if state_index == 0
css_classes << 'last' if state_index == states.length - 1
# It'd be nice to have separate classes but combining them with a dash helps out for IE6 which only sees the last class
content_tag('li', text, class: css_classes)
end
content_tag('ol', raw(items.join("\n")), class: 'progress-steps nav nav-pills nav-justified', id: "checkout-step-#{@order.state}")
end
end
Loading