kaui 0.4.3 → 0.4.4

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    kaui (0.4.3)
+    kaui (0.4.4)
       cancan (~> 1.6.10)
       d3_rails (~> 3.2.8)
       devise (~> 3.0.2)
       jquery-rails (~> 3.0.4)
-      killbill-client (~> 0.3.3)
+      killbill-client (~> 0.3.5)
       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.3)
+    killbill-client (0.3.5)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)

data/app/controllers/kaui/account_tags_controller.rb

@@ -1,11 +1,12 @@
 class Kaui::AccountTagsController < Kaui::EngineController
 
   def show
-    account_id = params[:id]
+    account_id = params[:account_id]
 
     if account_id.present?
       begin
-        @tags = Kaui::KillbillHelper::get_tags_for_account(account_id, options_for_klient)
+        @tags = Kaui::KillbillHelper::get_tags_for_account(account_id, "FULL", options_for_klient)
+        @account = Kaui::KillbillHelper::get_account(account_id, false, false, options_for_klient)
       rescue => e
         flash.now[:error] = "Error while getting tags: #{as_string(e)}"
       end
@@ -19,7 +20,7 @@ class Kaui::AccountTagsController < Kaui::EngineController
     begin
       @available_tags = Kaui::TagDefinition.all_for_account(options_for_klient).sort
       @account = Kaui::KillbillHelper::get_account(@account_id, false, false, options_for_klient)
-      @tag_names = Kaui::KillbillHelper::get_tags_for_account(@account.account_id, options_for_klient).map { |tag| tag.tag_definition_name }
+      @tag_names = Kaui::KillbillHelper::get_tags_for_account(@account.account_id, "NONE", options_for_klient).map { |tag| tag.tag_definition_name }
     rescue => e
       flash.now[:error] = "Error while editing tags: #{as_string(e)}"
     end
@@ -27,7 +28,7 @@ class Kaui::AccountTagsController < Kaui::EngineController
 
   def update
     begin
-      current_tags = Kaui::KillbillHelper::get_tags_for_account(params[:account_id], options_for_klient).map { |tag| tag.tag_definition_id }
+      current_tags = Kaui::KillbillHelper::get_tags_for_account(params[:account_id], "NONE", options_for_klient).map { |tag| tag.tag_definition_id }
 
       new_tags = []
       params.each do |tag, tag_name|

data/app/controllers/kaui/accounts_controller.rb

@@ -23,7 +23,9 @@ class Kaui::AccountsController < Kaui::EngineController
 
       if @account.present? and @account.is_a? Kaui::Account
         begin
-          @tags = Kaui::KillbillHelper::get_tags_for_account(@account.account_id, options_for_klient).sort
+          @tags = Kaui::KillbillHelper::get_tags_for_account(@account.account_id, "NONE", options_for_klient).sort_by do |tag|
+            @tag_definition_name <=> tag.tag_definition_name
+          end
           @account_emails = Kaui::AccountEmail.where({ :account_id => @account.account_id }, options_for_klient)
           @overdue_state = Kaui::KillbillHelper::get_overdue_state_for_account(@account.account_id, options_for_klient)
           @payment_methods = Kaui::KillbillHelper::get_non_external_payment_methods(@account.account_id, options_for_klient)

data/app/helpers/kaui/killbill_helper.rb

@@ -211,7 +211,8 @@ module Kaui
 
       entitlement = KillBillClient::Model::EntitlementNoEvents.new
       entitlement.subscription_id = subscription_id
-      entitlement.cancel(extract_created_by(current_user), extract_reason_code(reason), comment, nil, policy, options)
+      # We are using same entitlement/billing policy here for now
+      entitlement.cancel(extract_created_by(current_user), extract_reason_code(reason), comment, nil, policy, policy, options)
     end
 
     def self.compute_previous_ctd(ctd, billing_period, options = {})
@@ -457,9 +458,8 @@ module Kaui
                     build_audit_headers(current_user, reason, comment, options)
     end
 
-    def self.get_tags_for_account(account_id, options = {})
-      data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/tags", options
-      process_response(data, :multiple) { |json| Kaui::Tag.new(json) }
+    def self.get_tags_for_account(account_id, audit = "NONE", options = {})
+      KillBillClient::Model::Tag.find_all_by_account_id account_id, audit, options
     end
 
     def self.get_tags_for_bundle(bundle_id, options = {})

data/app/views/kaui/account_tags/_account_tags_table.html.erb

@@ -1,10 +1,29 @@
-<dt>Tags:</dt>
-<dd>       
-  <% if tags.present? %>
-    <% tags.sort.each_with_index do |tag, idx| %>
-      <span><%= tag %><% if idx < tags.length - 1 %>, <% end %></span>
-    <% end %>
-    <br/>
-  <% end %>
-  <%= link_to 'Add/Remove', kaui_engine.tags_url_or_path, :class => "btn btn-mini" %>
-</dd>
+<div class="page-header">
+  <h3>Tags for <%= (link_to @account.name, account_path(@account.account_id)) if @account.present? %></h3>
+</div>
+<table class="table table-condensed table-striped data-table">
+  <thead>
+    <tr>
+      <th>Tag Name</th>
+      <th>Executed date</th>
+      <th>Execution type</th>
+      <th>Executed by</th>
+      <th>Comments</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% if @tags.present? %>
+      <% @tags.each do |tag| %>
+        <% log = tag.audit_logs.first if tag.audit_logs.present? %>
+        <tr>
+          <td><%= link_to tag.tag_definition_name, tag_definition_path(:id => tag.tag_definition_id) %></td>
+          <td><%= format_date(log.change_date, @account.timezone).html_safe if log.change_date.present? %></td>
+          <td><%= log.change_type if log.change_type.present? %></td>
+          <td><%= log.changed_by if log.changed_by.present? %></td>
+          <td><%= log.reason_code if log.reason_code.present? %> <%= log.comments if log.comments.present? %></td>
+        </tr>
+      <% end #end tag%>
+    <% end #end if tags present%>
+  </tbody>
+</table>
+

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

@@ -0,0 +1,3 @@
+<%= render "account_tags_table" %>
+<%= link_to 'Back', :back, :class => 'btn' %>
+<%= link_to 'Add/Remove Tags', edit_account_tags_path(:account_id => @account), :class => 'btn' %>

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

@@ -30,4 +30,4 @@
 </table>
 <% else %>
   <p>Refund info not found</p>
-<% end %>
+<% end %>

data/app/views/kaui/tags/_tags_table.html.erb

@@ -7,4 +7,5 @@
     <br/>
   <% end %>
   <%= link_to 'Add/Remove', tags_url_or_path, :class => 'btn btn-mini' %>
+  <%= link_to 'Tags Audit', account_tags_path(:account_id => @account), :class => 'btn btn-mini' %>
 </dd>

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.3'
+  s.add_dependency 'killbill-client', '~> 0.3.5'
   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.3"
+  VERSION = "0.4.4"
 end

data/test/test_helper.rb

@@ -90,7 +90,7 @@ module Kaui::KillbillHelper
     []
   end
 
-  def self.get_tags_for_account(account_id, options = {})
+  def self.get_tags_for_account(account_id, audit = "NONE", options = {})
     []
   end
 

data/test/unit/kaui/date_helper_test.rb

@@ -8,6 +8,6 @@ class Kaui::DateHelperTest < ActiveSupport::TestCase
   end
 
   test "can parse from date" do
-    assert_equal "2012-06-30", format_date(Date.new(2012, 7, 1))
+    assert_equal "2012-07-01", format_date(Date.new(2012, 7, 1))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-09-04 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.3
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -259,6 +259,7 @@ files:
 - app/views/kaui/account_emails/show.html.erb
 - app/views/kaui/account_tags/_account_tags_table.html.erb
 - app/views/kaui/account_tags/edit.html.erb
+- app/views/kaui/account_tags/show.html.erb
 - app/views/kaui/account_timelines/index.html.erb
 - app/views/kaui/account_timelines/show.html.erb
 - app/views/kaui/accounts/index.html.erb
@@ -437,7 +438,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1687584771760312948
+      hash: -2233739606759617333
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25