spree_delivery_options 2.2.3 → 2.2.4

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 (24) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -1
  3. data/app/assets/javascripts/{admin → spree/backend}/delivery_time_options.js +0 -0
  4. data/app/assets/javascripts/spree/backend/spree_delivery_options.js +2 -0
  5. data/app/assets/javascripts/{store → spree/frontend}/delivery_options_form.js +0 -0
  6. data/app/assets/javascripts/{store → spree/frontend}/delivery_time_options.js +0 -0
  7. data/app/assets/javascripts/{store → spree/frontend}/jquery-ui-1.10.4.custom.js +0 -0
  8. data/app/assets/javascripts/spree/frontend/spree_delivery_options.js +4 -0
  9. data/app/assets/stylesheets/{admin → spree/backend}/delivery_options_form.scss +0 -0
  10. data/app/assets/stylesheets/{admin → spree/backend}/order_details.scss +0 -0
  11. data/app/assets/stylesheets/spree/backend/spree_delivery_options.css +4 -0
  12. data/app/assets/stylesheets/{store → spree/frontend}/delivery_checkout.scss +1 -1
  13. data/app/assets/stylesheets/{store → spree/frontend}/delivery_options_homepage.scss +0 -0
  14. data/app/assets/stylesheets/{store → spree/frontend}/jquery-ui-1.10.4.custom.css +0 -0
  15. data/app/assets/stylesheets/spree/frontend/spree_delivery_options.css +6 -0
  16. data/app/overrides/add_delivery_options_link_order_page.rb +1 -1
  17. data/app/overrides/admin_order_information.rb +3 -3
  18. data/app/views/spree/taxons/_delivery_options.haml +1 -1
  19. data/spree_delivery_options.gemspec +4 -2
  20. metadata +45 -17
  21. data/app/assets/javascripts/admin/spree_delivery_options.js +0 -2
  22. data/app/assets/javascripts/store/spree_delivery_options.js +0 -4
  23. data/app/assets/stylesheets/admin/spree_delivery_options.css +0 -4
  24. data/app/assets/stylesheets/store/spree_delivery_options.css +0 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0ec4e7709318e9c786e6d425f7cac16cc655d25e
4
- data.tar.gz: 1433b6e96caf18a0c9e3664ae836865d063d28f0
3
+ metadata.gz: 5adf6236a9fcd7f9bfa5f7a5b00e5d755752358e
4
+ data.tar.gz: d52ff8c74feb6d754fdab52f0ffce25f6408507f
5
5
  SHA512:
6
- metadata.gz: 7ceb6777c09c92c3963aba5047910f9a5cf7cf6ca2abb12cdd5fa38688a9fa686fc3de653417ec2f4a25253362967061a911bc93f4f46e61b1e3472094cee7f6
7
- data.tar.gz: b0e4a50a520b747b2b05b256d217593d5881c69ce331b9f21d692de7bf8cb7af1425cbe37b4994edd37a68c88f448a3e497d53565fe0f7646dcdbdbe47d284f3
6
+ metadata.gz: b7fcb813f1c71da82254199b1c974499a0f90752e1568b69f433ffb7f60adcbabf00d0b4b54380685a42cda70c439200a8fdda4de5cdaf0d79ea472f23b42871
7
+ data.tar.gz: edf771445c7744f5cfa9c0523a1486a0b6d5ba573b7246ac6c9f0e11c34e0219311bc5fc491f26c28bc3cd4e94269ec63b42b6912feb5332972524f169019230
data/Gemfile CHANGED
@@ -1,7 +1,7 @@
1
1
  source 'http://rubygems.org'
2
2
 
3
3
  # Provides basic authentication functionality for testing parts of your engine
4
- gem 'spree_auth_devise', :git => "git://github.com/spree/spree_auth_devise", :branch => '2-1-stable'
4
+ gem 'spree_auth_devise', :git => "git://github.com/spree/spree_auth_devise", :branch => '2-2-stable'
5
5
  gem 'haml'
6
6
 
7
7
  gemspec
data/app/assets/javascripts/spree/backend/spree_delivery_options.js ADDED
@@ -0,0 +1,2 @@
1
+ //= require jquery
2
+ //= require spree/backend/delivery_time_options
data/app/assets/javascripts/spree/frontend/spree_delivery_options.js ADDED
@@ -0,0 +1,4 @@
1
+ //= require jquery
2
+ //= require spree/frontend/delivery_time_options
3
+ //= require spree/frontend/delivery_options_form
4
+ //= require spree/frontend/jquery-ui-1.10.4.custom
data/app/assets/stylesheets/spree/backend/spree_delivery_options.css ADDED
@@ -0,0 +1,4 @@
1
+ /*
2
+ *= require spree/backend/order_details
3
+ *= require spree/backend/delivery_options_form
4
+ */
data/app/assets/stylesheets/{store → spree/frontend}/delivery_checkout.scss RENAMED
@@ -1,4 +1,4 @@
1
- @import 'store/variables';
1
+ @import 'spree/frontend/variables';
2
2
 
3
3
  #shipping_method {
4
4
  .stock-delivery-date-title, .stock-delivery-instructions-title {
data/app/assets/stylesheets/spree/frontend/spree_delivery_options.css ADDED
@@ -0,0 +1,6 @@
1
+ /*
2
+ *= require spree/frontend
3
+ *= require spree/frontend/delivery_checkout
4
+ *= require spree/frontend/delivery_options_homepage
5
+ *= require spree/frontend/jquery-ui-1.10.4.custom.css
6
+ */
data/app/overrides/add_delivery_options_link_order_page.rb CHANGED
@@ -1,4 +1,4 @@
1
- Deface::Override.new(:virtual_path => "spree/admin/shared/_order_tabs",
1
+ Deface::Override.new(:virtual_path => "spree/admin/shared/_order_submenu",
2
2
  :name => "add_delivery_info_to_order_details",
3
3
  :insert_bottom => "[data-hook='admin_order_tabs']",
4
4
  :partial => "spree/admin/shared/delivery_options_link",
data/app/overrides/admin_order_information.rb CHANGED
@@ -1,5 +1,5 @@
1
- Deface::Override.new(:virtual_path => "spree/admin/shared/_order_tabs",
1
+ Deface::Override.new(:virtual_path => "spree/admin/shared/_order_summary",
2
2
  :name => "add_delivery_date_to_admin_order_information",
3
- :insert_after => "#order_total",
3
+ :insert_top => "dl.additional-info",
4
4
  :partial => "spree/admin/shared/admin_order_information_delivery_date",
5
- :disabled => false)
5
+ :disabled => false)
data/app/views/spree/taxons/_delivery_options.haml CHANGED
@@ -1,6 +1,6 @@
1
1
  - if SpreeDeliveryOptions::Config.show_homepage_form
2
2
  #delivery-options-homepage
3
- - order = current_order(true)
3
+ - order = current_order(create_order_if_necessary: true)
4
4
  - if order.delivery_date? && order.delivery_time
5
5
  .row.success
6
6
  .columns.sixteen.alpha.omega
data/spree_delivery_options.gemspec CHANGED
@@ -2,7 +2,7 @@
2
2
  Gem::Specification.new do |s|
3
3
  s.platform = Gem::Platform::RUBY
4
4
  s.name = 'spree_delivery_options'
5
- s.version = '2.2.3'
5
+ s.version = '2.2.4'
6
6
  s.summary = 'Adds delivery date and time during checkout'
7
7
  s.description = ''
8
8
  s.required_ruby_version = '>= 2.0.0'
@@ -15,7 +15,9 @@ Gem::Specification.new do |s|
15
15
  s.require_path = 'lib'
16
16
  s.requirements << 'none'
17
17
 
18
- s.add_dependency 'spree_core', '~> 2.1.3'
18
+ s.add_dependency 'spree_core', '~> 2.2.1'
19
+ s.add_dependency 'spree_frontend', '~> 2.2.1'
20
+ s.add_dependency 'spree_backend', '~> 2.2.1'
19
21
 
20
22
  s.add_runtime_dependency 'haml'
21
23
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_delivery_options
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.3
4
+ version: 2.2.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Francisco Trindade
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-03-31 00:00:00.000000000 Z
11
+ date: 2014-04-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: spree_core
@@ -16,14 +16,42 @@ dependencies:
16
16
  requirements:
17
17
  - - ~>
18
18
  - !ruby/object:Gem::Version
19
- version: 2.1.3
19
+ version: 2.2.1
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - ~>
25
25
  - !ruby/object:Gem::Version
26
- version: 2.1.3
26
+ version: 2.2.1
27
+ - !ruby/object:Gem::Dependency
28
+ name: spree_frontend
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - ~>
32
+ - !ruby/object:Gem::Version
33
+ version: 2.2.1
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - ~>
39
+ - !ruby/object:Gem::Version
40
+ version: 2.2.1
41
+ - !ruby/object:Gem::Dependency
42
+ name: spree_backend
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - ~>
46
+ - !ruby/object:Gem::Version
47
+ version: 2.2.1
48
+ type: :runtime
49
+ prerelease: false
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - ~>
53
+ - !ruby/object:Gem::Version
54
+ version: 2.2.1
27
55
  - !ruby/object:Gem::Dependency
28
56
  name: haml
29
57
  requirement: !ruby/object:Gem::Requirement
@@ -219,20 +247,20 @@ files:
219
247
  - app/assets/images/store/ui-icons_666666_256x240.png
220
248
  - app/assets/images/store/ui-icons_ff0084_256x240.png
221
249
  - app/assets/images/store/ui-icons_ffffff_256x240.png
222
- - app/assets/javascripts/admin/delivery_time_options.js
223
- - app/assets/javascripts/admin/spree_delivery_options.js
224
- - app/assets/javascripts/store/delivery_options_form.js
225
- - app/assets/javascripts/store/delivery_time_options.js
226
- - app/assets/javascripts/store/jquery-ui-1.10.4.custom.js
227
- - app/assets/javascripts/store/spree_delivery_options.js
228
- - app/assets/stylesheets/admin/delivery_options_form.scss
229
- - app/assets/stylesheets/admin/order_details.scss
230
- - app/assets/stylesheets/admin/spree_delivery_options.css
250
+ - app/assets/javascripts/spree/backend/delivery_time_options.js
251
+ - app/assets/javascripts/spree/backend/spree_delivery_options.js
252
+ - app/assets/javascripts/spree/frontend/delivery_options_form.js
253
+ - app/assets/javascripts/spree/frontend/delivery_time_options.js
254
+ - app/assets/javascripts/spree/frontend/jquery-ui-1.10.4.custom.js
255
+ - app/assets/javascripts/spree/frontend/spree_delivery_options.js
231
256
  - app/assets/stylesheets/guides/responsive.scss
232
- - app/assets/stylesheets/store/delivery_checkout.scss
233
- - app/assets/stylesheets/store/delivery_options_homepage.scss
234
- - app/assets/stylesheets/store/jquery-ui-1.10.4.custom.css
235
- - app/assets/stylesheets/store/spree_delivery_options.css
257
+ - app/assets/stylesheets/spree/backend/delivery_options_form.scss
258
+ - app/assets/stylesheets/spree/backend/order_details.scss
259
+ - app/assets/stylesheets/spree/backend/spree_delivery_options.css
260
+ - app/assets/stylesheets/spree/frontend/delivery_checkout.scss
261
+ - app/assets/stylesheets/spree/frontend/delivery_options_homepage.scss
262
+ - app/assets/stylesheets/spree/frontend/jquery-ui-1.10.4.custom.css
263
+ - app/assets/stylesheets/spree/frontend/spree_delivery_options.css
236
264
  - app/controllers/spree/admin/orders/delivery_options_controller.rb
237
265
  - app/controllers/spree/taxons_controller_decorator.rb
238
266
  - app/helpers/spree/application_helper_decorator.rb
data/app/assets/javascripts/admin/spree_delivery_options.js DELETED
@@ -1,2 +0,0 @@
1
- //= require jquery
2
- //= require admin/delivery_time_options
data/app/assets/javascripts/store/spree_delivery_options.js DELETED
@@ -1,4 +0,0 @@
1
- //= require jquery
2
- //= require store/delivery_time_options
3
- //= require store/delivery_options_form
4
- //= require store/jquery-ui-1.10.4.custom
data/app/assets/stylesheets/admin/spree_delivery_options.css DELETED
@@ -1,4 +0,0 @@
1
- /*
2
- *= require admin/order_details
3
- *= require admin/delivery_options_form
4
- */
data/app/assets/stylesheets/store/spree_delivery_options.css DELETED
@@ -1,6 +0,0 @@
1
- /*
2
- *= require store/spree_frontend
3
- *= require store/delivery_checkout
4
- *= require store/delivery_options_homepage
5
- *= require store/jquery-ui-1.10.4.custom.css
6
- */