spree_temando 0.1.1 → 0.1.3

data/README.md

@@ -30,6 +30,9 @@ Temando::Api::Base.config.password = ENV['TEMANDO_PASSWORD']
 
 The extension adds a new Shipping calculator.
 
+*NOTE* this extension assumes that all product dimensions are in
+centimetres, with weights in kilograms.
+
 Add a new Shipping Method from the Spree Admin (under Configuration >
 Shipping Methods), and you can set the relevant calculator type to
 `Temando`.

data/Rakefile

@@ -4,37 +4,9 @@ begin
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'SpreeTemando'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
 
+require 'rspec/core/rake_task'
 
+RSpec::Core::RakeTask.new('spec')
 
-Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task :default => :test
+task :default => :spec

data/app/models/spree/temando_quote.rb

@@ -36,7 +36,7 @@ module Spree
         q.shipment = object
       end
 
-      [ :total_price, :tax, :currency, :minimum_eta, :maximum_eta, :name, :base_price, :guaranteed_eta, :carrier_id ].each do |field|
+      [ :total_price, :tax, :currency, :minimum_eta, :maximum_eta, :name, :base_price, :guaranteed_eta, :carrier_id, :carrier_name, :carrier_phone, :delivery_method ].each do |field|
         q.send("#{field}=".to_sym, quote.send(field))
       end
 

data/app/models/spree_temando/variant_shipping_decorator.rb

@@ -10,6 +10,7 @@ module SpreeTemando
     def to_temando_item
       return nil unless self.temando_quotable?
       item = Temando::Item::GeneralGoods.new
+      item.packaging_optimization = self.packaging_optimization
       # NOTE: All the distances in Temando are in metres
       item.height = (self.height / 100.0)
       item.length = (self.depth / 100.0)

data/app/views/spree/admin/shipments/_form.html.erb

@@ -0,0 +1,83 @@
+<div data-hook="admin_shipment_form_fields">
+  <% unless @shipment.order.cart? %>
+    <table class="index" style="width:100%;" data-hook="admin_shipment_form_inventory_units">
+      <tr data-hook="shipments_header">
+        <th style="width:130px;"><%= t(:include_in_shipment) %></th>
+        <th><%= t(:sku) %></th>
+        <th><%= t(:item_description) %></th>
+        <th><%= t(:status) %></th>
+        <th><%= t(:note) %></th>
+      </tr>
+
+      <% @shipment.order.inventory_units.each do |inventory_unit| %>
+        <tr data-hook="shipments_row">
+          <td style="text-align:center;">
+            <%= check_box_tag "inventory_units[#{inventory_unit.id}]",
+                              :true,
+                              (inventory_unit.shipment == @shipment),
+                              { :disabled => %w(shipped backordered returned).include?(inventory_unit.state),
+                                :class => 'inventory_unit'} %>
+          </td>
+          <td style="vertical-align:top; width:120px;"><%= inventory_unit.variant.sku %></td>
+          <td style="width:300px;">
+            <%=inventory_unit.variant.product.name %>
+            <%= '(' + variant_options(inventory_unit.variant) + ')' unless inventory_unit.variant.option_values.empty? %>
+          </td>
+          <td><%= t(inventory_unit.state) %></td>
+          <td>
+            <% if inventory_unit.shipment == @shipment %>
+              <%= t(:included_in_this_shipment) %>
+            <% elsif !inventory_unit.shipment.nil? %>
+              <%= t(:included_in_other_shipment) %> - <%= link_to inventory_unit.shipment.number, edit_admin_order_shipment_url(inventory_unit.order, inventory_unit.shipment) %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  <% end %>
+
+  <div data-hook="admin_shipment_form_address">
+    <% shipment_form.fields_for 'address' do |sa_form| %>
+      <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => sa_form, :name => t(:shipping_address), :use_billing => false } %>
+    <% end %>
+  </div>
+
+  <div data-hook="admin_shipment_form_details">
+    <table class="index">
+      <tr>
+        <th colspan="8"><%= t(:shipment_details) %></th>
+      </tr>
+      <tr>
+        <td>
+          <%= shipment_form.label :shipping_method_id, t(:shipping_method) + ':' %>
+        </td>
+        <td>
+          <%= shipment_form.select :shipping_method_id,
+                                          @shipping_methods.map {|sm| ["#{sm.name} - #{sm.zone.name}", sm.id] } %>
+        </td>
+        <td>
+          <%= shipment_form.label :tracking, t(:tracking) + ':' %>
+        </td>
+        <td><%= shipment_form.text_field :tracking %></td>
+      </tr>
+      <% temando_quote = @shipment.order.temando_quotes.first %>
+      <% if temando_quote %>
+        <tr>
+          <td><b>Carrier Name:</b> <%= temando_quote.carrier_name %></td>
+          <td><b>Carrier Phone:</b> <%= temando_quote.carrier_phone %></td>
+          <td colspan=5><b>Delivery Method:</b> <%= temando_quote.delivery_method %></td>
+        </tr>
+      <% end %>
+      <% if Spree::Config[:shipping_instructions] %>
+        <tr>
+          <td>
+            <%= shipment_form.label :special_instructions, t(:special_instructions) + ':' %>
+          </td>
+          <td colspan="3">
+              <%= shipment_form.text_area :special_instructions %>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  </div>
+</div>

data/db/migrate/20121113034743_add_carrier_data_to_temando_quote.rb

@@ -0,0 +1,7 @@
+class AddCarrierDataToTemandoQuote < ActiveRecord::Migration
+  def change
+    add_column :spree_temando_quotes, :carrier_name, :string
+    add_column :spree_temando_quotes, :carrier_phone, :string
+    add_column :spree_temando_quotes, :delivery_method, :string
+  end
+end

data/lib/spree_temando/engine.rb

@@ -1,3 +1,6 @@
+require 'spree_core'
+require 'temando'
+
 module SpreeTemando
   class Engine < ::Rails::Engine
     isolate_namespace SpreeTemando
@@ -9,7 +12,7 @@ module SpreeTemando
       Dir.glob(File.join(File.dirname(__FILE__), "../../app/**/*_decorator*.rb")) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end
-      Temando::Api::Base.logger = Rails.logger
+      ::Temando::Api::Base.logger = Rails.logger
     end
 
     initializer "spree_temando.register.shipping_calculators" do |app|

data/lib/spree_temando/version.rb

@@ -1,3 +1,3 @@
 module SpreeTemando
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_temando
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-17 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,15 +58,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: combustion
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 0.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +107,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-remote
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Adds temando shipping support to Spree
 email:
 - jason@reinteractive.net
@@ -107,6 +171,7 @@ files:
 - app/models/spree_temando/order_shipping_decorator.rb
 - app/models/spree_temando/shipment_shipping_decorator.rb
 - app/models/spree_temando/variant_shipping_decorator.rb
+- app/views/spree/admin/shipments/_form.html.erb
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20121011082400_create_spree_temando_quotes.rb
@@ -117,6 +182,7 @@ files:
 - db/migrate/20121011104200_add_cached_items_hash_to_temando_quote.rb
 - db/migrate/20121011115000_remove_temando_quote_delivery_method.rb
 - db/migrate/20121017165000_fix_temando_quote_associations.rb
+- db/migrate/20121113034743_add_carrier_data_to_temando_quote.rb
 - lib/spree_temando/engine.rb
 - lib/spree_temando/version.rb
 - lib/spree_temando.rb
@@ -124,7 +190,7 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.md
-homepage: http://github.com/reInteractive/spree_temando
+homepage: https://github.com/reInteractive-open/spree_temando
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -144,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Adds temando shipping support to Spree