spree 0.7.1 → 0.8.0

data/vendor/extensions/shipping/app/views/admin/shipping_methods/index.html.erb

@@ -1,28 +0,0 @@
-<h1><%=t("ext_shipping_shipping_methods") %></h1>
-<table class="admin-report" width="545">
-  <thead>
-    <tr>
-	    <th><%=t("name")%></th>
-      <th><%=t("zone")%></th>
-      <th><%=t("ext_shipping_calculator")%></th>
-      <th><%=t("action")%></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @shipping_methods.each do |shipping_method| %>
-      <tr class="<%= cycle('even', 'odd') %>">
-        <td><%=shipping_method.name %></td>
-        <td><%=shipping_method.zone.name %></td>
-        <td><%=shipping_method.shipping_calculator %></td>
-        <td>
-          <%=link_to t("edit"), edit_object_url(shipping_method) %> |
-          <%=link_to t("delete"), object_url(shipping_method), :method => :delete %>
-        </td>
-      </tr>
-    <% end %>
-    <% if @shipping_methods.empty? %>
-      <tr><td colspan="5">None.</td></tr>
-    <% end %>
-  </tbody>
-</table>
-<%= link_to t("ext_shipping_new_shipping_method"), new_object_url %>

data/vendor/extensions/shipping/config/locales/de.yml

@@ -1,25 +0,0 @@
---- 
-de: 
-  activerecord: 
-    attributes: 
-      product: 
-        shipping_category: "Shipping Category"
-    models: 
-      shipping_category: 
-        one: "Shipping Category"
-        other: "Shipping Categories"
-  ext_shipping_calculator: Calculator
-  ext_shipping_cost: Cost
-  ext_shipping_editing_shipping_category: "Editing Shipping Category"
-  ext_shipping_editing_shipping_method: "Editing Shipping Method"
-  ext_shipping_mark_shipped: "Mark Shipped"
-  ext_shipping_method: Method
-  ext_shipping_new_shipping_category: "New Shipping Category"
-  ext_shipping_new_shipping_method: "New Shipping Method"
-  ext_shipping_shipment_number: "Shipment #"
-  ext_shipping_shipping_categories: "Shipping Categories"
-  ext_shipping_shipping_categories_description: "Manage shipping categories to identify which products can be shipped via which method"
-  ext_shipping_shipping_methods: "Shipping Methods"
-  ext_shipping_shipping_methods_description: "Manage shipping methods"
-  ext_shipping_tracking: Tracking
-  select_preferred_shipping_option: "Select preferred shipping option"

data/vendor/extensions/shipping/config/locales/en-GB.yml

@@ -1,25 +0,0 @@
---- 
-en-GB: 
-  activerecord: 
-    attributes: 
-      product: 
-        shipping_category: "Shipping Category"
-    models: 
-      shipping_category: 
-        one: "Shipping Category"
-        other: "Shipping Categories"
-  ext_shipping_calculator: Calculator
-  ext_shipping_cost: Cost
-  ext_shipping_editing_shipping_category: "Editing Shipping Category"
-  ext_shipping_editing_shipping_method: "Editing Shipping Method"
-  ext_shipping_mark_shipped: "Mark Shipped"
-  ext_shipping_method: Method
-  ext_shipping_new_shipping_category: "New Shipping Category"
-  ext_shipping_new_shipping_method: "New Shipping Method"
-  ext_shipping_shipment_number: "Shipment #"
-  ext_shipping_shipping_categories: "Shipping Categories"
-  ext_shipping_shipping_categories_description: "Manage shipping categories to identify which products can be shipped via which method"
-  ext_shipping_shipping_methods: "Shipping Methods"
-  ext_shipping_shipping_methods_description: "Manage shipping methods"
-  ext_shipping_tracking: Tracking
-  select_preferred_shipping_option: "Select preferred shipping option"

data/vendor/extensions/shipping/config/locales/en-US.yml

@@ -1,25 +0,0 @@
---- 
-en-US: 
-  activerecord: 
-    attributes: 
-      product: 
-        shipping_category: "Shipping Category"
-    models: 
-      shipping_category: 
-        one: "Shipping Category"
-        other: "Shipping Categories"
-  ext_shipping_calculator: Calculator
-  ext_shipping_cost: Cost
-  ext_shipping_editing_shipping_category: "Editing Shipping Category"
-  ext_shipping_editing_shipping_method: "Editing Shipping Method"
-  ext_shipping_mark_shipped: "Mark Shipped"
-  ext_shipping_method: Method
-  ext_shipping_new_shipping_category: "New Shipping Category"
-  ext_shipping_new_shipping_method: "New Shipping Method"
-  ext_shipping_shipment_number: "Shipment #"
-  ext_shipping_shipping_categories: "Shipping Categories"
-  ext_shipping_shipping_categories_description: "Manage shipping categories to identify which products can be shipped via which method"
-  ext_shipping_shipping_methods: "Shipping Methods"
-  ext_shipping_shipping_methods_description: "Manage shipping methods"
-  ext_shipping_tracking: Tracking
-  select_preferred_shipping_option: "Select preferred shipping option"

data/vendor/extensions/shipping/config/locales/es.yml

@@ -1,25 +0,0 @@
---- 
-es: 
-  activerecord: 
-    attributes: 
-      product: 
-        shipping_category: "Shipping Category"
-    models: 
-      shipping_category: 
-        one: "Shipping Category"
-        other: "Shipping Categories"
-  ext_shipping_calculator: Calculator
-  ext_shipping_cost: Cost
-  ext_shipping_editing_shipping_category: "Editing Shipping Category"
-  ext_shipping_editing_shipping_method: "Editing Shipping Method"
-  ext_shipping_mark_shipped: "Mark Shipped"
-  ext_shipping_method: Method
-  ext_shipping_new_shipping_category: "New Shipping Category"
-  ext_shipping_new_shipping_method: "New Shipping Method"
-  ext_shipping_shipment_number: "Shipment #"
-  ext_shipping_shipping_categories: "Shipping Categories"
-  ext_shipping_shipping_categories_description: "Manage shipping categories to identify which products can be shipped via which method"
-  ext_shipping_shipping_methods: "Shipping Methods"
-  ext_shipping_shipping_methods_description: "Manage shipping methods"
-  ext_shipping_tracking: Tracking
-  select_preferred_shipping_option: "Select preferred shipping option"

data/vendor/extensions/shipping/config/locales/it.yml

@@ -1,25 +0,0 @@
---- 
-it: 
-  activerecord: 
-    attributes: 
-      product: 
-        shipping_category: "Shipping Category"
-    models: 
-      shipping_category: 
-        one: "Shipping Category"
-        other: "Shipping Categories"
-  ext_shipping_calculator: Calculator
-  ext_shipping_cost: Cost
-  ext_shipping_editing_shipping_category: "Editing Shipping Category"
-  ext_shipping_editing_shipping_method: "Editing Shipping Method"
-  ext_shipping_mark_shipped: "Mark Shipped"
-  ext_shipping_method: Method
-  ext_shipping_new_shipping_category: "New Shipping Category"
-  ext_shipping_new_shipping_method: "New Shipping Method"
-  ext_shipping_shipment_number: "Shipment #"
-  ext_shipping_shipping_categories: "Shipping Categories"
-  ext_shipping_shipping_categories_description: "Manage shipping categories to identify which products can be shipped via which method"
-  ext_shipping_shipping_methods: "Shipping Methods"
-  ext_shipping_shipping_methods_description: "Manage shipping methods"
-  ext_shipping_tracking: Tracking
-  select_preferred_shipping_option: "Select preferred shipping option"

data/vendor/extensions/shipping/config/locales/nb-NO.yml

@@ -1,25 +0,0 @@
---- 
-nb-NO: 
-  activerecord: 
-    attributes: 
-      product: 
-        shipping_category: "Fraktkategori"
-    models: 
-      shipping_category: 
-        one: "Fraktkategori"
-        other: "Fraktkategorier"
-  ext_shipping_calculator: Kalkulator
-  ext_shipping_cost: Kostnad
-  ext_shipping_editing_shipping_category: Endre fraktkategori
-  ext_shipping_editing_shipping_method: "Endre leveransemåte"
-  ext_shipping_mark_shipped: "Merk som levert"
-  ext_shipping_method: Leveransemåte
-  ext_shipping_new_shipping_category: "Ny fraktkategori"
-  ext_shipping_new_shipping_method: "Ny leveransemåte"
-  ext_shipping_shipment_number: "Leveransenummer"
-  ext_shipping_shipping_categories: "Fraktkategorier"
-  ext_shipping_shipping_categories_description: "Konfigurer fraktkategorier for å styre hvilke produkter som kan bruke de ulike leveransemåtene."
-  ext_shipping_shipping_methods: "Leveransemåter"
-  ext_shipping_shipping_methods_description: "Konfigurer leveransemåter."
-  ext_shipping_tracking: Sporing
-  select_preferred_shipping_option: "Velg ønsket leveransemåte"

data/vendor/extensions/shipping/config/locales/pl.yml

@@ -1,25 +0,0 @@
---- 
-pl: 
-  activerecord: 
-    attributes: 
-      product: 
-        shipping_category: "Shipping Category"
-    models: 
-      shipping_category: 
-        one: "Shipping Category"
-        other: "Shipping Categories"
-  ext_shipping_calculator: Calculator
-  ext_shipping_cost: Cost
-  ext_shipping_editing_shipping_category: "Editing Shipping Category"
-  ext_shipping_editing_shipping_method: "Editing Shipping Method"
-  ext_shipping_mark_shipped: "Mark Shipped"
-  ext_shipping_method: Method
-  ext_shipping_new_shipping_category: "New Shipping Category"
-  ext_shipping_new_shipping_method: "New Shipping Method"
-  ext_shipping_shipment_number: "Shipment #"
-  ext_shipping_shipping_categories: "Shipping Categories"
-  ext_shipping_shipping_categories_description: "Manage shipping categories to identify which products can be shipped via which method"
-  ext_shipping_shipping_methods: "Shipping Methods"
-  ext_shipping_shipping_methods_description: "Manage shipping methods"
-  ext_shipping_tracking: Tracking
-  select_preferred_shipping_option: "Select preferred shipping option"

data/vendor/extensions/shipping/config/locales/pt-BR.yml

@@ -1,25 +0,0 @@
---- 
-pt-BR: 
-  activerecord: 
-    attributes: 
-      product: 
-        shipping_category: "Shipping Category"
-    models: 
-      shipping_category: 
-        one: "Shipping Category"
-        other: "Shipping Categories"
-  ext_shipping_calculator: Calculator
-  ext_shipping_cost: Cost
-  ext_shipping_editing_shipping_category: "Editing Shipping Category"
-  ext_shipping_editing_shipping_method: "Editing Shipping Method"
-  ext_shipping_mark_shipped: "Mark Shipped"
-  ext_shipping_method: Method
-  ext_shipping_new_shipping_category: "New Shipping Category"
-  ext_shipping_new_shipping_method: "New Shipping Method"
-  ext_shipping_shipment_number: "Shipment #"
-  ext_shipping_shipping_categories: "Shipping Categories"
-  ext_shipping_shipping_categories_description: "Manage shipping categories to identify which products can be shipped via which method"
-  ext_shipping_shipping_methods: "Shipping Methods"
-  ext_shipping_shipping_methods_description: "Manage shipping methods"
-  ext_shipping_tracking: Tracking
-  select_preferred_shipping_option: "Select preferred shipping option"

data/vendor/extensions/shipping/config/locales/ru-RU.yml

@@ -1,25 +0,0 @@
---- 
-ru-RU: 
-  activerecord: 
-    attributes: 
-      product: 
-        shipping_category: "Категория доставки"
-    models: 
-      shipping_category: 
-        one: "Категория доставки"
-        other: "Категории доставки"
-  ext_shipping_calculator: Калькулятор
-  ext_shipping_cost: Стоимость
-  ext_shipping_editing_shipping_category: "Редактировать категорию доставки"
-  ext_shipping_editing_shipping_method: "Редактировать способ доставки"
-  ext_shipping_mark_shipped: "Отметить как доставленный"
-  ext_shipping_method: Способ
-  ext_shipping_new_shipping_category: "Новая категория доставки"
-  ext_shipping_new_shipping_method: "Новый способ доставки"
-  ext_shipping_shipment_number: "Доставка #"
-  ext_shipping_shipping_categories: "Категории доставки"
-  ext_shipping_shipping_categories_description: "Настройка категорий доставки - укажите, какие продукты могут быть доставлены какими способами"
-  ext_shipping_shipping_methods: "Способы доставки"
-  ext_shipping_shipping_methods_description: "Управление методами доставки"
-  ext_shipping_tracking: Отслеживание
-  select_preferred_shipping_option: "Выберите предпочитаемый способ доставки"

data/vendor/extensions/shipping/config/routes.rb

@@ -1,10 +0,0 @@
-map.namespace :admin do |admin|
-  admin.resources :shipments
-  admin.resources :shipping_methods
-  admin.resources :shipping_categories  
-  admin.resources :orders, :has_many => :shipments
-end  
-#map.resources :shipments, :member => {:shipping_method => :any}
-map.resources :orders, :member => {:fatal_shipping => :get} do |order|
-  order.resources :shipments, :member => {:shipping_method => :get}
-end

data/vendor/extensions/shipping/db/sample/addresses.yml

@@ -1,14 +0,0 @@
-<% 1.upto(30) do |i| %>
-frank_ship_address_<%= i %>:
-  firstname: Betty
-  lastname: Bar
-  address1: 123 Foo St.
-  address2: Apt. F
-  city: Fooville
-  state: new_york
-  zipcode: 16804
-  country_id: 214
-  phone: 614-555-1212
-  addressable: shipment_<%= i %>
-  addressable_type: Shipment
-<% end %>

data/vendor/extensions/shipping/db/sample/zone_members.yml

@@ -1,16 +0,0 @@
-usa_member:
-  parent: available_shipping
-  member_id: 214
-  member_type: Country
-canada_member:
-  parent: available_shipping
-  member_id: 35
-  member_type: Country
-uk_one_ship_opt:
-  parent: one_ship_option
-  member_id: 213
-  member_type: Country
-uae_one_ship_opt:
-  parent: one_ship_option
-  member_id: 212                # UAE, just cos it's close to US/UK in the list
-  member_type: Country

data/vendor/extensions/shipping/lib/spree/shipping_calculator.rb

@@ -1,28 +0,0 @@
-module Spree #:nodoc:
-  module ShippingCalculator
-
-    def mark_shipped
-      inventory_units.each do |inventory_unit|
-        inventory_unit.ship!
-      end
-    end
-        
-    # collection of available shipping countries
-    def shipping_countries
-      ShippingMethod.all.collect { |method| method.zone.country_list }.flatten.uniq.sort_by {|item| item.send 'name'}
-    end
-    
-    private
-=begin
-    def before_shipment
-      # automatically calculate shipping if there is only a single shipping method
-      if shipping_methods.size == 1
-        self.shipments << Shipment.create(:order => self, :shipping_method => shipping_methods.first)
-        self.state = "creditcard"
-        save
-      end
-    end
-=end
-
-  end
-end

data/vendor/extensions/shipping/lib/tasks/shipping_extension_tasks.rake

@@ -1,29 +0,0 @@
-namespace :db do
-  desc "Bootstrap your database for Spree."
-  task :bootstrap  => :environment do
-    # load initial database fixtures (in db/sample/*.yml) into the current environment's database
-    ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
-    Dir.glob(File.join(ShippingExtension.root, "db", 'sample', '*.{yml,csv}')).each do |fixture_file|
-      Fixtures.create_fixtures("#{ShippingExtension.root}/db/sample", File.basename(fixture_file, '.*'))
-    end
-
-  end
-end
-
-namespace :spree do
-  namespace :extensions do
-    namespace :shipping do
-      desc "Copies public assets of the Shipping to the instance public/ directory."
-      task :update => :environment do
-        is_svn_or_dir = proc {|path| path =~ /\.svn/ || File.directory?(path) }
-        Dir[ShippingExtension.root + "/public/**/*"].reject(&is_svn_or_dir).each do |file|
-          path = file.sub(ShippingExtension.root, '')
-          directory = File.dirname(path)
-          puts "Copying #{path}..."
-          mkdir_p RAILS_ROOT + directory
-          cp file, RAILS_ROOT + path
-        end
-      end  
-    end
-  end
-end

data/vendor/extensions/shipping/shipping_extension.rb

@@ -1,40 +0,0 @@
-# Uncomment this if you reference any of your controllers in activate
-require_dependency 'application'
-
-class ShippingExtension < Spree::Extension
-  version "1.0"
-  description "Describe your extension here"
-  url "http://yourwebsite.com/shipping"
-
-  def activate
-
-    Admin::ConfigurationsController.class_eval do
-      before_filter :add_shipping_links, :only => :index
-      def add_shipping_links
-        @extension_links << {:link => admin_shipping_methods_path, :link_text => t("ext_shipping_shipping_methods"), :description => t("ext_shipping_shipping_methods_description")}
-        @extension_links << {:link => admin_shipping_categories_path, :link_text => t("ext_shipping_shipping_categories"), :description => t("ext_shipping_shipping_categories_description")}
-      end
-    end
-    
-    Variant.additional_fields += [
-        {:name => 'Weight', :only => [:variant], :format => "%.2f"},
-        {:name => 'Height', :only => [:variant], :format => "%.2f"},
-        {:name => 'Width', :only => [:variant], :format => "%.2f"},
-        {:name => 'Depth', :only => [:variant], :format => "%.2f"}
-      ]
-
-    # register Accessories product tab
-    Admin::BaseController.class_eval do
-      before_filter :add_shipments_tab
-      
-      private
-      def add_shipments_tab
-        @order_admin_tabs << {:name => 'Shipments', :url => "admin_order_shipments_url"}
-      end
-    end
-
-    Product.class_eval do
-      belongs_to :shipping_category
-    end
-  end
-end

data/vendor/extensions/shipping/spec/spec.opts

@@ -1,6 +0,0 @@
---colour
---format
-progress
---loadby
-mtime
---reverse

data/vendor/extensions/shipping/spec/spec_helper.rb

@@ -1,37 +0,0 @@
-unless defined? SPREE_ROOT
-  ENV["RAILS_ENV"] = "test"
-  case
-  when ENV["SPREE_ENV_FILE"]
-    require ENV["SPREE_ENV_FILE"]
-  when File.dirname(__FILE__) =~ %r{vendor/SPREE/vendor/extensions}
-    require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../../")}/config/environment"
-  else
-    require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../")}/config/environment"
-  end
-end
-require "#{SPREE_ROOT}/spec/spec_helper"
-
-if File.directory?(File.dirname(__FILE__) + "/scenarios")
-  Scenario.load_paths.unshift File.dirname(__FILE__) + "/scenarios"
-end
-if File.directory?(File.dirname(__FILE__) + "/matchers")
-  Dir[File.dirname(__FILE__) + "/matchers/*.rb"].each {|file| require file }
-end
-
-Spec::Runner.configure do |config|
-  # config.use_transactional_fixtures = true
-  # config.use_instantiated_fixtures  = false
-  # config.fixture_path = RAILS_ROOT + '/spec/fixtures'
-
-  # You can declare fixtures for each behaviour like this:
-  #   describe "...." do
-  #     fixtures :table_a, :table_b
-  #
-  # Alternatively, if you prefer to declare them only once, you can
-  # do so here, like so ...
-  #
-  #   config.global_fixtures = :table_a, :table_b
-  #
-  # If you declare global fixtures, be aware that they will be declared
-  # for all of your examples, even those that don't use them.
-end