spree_delivery_options 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ec4e7709318e9c786e6d425f7cac16cc655d25e
-  data.tar.gz: 1433b6e96caf18a0c9e3664ae836865d063d28f0
+  metadata.gz: 5adf6236a9fcd7f9bfa5f7a5b00e5d755752358e
+  data.tar.gz: d52ff8c74feb6d754fdab52f0ffce25f6408507f
 SHA512:
-  metadata.gz: 7ceb6777c09c92c3963aba5047910f9a5cf7cf6ca2abb12cdd5fa38688a9fa686fc3de653417ec2f4a25253362967061a911bc93f4f46e61b1e3472094cee7f6
-  data.tar.gz: b0e4a50a520b747b2b05b256d217593d5881c69ce331b9f21d692de7bf8cb7af1425cbe37b4994edd37a68c88f448a3e497d53565fe0f7646dcdbdbe47d284f3
+  metadata.gz: b7fcb813f1c71da82254199b1c974499a0f90752e1568b69f433ffb7f60adcbabf00d0b4b54380685a42cda70c439200a8fdda4de5cdaf0d79ea472f23b42871
+  data.tar.gz: edf771445c7744f5cfa9c0523a1486a0b6d5ba573b7246ac6c9f0e11c34e0219311bc5fc491f26c28bc3cd4e94269ec63b42b6912feb5332972524f169019230

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 # Provides basic authentication functionality for testing parts of your engine
-gem 'spree_auth_devise', :git => "git://github.com/spree/spree_auth_devise", :branch => '2-1-stable'
+gem 'spree_auth_devise', :git => "git://github.com/spree/spree_auth_devise", :branch => '2-2-stable'
 gem 'haml'
 
 gemspec

data/app/assets/javascripts/spree/backend/spree_delivery_options.js

@@ -0,0 +1,2 @@
+//= require jquery
+//= require spree/backend/delivery_time_options

data/app/assets/javascripts/spree/frontend/spree_delivery_options.js

@@ -0,0 +1,4 @@
+//= require jquery
+//= require spree/frontend/delivery_time_options
+//= require spree/frontend/delivery_options_form
+//= require spree/frontend/jquery-ui-1.10.4.custom

data/app/assets/stylesheets/spree/backend/spree_delivery_options.css

@@ -0,0 +1,4 @@
+/*
+ *= require spree/backend/order_details
+ *= require spree/backend/delivery_options_form
+ */

data/app/assets/stylesheets/{store → spree/frontend}/delivery_checkout.scss

@@ -1,4 +1,4 @@
-@import 'store/variables';
+@import 'spree/frontend/variables';
 
 #shipping_method {
   .stock-delivery-date-title, .stock-delivery-instructions-title {

data/app/assets/stylesheets/spree/frontend/spree_delivery_options.css

@@ -0,0 +1,6 @@
+/*
+ *= require spree/frontend
+ *= require spree/frontend/delivery_checkout
+ *= require spree/frontend/delivery_options_homepage
+ *= require spree/frontend/jquery-ui-1.10.4.custom.css
+ */

data/app/overrides/add_delivery_options_link_order_page.rb

@@ -1,4 +1,4 @@
-Deface::Override.new(:virtual_path => "spree/admin/shared/_order_tabs",
+Deface::Override.new(:virtual_path => "spree/admin/shared/_order_submenu",
                      :name => "add_delivery_info_to_order_details",
                      :insert_bottom => "[data-hook='admin_order_tabs']",
                      :partial => "spree/admin/shared/delivery_options_link",

data/app/overrides/admin_order_information.rb

@@ -1,5 +1,5 @@
-Deface::Override.new(:virtual_path => "spree/admin/shared/_order_tabs",
+Deface::Override.new(:virtual_path => "spree/admin/shared/_order_summary",
                      :name => "add_delivery_date_to_admin_order_information",
-                     :insert_after => "#order_total",
+                     :insert_top => "dl.additional-info",
                      :partial => "spree/admin/shared/admin_order_information_delivery_date",
-                     :disabled => false)
+                     :disabled => false)

data/app/views/spree/taxons/_delivery_options.haml

@@ -1,6 +1,6 @@
 - if SpreeDeliveryOptions::Config.show_homepage_form
   #delivery-options-homepage
-    - order = current_order(true)
+    - order = current_order(create_order_if_necessary: true)
     - if order.delivery_date? && order.delivery_time
       .row.success
         .columns.sixteen.alpha.omega

data/spree_delivery_options.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_delivery_options'
-  s.version     = '2.2.3'
+  s.version     = '2.2.4'
   s.summary     = 'Adds delivery date and time during checkout'
   s.description = ''
   s.required_ruby_version = '>= 2.0.0'
@@ -15,7 +15,9 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core', '~> 2.1.3'
+  s.add_dependency 'spree_core', '~> 2.2.1'
+  s.add_dependency 'spree_frontend', '~> 2.2.1'
+  s.add_dependency 'spree_backend', '~> 2.2.1'
 
   s.add_runtime_dependency 'haml'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_delivery_options
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Francisco Trindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.2.1
+- !ruby/object:Gem::Dependency
+  name: spree_frontend
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+- !ruby/object:Gem::Dependency
+  name: spree_backend
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -219,20 +247,20 @@ files:
 - app/assets/images/store/ui-icons_666666_256x240.png
 - app/assets/images/store/ui-icons_ff0084_256x240.png
 - app/assets/images/store/ui-icons_ffffff_256x240.png
-- app/assets/javascripts/admin/delivery_time_options.js
-- app/assets/javascripts/admin/spree_delivery_options.js
-- app/assets/javascripts/store/delivery_options_form.js
-- app/assets/javascripts/store/delivery_time_options.js
-- app/assets/javascripts/store/jquery-ui-1.10.4.custom.js
-- app/assets/javascripts/store/spree_delivery_options.js
-- app/assets/stylesheets/admin/delivery_options_form.scss
-- app/assets/stylesheets/admin/order_details.scss
-- app/assets/stylesheets/admin/spree_delivery_options.css
+- app/assets/javascripts/spree/backend/delivery_time_options.js
+- app/assets/javascripts/spree/backend/spree_delivery_options.js
+- app/assets/javascripts/spree/frontend/delivery_options_form.js
+- app/assets/javascripts/spree/frontend/delivery_time_options.js
+- app/assets/javascripts/spree/frontend/jquery-ui-1.10.4.custom.js
+- app/assets/javascripts/spree/frontend/spree_delivery_options.js
 - app/assets/stylesheets/guides/responsive.scss
-- app/assets/stylesheets/store/delivery_checkout.scss
-- app/assets/stylesheets/store/delivery_options_homepage.scss
-- app/assets/stylesheets/store/jquery-ui-1.10.4.custom.css
-- app/assets/stylesheets/store/spree_delivery_options.css
+- app/assets/stylesheets/spree/backend/delivery_options_form.scss
+- app/assets/stylesheets/spree/backend/order_details.scss
+- app/assets/stylesheets/spree/backend/spree_delivery_options.css
+- app/assets/stylesheets/spree/frontend/delivery_checkout.scss
+- app/assets/stylesheets/spree/frontend/delivery_options_homepage.scss
+- app/assets/stylesheets/spree/frontend/jquery-ui-1.10.4.custom.css
+- app/assets/stylesheets/spree/frontend/spree_delivery_options.css
 - app/controllers/spree/admin/orders/delivery_options_controller.rb
 - app/controllers/spree/taxons_controller_decorator.rb
 - app/helpers/spree/application_helper_decorator.rb

data/app/assets/javascripts/admin/spree_delivery_options.js

@@ -1,2 +0,0 @@
-//= require jquery
-//= require admin/delivery_time_options

data/app/assets/javascripts/store/spree_delivery_options.js

@@ -1,4 +0,0 @@
-//= require jquery
-//= require store/delivery_time_options
-//= require store/delivery_options_form
-//= require store/jquery-ui-1.10.4.custom

data/app/assets/stylesheets/admin/spree_delivery_options.css

@@ -1,4 +0,0 @@
-/*
- *= require admin/order_details
- *= require admin/delivery_options_form
- */

data/app/assets/stylesheets/store/spree_delivery_options.css

@@ -1,6 +0,0 @@
-/*
- *= require store/spree_frontend
- *= require store/delivery_checkout
- *= require store/delivery_options_homepage
- *= require store/jquery-ui-1.10.4.custom.css
- */