uomi 0.2.16 → 0.2.17

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OGJlNzE0NmYyNTIxZTEyZTQ2OTBlYWNkNTI0YzkyYjgxMDZlNDcyNw==
+  data.tar.gz: !binary |-
+    NmQ0MzExZDNmMTU2YjZjZDdjMDY0MGQ4YzE0MzRkNWFlZTc5NmJmYQ==
+SHA512:
+  metadata.gz: !binary |-
+    ODc4NWRiY2ExMzlkZDM5NmExZWNhNjM3MTgyZjAyYzkwNGMzODBiZjEwMmZj
+    NDQxMmM1MDljZGNjZmRiYzYxODhkMjAzZTM0Nzc0YzMxM2NlOWU1OGM2YTIw
+    Y2NiNjZhNDE0MmNhZDBiZTAwYTgxYTUxM2I1MGIxNmVlYTFhMDE=
+  data.tar.gz: !binary |-
+    YzVlNWQ0ZDFkOTJjZjQyYWY3ODIxNzkzZGUxNTg3MWQ5Y2VkODZkMzhiM2Ix
+    MzU0N2UzZWMwMzA0YTY4NGNiNmQxYTI3YTYzZjg0MzNiZjUzZWMwYzNmYTlj
+    MmRlYWYxMWYyMGRkMGEwYzAyNDEwZjg4ZjVmZDRmM2U1NzRlMTU=

data/lib/generators/active_record/templates/migration.rb

@@ -20,6 +20,8 @@ class CreateUomiTables < ActiveRecord::Migration
       t.timestamps
     end
 
+    add_index(:uomi_line_items, :invoice_id)
+
     create_table "uomi_transactions", :force => true do |t|
       t.integer "invoice_id"
       t.string  "type"
@@ -27,6 +29,8 @@ class CreateUomiTables < ActiveRecord::Migration
       t.timestamps
     end
 
+    add_index(:uomi_transactions, :invoice_id)
+
     create_table "uomi_invoices", :force => true do |t|
       t.integer  "seller_id"
       t.integer  "buyer_id"
@@ -46,6 +50,8 @@ class CreateUomiTables < ActiveRecord::Migration
       t.string "reference"
       t.timestamps
     end
+
+    add_index(:uomi_payment_references, :invoice_id)
     
     create_table "uomi_sellers", :force => true do |t|
       t.integer "sellerable_id"
@@ -65,6 +71,8 @@ class CreateUomiTables < ActiveRecord::Migration
       t.timestamps
     end
 
+    add_index(:uomi_invoice_decorators, :invoice_id)
+
     create_table "uomi_credit_note_invoices", :force => true do |t|
       t.integer "invoice_id"
       t.integer "credit_note_id"
@@ -81,4 +89,4 @@ class CreateUomiTables < ActiveRecord::Migration
  
   end
 
-end
+end

data/lib/uomi/credit_note.rb

@@ -6,6 +6,24 @@ module Uomi
     has_many :invoices, through: :credit_note_invoices
     has_many :credit_note_credit_transactions, dependent: :destroy
 
+    workflow do
+      state :draft do
+        event :issue, transitions_to: :issued
+        event :void, transitions_to: :voided
+      end
+      
+      state :issued do
+        event :settle, transitions_to: :settled
+        event :void, transitions_to: :voided
+      end
+
+      state :settled do
+        event :void, transitions_to: :voided
+      end
+
+      state :voided
+    end
+
     def issue(issued_at = Time.now)
       self.issued_at = issued_at
       create_initial_transaction!
@@ -97,5 +115,19 @@ module Uomi
       self.add_debit_transaction(amount: options[:amount])
       CreditNoteCreditTransaction.create!(transaction: invoice.transactions.last, credit_note_id: self.id)
     end
+
+    def void
+      annul_remaining_amount! unless self.draft?
+      reverse_transactions_against_invoice
+      self
+    end
+
+    def reverse_transactions_against_invoice
+      credit_note_credit_transactions.each do |cnct|
+        invoice = cnct.transaction.invoice
+        invoice.add_debit_transaction(amount: cnct.transaction.amount)
+        invoice.save!
+      end
+    end
   end
 end

data/lib/uomi/invoice.rb

@@ -27,7 +27,10 @@ module Uomi
         event :void, transitions_to: :voided
       end
 
-      state :settled
+      state :settled do
+        event :unsettle, transitions_to: :issued
+      end
+
       state :voided
     end
 
@@ -102,8 +105,10 @@ module Uomi
     end
       
     def calculate_balance
-      self.balance = (0 - debit_transactions.sum(&:amount)) + credit_transactions.sum(&:amount)
+      bal = (0 - debit_transactions.sum(&:amount)) + credit_transactions.sum(&:amount)
+      self.balance = bal
       settle! if should_settle?
+      unsettle! if (bal < 0 && settled?)
     end
 
     def should_settle?

data/lib/uomi/version.rb

@@ -1,3 +1,3 @@
 module Uomi
-  VERSION = "0.2.16"
+  VERSION = "0.2.17"
 end

data/spec/lib/uomi/credit_note_spec.rb

@@ -216,6 +216,32 @@ describe Uomi::CreditNote do
               t = @credit_note.credit_note_credit_transactions.last
               t.transaction.invoice.should == @invoice2
             end
+
+            context "Void the credit note" do
+              before(:each) do
+                @credit_note.void!
+                @credit_note.reload
+                @invoice1.reload
+                @invoice2.reload
+              end
+
+              it "Credit note should be voided" do
+                @credit_note.should be_voided
+              end
+
+              it "Invoice 1 should not be settled" do
+                @invoice1.should_not be_settled
+              end
+
+              it "invoice 2 should not be settled" do
+                @invoice2.should_not be_settled
+              end
+
+              it "should still keep the links between credit notes and invoices for history" do
+                @invoice1.credit_notes.should == [@credit_note]
+                @invoice2.credit_notes.should == [@credit_note]
+              end
+            end
           end
         end
       end

metadata

@@ -1,132 +1,122 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: uomi
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 16
-  version: 0.2.16
+version: !ruby/object:Gem::Version
+  version: 0.2.17
 platform: ruby
-authors: 
+authors:
 - Douglas Anderson
 - Jeffrey van Aswegen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-09-16 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-02-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: workflow
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 7
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: workflow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: andand
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: andand
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: combustion
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.3.1
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: database_cleaner
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
-  version_requirements: *id007
-description: " Manage invoices. "
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+description: ! ' Manage invoices. '
+email:
 - i.am.douglas.anderson@gmail.com
 - jeffmess@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - .travis.yml
@@ -169,39 +159,30 @@ files:
 - spec/lib/uomi/overdue_invoice_spec.rb
 - spec/spec_helper.rb
 - uomi.gemspec
-has_rdoc: true
 homepage: https://github.com/tehtorq/invoicing
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: uomi
-rubygems_version: 1.3.7.1
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An uomi gem.
-test_files: 
+test_files:
 - spec/README
 - spec/internal/config/database.yml.sample
 - spec/internal/config/routes.rb