sk-api 1.0.4 → 1.0.5

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/activeresource_patches/base.rb

@@ -30,4 +30,15 @@ module ActiveResource
       collection.collect! { |record| instantiate_record(record, prefix_options) }
     end
   end
+end
+
+# Force json decoding using Rufus
+module ActiveResource
+  module Formats
+    module JsonFormat
+      def decode(json)
+        Rufus::Json.decode(json)
+      end
+    end
+  end
 end

data/lib/resources/invoice.rb

@@ -35,7 +35,7 @@ module SKApi
            "lock_version"   => {"type" => "integer", "optional" => true, "readonly" => true},
            "client_id"      => {"type" => "string"},
            "client"         => {"type" => "object", "properties" => SKApi::Resources::Client.schema_props, "optional" => true, "readonly" => true},
-           "line_items"     => {"type" => "array","properties" => SKApi::Resources::LineItem.schema_props, "optional" => true,},
+           "line_items"     => {"type" => "array","properties" => SKApi::Resources::LineItem.schema_props, "optional" => true}
          }
       end
 

data/lib/resources/line_item.rb

@@ -23,7 +23,7 @@ module SKApi
            "price_single"   => {"type" => "number"},
            "discount"       => {"type" => "number", "optional" => true},
            "tax"            => {"type" => "number", "optional" => true},
-           "use_product"    => {"type" => "boolean", "optional" => true},
+           "use_product"    => {"type" => "integer", "optional" => true},
            "created_at"     => {"type" => "string", "format" =>"date-time", "optional" => true, "readonly" => true},
            "updated_at"     => {"type" => "string", "format" =>"date-time", "optional" => true, "readonly" => true}
         }

data/spec/resources/invoice_spec.rb

@@ -115,9 +115,65 @@ describe SKApi::Resources::Invoice, "with line items" do
 
   it "should add line item" do
     item = SKApi::Resources::LineItem.new( {  :position=>2, :description => 'Goat-Pie', :price_single => 10, :quantity=>10} )
+    product = SKApi::Resources::Product.new(:name=>'Eis am Stiel', :price => 1.50, :tax=>19, :description => 'Mmmhh lecker Eis')
+    product.save.should be_true
+    item1 = SKApi::Resources::LineItem.new( { :position=>3, :use_product => 1, :product_id=> product.id, :quantity => 10 } )
     @doc.line_items << item
+    @doc.line_items << item1
     @doc.save
-    @doc.line_items.length.should == 2
-    @doc.price_total.should == 220.0
+    @doc.line_items.length.should == 3
+    @doc.price_total.should == 235.0
   end
+
 end
+=begin
+describe SKApi::Resources::Invoice, "with line items" do
+
+  before :all do
+    @client = SKApi::Resources::Client.new(:organisation=>'Credit Note API-Tester')
+    @client.save.should be_true
+    #setup test doc to work with
+    @doc = SKApi::Resources::Invoice.new(:client_id => @client.id,
+                                          :line_items => [{ :position=>1, :description => 'Pork Chops', :quantity => 12, :price_single =>'10.00' }] )
+    @doc.save.should be_true
+  end
+
+  after :all do
+    delete_test_data(@doc, @client)
+  end
+
+  it "should create a line item" do
+    @doc.line_items.length.should == 1
+    @doc.line_items.first.description.should == 'Pork Chops'
+    @doc.price_total.should == 120.0
+  end
+
+  it "should edit line item" do
+    @doc.line_items[0].description = 'Egg Sandwich'
+    @doc.save
+    @doc.line_items.length.should == 1
+    @doc.line_items.first.description.should == 'Egg Sandwich'
+  end
+
+  it "should add line item" do
+    item = SKApi::Resources::LineItem.new( {  :position=>2, :description => 'Goat-Pie', :price_single => 10, :quantity=>10} )
+    product = SKApi::Resources::Product.new(:name=>'Eis am Stiel', :price => 1.50, :tax=>19, :description => 'Mmmhh lecker Eis')
+    product.save.should be_true
+    item1 = SKApi::Resources::LineItem.new( { :position=>3, :use_product => 1, :quantity => 10 } )
+    @doc.line_items << item
+    @doc.line_items << item1
+    @doc.save
+    @doc.line_items.length.should == 3
+    @doc.price_total.should == 220.0
+  end
+
+  xit "should add line item and use product information" do
+
+    @doc.line_items << item
+    @doc.save
+    @doc.line_items.length.should == 3
+    @doc.price_total.should == 15.0
+
+    product.destroy
+  end
+=end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Georg Leciejewski
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-07 00:00:00 +01:00
+date: 2010-03-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency