kaui 0.4.2 → 0.4.3

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    kaui (0.4.2)
+    kaui (0.4.3)
       cancan (~> 1.6.10)
       d3_rails (~> 3.2.8)
       devise (~> 3.0.2)
       jquery-rails (~> 3.0.4)
-      killbill-client (~> 0.3.2)
+      killbill-client (~> 0.3.3)
       money-rails (~> 0.8.1)
       rails (~> 3.2.14)
       rest-client (~> 1.6.7)
@@ -60,7 +60,7 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.0)
-    killbill-client (0.3.2)
+    killbill-client (0.3.3)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)

data/app/controllers/kaui/account_timelines_controller.rb

@@ -27,7 +27,7 @@ class Kaui::AccountTimelinesController < Kaui::EngineController
       @timeline.payments.each do |payment|
         if payment.invoice_id.present? && payment.payment_id.present?
           begin
-            @invoices_by_id[payment.invoice_id] = Kaui::KillbillHelper::get_invoice(payment.invoice_id, true, options_for_klient)
+            @invoices_by_id[payment.invoice_id] = Kaui::KillbillHelper::get_invoice(payment.invoice_id, true, "NONE", options_for_klient)
           rescue => e
             flash.now[:error] = "Could not get invoice information for the timeline #{@account_id}: #{as_string(e)}"
           end
@@ -41,7 +41,7 @@ class Kaui::AccountTimelinesController < Kaui::EngineController
       @timeline.invoices.each do |invoice|
         if invoice.invoice_id.present? && !@invoices_by_id.has_key?(invoice.invoice_id)
           begin
-            @invoices_by_id[invoice.invoice_id] = Kaui::KillbillHelper::get_invoice(invoice.invoice_id, true, options_for_klient)
+            @invoices_by_id[invoice.invoice_id] = Kaui::KillbillHelper::get_invoice(invoice.invoice_id, true, "NONE", options_for_klient)
           rescue => e
             flash.now[:error] = "Could not get invoice information for the timeline #{@account_id}: #{as_string(e)}"
           end

data/app/controllers/kaui/chargebacks_controller.rb

@@ -26,7 +26,7 @@ class Kaui::ChargebacksController < Kaui::EngineController
     begin
       @account = Kaui::KillbillHelper::get_account(@account_id, false, false, options_for_klient)
       @payment = Kaui::KillbillHelper::get_payment(@payment_id, options_for_klient)
-      @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id, true, options_for_klient)
+      @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id, true, "NONE", options_for_klient)
     rescue => e
       flash[:error] = "Error while starting a new chargeback: #{as_string(e)}"
       redirect_to kaui_engine.account_timeline_path(:id => params[:account_id])

data/app/controllers/kaui/charges_controller.rb

@@ -7,7 +7,7 @@ class Kaui::ChargesController < Kaui::EngineController
       @account = Kaui::KillbillHelper::get_account(@account_id, false, false, options_for_klient)
 
       if @invoice_id.present?
-        @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id, true, options_for_klient)
+        @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id, true, "NONE", options_for_klient)
         @charge = Kaui::Charge.new("accountId" => @account_id, "invoiceId" => @invoice_id)
       else
         @charge = Kaui::Charge.new("accountId" => @account_id)

data/app/controllers/kaui/invoice_items_controller.rb

@@ -14,7 +14,7 @@ class Kaui::InvoiceItemsController < Kaui::EngineController
   end
 
   def update
-    @invoice_item = Kaui::InvoiceItem.new(params[:invoice_item])
+    @invoice_item = Kaui::KillbillHelper.new_invoice_item(params[:kill_bill_client_model_invoice_item])
     begin
       Kaui::KillbillHelper.adjust_invoice(@invoice_item, current_user, params[:reason], params[:comment], options_for_klient)
       flash[:notice] = "Adjustment item created"
@@ -43,7 +43,7 @@ class Kaui::InvoiceItemsController < Kaui::EngineController
     invoice_id = params[:invoice_id]
     if invoice_item_id.present? and invoice_id.present?
       begin
-        @invoice_item = Kaui::KillbillHelper.get_invoice_item(invoice_id, invoice_item_id, options_for_klient)
+        @invoice_item = Kaui::KillbillHelper.get_invoice_item invoice_id, invoice_item_id, options_for_klient
       rescue => e
         flash[:error] = "Error while trying to find the invoice item: #{as_string(e)}"
       end

data/app/controllers/kaui/invoices_controller.rb

@@ -9,7 +9,7 @@ class Kaui::InvoicesController < Kaui::EngineController
     invoice_id_or_number = params[:id]
     if invoice_id_or_number.present?
       begin
-        @invoice = Kaui::KillbillHelper.get_invoice(invoice_id_or_number, true, options_for_klient)
+        @invoice = Kaui::KillbillHelper.get_invoice(invoice_id_or_number, true, "FULL", options_for_klient)
         if @invoice.present?
           @invoice_id = @invoice.invoice_id
           @account = Kaui::KillbillHelper.get_account(@invoice.account_id, false, false, options_for_klient)

data/app/controllers/kaui/payments_controller.rb

@@ -4,7 +4,7 @@ class Kaui::PaymentsController < Kaui::EngineController
     @account_id = params[:account_id]
     @invoice_id = params[:invoice_id]
     begin
-      @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id, true, options_for_klient)
+      @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id, true, "NONE", options_for_klient)
       @account = Kaui::KillbillHelper::get_account(@account_id, false, false, options_for_klient)
     rescue => e
       flash[:error] = "Error while creating a new payment: #{as_string(e)}"

data/app/controllers/kaui/refunds_controller.rb

@@ -57,7 +57,7 @@ class Kaui::RefundsController < Kaui::EngineController
     begin
       @account = Kaui::KillbillHelper::get_account(@account_id, false, false, options_for_klient)
       @payment = Kaui::KillbillHelper::get_payment(@payment_id, options_for_klient)
-      @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id, true, options_for_klient)
+      @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id, true, "NONE", options_for_klient)
     rescue => e
       flash[:error] = "Error while processing refund: #{as_string(e)}"
       redirect_to kaui_engine.account_timeline_path(:id => params[:account_id])
@@ -65,7 +65,7 @@ class Kaui::RefundsController < Kaui::EngineController
   end
 
   def create
-    invoice = Kaui::KillbillHelper::get_invoice(params[:invoice_id], true, options_for_klient)
+    invoice = Kaui::KillbillHelper::get_invoice(params[:invoice_id], true, "NONE", options_for_klient)
     refund = Kaui::Refund.new(params[:refund])
     refund.adjusted = (refund.adjustment_type != "noInvoiceAdjustment")
     if refund.adjustment_type == "invoiceItemAdjustment"

data/app/helpers/kaui/date_helper.rb

@@ -1,6 +1,17 @@
 module Kaui
   module DateHelper
+
+    LOCAL_DATE_RE = /^\d+-\d+-\d+$/
+
     def format_date(date, timezone="Pacific Time (US & Canada)")
+
+      # Double check this is not null
+      return nil if date.nil?
+
+      # If this is a local date we assume this is already in the account timezone, and so there is nothing to do
+      return date.to_s if LOCAL_DATE_RE.match(date.to_s)
+
+      # If not, convert into account timezone and return the date part only
       parsed_date = DateTime.parse(date.to_s).in_time_zone(timezone)
       parsed_date.to_s(:date_only)
     end

data/app/helpers/kaui/killbill_helper.rb

@@ -232,14 +232,14 @@ module Kaui
 
     ############## INVOICE ##############
 
-    def self.get_invoice(id_or_number, with_items = true, options = {})
-      KillBillClient::Model::Invoice.find_by_id_or_number id_or_number, with_items, options
+    def self.get_invoice(id_or_number, with_items = true, audit = "NONE", options = {})
+      KillBillClient::Model::Invoice.find_by_id_or_number id_or_number, with_items, audit, options
     end
 
     def self.get_invoice_item(invoice_id, invoice_item_id, options = {})
       # Find the item from the invoice
       # TODO add killbill-server API
-      invoice = Kaui::KillbillHelper.get_invoice(invoice_id, options)
+      invoice = Kaui::KillbillHelper.get_invoice(invoice_id, true, "NONE", options)
       if invoice.present? and invoice.items.present?
         invoice.items.each do |item|
           return item if item.invoice_item_id == invoice_item_id
@@ -248,6 +248,15 @@ module Kaui
       nil
     end
 
+    def self.new_invoice_item(invoice_item)
+      item = KillBillClient::Model::InvoiceItem.new
+      invoice_item.each do |attribute, value|
+        item.methods.include?("#{attribute}=".to_sym) ? 
+        item.send("#{attribute}=".to_sym, value) : next
+      end
+      item
+    end
+
     def self.get_invoice_html(invoice_id, options = {})
       data = call_killbill :get, "/1.0/kb/invoices/#{invoice_id}/html", options
       data[:body] if data.present?

data/app/models/kaui/base.rb

@@ -1,7 +1,5 @@
 class Kaui::Base
-  include ActiveModel::Validations
-  include ActiveModel::Conversion
-  extend ActiveModel::Naming
+  include Kaui::RailsMethods
 
   attr_reader :errors
 
@@ -129,59 +127,5 @@ class Kaui::Base
      end
   end
 
-  def ==(other)
-    !other.nil? && self.class == other.class && self.to_hash == other.to_hash
-  end
-
-  def persisted?
-    @persisted
-  end
-
-  def new_record?
-    !persisted?
-  end
-
-  def to_param
-    # id is a string (killbill UUID)
-    @id
-  end
-
-  def read_attribute_for_validation(attr)
-    send(attr)
-  end
-
-  def self.human_attribute_name(attr, options = {})
-    attr
-  end
-
-  def self.lookup_ancestors
-    [self]
-  end
-
-  def self.all
-    []
-  end
-
-  def self.count
-    all.count
-  end
-
-  def self.find(id)
-    nil
-  end
-
-  def save
-    @errors.add(:save, 'Saving this object is not yet supported')
-    false
-  end
 
-  def update_attributes(tag_definition)
-    @errors.add(:update, 'Updating this object is not yet supported')
-    false
-  end
-
-  def destroy
-    @errors.add(:destroy, 'Destroying this object is not yet supported')
-    false
-  end
 end

data/app/models/kaui/rails_methods.rb

@@ -0,0 +1,76 @@
+module Kaui
+  module RailsMethods
+    
+    # let all the rails mocks and overrides be here
+    def self.included(base_class)
+      base_class.class_eval do
+        extend  ActiveModel::Naming
+        include ActiveModel::Validations
+        include ActiveModel::Conversion
+
+        def ==(other)
+          !other.nil? && self.class == other.class && self.to_hash == other.to_hash
+        end
+
+        def persisted?
+          @persisted
+        end
+
+        def new_record?
+          !persisted?
+        end
+
+        def to_param
+          # id is a string (killbill UUID)
+          @id
+        end
+
+        def read_attribute_for_validation(attr)
+          send(attr)
+        end
+
+        def save
+          @errors.add(:save, 'Saving this object is not yet supported')
+          false
+        end
+
+        def update_attributes(tag_definition)
+          @errors.add(:update, 'Updating this object is not yet supported')
+          false
+        end
+
+        def destroy
+          @errors.add(:destroy, 'Destroying this object is not yet supported')
+          false
+        end
+
+      end # end instance methods
+
+      base_class.instance_eval do
+        def self.human_attribute_name(attr, options = {})
+          attr
+        end
+
+        def self.lookup_ancestors
+          [self]
+        end
+
+        def self.all
+          []
+        end
+
+        def self.count
+          all.count
+        end
+
+        def self.find(id)
+          nil
+        end
+
+      end # end class methods
+
+    end # end def included
+
+
+  end
+end

data/app/views/kaui/invoices/show.html.erb

@@ -36,12 +36,13 @@
     <thead>
       <tr>
         <th style="width: 10%">External Key</th>
-        <th style="width: 30%">Description</th>
+        <th style="width: 20%">Description</th>
         <th style="width: 10%">Start date</th>
         <th style="width: 10%">End date</th>
         <th style="width: 10%">Charged through date</th>
         <th style="width: 10%">Price list</th>
         <th style="width: 10%">Amount</th>
+        <th style="width: 10%">Comments</th>
         <th style="width: 10%"></th>
       </tr>
     </thead>
@@ -59,6 +60,7 @@
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= format_date(sub.charged_through_date, @account.timezone).html_safe if sub.present? %></td>
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= sub.price_list.downcase.capitalize if sub.present? and sub.price_list.present? %></td>
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= humanized_money_with_symbol Kaui::Base.to_money(item.amount, item.currency) %> (<%= item.currency %>)</td>
+          <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= item.audit_logs.map {|log| log.comments}.compact.join('<br/>') if item.audit_logs.present? %></td>
           <td>
             <% if can? :item_adjust, Kaui::Invoice %>
               <nobr>

data/config/initializers/kilbill-client-init.rb

@@ -0,0 +1,9 @@
+# hack to make the killbillclient models work as rails models
+
+module KillBillClient
+  module Model
+    Resource.class_eval do
+      include Kaui::RailsMethods
+    end
+  end
+end

data/kaui.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rest-client', '~> 1.6.7'
   s.add_dependency 'money-rails', '~> 0.8.1'
   s.add_dependency 'd3_rails', '~> 3.2.8'
-  s.add_dependency 'killbill-client', '~> 0.3.2'
+  s.add_dependency 'killbill-client', '~> 0.3.3'
   s.add_dependency 'devise', '~> 3.0.2'
   s.add_dependency 'cancan', '~> 1.6.10'
 

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/test/dummy/app/assets/javascripts/application.js

@@ -13,7 +13,7 @@
 //= require jquery
 //= require jquery_ujs
 //= require d3
-//= require js/bootstrap.v2.0.4.min
+//= require js/bootstrap.v2.2.1.min
 //= require js/jquery.dataTables.v1.9.3.min
 //= require kaui/bootstrap-tweaks
 //= require kaui/validation

data/test/dummy/app/assets/stylesheets/application.css

@@ -8,7 +8,7 @@
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
  *
- *= require css/bootstrap.v2.0.4.min
+ *= require css/bootstrap.v2.2.1.min
  *= require kaui/analytics
  *= require_self
  *= require_tree .

data/test/test_helper.rb

@@ -62,7 +62,7 @@ module Kaui::KillbillHelper
     find_among_fixtures(Kaui::OverdueState, account_id)
   end
 
-  def self.get_invoice(invoice_id, with_items = true, options = {})
+  def self.get_invoice(invoice_id, with_items = true, audit= "NONE", options = {})
     find_among_fixtures(Kaui::Invoice, invoice_id)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -246,6 +246,7 @@ files:
 - app/models/kaui/payment.rb
 - app/models/kaui/payment_attempt.rb
 - app/models/kaui/product.rb
+- app/models/kaui/rails_methods.rb
 - app/models/kaui/refund.rb
 - app/models/kaui/subscription.rb
 - app/models/kaui/tag.rb
@@ -311,6 +312,7 @@ files:
 - app/views/kaui/tags/_tags_table.html.erb
 - bin/kaui
 - config/initializers/devise.rb
+- config/initializers/kilbill-client-init.rb
 - config/initializers/killbill_authenticatable.rb
 - config/initializers/time_formats.rb
 - config/locales/devise.en.yml
@@ -435,7 +437,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1588433820236604683
+      hash: 1687584771760312948
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25