kaui 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44e6088db793de66aab1c622dac27f3ae50c8d8a
-  data.tar.gz: 1c33caaa564cc276412f6e7ca9cc721421c2ecff
+  metadata.gz: bd49d087cb5c254ed629586ba797f0634fb3eb98
+  data.tar.gz: a974af62e8d78d37100fccf5c8bc27057cf98c6c
 SHA512:
-  metadata.gz: c7d1fd9ea17cca4ecaab91417b0119d87f4d99d17a2ffd660c83208d2c7385d5d5ff37350ee76b4d0d4ae33ee90a638e65c94f1eb4dbc5e9b58b7d0727ff1d42
-  data.tar.gz: b07a484c935a30a48388e3a20047f4b494430559fb27ad917459a69e5588c184be03de1ada2b270da563322102d06bae3c727dde61a0b70128545047b52b8ea6
+  metadata.gz: d87e9d3c36da492ff243e3ab800f9bc766f4884955d02e9697bc37a6239039ff38264c22563e912fd050cee10ef9f8565f649f2ac72bae675670b15abfd477da
+  data.tar.gz: c7f4ef4c208234e5667b7ce9eb887c923381a4e262239e3148d4559ed719f6a1bbbfb4685c5092c7e7158f5b7b3825d41814c3bbe376612171259ce8743497ad

data/.travis.yml

@@ -21,6 +21,11 @@ jdk:
 before_script:
   - mysql -e 'create database kaui_test;'
 
+script:
+  - RAILS_ENV=test bundle exec rake db:migrate --trace
+  - bundle exec rake db:test:prepare
+  - bundle exec rake
+
 matrix:
   allow_failures:
     - rvm: ruby-head

data/Gemfile.lock

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

data/app/controllers/kaui/account_emails_controller.rb

@@ -1,10 +1,10 @@
 module Kaui
-  class AccountEmailsController < ApplicationController
+  class AccountEmailsController < EngineController
     # GET /account_emails/1
     # GET /account_emails/1.json
     def show
       @account_id = params[:id]
-      @account_emails = AccountEmail.where(:account_id => @account_id)
+      @account_emails = AccountEmail.where({ :account_id => @account_id }, options_for_klient)
 
       respond_to do |format|
         format.html # show.html.erb
@@ -29,7 +29,7 @@ module Kaui
       @account_email = AccountEmail.new(params[:account_email])
 
       respond_to do |format|
-        if @account_email.save
+        if @account_email.save(current_user, params[:reason], params[:comment], options_for_klient)
           format.html { redirect_to kaui_engine.account_email_path(@account_email), :notice => 'Account email was successfully created.' }
           format.json { render :json => @account_email, :status => :created, :location => @account_email }
         else
@@ -42,8 +42,8 @@ module Kaui
     # DELETE /account_emails/1
     # DELETE /account_emails/1.json
     def destroy
-      @account_email = AccountEmail.where(:account_id => params[:id], :email => params[:email])
-      @account_email.destroy
+      @account_email = AccountEmail.where({ :account_id => params[:id], :email => params[:email] }, options_for_klient)
+      @account_email.destroy(current_user, params[:reason], params[:comment], options_for_klient)
 
       respond_to do |format|
         format.html { redirect_to kaui_engine.account_email_path(params[:id]) }

data/app/controllers/kaui/account_tags_controller.rb

@@ -17,7 +17,7 @@ class Kaui::AccountTagsController < Kaui::EngineController
   def edit
     @account_id = params[:account_id]
     begin
-      @available_tags = Kaui::TagDefinition.all_for_account.sort
+      @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 }
     rescue => e
@@ -48,12 +48,11 @@ class Kaui::AccountTagsController < Kaui::EngineController
         tags_to_add << new_tag_definition_id unless current_tags.include?(new_tag_definition_id)
       end
 
-      Kaui::KillbillHelper::remove_tags_for_account(params[:account_id], tags_to_remove, options_for_klient) unless tags_to_remove.empty?
-      Kaui::KillbillHelper::add_tags_for_account(params[:account_id], tags_to_add, options_for_klient) unless tags_to_add.empty?
+      Kaui::KillbillHelper::remove_tags_for_account(params[:account_id], tags_to_remove, current_user, params[:reason], params[:comment], options_for_klient) unless tags_to_remove.empty?
+      Kaui::KillbillHelper::add_tags_for_account(params[:account_id], tags_to_add, current_user, params[:reason], params[:comment], options_for_klient) unless tags_to_add.empty?
     rescue => e
       flash[:error] = "Error while updating tags: #{as_string(e)}"
     end
     redirect_to kaui_engine.account_path(params[:account_id])
   end
-
 end

data/app/controllers/kaui/accounts_controller.rb

@@ -153,7 +153,7 @@ class Kaui::AccountsController < Kaui::EngineController
 
   def toggle_email_notifications
     begin
-      @account = Kaui::KillbillHelper::update_email_notifications(params[:id], params[:is_notified], options_for_klient)
+      @account = Kaui::KillbillHelper::update_email_notifications(params[:id], params[:is_notified], current_user, params[:reason], params[:comment], options_for_klient)
       flash[:notice] = "Email preferences updated"
     rescue => e
       flash[:error] = "Error while switching email notifications #{invoice_id}: #{as_string(e)}"

data/app/controllers/kaui/bundle_tags_controller.rb

@@ -30,11 +30,10 @@ class Kaui::BundleTagsController < Kaui::EngineController
       bundle = Kaui::KillbillHelper::get_bundle(params[:bundle_id], options_for_klient)
       tags = params[:tags]
 
-      Kaui::KillbillHelper::set_tags_for_bundle(bundle.bundle_id, tags, options_for_klient)
+      Kaui::KillbillHelper::set_tags_for_bundle(bundle.bundle_id, tags, current_user, params[:reason], params[:comment], options_for_klient)
       redirect_to Kaui.bundle_home_path.call(bundle.bundle_id)
     rescue => e
       flash.now[:error] = "Error while updating tags: #{as_string(e)}"
     end
   end
-
 end

data/app/controllers/kaui/bundles_controller.rb

@@ -55,7 +55,7 @@ class Kaui::BundlesController < Kaui::EngineController
       if bundle_id.present? && result.is_a?(Kaui::Account)
         @new_account = result
         begin
-          Kaui::KillbillHelper::transfer_bundle(bundle_id, @new_account.account_id, options_for_klient)
+          Kaui::KillbillHelper::transfer_bundle(bundle_id, @new_account.account_id, current_user, params[:reason], params[:comment], options_for_klient)
           flash[:notice] = "Bundle transfered successfully"
         rescue => e
           flash[:error] = "Error transfering bundle #{as_string(e)}"
@@ -77,5 +77,4 @@ class Kaui::BundlesController < Kaui::EngineController
       render :transfer
     end
   end
-
 end

data/app/controllers/kaui/chargebacks_controller.rb

@@ -44,7 +44,7 @@ class Kaui::ChargebacksController < Kaui::EngineController
 
     if chargeback.present?
       begin
-        Kaui::KillbillHelper::create_chargeback(chargeback, params[:reason], params[:comment], options_for_klient)
+        Kaui::KillbillHelper::create_chargeback(chargeback, current_user, params[:reason], params[:comment], options_for_klient)
         flash[:notice] = "Chargeback created"
       rescue => e
         flash[:error] = "Error while creating a new chargeback: #{as_string(e)}"

data/app/controllers/kaui/charges_controller.rb

@@ -22,7 +22,7 @@ class Kaui::ChargesController < Kaui::EngineController
 
     if charge.present?
       begin
-        Kaui::KillbillHelper::create_charge(charge, params[:requested_date], current_user, nil, params[:comment], options_for_klient)
+        Kaui::KillbillHelper::create_charge(charge, params[:requested_date], current_user, params[:reason], params[:comment], options_for_klient)
         flash[:notice] = "Charge created"
         redirect_to kaui_engine.account_timeline_path(:id => charge.account_id)
       rescue => e

data/app/controllers/kaui/payments_controller.rb

@@ -27,5 +27,4 @@ class Kaui::PaymentsController < Kaui::EngineController
     end
     redirect_to kaui_engine.account_timeline_path(:id => payment.account_id)
   end
-
 end

data/app/controllers/kaui/refunds_controller.rb

@@ -105,5 +105,4 @@ class Kaui::RefundsController < Kaui::EngineController
     end
     nil
   end
-
 end

data/app/controllers/kaui/subscriptions_controller.rb

@@ -62,7 +62,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
       @subscription.product_name = plan["productName"]
       @subscription.price_list = plan["priceListName"]
 
-      Kaui::KillbillHelper::create_subscription(@subscription, current_user, options_for_klient)
+      Kaui::KillbillHelper::create_subscription(@subscription, current_user, params[:reason], params[:comment], options_for_klient)
       redirect_to Kaui.bundle_home_path.call(@bundle.bundle_id)
     rescue => e
       flash.now[:error] = "Error while creating the new subscription: #{as_string(e)}"
@@ -134,7 +134,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
         subscription.price_list = plan["priceListName"]
         subscription.subscription_id = params[:subscription][:subscription_id]
 
-        Kaui::KillbillHelper::update_subscription(subscription, requested_date, policy, current_user, options_for_klient)
+        Kaui::KillbillHelper::update_subscription(subscription, requested_date, policy, current_user, params[:reason], params[:comment], options_for_klient)
       rescue => e
         flash[:error] = "Error while updating subscription: #{as_string(e)}"
       end
@@ -148,7 +148,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
     subscription_id = params[:id]
     if subscription_id.present?
       begin
-        Kaui::KillbillHelper::reinstate_subscription(subscription_id, current_user, options_for_klient)
+        Kaui::KillbillHelper::reinstate_subscription(subscription_id, current_user, params[:reason], params[:comment], options_for_klient)
         flash[:notice] = "Subscription reinstated"
       rescue => e
         flash[:error] = "Error while reinstating subscription: #{as_string(e)}"
@@ -163,7 +163,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
     subscription_id = params[:id]
     if subscription_id.present?
       begin
-        Kaui::KillbillHelper::delete_subscription(subscription_id, params[:policy], params[:ctd], params[:billing_period], current_user, options_for_klient)
+        Kaui::KillbillHelper::delete_subscription(subscription_id, params[:policy], params[:ctd], params[:billing_period], current_user, params[:reason], params[:comment], options_for_klient)
       rescue => e
         flash[:error] = "Error while canceling subscription: #{as_string(e)}"
       end

data/app/controllers/kaui/tag_definitions_controller.rb

@@ -49,7 +49,7 @@ module Kaui
       @tag_definition = TagDefinition.new(params[:tag_definition])
 
       respond_to do |format|
-        if @tag_definition.save
+        if @tag_definition.save(current_user, params[:reason], params[:comment], options_for_klient)
           format.html { redirect_to @tag_definition, :notice => 'Tag definition was successfully created.' }
           format.json { render :json => @tag_definition, :status => :created, :location => @tag_definition }
         else
@@ -79,7 +79,7 @@ module Kaui
     # DELETE /tag_definitions/1.json
     def destroy
       @tag_definition = TagDefinition.find(params[:id], options_for_klient)
-      @tag_definition.destroy
+      @tag_definition.destroy(current_user, params[:reason], params[:comment], options_for_klient)
 
       respond_to do |format|
         format.html { redirect_to tag_definitions_url, :notice => 'Tag definition was successfully destroyed.' }

data/app/helpers/kaui/killbill_helper.rb

@@ -21,6 +21,7 @@ module Kaui
         if args[-1][:session_id]
           args[-1]["Cookie"] = "JSESSIONID=#{args[-1][:session_id]}"
         end
+        [:api_key, :api_secret, :username, :password, :session_id].each { |k| args[-1].delete(k) }
 
         response = RestClient.send(method.to_sym, url, *args)
         data = {:code => response.code}
@@ -49,7 +50,22 @@ module Kaui
     end
 
     def self.extract_reason_code(reason)
+      reason_code = reason
       reason_code = $1 if reason =~ /\s*(\d+).*/
+      reason_code
+    end
+
+    def self.build_audit_headers(current_user, reason, comment, options)
+      {
+        :content_type => "application/json",
+        "X-Killbill-CreatedBy" => extract_created_by(current_user),
+        "X-Killbill-Reason" => extract_reason_code(reason),
+        "X-Killbill-Comment" => "#{comment}",
+      }.merge(options)
+    end
+
+    def self.extract_created_by(current_user)
+      current_user.respond_to?(:kb_username) ? current_user.kb_username : current_user.to_s
     end
 
     ############## ACCOUNT ##############
@@ -96,20 +112,13 @@ module Kaui
       call_killbill :post,
                     "/1.0/kb/accounts/#{account_email.account_id}/emails",
                     ActiveSupport::JSON.encode(account_email_data, :root => false),
-                    :content_type => "application/json",
-                    "X-Killbill-CreatedBy" => current_user,
-                    "X-Killbill-Reason" => extract_reason_code(reason),
-                    "X-Killbill-Comment" => "#{comment}",
-                    **options
+                    build_audit_headers(current_user, reason, comment, options)
     end
 
     def self.remove_account_email(account_email, current_user = nil, reason = nil, comment = nil, options = {})
       call_killbill :delete,
                     "/1.0/kb/accounts/#{account_email.account_id}/emails/#{account_email.email}",
-                    "X-Killbill-CreatedBy" => current_user,
-                    "X-Killbill-Reason" => "#{reason}",
-                    "X-Killbill-Comment" => "#{comment}",
-                    **options
+                    build_audit_headers(current_user, reason, comment, options)
     end
 
     def self.update_email_notifications(account_id, is_notified, current_user = nil, reason = nil, comment = nil, options = {})
@@ -117,11 +126,7 @@ module Kaui
       call_killbill :put,
                     "/1.0/kb/accounts/#{account_id}/emailNotifications",
                     ActiveSupport::JSON.encode(email_data, :root => false),
-                    :content_type => "application/json",
-                    "X-Killbill-CreatedBy" => current_user,
-                    "X-Killbill-Reason" => extract_reason_code(reason),
-                    "X-Killbill-Comment" => "#{comment}",
-                    **options
+                    build_audit_headers(current_user, reason, comment, options)
     end
 
     ############## BUNDLE ##############
@@ -154,11 +159,7 @@ module Kaui
       call_killbill :put,
                     "/1.0/kb/bundles/#{bundle_id}?cancelImmediately=#{cancel_immediately}&transferAddOn=#{transfer_addons}",
                     ActiveSupport::JSON.encode("accountId" => new_account_id),
-                    :content_type => :json,
-                    "X-Killbill-CreatedBy" => current_user,
-                    "X-Killbill-Reason" => "#{reason}",
-                    "X-Killbill-Comment" => "#{comment}",
-                    **options
+                    build_audit_headers(current_user, reason, comment, options)
     end
 
     ############## SUBSCRIPTION ##############
@@ -189,11 +190,7 @@ module Kaui
       call_killbill :post,
                     "/1.0/kb/subscriptions",
                     ActiveSupport::JSON.encode(subscription_data, :root => false),
-                    :content_type => "application/json",
-                    "X-Killbill-CreatedBy" => current_user,
-                    "X-Killbill-Reason" => "#{reason}",
-                    "X-Killbill-Comment" => "#{comment}",
-                    **options
+                    build_audit_headers(current_user, reason, comment, options)
     end
 
     def self.update_subscription(subscription, requested_date = nil, policy = nil, current_user = nil, reason = nil, comment = nil, options = {})
@@ -208,22 +205,14 @@ module Kaui
       call_killbill :put,
                     "/1.0/kb/subscriptions/#{subscription.subscription_id}#{params}",
                     ActiveSupport::JSON.encode(subscription_data, :root => false),
-                    :content_type => :json,
-                    "X-Killbill-CreatedBy" => current_user,
-                    "X-Killbill-Reason" => "#{reason}",
-                    "X-Killbill-Comment" => "#{comment}",
-                    **options
+                    build_audit_headers(current_user, reason, comment, options)
     end
 
     def self.reinstate_subscription(subscription_id, current_user = nil, reason = nil, comment = nil, options = {})
       call_killbill :put,
                     "/1.0/kb/subscriptions/#{subscription_id}/uncancel",
                     "",
-                    :content_type => :json,
-                    "X-Killbill-CreatedBy" => current_user,
-                    "X-Killbill-Reason" => "#{reason}",
-                    "X-Killbill-Comment" => "#{comment}",
-                    **options
+                    build_audit_headers(current_user, reason, comment, options)
     end
 
     def self.delete_subscription(subscription_id, policy = nil, ctd = nil, billing_period = nil, current_user = nil, reason = nil, comment = nil, options = {})
@@ -233,10 +222,7 @@ module Kaui
       params += "requestedDate=#{prev_ctd.strftime('%Y-%m-%dT%H:%M:%S')}" unless prev_ctd.nil?
       call_killbill :delete,
                     "/1.0/kb/subscriptions/#{subscription_id}#{params}",
-                    "X-Killbill-CreatedBy" => current_user,
-                    "X-Killbill-Reason" => "#{reason}",
-                    "X-Killbill-Comment" => "#{comment}",
-                    **options
+                    build_audit_headers(current_user, reason, comment, options)
     end
 
     def self.compute_previous_ctd(ctd, billing_period, options = {})
@@ -283,11 +269,7 @@ module Kaui
       call_killbill :post,
                     "/1.0/kb/invoices/#{invoice_item.invoice_id}",
                     ActiveSupport::JSON.encode(invoice_data, :root => false),
-                    :content_type => :json,
-                    "X-Killbill-CreatedBy" => current_user,
-                    "X-Killbill-Reason" => "#{reason}",
-                    "X-Killbill-Comment" => "#{comment}",
-                    **options
+                    build_audit_headers(current_user, reason, comment, options)
     end
 
     def self.create_charge(charge, requested_date, current_user = nil, reason = nil, comment = nil, options = {})
@@ -298,30 +280,19 @@ module Kaui
         call_killbill :post,
                       "/1.0/kb/invoices/#{charge.invoice_id}/charges#{date_param}",
                       ActiveSupport::JSON.encode(charge_data, :root => false),
-                      :content_type => "application/json",
-                      "X-Killbill-CreatedBy" => current_user,
-                      "X-Killbill-Reason" => extract_reason_code(reason),
-                      "X-Killbill-Comment" => "#{comment}",
-                      **options
+                      build_audit_headers(current_user, reason, comment, options)
       else
         call_killbill :post,
                       "/1.0/kb/invoices/charges#{date_param}",
                       ActiveSupport::JSON.encode(charge_data, :root => false),
-                      :content_type => "application/json",
-                      "X-Killbill-CreatedBy" => current_user,
-                      "X-Killbill-Reason" => extract_reason_code(reason),
-                      "X-Killbill-Comment" => "#{comment}",
-                      **options
+                      build_audit_headers(current_user, reason, comment, options)
       end
     end
 
     def self.delete_cba(account_id, invoice_id, invoice_item_id, current_user = nil, reason = nil, comment = nil, options = {})
       call_killbill :delete,
                     "/1.0/kb/invoices/#{invoice_id}/#{invoice_item_id}/cba?accountId=#{account_id}",
-                    "X-Killbill-CreatedBy" => current_user,
-                    "X-Killbill-Reason" => "#{reason}",
-                    "X-Killbill-Comment" => "#{comment}",
-                    **options
+                    build_audit_headers(current_user, reason, comment, options)
     end
 
     ############## CATALOG ##############
@@ -362,11 +333,7 @@ module Kaui
       call_killbill :post,
                     "/1.0/kb/invoices/payments?externalPayment=#{external}",
                     ActiveSupport::JSON.encode({:accountId => account_id}, :root => false),
-                    :content_type => "application/json",
-                    "X-Killbill-CreatedBy" => current_user,
-                    "X-Killbill-Reason" => extract_reason_code(reason),
-                    "X-Killbill-Comment" => "#{comment}",
-                    **options
+                    build_audit_headers(current_user, reason, comment, options)
     end
 
     def self.create_payment(payment, external, current_user = nil, reason = nil, comment = nil, options = {})
@@ -381,18 +348,14 @@ module Kaui
         call_killbill :post,
                       "/1.0/kb/invoices/#{payment.invoice_id}/payments?externalPayment=#{external}",
                       ActiveSupport::JSON.encode(payment_data, :root => false),
-                      :content_type => "application/json",
-                      "X-Killbill-CreatedBy" => current_user,
-                      "X-Killbill-Reason" => extract_reason_code(reason),
-                      "X-Killbill-Comment" => "#{comment}",
-                      **options
+                      build_audit_headers(current_user, reason, comment, options)
       end
     end
 
     ############## PAYMENT METHOD ##############
 
     def self.delete_payment_method(payment_method_id, set_auto_pay_off = false, current_user = nil, reason = nil, comment = nil, options = {})
-      KillBillClient::Model::PaymentMethod.destroy payment_method_id, set_auto_pay_off, current_user, reason, comment, options
+      KillBillClient::Model::PaymentMethod.destroy payment_method_id, set_auto_pay_off, extract_created_by(current_user), extract_reason_code(reason), comment, options
     end
 
     def self.get_non_external_payment_methods(account_id, options = {})
@@ -414,11 +377,11 @@ module Kaui
     end
 
     def self.set_payment_method_as_default(account_id, payment_method_id, current_user = nil, reason = nil, comment = nil, options = {})
-      KillBillClient::Model::PaymentMethod.set_default payment_method_id, account_id, current_user, reason, comment, options
+      KillBillClient::Model::PaymentMethod.set_default payment_method_id, account_id, extract_created_by(current_user), extract_reason_code(reason), comment, options
     end
 
     def self.add_payment_method(is_default, payment_method, current_user = nil, reason = nil, comment = nil, options = {})
-      payment_method.create is_default, current_user, reason, comment, options
+      payment_method.create is_default, extract_created_by(current_user), extract_reason_code(reason), comment, options
     end
 
     ############## REFUND ##############
@@ -441,11 +404,7 @@ module Kaui
       call_killbill :post,
                     "/1.0/kb/payments/#{payment_id}/refunds",
                     ActiveSupport::JSON.encode(refund_data, :root => false),
-                    :content_type => "application/json",
-                    "X-Killbill-CreatedBy" => current_user,
-                    "X-Killbill-Reason" => extract_reason_code(reason),
-                    "X-Killbill-Comment" => "#{comment}",
-                    **options
+                    build_audit_headers(current_user, reason, comment, options)
     end
 
     ############## CHARGEBACK ##############
@@ -461,11 +420,7 @@ module Kaui
       call_killbill :post,
                     "/1.0/kb/chargebacks",
                     ActiveSupport::JSON.encode(chargeback_data, :root => false),
-                    :content_type => "application/json",
-                    "X-Killbill-CreatedBy" => current_user,
-                    "X-Killbill-Reason" => extract_reason_code(reason),
-                    "X-Killbill-Comment" => "#{comment}",
-                    **options
+                    build_audit_headers(current_user, reason, comment, options)
     end
 
     ############## CREDIT ##############
@@ -475,11 +430,7 @@ module Kaui
       call_killbill :post,
                     "/1.0/kb/credits",
                     ActiveSupport::JSON.encode(credit_data, :root => false),
-                    :content_type => "application/json",
-                    "X-Killbill-CreatedBy" => current_user,
-                    "X-Killbill-Reason" => extract_reason_code(reason),
-                    "X-Killbill-Comment" => "#{comment}",
-                    **options
+                    build_audit_headers(current_user, reason, comment, options)
     end
 
     ############## TAG ##############
@@ -499,20 +450,13 @@ module Kaui
       call_killbill :post,
                     "/1.0/kb/tagDefinitions",
                     ActiveSupport::JSON.encode(tag_definition_data, :root => false),
-                    :content_type => "application/json",
-                    "X-Killbill-CreatedBy" => current_user,
-                    "X-Killbill-Reason" => extract_reason_code(reason),
-                    "X-Killbill-Comment" => "#{comment}",
-                    **options
+                    build_audit_headers(current_user, reason, comment, options)
     end
 
     def self.delete_tag_definition(tag_definition_id, current_user = nil, reason = nil, comment = nil, options = {})
       call_killbill :delete,
                     "/1.0/kb/tagDefinitions/#{tag_definition_id}",
-                    "X-Killbill-CreatedBy" => current_user,
-                    "X-Killbill-Reason" => "#{reason}",
-                    "X-Killbill-Comment" => "#{comment}",
-                    **options
+                    build_audit_headers(current_user, reason, comment, options)
     end
 
     def self.get_tags_for_account(account_id, options = {})
@@ -525,25 +469,18 @@ module Kaui
       return data[:json]
     end
 
-
     def self.add_tags_for_account(account_id, tags, current_user = nil, reason = nil, comment = nil, options = {})
       call_killbill :post,
                     "/1.0/kb/accounts/#{account_id}/tags?" + RestClient::Payload.generate(:tagList => tags.join(",")).to_s,
                     nil,
-                    "X-Killbill-CreatedBy" => current_user,
-                    "X-Killbill-Reason" => "#{reason}",
-                    "X-Killbill-Comment" => "#{comment}",
-                    **options
+                    build_audit_headers(current_user, reason, comment, options)
     end
 
     def self.remove_tags_for_account(account_id, tags, current_user = nil, reason = nil, comment = nil, options = {})
       return if !tags.present? || tags.size == 0
       call_killbill :delete,
                     "/1.0/kb/accounts/#{account_id}/tags?" + RestClient::Payload.generate(:tagList => tags.join(",")).to_s,
-                    "X-Killbill-CreatedBy" => current_user,
-                    "X-Killbill-Reason" => "#{reason}",
-                    "X-Killbill-Comment" => "#{comment}",
-                    **options
+                    build_audit_headers(current_user, reason, comment, options)
     end
 
     def self.set_tags_for_bundle(bundle_id, tags, current_user = nil, reason = nil, comment = nil, options = {})
@@ -552,10 +489,7 @@ module Kaui
         call_killbill :post,
                       "/1.0/kb/bundles/#{bundle_id}/tags?" + RestClient::Payload.generate(:tag_list => tags.join(",")).to_s,
                       nil,
-                      "X-Killbill-CreatedBy" => current_user,
-                      "X-Killbill-Reason" => "#{reason}",
-                      "X-Killbill-Comment" => "#{comment}",
-                      **options
+                      build_audit_headers(current_user, reason, comment, options)
       end
     end
 
@@ -584,10 +518,7 @@ module Kaui
       call_killbill :put,
                     "/1.0/kb/analytics/#{account_id}",
                     nil,
-                    "X-Killbill-CreatedBy" => current_user,
-                    "X-Killbill-Reason" => "#{reason}",
-                    "X-Killbill-Comment" => "#{comment}",
-                    **options
+                    build_audit_headers(current_user, reason, comment, options)
     end
 
     def self.get_accounts_created_over_time(options = {})

data/app/models/kaui/account_email.rb

@@ -12,22 +12,18 @@ class Kaui::AccountEmail < Kaui::Base
   end
 
   def self.where(conditions, options_for_klient = {})
-    begin
-      account_emails = Kaui::KillbillHelper.get_account_emails(conditions[:account_id], options_for_klient) || []
-      return account_emails.sort unless conditions[:email].present?
+    account_emails = Kaui::KillbillHelper.get_account_emails(conditions[:account_id], options_for_klient) || []
+    return account_emails.sort unless conditions[:email].present?
 
-      account_emails.each do |account_email|
-        return account_email if account_email.email == conditions[:email]
-      end
-    rescue => e
-      @errors.add(:where, "Error while getting account emails: #{e}")
+    account_emails.each do |account_email|
+      return account_email if account_email.email == conditions[:email]
     end
     []
   end
 
-  def save(options_for_klient = {})
+  def save(user = nil, reason = nil, comment = nil, options_for_klient = {})
     begin
-      Kaui::KillbillHelper.add_account_email(self, options_for_klient)
+      Kaui::KillbillHelper.add_account_email(self, user, reason, comment, options_for_klient)
       true
     rescue => e
       @errors.add(:save, "Error while trying to add an account email: #{e}")
@@ -35,9 +31,9 @@ class Kaui::AccountEmail < Kaui::Base
     end
   end
 
-  def destroy(options_for_klient = {})
+  def destroy(user = nil, reason = nil, comment = nil, options_for_klient = {})
     begin
-      Kaui::KillbillHelper.remove_account_email(self, options_for_klient)
+      Kaui::KillbillHelper.remove_account_email(self, user, reason, comment, options_for_klient)
       true
     rescue => e
       @errors.add(:destroy, "Error while trying to delete an account email: #{e}")

data/app/models/kaui/tag_definition.rb

@@ -17,19 +17,19 @@ class Kaui::TagDefinition < Kaui::Base
   # See com.ning.billing.util.dao.ObjectType in killbill-api
   %w(ACCOUNT ACCOUNT_EMAIL BUNDLE INVOICE PAYMENT INVOICE_ITEM INVOICE_PAYMENT
      SUBSCRIPTION SUBSCRIPTION_EVENT PAYMENT_METHOD REFUND TAG_DEFINITION).each do |object_type|
-       define_singleton_method "all_for_#{object_type.downcase}" do
-         self.all.delete_if { |tag_definition| !tag_definition.applicable_object_types.include? object_type }
+       define_singleton_method "all_for_#{object_type.downcase}" do |options_for_klient = {}|
+         self.all(options_for_klient).delete_if { |tag_definition| !tag_definition.applicable_object_types.include? object_type }
        end
   end
 
-  def save(options_for_klient = {})
-    Kaui::KillbillHelper.create_tag_definition(self, options_for_klient)
+  def save(user = nil, reason = nil, comment = nil, options_for_klient = {})
+    Kaui::KillbillHelper.create_tag_definition(self, user, reason, comment, options_for_klient)
     # TODO - we should return the newly created id and update the model
     # @persisted = true
   end
 
-  def destroy(options_for_klient = {})
-    Kaui::KillbillHelper.delete_tag_definition(@id, options_for_klient)
+  def destroy(user = nil, reason = nil, comment = nil, options_for_klient = {})
+    Kaui::KillbillHelper.delete_tag_definition(@id, user, reason, comment, options_for_klient)
     @persisted = false
   end
 
@@ -53,4 +53,4 @@ class Kaui::TagDefinition < Kaui::Base
     return -1 if !is_system_tag? and tag_definition.is_system_tag?
     @name <=> tag_definition.name
   end
-end
+end

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

@@ -242,7 +242,7 @@
                 <%= link_to 'Refund', kaui_engine.new_refund_path(:params => { :payment_id => payment.payment_id,
                                                                                :account_id => @account.account_id,
                                                                                :invoice_id => payment.invoice_id }),
-                                                                  :class => "btn btn-mini #{"disabled" unless payment.payment_id.present? and payment.status == 'SUCCESS' and !payment.is_fully_refunded?}" %>
+                                                                  :class => "btn btn-mini #{"disabled" unless payment.payment_id.present? and payment.status == 'SUCCESS' and payment.paid_amount != 0}" %>
               </nobr>
             <% end %>
             <% if can? :chargeback, Kaui::Payment %>

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.2.0'
+  s.add_dependency 'killbill-client', '~> 0.2.1'
   s.add_dependency 'devise', '~> 3.0.2'
   s.add_dependency 'cancan', '~> 1.6.10'
 

data/lib/kaui/installer/installer.rb

@@ -68,7 +68,7 @@ module KauiCmd
     private
 
       def rails_project?
-        File.exists? File.join(@app_path, 'script', 'rails')
+        File.exists?(File.join(@app_path, 'script', 'rails')) || File.exists?(File.join(@app_path, 'bin', 'rails'))
       end
 
       def gem(name, gem_options={})

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/test_helper.rb

@@ -102,12 +102,12 @@ module Kaui::KillbillHelper
     find_among_fixtures(Kaui::TagDefinition, tag_definition_id, 'id')
   end
 
-  def self.create_tag_definition(tag_definition, options = {})
+  def self.create_tag_definition(tag_definition, user, reason, comment, options = {})
     tag_definition.id = SecureRandom.uuid
     add_fixture(tag_definition, Kaui::TagDefinition)
   end
 
-  def self.delete_tag_definition(tag_definition_id, options = {})
+  def self.delete_tag_definition(tag_definition_id, user, reason, comment, options = {})
     delete_fixture(Kaui::TagDefinition, tag_definition_id, 'id')
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement