caboose-store 0.0.11 → 0.0.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (32) hide show
  1. checksums.yaml +8 -8
  2. data/app/assets/javascripts/caboose_store/application.js +0 -2
  3. data/app/assets/javascripts/caboose_store/checkout.js +143 -143
  4. data/app/assets/javascripts/caboose_store/modules/checkout.js +31 -32
  5. data/app/assets/javascripts/caboose_store/modules/checkout_step1.js +157 -0
  6. data/app/assets/javascripts/caboose_store/modules/checkout_step2.js +39 -0
  7. data/app/assets/javascripts/caboose_store/modules/checkout_step3.js +34 -0
  8. data/app/assets/javascripts/caboose_store/modules/checkout_step4.js +102 -0
  9. data/app/assets/templates/caboose_store/checkout/forms/guest.jst.ejs +1 -1
  10. data/app/assets/templates/caboose_store/checkout/forms/register.jst.ejs +1 -1
  11. data/app/assets/templates/caboose_store/checkout/forms/signin.jst.ejs +1 -1
  12. data/app/assets/templates/caboose_store/checkout/line_items.jst.ejs +1 -2
  13. data/app/assets/templates/caboose_store/checkout/login.jst.ejs +4 -4
  14. data/app/controllers/caboose_store/checkout_controller.rb +108 -46
  15. data/app/helpers/caboose_store/checkout_helper.rb +15 -0
  16. data/app/models/caboose_store/schema.rb +4 -0
  17. data/app/models/caboose_store/states.rb +66 -0
  18. data/app/views/caboose_store/cart/index.html.erb +4 -0
  19. data/app/views/caboose_store/checkout/_confirm.html.erb +61 -0
  20. data/app/views/caboose_store/checkout/index.html.erb +1 -1
  21. data/app/views/caboose_store/checkout/relay.html.erb +2 -2
  22. data/app/views/caboose_store/checkout/relay_old.html.erb +12 -0
  23. data/app/views/caboose_store/checkout/step_four.html.erb +91 -0
  24. data/app/views/caboose_store/checkout/step_one.html.erb +46 -11
  25. data/app/views/caboose_store/checkout/step_one_old.html.erb +13 -0
  26. data/app/views/caboose_store/checkout/step_three.html.erb +23 -0
  27. data/app/views/caboose_store/checkout/step_two.html.erb +49 -13
  28. data/app/views/caboose_store/checkout/step_two_old.html.erb +14 -0
  29. data/app/views/caboose_store/products/details.html.erb +2 -0
  30. data/config/routes.rb +10 -7
  31. data/lib/caboose-store/version.rb +1 -1
  32. metadata +13 -2
@@ -0,0 +1,14 @@
1
+ <div id="checkout" class="loading">
2
+ <header>Thanks for shopping with us!</header>
3
+ <h3><span>step 2 of 2</span></h3>
4
+ <figure class="loading"></figure>
5
+ <section id="checkout-shipping"></section>
6
+ <section id="checkout-line-items"></section>
7
+ <section id="checkout-payment"></section>
8
+
9
+ <section id="checkout-complete">
10
+ <button class="blue">Complete my Purchase</button>
11
+ <em>or</em>
12
+ <a href="/">return to the store</a>
13
+ </section>
14
+ </div>
@@ -255,6 +255,8 @@ ol.carousel-indicators li.thumbnail {
255
255
  </div>
256
256
 
257
257
  <%= content_for :caboose_js do %>
258
+ <%= javascript_include_tag 'caboose_store/modules/cart' %>
259
+ <%= javascript_include_tag 'caboose_store/modules/product' %>
258
260
  <script type='text/javascript'>
259
261
 
260
262
  var option1 = <%= raw p.option1 ? p.option1.to_json : false %>;
data/config/routes.rb CHANGED
@@ -11,20 +11,23 @@ CabooseStore::Engine.routes.draw do
11
11
 
12
12
  # Checkout
13
13
 
14
- get '/checkout' => 'checkout#step_one'
14
+ get '/checkout' => 'checkout#index'
15
15
  get '/checkout/step-one' => 'checkout#step_one'
16
16
  get '/checkout/step-two' => 'checkout#step_two'
17
- get '/checkout/address' => 'checkout#address'
17
+ get '/checkout/step-three' => 'checkout#step_three'
18
+ get '/checkout/step-four' => 'checkout#step_four'
19
+ get '/checkout/thanks' => 'checkout#thanks'
20
+
21
+ #get '/checkout/address' => 'checkout#address'
18
22
  put '/checkout/address' => 'checkout#update_address'
19
23
  post '/checkout/attach-user' => 'checkout#attach_user'
20
24
  post '/checkout/attach-guest' => 'checkout#attach_guest'
21
- get '/checkout/shipping' => 'checkout#shipping'
25
+ #get '/checkout/shipping' => 'checkout#shipping'
22
26
  put '/checkout/shipping' => 'checkout#update_shipping'
23
- get '/checkout/payment' => 'checkout#payment'
27
+ #get '/checkout/payment' => 'checkout#payment'
24
28
  get '/checkout/relay/:order_id' => 'checkout#relay'
25
- post '/checkout/relay/:order_id' => 'checkout#relay'
26
- get '/checkout/thanks' => 'checkout#thanks'
27
- get '/checkout/empty' => 'checkout#empty'
29
+ post '/checkout/relay/:order_id' => 'checkout#relay'
30
+ #get '/checkout/empty' => 'checkout#empty'
28
31
 
29
32
  # Products
30
33
 
@@ -1,3 +1,3 @@
1
1
  module CabooseStore
2
- VERSION = '0.0.11'
2
+ VERSION = '0.0.12'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: caboose-store
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.11
4
+ version: 0.0.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-08-18 00:00:00.000000000 Z
11
+ date: 2014-08-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: caboose-cms
@@ -50,6 +50,10 @@ files:
50
50
  - app/assets/javascripts/caboose_store/main.js
51
51
  - app/assets/javascripts/caboose_store/modules/cart.js
52
52
  - app/assets/javascripts/caboose_store/modules/checkout.js
53
+ - app/assets/javascripts/caboose_store/modules/checkout_step1.js
54
+ - app/assets/javascripts/caboose_store/modules/checkout_step2.js
55
+ - app/assets/javascripts/caboose_store/modules/checkout_step3.js
56
+ - app/assets/javascripts/caboose_store/modules/checkout_step4.js
53
57
  - app/assets/javascripts/caboose_store/modules/product.js
54
58
  - app/assets/stylesheets/caboose_store/admin.css
55
59
  - app/assets/stylesheets/caboose_store/admin_products.css
@@ -116,6 +120,7 @@ files:
116
120
  - app/models/caboose_store/schema.rb
117
121
  - app/models/caboose_store/search_filter.rb
118
122
  - app/models/caboose_store/shipping_calculator.rb
123
+ - app/models/caboose_store/states.rb
119
124
  - app/models/caboose_store/tax_calculator.rb
120
125
  - app/models/caboose_store/tax_line.rb
121
126
  - app/models/caboose_store/variant.rb
@@ -127,6 +132,7 @@ files:
127
132
  - app/views/caboose_store/checkout/_address_form.html.erb
128
133
  - app/views/caboose_store/checkout/_billing_form.html.erb
129
134
  - app/views/caboose_store/checkout/_cart.html.erb
135
+ - app/views/caboose_store/checkout/_confirm.html.erb
130
136
  - app/views/caboose_store/checkout/_order_discount.html.erb
131
137
  - app/views/caboose_store/checkout/_shipping_address.html.erb
132
138
  - app/views/caboose_store/checkout/_shipping_method.html.erb
@@ -139,10 +145,15 @@ files:
139
145
  - app/views/caboose_store/checkout/login.html.erb
140
146
  - app/views/caboose_store/checkout/payment.html.erb
141
147
  - app/views/caboose_store/checkout/relay.html.erb
148
+ - app/views/caboose_store/checkout/relay_old.html.erb
142
149
  - app/views/caboose_store/checkout/relay_postMessage.html.erb
143
150
  - app/views/caboose_store/checkout/shipping.html.erb
151
+ - app/views/caboose_store/checkout/step_four.html.erb
144
152
  - app/views/caboose_store/checkout/step_one.html.erb
153
+ - app/views/caboose_store/checkout/step_one_old.html.erb
154
+ - app/views/caboose_store/checkout/step_three.html.erb
145
155
  - app/views/caboose_store/checkout/step_two.html.erb
156
+ - app/views/caboose_store/checkout/step_two_old.html.erb
146
157
  - app/views/caboose_store/checkout/thanks.html.erb
147
158
  - app/views/caboose_store/layouts/_banner.html.erb
148
159
  - app/views/caboose_store/layouts/_banner2.html.erb