kaui 0.6.2 → 0.6.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8b73e8b1dabc92e63dd6227a3c8102f4dac0b765
+  data.tar.gz: c1f569654631d519836211d353258401eda5715d
+SHA512:
+  metadata.gz: 391cb888a26646d995a2bf6e9158ec4d8a94a45c68884c6eac5a2f8afc74daf012e95900d26ac23d6d9ca86f8ec2bc65bdb228fe6bdb277c89a21da2908ec5a4
+  data.tar.gz: 84200769fc54c0e5101259ee3f81046c640cbd91f617d1c17148396c7576acc9cafccc01028356233c75e63ddcf373a5e0fe3bdf4849eaa593c821ff531f9dea

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    kaui (0.6.2)
+    kaui (0.6.3)
       cancan (~> 1.6.10)
       d3_rails (~> 3.2.8)
       devise (~> 3.0.2)
       jquery-rails (~> 3.0.4)
-      killbill-client (~> 0.5.4)
+      killbill-client (~> 0.5.5)
       money-rails (~> 0.8.1)
       rails (~> 3.2.14)
       rest-client (~> 1.6.7)
@@ -14,12 +14,12 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.15)
-      actionpack (= 3.2.15)
+    actionmailer (3.2.16)
+      actionpack (= 3.2.16)
       mail (~> 2.5.4)
-    actionpack (3.2.15)
-      activemodel (= 3.2.15)
-      activesupport (= 3.2.15)
+    actionpack (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -27,45 +27,45 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.15)
-      activesupport (= 3.2.15)
+    activemodel (3.2.16)
+      activesupport (= 3.2.16)
       builder (~> 3.0.0)
-    activerecord (3.2.15)
-      activemodel (= 3.2.15)
-      activesupport (= 3.2.15)
+    activerecord (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.15)
-      activemodel (= 3.2.15)
-      activesupport (= 3.2.15)
-    activesupport (3.2.15)
+    activeresource (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
+    activesupport (3.2.16)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    arel (3.0.2)
+    arel (3.0.3)
     bcrypt-ruby (3.1.2)
     builder (3.0.4)
     cancan (1.6.10)
     d3_rails (3.2.8)
       railties (>= 3.1.0)
-    devise (3.0.3)
+    devise (3.0.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
       warden (~> 1.2.3)
     erubis (2.7.0)
     hike (1.2.3)
-    i18n (0.6.5)
+    i18n (0.6.9)
     journey (1.0.4)
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
-    killbill-client (0.5.4)
+    killbill-client (0.5.5)
       json (~> 1.8.0)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.25)
+    mime-types (1.25.1)
     money (5.1.1)
       i18n (~> 0.6.0)
     money-rails (0.8.1)
@@ -74,7 +74,7 @@ GEM
       railties (>= 3.0)
     multi_json (1.8.2)
     mysql2 (0.3.13)
-    orm_adapter (0.4.0)
+    orm_adapter (0.5.0)
     polyglot (0.3.3)
     rack (1.4.5)
     rack-cache (1.2)
@@ -83,22 +83,22 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.15)
-      actionmailer (= 3.2.15)
-      actionpack (= 3.2.15)
-      activerecord (= 3.2.15)
-      activeresource (= 3.2.15)
-      activesupport (= 3.2.15)
+    rails (3.2.16)
+      actionmailer (= 3.2.16)
+      actionpack (= 3.2.16)
+      activerecord (= 3.2.16)
+      activeresource (= 3.2.16)
+      activesupport (= 3.2.16)
       bundler (~> 1.0)
-      railties (= 3.2.15)
-    railties (3.2.15)
-      actionpack (= 3.2.15)
-      activesupport (= 3.2.15)
+      railties (= 3.2.16)
+    railties (3.2.16)
+      actionpack (= 3.2.16)
+      activesupport (= 3.2.16)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.1.0)
+    rake (10.1.1)
     rdoc (3.12.2)
       json (~> 1.4)
     rest-client (1.6.7)

data/app/controllers/kaui/account_tags_controller.rb

@@ -5,7 +5,7 @@ class Kaui::AccountTagsController < Kaui::EngineController
 
     if account_id.present?
       begin
-        @tags = Kaui::KillbillHelper::get_tags_for_account(account_id, "FULL", options_for_klient)
+        @tags = Kaui::KillbillHelper::get_tags_for_account(account_id, true, "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)}"
@@ -20,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, "NONE", options_for_klient).map { |tag| tag.tag_definition_name }
+      @tag_names = Kaui::KillbillHelper::get_tags_for_account(@account.account_id, false, "NONE", options_for_klient).map { |tag| tag.tag_definition_name }
     rescue => e
       flash.now[:error] = "Error while editing tags: #{as_string(e)}"
     end
@@ -28,7 +28,7 @@ class Kaui::AccountTagsController < Kaui::EngineController
 
   def update
     begin
-      current_tags = Kaui::KillbillHelper::get_tags_for_account(params[:account_id], "NONE", options_for_klient).map { |tag| tag.tag_definition_id }
+      current_tags = Kaui::KillbillHelper::get_tags_for_account(params[:account_id], false, "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

@@ -51,7 +51,7 @@ 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, "NONE", options_for_klient).sort { |tag_a, tag_b| tag_a.tag_definition_name.downcase <=> tag_b.tag_definition_name.downcase }
+          @tags = Kaui::KillbillHelper::get_tags_for_account(@account.account_id, false, "NONE", options_for_klient).sort { |tag_a, tag_b| tag_a.tag_definition_name.downcase <=> tag_b.tag_definition_name.downcase }
           @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

@@ -464,8 +464,8 @@ module Kaui
                     build_audit_headers(current_user, reason, comment, options)
     end
 
-    def self.get_tags_for_account(account_id, audit = "NONE", options = {})
-      KillBillClient::Model::Tag.find_all_by_account_id account_id, audit, options
+    def self.get_tags_for_account(account_id, included_deleted = false, audit = "NONE", options = {})
+      KillBillClient::Model::Tag.find_all_by_account_id account_id, included_deleted, audit, options
     end
 
     def self.get_tags_for_bundle(bundle_id, options = {})

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

@@ -14,16 +14,17 @@
   <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%>
+        <% tag.audit_logs.each do |log| %>
+          <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><span <% if log.change_type != 'INSERT' %>class='alert-error' <% else %>class='alert-success' <% end %>><%= log.change_type %></span></td>
+            <td><%= log.changed_by %></td>
+            <td><%= log.reason_code %> <%= log.comments %></td>
+          </tr>
+        <% end %>
+      <% end %>
+    <% end %>
   </tbody>
 </table>
 

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

@@ -25,6 +25,13 @@
       </div>
     </div>
 
+    <div class='control-group'>
+      <%= label_tag :comment, 'Comment', :class => "control-label" %>
+      <div class="controls">
+        <%= text_area_tag :comment, '', :rows => 3, :class => 'input-xlarge' %>
+      </div>
+    </div>
+
     <div class='form-actions'>
       <%= button_tag 'Update', :class =>'btn btn-primary' %>
       <%= link_to 'Back', :back, :class => 'btn' %>
@@ -35,4 +42,4 @@
   $(function() {
     $('.tag-description').tooltip();
   });
-<% end %>
+<% end %>

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

@@ -1,5 +1,5 @@
 <dt>Tags:</dt>
-<dd>       
+<dd>
   <% if tags.present? %>
     <% tags.each_with_index do |tag, idx| %>
       <span><%= tag.tag_definition_name %><% if idx < tags.length - 1 %>, <% end %></span>

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.5.4'
+  s.add_dependency 'killbill-client', '~> 0.5.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.6.2"
+  VERSION = "0.6.3"
 end

data/test/dummy/config/application.rb

@@ -8,6 +8,9 @@ require "jquery-rails"
 
 module Dummy
   class Application < Rails::Application
+    # See https://github.com/svenfuchs/i18n/commit/3b6e56e06fd70f6e4507996b017238505e66608c
+    config.i18n.enforce_available_locales = true
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.

data/test/test_helper.rb

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

metadata

@@ -1,174 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.6.2
-  prerelease: 
+  version: 0.6.3
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.14
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.4
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.7
 - !ruby/object:Gem::Dependency
   name: money-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: d3_rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.8
 - !ruby/object:Gem::Dependency
   name: killbill-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.10
 - !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'
 - !ruby/object:Gem::Dependency
   name: mysql2
   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: Rails UI plugin for Killbill administration.
@@ -178,8 +157,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -418,30 +397,26 @@ files:
 homepage: http://www.killbilling.org
 licenses:
 - Apache License (2.0)
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3174451969916924210
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Killbill Admin UI plugin
 test_files:
 - test/dummy/README.rdoc