kaui 1.4.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e742130946b631b91580c426cdcb8ee8dfd07d5a
-  data.tar.gz: fdbf1ab93ef8dc3e1a7680f51779cdf1a958fe9d
+SHA256:
+  metadata.gz: 87cb8b7da87b9a90782c29d1798aeaaf02e0373fb2b12479d6ea9e705052db28
+  data.tar.gz: 1536ede11cba88fd15fd3a76109b7fe9c3277afb0040d98b8c9a9ab2e1198f04
 SHA512:
-  metadata.gz: 2f27c656b5b034092471fb10989c134fc0bd6cbbe7694a75fe8461c81459bbf3f8d83145cfe6c130e025218ecfa39284fcc3bb80d378417db33c1c3809c15dba
-  data.tar.gz: 4cf31c31fec9d8071830403b990187e282221b6c6c2d2f6fb861400c9cebf33c240f0045988b52ebe83bc970c409b5364026a4bcae4815c2fbe4228c14493238
+  metadata.gz: 908f46db4f8461a2f799c3eb0135824b7827a90da6a4f1e2903106c28c38c62238b93eee95bd120ad56d55a060260dead1a7569dd82bc0af0386478b5c98ee4d
+  data.tar.gz: 91f0d828ee558b7d2710440e3196c52a5fc080b54340569aa27538db0acf3545ccc506376ebfb54e7d786e62cd922ee6c8a3d1aab2c4a1d0a59536af7cbcb7eb

data/README.md

@@ -11,7 +11,8 @@ Kill Bill compatibility
 | 0.14.y       | 0.16.z            |
 | 0.15.y       | 0.18.z (Rails 4)  |
 | 0.16.y       | 0.18.z (Rails 5)  |
-| 1.x.y        | 0.20.z            |
+| 1.x.y        | 0.20.z (Rails 5)  |
+| 2.x.y        | 0.22.z (Rails 5)  |
 
 Dependencies
 ------------
@@ -25,10 +26,32 @@ You can run Kaui locally by using the test/dummy app provided:
 
 ```
 export RAILS_ENV=development
+export DATABASE_URL=mysql://root:killbill@<MySQL Host IP>/killbill
 bundle install
 rails db:migrate
 rails s
 ```
+If you experience an error of;
+
+```
+You must use Bundler 2 or greater with this lockfile.
+```
+
+Then run the following commands to update your environment.
+
+Update Rubygems;
+
+```
+gem update --system
+```
+Update bundler;
+```
+gem install bundler
+```
+Update the Gemfile.lock file;
+```
+bundler update --bundler
+```
 
 The Kill Bill URL can be configured through the `KILLBILL_URL` environment variable, e.g.
 

data/app/assets/javascripts/kaui/kaui.js

@@ -144,6 +144,7 @@ jQuery(document).ready(function ($) {
     const VALIDATE_EXTERNAL_KEY = {
         account: { url: Routes.kaui_engine_accounts_validate_external_key_path(), invalid_msg_class_name: '.account_external_key_invalid_msg' },
         payment_method: {url: Routes.kaui_engine_payment_methods_validate_external_key_path(), invalid_msg_class_name: '.payment_method_external_key_invalid_msg'},
+        bundle: {url: Routes.kaui_engine_subscriptions_validate_bundle_external_key_path(), invalid_msg_class_name: '.subscription_bundle_external_key_invalid_msg'},
         subscription: {url: Routes.kaui_engine_subscriptions_validate_external_key_path(), invalid_msg_class_name: '.subscription_external_key_invalid_msg'}
     }
 
@@ -157,8 +158,13 @@ jQuery(document).ready(function ($) {
         validate_external_key($(this).val(),'payment_method');
     });
 
-    validate_external_key($('#external_key').val(),'subscription');
-    $('#external_key').on('change', function(e){
+    validate_external_key($('#bundle_external_key').val(),'bundle');
+    $('#bundle_external_key').on('change', function(e){
+        validate_external_key($(this).val(),'bundle');
+    });
+
+    validate_external_key($('#subscription_external_key').val(),'subscription');
+    $('#subscription_external_key').on('change', function(e){
         validate_external_key($(this).val(),'subscription');
     });
 

data/app/controllers/kaui/audit_logs_controller.rb

@@ -1,5 +1,5 @@
 class Kaui::AuditLogsController < Kaui::EngineController
-  OBJECT_WITH_HISTORY = %w[ACCOUNT ACCOUNT_EMAIL CUSTOM_FIELD PAYMENT_ATTEMPT PAYMENT PAYMENT_METHOD TRANSACTION TAG TAG_DEFINITION]
+  OBJECT_WITH_HISTORY = %w[ACCOUNT ACCOUNT_EMAIL BLOCKING_STATES BUNDLE CUSTOM_FIELD INVOICE INVOICE_ITEM PAYMENT_ATTEMPT PAYMENT PAYMENT_METHOD SUBSCRIPTION SUBSCRIPTION_EVENT TRANSACTION TAG TAG_DEFINITION]
 
   def index
     cached_options_for_klient = options_for_klient
@@ -57,8 +57,25 @@ class Kaui::AuditLogsController < Kaui::EngineController
         elsif object_type == 'ACCOUNT_EMAIL'
           account = Kaui::Account::find_by_id_or_key(account_id, false, false, cached_options_for_klient)
           audit_logs_with_history = account.email_audit_logs_with_history(object_id, cached_options_for_klient)
+        elsif object_type == 'BLOCKING_STATES'
+          audit_logs_with_history = Kaui::Account::blocking_state_audit_logs_with_history(object_id, cached_options_for_klient)
+        elsif object_type == 'BUNDLE'
+          bundle = Kaui::Bundle::find_by_id(object_id, cached_options_for_klient)
+          audit_logs_with_history = bundle.audit_logs_with_history(cached_options_for_klient)
         elsif object_type == 'CUSTOM_FIELD'
           audit_logs_with_history = Kaui::CustomField.new({:custom_field_id => object_id}).audit_logs_with_history(cached_options_for_klient)
+        elsif object_type == 'INVOICE'
+          invoice = Kaui::Invoice::find_by_id(object_id, false, "NONE", cached_options_for_klient)
+          audit_logs_with_history = invoice.audit_logs_with_history(cached_options_for_klient)
+        elsif object_type == 'INVOICE_ITEM'
+          invoice_item = Kaui::InvoiceItem.new
+          invoice_item.invoice_item_id = object_id
+          audit_logs_with_history = invoice_item.audit_logs_with_history(cached_options_for_klient)
+=begin See https://github.com/killbill/killbill/issues/1104
+        elsif object_type == 'INVOICE_PAYMENT'
+          invoice_payment = Kaui::InvoicePayment::find_by_id(object_id, false, false, cached_options_for_klient)
+=end
+          audit_logs_with_history = invoice_payment.audit_logs_with_history(cached_options_for_klient)
         elsif object_type == 'PAYMENT_ATTEMPT'
           audit_logs_with_history = Kaui::Payment::attempt_audit_logs_with_history(object_id, cached_options_for_klient)
         elsif object_type == 'PAYMENT'
@@ -67,6 +84,11 @@ class Kaui::AuditLogsController < Kaui::EngineController
         elsif object_type == 'PAYMENT_METHOD'
           payment_method = Kaui::PaymentMethod::find_by_id(object_id, false, cached_options_for_klient)
           audit_logs_with_history = payment_method.audit_logs_with_history(cached_options_for_klient)
+        elsif object_type == 'SUBSCRIPTION'
+          subscription = Kaui::Subscription::find_by_id(object_id, cached_options_for_klient)
+          audit_logs_with_history = subscription.audit_logs_with_history(cached_options_for_klient)
+        elsif object_type == 'SUBSCRIPTION_EVENT'
+          audit_logs_with_history = Kaui::Subscription::event_audit_logs_with_history(object_id, cached_options_for_klient)
         elsif object_type == 'TRANSACTION'
           audit_logs_with_history = Kaui::Transaction::new({:transaction_id => object_id}).audit_logs_with_history(cached_options_for_klient)
         elsif object_type == 'TAG'

data/app/controllers/kaui/charges_controller.rb

@@ -5,7 +5,7 @@ class Kaui::ChargesController < Kaui::EngineController
     amount = params[:amount]
 
     if invoice_id.present?
-      @invoice = Kaui::Invoice.find_by_id(invoice_id, true, 'NONE', options_for_klient)
+      @invoice = Kaui::Invoice.find_by_id(invoice_id, 'NONE', options_for_klient)
       amount ||= @invoice.balance
       currency = @invoice.currency
     else

data/app/controllers/kaui/credits_controller.rb

@@ -5,7 +5,7 @@ class Kaui::CreditsController < Kaui::EngineController
     amount = params[:amount]
 
     if invoice_id.present?
-      @invoice = Kaui::Invoice.find_by_id(invoice_id, true, 'NONE', options_for_klient)
+      @invoice = Kaui::Invoice.find_by_id(invoice_id, 'NONE', options_for_klient)
       amount ||= @invoice.balance
       currency = @invoice.currency
     else
@@ -13,7 +13,7 @@ class Kaui::CreditsController < Kaui::EngineController
       currency = params[:currency] || 'USD'
     end
 
-    @credit = Kaui::Credit.new(:account_id => params.require(:account_id), :invoice_id => invoice_id, :credit_amount => amount, :currency => currency)
+    @credit = Kaui::Credit.new(:account_id => params.require(:account_id), :invoice_id => invoice_id, :amount => amount, :currency => currency)
   end
 
   def create
@@ -23,13 +23,13 @@ class Kaui::CreditsController < Kaui::EngineController
     # No need to show the newly created invoice for account level credits
     should_redirect_to_invoice = credit.invoice_id.present?
 
-    credit = credit.create(true, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+    credits = credit.create(true, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
     flash[:notice] = 'Credit was successfully created'
 
     if should_redirect_to_invoice
-      redirect_to kaui_engine.account_invoice_path(credit.account_id, credit.invoice_id)
+      redirect_to kaui_engine.account_invoice_path(credits[0].account_id, credits[0].invoice_id)
     else
-      redirect_to kaui_engine.account_path(credit.account_id)
+      redirect_to kaui_engine.account_path(credits[0].account_id)
     end
   end
 end

data/app/controllers/kaui/home_controller.rb

@@ -52,7 +52,7 @@ class Kaui::HomeController < Kaui::EngineController
   def invoice_search(search_query, search_by = nil, fast = 0, options = {})
     if search_by == 'ID'
       begin
-        invoice = Kaui::Invoice.find_by_id(search_query, false, 'NONE', options)
+        invoice = Kaui::Invoice.find_by_id(search_query, 'NONE', options)
         redirect_to account_invoice_path(invoice.account_id, invoice.invoice_id) and return
       rescue KillBillClient::API::NotFound => _
         search_error("No invoice matches \"#{search_query}\"")
@@ -63,7 +63,7 @@ class Kaui::HomeController < Kaui::EngineController
       invoice = Kaui::Invoice.list_or_search(search_query, 0, 1, options).first
       if invoice.blank?
         begin
-          invoice = Kaui::Invoice.find_by_invoice_item_id(search_query, false, false, 'NONE', options)
+          invoice = Kaui::Invoice.find_by_invoice_item_id(search_query, false, 'NONE', options)
           redirect_to account_invoice_path(invoice.account_id, invoice.invoice_id) and return
         rescue KillBillClient::API::NotFound => _
           search_error("No invoice matches \"#{search_query}\"")

data/app/controllers/kaui/invoice_items_controller.rb

@@ -5,7 +5,7 @@ class Kaui::InvoiceItemsController < Kaui::EngineController
     invoice_id = params.require(:invoice_id)
 
     # See https://github.com/killbill/killbill/issues/7
-    invoice = Kaui::Invoice.find_by_id(invoice_id, true, 'NONE', options_for_klient)
+    invoice = Kaui::Invoice.find_by_id(invoice_id, 'NONE', options_for_klient)
     @invoice_item = invoice.items.find { |ii| ii.invoice_item_id == invoice_item_id }
 
     if @invoice_item.nil?

data/app/controllers/kaui/invoices_controller.rb

@@ -18,7 +18,7 @@ class Kaui::InvoicesController < Kaui::EngineController
       if account.nil?
         Kaui::Invoice.list_or_search(search_key, offset, limit, cached_options_for_klient)
       else
-        account.invoices(true, cached_options_for_klient).map! { |invoice| Kaui::Invoice.build_from_raw_invoice(invoice) }
+        account.invoices(cached_options_for_klient).map! { |invoice| Kaui::Invoice.build_from_raw_invoice(invoice) }
       end
     end
 
@@ -47,7 +47,7 @@ class Kaui::InvoicesController < Kaui::EngineController
     # Go to the database once
     cached_options_for_klient = options_for_klient
 
-    @invoice = Kaui::Invoice.find_by_id(params.require(:id), true, 'FULL', cached_options_for_klient)
+    @invoice = Kaui::Invoice.find_by_id(params.require(:id), 'FULL', cached_options_for_klient)
 
     fetch_payments = promise { @invoice.payments(true, true, 'FULL', cached_options_for_klient).map { |payment| Kaui::InvoicePayment.build_from_raw_payment(payment) } }
     fetch_pms = fetch_payments.then { |payments| Kaui::PaymentMethod.payment_methods_for_payments(payments, cached_options_for_klient) }
@@ -78,7 +78,7 @@ class Kaui::InvoicesController < Kaui::EngineController
   end
 
   def restful_show
-    invoice = Kaui::Invoice.find_by_id(params.require(:id), false, 'NONE', options_for_klient)
+    invoice = Kaui::Invoice.find_by_id(params.require(:id), 'NONE', options_for_klient)
     redirect_to account_invoice_path(invoice.account_id, invoice.invoice_id)
   end
 
@@ -88,7 +88,7 @@ class Kaui::InvoicesController < Kaui::EngineController
 
   def commit_invoice
     cached_options_for_klient = options_for_klient
-    invoice = KillBillClient::Model::Invoice.find_by_id(params.require(:id), false, 'NONE', cached_options_for_klient)
+    invoice = KillBillClient::Model::Invoice.find_by_id(params.require(:id), 'NONE', cached_options_for_klient)
     invoice.commit(current_user.kb_username, params[:reason], params[:comment], cached_options_for_klient)
     redirect_to account_invoice_path(invoice.account_id, invoice.invoice_id), :notice => 'Invoice successfully committed'
   end

data/app/controllers/kaui/payments_controller.rb

@@ -74,7 +74,7 @@ class Kaui::PaymentsController < Kaui::EngineController
 
   def new
     cached_options_for_klient = options_for_klient
-    fetch_invoice = promise { Kaui::Invoice.find_by_id(params.require(:invoice_id), true, 'NONE', cached_options_for_klient) }
+    fetch_invoice = promise { Kaui::Invoice.find_by_id(params.require(:invoice_id), 'NONE', cached_options_for_klient) }
     fetch_payment_methods = promise { Kaui::PaymentMethod.find_all_by_account_id(params.require(:account_id), false, cached_options_for_klient) }
 
     @invoice = wait(fetch_invoice)

data/app/controllers/kaui/refunds_controller.rb

@@ -3,7 +3,7 @@ class Kaui::RefundsController < Kaui::EngineController
   def new
     cached_options_for_klient = options_for_klient
 
-    fetch_invoice = promise { Kaui::Invoice.find_by_id(params.require(:invoice_id), true, 'NONE', cached_options_for_klient) }
+    fetch_invoice = promise { Kaui::Invoice.find_by_id(params.require(:invoice_id), 'NONE', cached_options_for_klient) }
     fetch_payment = promise { Kaui::InvoicePayment::find_by_id(params.require(:payment_id), false, false, cached_options_for_klient) }
     fetch_bundles = promise { @account.bundles(cached_options_for_klient) }
 
@@ -15,7 +15,7 @@ class Kaui::RefundsController < Kaui::EngineController
   end
 
   def create
-    invoice = Kaui::Invoice.find_by_id(params.require(:invoice_id), true, 'NONE', options_for_klient)
+    invoice = Kaui::Invoice.find_by_id(params.require(:invoice_id), 'NONE', options_for_klient)
 
     if params[:adjustment_type] == 'invoiceItemAdjustment'
       items = []

data/app/controllers/kaui/subscriptions_controller.rb

@@ -141,7 +141,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
     redirect_to kaui_engine.account_bundles_path(subscription.account_id)
   end
 
-  def validate_external_key
+  def validate_bundle_external_key
     json_response do
       external_key = params.require(:external_key)
 
@@ -155,6 +155,21 @@ class Kaui::SubscriptionsController < Kaui::EngineController
     end
   end
 
+
+  def validate_external_key
+    json_response do
+      external_key = params.require(:external_key)
+
+      begin
+        subscription = Kaui::Subscription.find_by_external_key(external_key, options_for_klient)
+      rescue KillBillClient::API::NotFound
+        subscription = nil
+      end
+
+      { :is_found => !subscription.nil? }
+    end
+  end
+
   def update_tags
     subscription_id = params.require(:id)
     subscription = Kaui::Subscription.find_by_id(subscription_id, options_for_klient)

data/app/views/kaui/bundles/index.html.erb

@@ -18,7 +18,7 @@
             </tr>
             <% unless bundle.bundle_id == bundle.external_key %>
                 <tr>
-                  <th>External key</th>
+                  <th>Bundle key</th>
                   <td><%= bundle.external_key %></td>
                 </tr>
             <% end %>

data/app/views/kaui/credits/_form.html.erb

@@ -2,9 +2,9 @@
     <%= f.hidden_field :invoice_id %>
 
     <div class="form-group">
-      <%= f.label :credit_amount, 'Amount', :class => 'col-sm-2 control-label' %>
+      <%= f.label :amount, 'Amount', :class => 'col-sm-2 control-label' %>
       <div class="col-sm-10">
-        <%= f.number_field :credit_amount, :step => :any, :id => 'credit_amount', :class => 'form-control' %>
+        <%= f.number_field :amount, :step => :any, :id => 'amount', :class => 'form-control' %>
         <% if @invoice.present? %>
             <p class="help-block">Currency: <%= @invoice.currency %></p>
         <% end %>

data/app/views/kaui/subscriptions/_form.html.erb

@@ -7,15 +7,27 @@
         <%= hidden_field_tag :base_product_name, @base_product_name %>
     <% elsif @subscription.product_category == 'BASE' %>
         <div class="form-group">
-          <%= f.label :external_key, 'Key', :class => 'col-sm-2 control-label' %>
+          <%= f.label :bundle_external_key, 'Bundle Key', :class => 'col-sm-2 control-label' %>
           <div class="col-sm-10">
-            <%= f.text_field :external_key, :class => 'form-control', :id => 'external_key' %>
-            <div class="subscription_external_key_invalid_msg text-danger">
+            <%= f.text_field :bundle_external_key, :class => 'form-control', :id => 'bundle_external_key' %>
+            <div class="subscription_bundle_external_key_invalid_msg text-danger">
               Warning! External key already in use.
             </div>
           </div>
         </div>
     <% end %>
+
+    <div class="form-group">
+      <%= f.label :subscription_external_key, 'Subscription Key', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= f.text_field :external_key, :class => 'form-control', :id => 'subscription_external_key' %>
+        <div class="subscription_external_key_invalid_msg text-danger">
+          Warning! External key already in use.
+        </div>
+      </div>
+    </div>
+
+
     <div class="form-group">
       <%= label_tag :plan_name, 'Plan', :class => 'col-sm-2 control-label' %>
       <div class="col-sm-10">

data/config/routes.rb

@@ -128,6 +128,7 @@ Kaui::Engine.routes.draw do
     match '/:id/update_bcd' => 'subscriptions#update_bcd', :via => :put, :as => 'update_bcd'
     match '/:id/reinstate' => 'subscriptions#reinstate', :via => :put, :as => 'reinstate'
     match '/validate_external_key' => 'subscriptions#validate_external_key', :via => :get, :as => 'subscriptions_validate_external_key'
+    match '/validate_bundle_external_key' => 'subscriptions#validate_bundle_external_key', :via => :get, :as => 'subscriptions_validate_bundle_external_key'
   end
   resources :subscriptions, :only => [:new, :create, :show, :edit, :update, :destroy]
 

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = '1.4.1'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-18 00:00:00.000000000 Z
+date: 2019-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -878,8 +878,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Killbill Admin UI mountable engine