spree_zoned 0.5.3 → 0.5.4

data/README.md

@@ -34,6 +34,10 @@ This Spree extension is probalbly essential to you if operating outside of the U
 
  
 
+## Installation
+
+    rails generate spree_zoned:install
+
 ## Example
 
 Example goes here.

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

@@ -1,2 +1,2 @@
 div#zoned-countryselect { text-align: right; }
-div#zoned-countryselect label { background-color: #a33; }
+div#zoned-countryselect label { color: #a33; }

data/app/controllers/spree/admin/zoned_controller.rb

@@ -1,24 +1,14 @@
 module Spree
-  
-  module Admin
-  
-    module Zoned
-
-      class ZonedController < BaseController
-
-        def setcountry
-          respond_to do |format|
-            format.js do
-              @current_country = params[:id]
-              render :nothing => true
-            end
+  module Admin  
+    class ZonedController < BaseController
+      def setcountry
+        respond_to do |format|
+          format.js do
+            @current_country = params[:id]
+            render :nothing => true
           end
         end
-
       end
-      
-    end
-    
+    end      
   end
-
 end

data/app/views/spree/admin/zoned/_prd_country.html.erb

@@ -4,7 +4,7 @@
     options_for_select( # common countries have negative id
       [["Kein Land ausgewählt", 0]] +
       Rails.application.config.commonCountriesForSelect,
-      0, # preselect item "No country selected"
+      @current_country || 0, # preselect item "No country selected"
     ),
     :data => {
 	    :remote => true,

data/lib/generators/spree_zoned/install/install_generator.rb

@@ -1,44 +1,48 @@
-module Spree
-  module Zoned
-    module Generators
-      class InstallGenerator < Rails::Generators::Base
-      
-        source_root File.expand_path("../assets", __FILE__)
+module SpreeZoned
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+    
+      source_root File.expand_path("../assets", __FILE__)
 
-        def add_javascripts
+      def add_javascripts
+        res = ask 'Would you like to append spree_zoned to your js manifests now?\n(only answer no if you you\'ve already done it) [Y/n]'
+        if res == '' || res.downcase == 'y'
           append_file 'app/assets/javascripts/store/all.js', "//= require store/spree_zoned\n"
           append_file 'app/assets/javascripts/admin/all.js', "//= require admin/spree_zoned\n"
         end
+      end
 
-        def add_stylesheets
+      def add_stylesheets
+        res = ask 'Would you like to inject spree_zoned into your css manifests now?\n(only answer no if you you\'ve already done it) [Y/n]'
+        if res == '' || res.downcase == 'y'
           inject_into_file 'app/assets/stylesheets/store/all.css', " *= require store/spree_zoned\n", :before => /\*\//, :verbose => true                
           inject_into_file 'app/assets/stylesheets/admin/all.css', " *= require admin/spree_zoned\n", :before => /\*\//, :verbose => true
         end
+      end
 
-        def add_migrations
-          run 'bundle exec rake railties:install:migrations FROM=spree_zoned'
-        end
+      def add_migrations
+        run 'bundle exec rake railties:install:migrations FROM=spree_zoned'
+      end
 
-        def run_migrations
-           res = ask 'Would you like to run the migrations now? [Y/n]'
-           if res == '' || res.downcase == 'y'
-             run 'bundle exec rake db:migrate'
-           else
-             puts 'Skiping rake db:migrate, don\'t forget to run it!'
-           end
-        end
-      
-        private
-      
-        def copyasset(filename)
-          if copy_file "#{filename}", "app/assets/#{filename}"
-            puts "Copied #{filename} into app/assets/#{filename}\n" 
-          else
-            puts "[Failed] File copying #{filename} into app/assets/#{filename}\n"
-          end
+      def run_migrations
+         res = ask 'Would you like to run the migrations now? [Y/n]'
+         if res == '' || res.downcase == 'y'
+           run 'bundle exec rake db:migrate'
+         else
+           puts 'Skipping rake db:migrate, don\'t forget to run it!'
+         end
+      end
+    
+      private
+    
+      def copyasset(filename)
+        if copy_file "#{filename}", "app/assets/#{filename}"
+          puts "Copied #{filename} into app/assets/#{filename}\n" 
+        else
+          puts "[Failed] File copying #{filename} into app/assets/#{filename}\n"
         end
-      
       end
+    
     end
   end
 end

data/spree_zoned.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_zoned'
-  s.version     = '0.5.3'
+  s.version     = '0.5.4'
   s.summary     = 'A Spree extension to make your store zoned'
   s.description = "Everything you need for a zoned Spree store: zoned pricing, zoned products, zoned product ordering, zoned locales, ...\nProbalbly essential to you if you operate outside of the US."
   s.required_ruby_version = '>= 1.9.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_zoned
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors: