kaui 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94aaf4133d5cfa9e2663a9062bc32f19ce52ce04
-  data.tar.gz: 13e3b70e78c58ae04b5ab35a802f6ea91305ddc3
+  metadata.gz: b872df3f942d9f2a4e5efc1f1fd93ebb8e37e956
+  data.tar.gz: f25ca3f933403dea99fd1c776330ec7966c190c4
 SHA512:
-  metadata.gz: 6c5067d3e078ac77718213af8085ef89d8707ac8dbf062b71f481816de5efb059dad264d109f3e3b4dec7bdc5b00eaeab2ca8e9e5848d0fa64c8b57ca4196405
-  data.tar.gz: fbc13854e23b80c7f9553f197911ac16fc642c20072574ff3c02de05fdcb927645adee97a4dca9c74dfd31e9c86ed2d889438c244b06f01d18db3fe10f132d57
+  metadata.gz: 65ae3a7873e00c75ff89a88b0b44fc9bbd8c02f5e68ced24a4f1eb9a696dbfe9b6c0522d360afc2dde9af93fff0c04f8acb9c717a4e6f8a8b6ba18febda005aa
+  data.tar.gz: 7e1f005312d0697fb899dee663e7d89af286b2e22242c4ee66488dc2e92d0a873883a67ca7ba158916e6366fa7c462b2f05cac4762ff3af0883593d0d262647c

data/README.md

@@ -11,7 +11,7 @@ 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.19.z            |
+| 1.x.y        | 0.20.z            |
 
 Dependencies
 ------------

data/app/assets/stylesheets/kaui/subscription.less

@@ -17,4 +17,8 @@ table tr.expired {
       }
     }
   }
+}
+
+.price-override-popover {
+  cursor: pointer;
 }

data/app/assets/stylesheets/kaui/tags.less

@@ -60,7 +60,7 @@
             padding: 0 15px;
             font-size: 12px;
             color: #999999;
-            overflow: hidden;
+            overflow: auto;
             width: auto;
             border-bottom: 0;
             display: inline-block;

data/app/controllers/kaui/account_children_controller.rb

@@ -16,9 +16,9 @@ class Kaui::AccountChildrenController < Kaui::EngineController
   # It will fetch all the children. It use the paginate to fetch all children as permitting for future exchange
   # when killbill account/{account_id}/children endpoint includes offset and limit parameters.
   def pagination
-
+    cached_options_for_klient = options_for_klient
     searcher = lambda do |parent_account_id, offset, limit|
-      Kaui::Account.find_children(parent_account_id, true, true, 'NONE', options_for_klient)
+      Kaui::Account.find_children(parent_account_id, true, true, 'NONE', cached_options_for_klient)
     end
 
     data_extractor = lambda do |account_child, column|

data/app/controllers/kaui/account_tags_controller.rb

@@ -24,8 +24,9 @@ class Kaui::AccountTagsController < Kaui::EngineController
   def edit
     @account_id = params.require(:account_id)
 
-    fetch_tag_names = promise { (Kaui::Tag.all_for_account(@account_id, false, 'NONE', options_for_klient).map { |tag| tag.tag_definition_name }).sort }
-    fetch_available_tags = promise { Kaui::TagDefinition.all_for_account(options_for_klient) }
+    cached_options_for_klient = options_for_klient
+    fetch_tag_names = promise { (Kaui::Tag.all_for_account(@account_id, false, 'NONE', cached_options_for_klient).map { |tag| tag.tag_definition_name }).sort }
+    fetch_available_tags = promise { Kaui::TagDefinition.all_for_account(cached_options_for_klient) }
 
     @tag_names = wait(fetch_tag_names)
     @available_tags = wait(fetch_available_tags)

data/app/controllers/kaui/accounts_controller.rb

@@ -21,8 +21,9 @@ class Kaui::AccountsController < Kaui::EngineController
   end
 
   def pagination
+    cached_options_for_klient = options_for_klient
     searcher = lambda do |search_key, offset, limit|
-      Kaui::Account.list_or_search(search_key, offset, limit, options_for_klient)
+      Kaui::Account.list_or_search(search_key, offset, limit, cached_options_for_klient)
     end
 
     data_extractor = lambda do |account, column|
@@ -255,10 +256,12 @@ class Kaui::AccountsController < Kaui::EngineController
 
     raise('Account id and account parent id cannot be equal.') if @account.account_id == @account.parent_account_id
 
+    cached_options_for_klient = options_for_klient
+
     # check if parent id is valid
-    Kaui::Account.find_by_id(@account.parent_account_id,false,false,options_for_klient)
+    Kaui::Account.find_by_id(@account.parent_account_id, false, false, cached_options_for_klient)
 
-    @account.update(false, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+    @account.update(false, current_user.kb_username, params[:reason], params[:comment], cached_options_for_klient)
 
     redirect_to account_path(@account.account_id), :notice => 'Account successfully updated'
   rescue => e
@@ -272,13 +275,14 @@ class Kaui::AccountsController < Kaui::EngineController
 
   def unlink_to_parent
     account_id = params.require(:account_id)
+    cached_options_for_klient = options_for_klient
 
     # search for the account and remove the parent account id
     # check if parent id is valid
-    account = Kaui::Account.find_by_id(account_id,false,false,options_for_klient)
+    account = Kaui::Account.find_by_id(account_id, false, false, cached_options_for_klient)
     account.is_payment_delegated_to_parent = false
     account.parent_account_id = nil
-    account.update(true, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+    account.update(true, current_user.kb_username, params[:reason], params[:comment], cached_options_for_klient)
 
     redirect_to account_path(@account.account_id), :notice => 'Account successfully updated'
   rescue => e

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -121,8 +121,6 @@ class Kaui::AdminTenantsController < Kaui::EngineController
   end
 
   def new_catalog
-
-
     @tenant = safely_find_tenant_by_id(params[:id])
 
     options = tenant_options_for_client
@@ -147,7 +145,6 @@ class Kaui::AdminTenantsController < Kaui::EngineController
   end
 
   def delete_catalog
-
     tenant = safely_find_tenant_by_id(params[:id])
 
     options = tenant_options_for_client
@@ -191,9 +188,7 @@ class Kaui::AdminTenantsController < Kaui::EngineController
     @simple_plan.plan_id = params[:plan_id]
   end
 
-
   def create_simple_plan
-
     current_tenant = safely_find_tenant_by_id(params[:id])
 
     options = tenant_options_for_client
@@ -221,7 +216,6 @@ class Kaui::AdminTenantsController < Kaui::EngineController
   end
 
   def modify_overdue_config
-
     current_tenant = safely_find_tenant_by_id(params[:id])
 
     options = tenant_options_for_client
@@ -236,7 +230,6 @@ class Kaui::AdminTenantsController < Kaui::EngineController
     redirect_to admin_tenant_path(current_tenant.id), :notice => 'Overdue config was successfully added '
   end
 
-
   def upload_overdue_config
     current_tenant = safely_find_tenant_by_id(params[:id])
 
@@ -252,7 +245,6 @@ class Kaui::AdminTenantsController < Kaui::EngineController
     redirect_to admin_tenant_path(current_tenant.id), :notice => 'Overdue config was successfully uploaded'
   end
 
-
   def upload_invoice_template
     current_tenant = safely_find_tenant_by_id(params[:id])
 
@@ -449,7 +441,6 @@ class Kaui::AdminTenantsController < Kaui::EngineController
 
   private
 
-
   def safely_find_tenant_by_id(tenant_id)
     tenant = Kaui::Tenant.find_by_id(tenant_id)
     raise ActiveRecord::RecordNotFound.new('Could not find tenant ' + tenant_id) unless retrieve_tenants_for_current_user.include?(tenant.kb_tenant_id)
@@ -470,7 +461,6 @@ class Kaui::AdminTenantsController < Kaui::EngineController
   end
 
   def set_tenant_if_nil(tenant)
-
     if session[:kb_tenant_id].nil?
       session[:kb_tenant_id] = tenant.kb_tenant_id
       session[:kb_tenant_name] = tenant.name

data/app/controllers/kaui/bundle_tags_controller.rb

@@ -3,8 +3,9 @@ class Kaui::BundleTagsController < Kaui::EngineController
   def edit
     @bundle_id = params.require(:bundle_id)
 
-    fetch_tag_names = promise { (Kaui::Tag.all_for_bundle(@bundle_id, false, 'NONE', options_for_klient).map { |tag| tag.tag_definition_name }).sort }
-    fetch_available_tags = promise { Kaui::TagDefinition.all_for_bundle(options_for_klient) }
+    cached_options_for_klient = options_for_klient
+    fetch_tag_names = promise { (Kaui::Tag.all_for_bundle(@bundle_id, false, 'NONE', cached_options_for_klient).map { |tag| tag.tag_definition_name }).sort }
+    fetch_available_tags = promise { Kaui::TagDefinition.all_for_bundle(cached_options_for_klient) }
 
     @tag_names = wait(fetch_tag_names)
     @available_tags = wait(fetch_available_tags)

data/app/controllers/kaui/bundles_controller.rb

@@ -1,25 +1,27 @@
 class Kaui::BundlesController < Kaui::EngineController
 
   def index
-    fetch_bundles = promise { @account.bundles(options_for_klient) }
+    cached_options_for_klient = options_for_klient
+
+    fetch_bundles = promise { @account.bundles(cached_options_for_klient) }
     fetch_bundle_tags = promise {
-      all_bundle_tags = @account.all_tags(:BUNDLE, false, 'NONE', options_for_klient)
+      all_bundle_tags = @account.all_tags(:BUNDLE, false, 'NONE', cached_options_for_klient)
       all_bundle_tags.inject({}) {|hsh, entry| (hsh[entry.object_id] ||= []) << entry; hsh}
     }
     fetch_subscription_tags = promise {
-      all_subscription_tags = @account.all_tags(:SUBSCRIPTION, false, 'NONE', options_for_klient)
+      all_subscription_tags = @account.all_tags(:SUBSCRIPTION, false, 'NONE', cached_options_for_klient)
       all_subscription_tags.inject({}) {|hsh, entry| (hsh[entry.object_id] ||= []) << entry; hsh}
     }
     fetch_bundle_fields = promise {
-      all_bundle_fields = @account.all_custom_fields(:BUNDLE, 'NONE', options_for_klient)
+      all_bundle_fields = @account.all_custom_fields(:BUNDLE, 'NONE', cached_options_for_klient)
       all_bundle_fields.inject({}) {|hsh, entry| (hsh[entry.object_id] ||= []) << entry; hsh}
     }
     fetch_subscription_fields = promise {
-      all_subscription_fields = @account.all_custom_fields(:SUBSCRIPTION, 'NONE', options_for_klient)
+      all_subscription_fields = @account.all_custom_fields(:SUBSCRIPTION, 'NONE', cached_options_for_klient)
       all_subscription_fields.inject({}) {|hsh, entry| (hsh[entry.object_id] ||= []) << entry; hsh}
     }
-    fetch_available_tags = promise { Kaui::TagDefinition.all_for_bundle(options_for_klient) }
-    fetch_available_subscription_tags = promise { Kaui::TagDefinition.all_for_subscription(options_for_klient) }
+    fetch_available_tags = promise { Kaui::TagDefinition.all_for_bundle(cached_options_for_klient) }
+    fetch_available_subscription_tags = promise { Kaui::TagDefinition.all_for_subscription(cached_options_for_klient) }
 
     @bundles = wait(fetch_bundles)
     @tags_per_bundle = wait(fetch_bundle_tags)
@@ -44,10 +46,12 @@ class Kaui::BundlesController < Kaui::EngineController
   end
 
   def do_transfer
-    new_account = Kaui::Account::find_by_id_or_key(params.require(:new_account_key), false, false, options_for_klient)
+    cached_options_for_klient = options_for_klient
+
+    new_account = Kaui::Account::find_by_id_or_key(params.require(:new_account_key), false, false, cached_options_for_klient)
 
     bundle = Kaui::Bundle::new(:bundle_id => params.require(:id), :account_id => new_account.account_id)
-    bundle.transfer(nil, params[:billing_policy], current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+    bundle.transfer(nil, params[:billing_policy], current_user.kb_username, params[:reason], params[:comment], cached_options_for_klient)
 
     redirect_to kaui_engine.account_bundles_path(new_account.account_id), :notice => 'Bundle was successfully transferred'
   end

data/app/controllers/kaui/chargebacks_controller.rb

@@ -8,11 +8,13 @@ class Kaui::ChargebacksController < Kaui::EngineController
   end
 
   def create
+    cached_options_for_klient = options_for_klient
+
     @chargeback = Kaui::Chargeback.new(params.require(:chargeback))
     should_cancel_subs = (params[:cancel_all_subs] == '1')
 
     begin
-      payment = @chargeback.chargeback(current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+      payment = @chargeback.chargeback(current_user.kb_username, params[:reason], params[:comment], cached_options_for_klient)
     rescue => e
       flash.now[:error] = "Error while creating a new chargeback: #{as_string(e)}"
       render :action => :new and return
@@ -21,15 +23,15 @@ class Kaui::ChargebacksController < Kaui::EngineController
     # Cancel all subscriptions on the account, if required
     if should_cancel_subs
       begin
-        account = Kaui::Account.find_by_id(payment.account_id, false, false, options_for_klient)
-        account.bundles(options_for_klient).each do |bundle|
+        account = Kaui::Account.find_by_id(payment.account_id, false, false, cached_options_for_klient)
+        account.bundles(cached_options_for_klient).each do |bundle|
           bundle.subscriptions.each do |subscription|
             # Already cancelled?
             next unless subscription.billing_end_date.blank?
 
             # Cancel the entitlement immediately but use the default billing policy
             entitlement = Kaui::Subscription.new(:subscription_id => subscription.subscription_id)
-            entitlement.cancel_entitlement_immediately(current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+            entitlement.cancel_entitlement_immediately(current_user.kb_username, params[:reason], params[:comment], cached_options_for_klient)
           end
         end
       rescue => e

data/app/controllers/kaui/invoices_controller.rb

@@ -11,12 +11,14 @@ class Kaui::InvoicesController < Kaui::EngineController
   end
 
   def pagination
+    cached_options_for_klient = options_for_klient
+
     searcher = lambda do |search_key, offset, limit|
-      account = Kaui::Account::find_by_id_or_key(search_key, false, false, options_for_klient) rescue nil
+      account = Kaui::Account::find_by_id_or_key(search_key, false, false, cached_options_for_klient) rescue nil
       if account.nil?
-        Kaui::Invoice.list_or_search(search_key, offset, limit, options_for_klient)
+        Kaui::Invoice.list_or_search(search_key, offset, limit, cached_options_for_klient)
       else
-        account.invoices(true, options_for_klient).map! { |invoice| Kaui::Invoice.build_from_raw_invoice(invoice) }
+        account.invoices(true, cached_options_for_klient).map! { |invoice| Kaui::Invoice.build_from_raw_invoice(invoice) }
       end
     end
 
@@ -81,12 +83,13 @@ class Kaui::InvoicesController < Kaui::EngineController
   end
 
   def show_html
-    render :plain => Kaui::Invoice.as_html(params.require(:id), options_for_klient)
+    render :html => Kaui::Invoice.as_html(params.require(:id), options_for_klient).html_safe
   end
 
   def commit_invoice
-    invoice = KillBillClient::Model::Invoice.find_by_id(params.require(:id), false, 'NONE', options_for_klient)
-    invoice.commit(current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+    cached_options_for_klient = options_for_klient
+    invoice = KillBillClient::Model::Invoice.find_by_id(params.require(:id), false, '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
 end

data/app/controllers/kaui/payments_controller.rb

@@ -73,8 +73,9 @@ class Kaui::PaymentsController < Kaui::EngineController
   end
 
   def new
-    fetch_invoice = promise { Kaui::Invoice.find_by_id(params.require(:invoice_id), true, 'NONE', options_for_klient) }
-    fetch_payment_methods = promise { Kaui::PaymentMethod.find_all_by_account_id(params.require(:account_id), false, options_for_klient) }
+    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_payment_methods = promise { Kaui::PaymentMethod.find_all_by_account_id(params.require(:account_id), false, cached_options_for_klient) }
 
     @invoice = wait(fetch_invoice)
     @payment_methods = wait(fetch_payment_methods)
@@ -91,15 +92,17 @@ class Kaui::PaymentsController < Kaui::EngineController
   end
 
   def show
-    invoice_payment = Kaui::InvoicePayment.find_safely_by_id(params.require(:id), options_for_klient)
+    cached_options_for_klient = options_for_klient
+
+    invoice_payment = Kaui::InvoicePayment.find_safely_by_id(params.require(:id), cached_options_for_klient)
     @payment = Kaui::InvoicePayment.build_from_raw_payment(invoice_payment)
 
     fetch_payment_fields = promise {
       direct_payment = Kaui::Payment.new(:payment_id => @payment.payment_id)
-      direct_payment.custom_fields('NONE', options_for_klient).sort { |cf_a, cf_b| cf_a.name.downcase <=> cf_b.name.downcase }
+      direct_payment.custom_fields('NONE', cached_options_for_klient).sort { |cf_a, cf_b| cf_a.name.downcase <=> cf_b.name.downcase }
     }
     # The payment method may have been deleted
-    fetch_payment_method = promise { Kaui::PaymentMethod.find_safely_by_id(@payment.payment_method_id, options_for_klient) }
+    fetch_payment_method = promise { Kaui::PaymentMethod.find_safely_by_id(@payment.payment_method_id, cached_options_for_klient) }
 
     @custom_fields = wait(fetch_payment_fields)
     @payment_method = wait(fetch_payment_method)

data/app/controllers/kaui/refunds_controller.rb

@@ -1,9 +1,11 @@
 class Kaui::RefundsController < Kaui::EngineController
 
   def new
-    fetch_invoice = promise { Kaui::Invoice.find_by_id(params.require(:invoice_id), true, 'NONE', options_for_klient) }
-    fetch_payment = promise { Kaui::InvoicePayment::find_by_id(params.require(:payment_id), false, false, options_for_klient) }
-    fetch_bundles = promise { @account.bundles(options_for_klient) }
+    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_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) }
 
     @invoice = wait(fetch_invoice)
     @payment = wait(fetch_payment)

data/app/controllers/kaui/subscriptions_controller.rb

@@ -33,6 +33,13 @@ class Kaui::SubscriptionsController < Kaui::EngineController
       @subscription.plan_name = plan_name
       requested_date = params[:type_change] == "DATE" ? params[:requested_date].presence : nil
 
+      # price override?
+      override_fixed_price = plan_details.phases.first.prices.blank? rescue false
+      override_recurring_price = !override_fixed_price
+      phase_type = @bundle.nil? ? plan_details.phases.first.type : @bundle.subscriptions.first.phase_type
+      overrides = price_overrides(phase_type, override_fixed_price, override_recurring_price)
+      @subscription.price_overrides = overrides unless overrides.blank?
+
       # un-set product_category since is not needed if plan name exist
       @subscription.product_category = nil
       @subscription = @subscription.create(current_user.kb_username, params[:reason], params[:comment], requested_date, false, options_for_klient)
@@ -49,13 +56,9 @@ class Kaui::SubscriptionsController < Kaui::EngineController
     _, plans_details = lookup_bundle_and_plan_details(@subscription)
     # Use a Set to deal with multiple pricelists
     @plans = Set.new.merge(plans_details.map { |p| p.plan })
-
-    @current_plan = "#{@subscription.product_name} #{@subscription.billing_period}".humanize
-    @current_plan += " (price list #{@subscription.price_list})" if @subscription.price_list != 'DEFAULT'
   end
 
   def update
-
     plan_name = params.require(:plan_name)
 
     requested_date = params[:type_change] == "DATE" ? params[:requested_date].presence : nil
@@ -65,9 +68,16 @@ class Kaui::SubscriptionsController < Kaui::EngineController
 
     subscription = Kaui::Subscription.find_by_id(params.require(:id), options_for_klient)
 
-    subscription.change_plan({
-                                 :planName => plan_name
-                             },
+    input = { :planName => plan_name }
+
+    # price override?
+    current_plan = subscription.prices.select { |price| price['phaseType'] == subscription.phase_type }
+    override_fixed_price = current_plan.last['recurringPrice'].nil?
+    override_recurring_price = !override_fixed_price
+    overrides = price_overrides(subscription.phase_type, override_fixed_price, override_recurring_price)
+    input[:priceOverrides] = overrides unless overrides.blank?
+
+    subscription.change_plan(input,
                              current_user.kb_username,
                              params[:reason],
                              params[:comment],
@@ -78,6 +88,8 @@ class Kaui::SubscriptionsController < Kaui::EngineController
                              options_for_klient)
 
     redirect_to kaui_engine.account_bundles_path(subscription.account_id), :notice => 'Subscription plan successfully changed'
+  rescue => e
+    redirect_to edit_subscription_path(params.require(:id)), :flash => { :error => "Error while changing subscription: #{as_string(e)}" }
   end
 
   def destroy
@@ -206,4 +218,19 @@ class Kaui::SubscriptionsController < Kaui::EngineController
 
     end
   end
+
+  def price_overrides(phase_type, override_fixed_price = true, override_recurring_price = false)
+    return nil if params[:price_override].blank?
+
+    price_override = params[:price_override]
+    overrides = []
+    override = KillBillClient::Model::PhasePriceAttributes.new
+    override.phase_type = phase_type
+    override.fixed_price = price_override if override_fixed_price
+    override.recurring_price = price_override if override_recurring_price
+
+    overrides << override
+
+    overrides
+  end
 end

data/app/helpers/kaui/subscription_helper.rb

@@ -62,15 +62,33 @@ module Kaui
 
       if humanized_billing_period.nil?
         if humanized_price_list.nil?
-          humanized_product_name
+          humanized_product_name = humanized_product_name + humanized_price_override(sub, '', '(', ')')
         else
-          humanized_product_name+ ' (' + humanized_price_list.downcase + ')'
+          humanized_product_name = humanized_product_name + ' (' + humanized_price_list.downcase + humanized_price_override(sub) + ')'
         end
       else
         if humanized_price_list.nil?
-          humanized_product_name + ' (' + humanized_billing_period.downcase + ')'
+          humanized_product_name = humanized_product_name + ' (' + humanized_billing_period.downcase + humanized_price_override(sub) + ')'
         else
-          humanized_product_name+ ' (' + humanized_billing_period.downcase + ', ' + humanized_price_list.downcase + ')'
+          humanized_product_name = humanized_product_name + ' (' + humanized_billing_period.downcase + ', ' + humanized_price_list.downcase + humanized_price_override(sub) + ')'
+        end
+      end
+
+      humanized_product_name.html_safe
+    end
+
+    def humanized_price_override(sub, separation = ', ', open_bracket = '', close_bracket = '')
+      if sub.plan_name.scan(/ *-\d+$/).empty?
+        ''
+      else
+        current_plan = sub.prices.select { |price| price['phaseType'] == sub.phase_type && price['planName'] == sub.plan_name }
+        price_override = current_plan.last['fixedPrice'] || current_plan.last['recurringPrice']
+
+        if price_override.blank?
+          ''
+        else
+          span = "<span data-toggle=\"popover\" class=\"price-override-popover\" data-content=\"#{price_override}\"><b>price override</b></span>"
+          "#{open_bracket}#{separation}#{span}#{close_bracket}"
         end
       end
     end

data/app/models/kaui/admin_tenant.rb

@@ -75,6 +75,7 @@ class Kaui::AdminTenant < KillBillClient::Model::Tenant
           else
             hsh[plugin_key] = yml[plugin_key.to_sym]
           end
+          hsh[plugin_key][:_raw] = e.values[0]
         elsif is_an_official_plugin && is_kv?(e.values[0])
           # Construct hash of properties based on java properties (k1=v1\nk2=v2\n...)
           hsh[plugin_key] = e.values[0].split("\n").inject({}) do |h, p0|
@@ -82,9 +83,10 @@ class Kaui::AdminTenant < KillBillClient::Model::Tenant
             h[k] = v;
             h
           end
+          hsh[plugin_key][:_raw] = e.values[0]
         else
           # Construct simple hash with one property :raw_config
-          hsh[killbill_key] = {:raw_config => e.values[0]}
+          hsh[killbill_key] = {:raw_config => e.values[0], :_raw => e.values[0]}
         end
         hsh
       end
@@ -99,21 +101,20 @@ class Kaui::AdminTenant < KillBillClient::Model::Tenant
         end
         "#{plugin_key}::#{serialized_props}"
       end.join(";")
-
     end
 
-
     def format_plugin_config(plugin_key, plugin_type, props)
       return nil unless props.present?
+      return props['raw_config'].gsub(/\r\n?/, "\n") if props['raw_config']
+
       if plugin_type == 'ruby'
         require 'yaml'
         props = reformat_plugin_config(plugin_type, props)
         hsh = {}
         hsh[plugin_key.to_sym] = {}
         props.each do |k,v|
-          hsh[plugin_key.to_sym][k.to_sym] = v.to_sym
+          hsh[plugin_key.to_sym][k.to_sym] = v
         end
-        hsh[plugin_key.to_sym]
         hsh.to_yaml
       elsif plugin_type == 'java'
         props = reformat_plugin_config(plugin_type, props)

data/app/models/kaui/base.rb

@@ -2,9 +2,9 @@ class Kaui::Base
 
   def self.to_money(amount, currency)
     begin
-      return Money.new(amount.to_f * 100, currency)
+      return Money.from_amount(amount.to_f, currency)
     rescue => _
     end if currency.present?
-    Money.new(amount.to_f * 100, 'USD')
+    Money.from_amount(amount.to_f, 'USD')
   end
 end

data/app/views/kaui/admin_tenants/_form_plugin_config.erb

@@ -112,12 +112,12 @@
             if ($("#toggle_raw").prop("checked")) {
                 var raw = [];
                 raw.push({ is_raw_config: true, property: "raw_config", property_label: "Raw Config", value: ''});
-                for ( var i = 0; i < plugin_key_values.length ; i++ ) {
-                    raw[0].value += plugin_key_values[i].property + '=' + plugin_key_values[i].value;
-                    if (i < plugin_key_values.length - 1) {
-                        raw[0].value += "\n";
-                    }
-                }
+
+                var plugin_name = $('#entered_plugin_name').val();
+                var plugin_key = $("#plugin_key").val();
+                var existing_props = get_tenant_plugin_properties(plugin_key, plugin_name);
+                raw[0].value = existing_props['_raw'];
+
                 render_plugin_key_values(raw, plugin_key_values);
             } else {
                 render_plugin_key_values(plugin_key_values, plugin_key_values);
@@ -135,6 +135,7 @@
                 $("#plugin_type").val(selectedOption[0].dataset['pluginType']);
                 $('#plugin_config_properties').attr('plugin_name', '');
                 $('#plugin_config_properties_header').hide();
+                $("#toggle_raw").prop('checked', false);
                 add_properties_for_plugin(plugin_key, plugin_name);
             }
         });
@@ -168,7 +169,7 @@
 
         function get_existing_tenant_plugin_properties(entered_plugin_name) {
             var tenant_plugin_properties = $('#entered_plugin_name').attr('tenant_plugin_config');
-            var res = {}
+            var res = {};
             if (tenant_plugin_properties != undefined) {
                 $.each(tenant_plugin_properties.split(';'), function(idx, el) {
                     var el_parts = el.split('::');
@@ -180,7 +181,7 @@
                         } else {
                             $.map(el_props.split('|'), function(el) {
                                 var parts = el.split('=');
-                                res[parts[0]] = parts[1];
+                                res[parts[0]] = parts.slice(1).join('=');
                             });
                         }
                         return false;
@@ -215,6 +216,18 @@
             return res;
         }
 
+        function get_tenant_plugin_properties(plugin_key, plugin_name) {
+            /* Retrieve existing plugin properties for this tenant */
+            var existing_props = get_existing_tenant_plugin_properties(plugin_key);
+
+            // try by plugin name for proprietary plugins
+            if (isBlank(existing_props)) {
+                existing_props = get_existing_tenant_plugin_properties(plugin_name);
+            }
+
+            return existing_props;
+        }
+
         function add_properties_for_plugin(plugin_key, plugin_name) {
             var plugin_info = get_selected_plugin_info(plugin_key);
 
@@ -229,13 +242,7 @@
                 return;
             }
 
-            /* Retrieve existing plugin properties for this tenant */
-            var existing_props = get_existing_tenant_plugin_properties(plugin_key);
-
-            // try by plugin name for proprietary plugins
-            if (isBlank(existing_props)) {
-                existing_props = get_existing_tenant_plugin_properties(plugin_name);
-            }
+            var existing_props = get_tenant_plugin_properties(plugin_key, plugin_name);
 
             var type = plugin_info['type'];
             var props = plugin_info['props']
@@ -285,7 +292,9 @@
             var plugin_props_with_values = [];
 
             $.each(merged_props_with_values, function(p, v) {
-                plugin_props_with_values.push({ property_label: format_label(p), property: p, value: v, is_raw_config: p == 'raw_config'});
+                if (p != '_raw') {
+                    plugin_props_with_values.push({ property_label: format_label(p), property: p, value: v, is_raw_config: p == 'raw_config'});
+                }
             });
 
             render_plugin_key_values(plugin_props_with_values, plugin_props_with_values);

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

@@ -2,7 +2,12 @@
 
   <div class="column-block">
 
-    <h1>Invoice <%= @invoice.invoice_number %></h1>
+    <h1>
+      Invoice <%= @invoice.invoice_number %>
+      <% unless @invoice.invoice_number.blank? %>
+        <%= link_to 'View customer invoice html', kaui_engine.show_html_invoice_path(@invoice.invoice_id), :class => 'btn', :target => '_blank' %>
+      <% end %>
+    </h1>
 
     <% dry_run = @invoice.invoice_number.blank? %>
     <% if dry_run %>

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

@@ -1,13 +1,19 @@
 <%= form_for @subscription, :url => subscription_path(@subscription.subscription_id), :html => {:method => :put, :class => 'form-horizontal'} do |f| %>
     <div class="form-group">
-      <%= label_tag :plan_name, 'New plan', :class => 'col-sm-2 control-label' %>
-      <div class="col-sm-10">
-        <%= select_tag :plan_name, options_for_select(@plans), :class => 'form-control' %>
+      <%= label_tag :plan_name, 'New plan', :class => 'col-sm-3 control-label' %>
+      <div class="col-sm-9">
+        <%= select_tag :plan_name, options_for_select(@plans, @subscription.plan_name.gsub(/ *-\d+$/, '')), :class => 'form-control' %>
       </div>
     </div>
 
     <div class="form-group">
-      <div class="col-sm-offset-2 col-sm-10">
+      <%= label_tag :price_override, 'Price Override', :class => 'col-sm-3 control-label' %>
+      <div class="col-sm-9">
+        <%= number_field_tag :price_override, nil, :class => 'form-control' %>
+      </div>
+    </div>
+    <div class="form-group">
+      <div class="col-sm-offset-3 col-sm-9">
         <div class="radio">
           <%= label_tag :type_change do %>
               <%= radio_button_tag :type_change, 'DEFAULT', :checked => true %>
@@ -29,20 +35,20 @@
       </div>
     </div>
     <div class="form-group", id="form_requested_date" >
-        <%= label_tag :requested_date, 'Change Date', :class => 'col-sm-2 control-label' %>
-        <div class="col-sm-10">
+        <%= label_tag :requested_date, 'Change Date', :class => 'col-sm-3 control-label' %>
+        <div class="col-sm-9">
             <%= text_field_tag :requested_date, Date.parse(Time.now.to_s).to_s, :class => 'form-control date-picker' %>
         </div>
     </div>
     <div class="form-group", id="form_policy">
-      <%= label_tag :policy, 'Policy', :class => 'col-sm-2 control-label' %>
-      <div class="col-sm-10">
+      <%= label_tag :policy, 'Policy', :class => 'col-sm-3 control-label' %>
+      <div class="col-sm-9">
         <%= select_tag :policy, options_for_select(['', 'IMMEDIATE', 'END_OF_TERM']), :class => 'form-control' %>
         <p class="help-block">Leave blank for default</p>
       </div>
     </div>
     <div class="form-group">
-      <div class="col-sm-offset-2 col-sm-10">
+      <div class="col-sm-offset-3 col-sm-9">
         <%= submit_tag 'Save', :class => 'btn btn-default' %>
       </div>
     </div>

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

@@ -22,6 +22,12 @@
         <%= select_tag :plan_name, options_for_select(@plans), :class => 'form-control' %>
       </div>
     </div>
+    <div class="form-group">
+      <%= label_tag :price_override, 'Price Override', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= number_field_tag :price_override, nil, :class => 'form-control' %>
+      </div>
+    </div>
     <div class="form-group">
       <div class="col-sm-offset-2 col-sm-10">
         <div class="radio">

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

@@ -105,5 +105,10 @@
         { "orderable": false }
       ]
     });
+
+    $(".price-override-popover").popover({
+      container: 'body',
+      trigger: 'hover'
+    });
   });
 <% end %>

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

data/test/functional/kaui/bundle_tags_controller_test.rb

@@ -20,15 +20,4 @@ class Kaui::BundleTagsControllerTest < Kaui::FunctionalTestHelper
     assert_not_nil assigns(:tag_names)
     assert_not_nil assigns(:available_tags)
   end
-
-  test 'should update tags' do
-    post :update,
-         :account_id => @account.account_id,
-         :bundle_id => @bundle.bundle_id,
-         :'tag_00000000-0000-0000-0000-000000000001' => 'AUTO_PAY_OFF',
-         :'tag_00000000-0000-0000-0000-000000000005' => 'MANUAL_PAY',
-         :'tag_00000000-0000-0000-0000-000000000003' => 'OVERDUE_ENFORCEMENT_OFF'
-    assert_redirected_to account_bundles_path(@account.account_id)
-    assert_equal 'Bundle tags successfully set', flash[:notice]
-  end
 end

data/test/functional/kaui/subscriptions_controller_test.rb

@@ -82,22 +82,21 @@ class Kaui::SubscriptionsControllerTest < Kaui::FunctionalTestHelper
     assert_response 200
     assert_not_nil assigns(:subscription)
     assert_not_nil assigns(:plans)
-    assert_not_nil assigns(:current_plan)
   end
 
   test 'should handle errors during update' do
     post :update, :id => @bundle.subscriptions.first.subscription_id
-    assert_redirected_to home_path
-    assert_equal 'Required parameter missing: plan_name', flash[:error]
+    assert_redirected_to edit_subscription_path(@bundle.subscriptions.first.subscription_id)
+    assert_equal 'Error while changing subscription: param is missing or the value is empty: plan_name', flash[:error]
 
     subscription_id = SecureRandom.uuid.to_s
     post :update, :id => subscription_id, :plan_name => 'super-monthly'
-    assert_redirected_to home_path
-    assert_equal "Error while communicating with the Kill Bill server: Error 404: Object id=#{subscription_id} type=SUBSCRIPTION doesn't exist!", flash[:error]
+    assert_redirected_to edit_subscription_path(subscription_id)
+    assert_equal "Error while changing subscription: Error 404: Object id=#{subscription_id} type=SUBSCRIPTION doesn't exist!", flash[:error]
 
     post :update, :id => @bundle.subscriptions.first.subscription_id, :plan_name => 'not-exists'
-    assert_redirected_to home_path
-    assert_equal "Error while communicating with the Kill Bill server: Error 400: Could not find a plan matching spec: (plan: 'not-exists', product: 'undefined', billing period: 'undefined', pricelist 'undefined')", flash[:error]
+    assert_redirected_to edit_subscription_path(@bundle.subscriptions.first.subscription_id)
+    assert_equal "Error while changing subscription: Error 400: Could not find a plan matching spec: (plan: 'not-exists', product: 'undefined', billing period: 'undefined', pricelist 'undefined')", flash[:error]
   end
 
   test 'should update' do
@@ -170,4 +169,26 @@ class Kaui::SubscriptionsControllerTest < Kaui::FunctionalTestHelper
     assert_equal JSON[@response.body]['is_found'], true
   end
 
+  test 'should update with price override' do
+    post :update,
+         :id => @bundle.subscriptions.first.subscription_id,
+         :plan_name => 'super-monthly',
+         :price_override => 500
+    assert_redirected_to account_bundles_path(@bundle.subscriptions.first.account_id)
+    assert_equal 'Subscription plan successfully changed', flash[:notice]
+  end
+
+  test 'should create with price override' do
+    post :create,
+         :subscription => {
+             :account_id => @account.account_id,
+             :external_key => SecureRandom.uuid,
+         },
+         :price_override => 500,
+         :plan_name => 'standard-monthly'
+
+    assert_redirected_to account_bundles_path(@account.account_id)
+    assert_equal 'Subscription was successfully created', flash[:notice]
+  end
+
 end

data/test/unit/kaui/admin_tenant_test.rb

@@ -14,6 +14,30 @@ class Kaui::AdminTenantTest < ActiveSupport::TestCase
                   {"plugin_key":"payu-latam","plugin_name":"killbill-payu-latam","plugin_type":"ruby","installed":false},{"plugin_key":"payment-test","plugin_name":"killbill-payment-test","plugin_type":"ruby","installed":false},
                   {"plugin_key":"securenet","plugin_name":"killbill-securenet","plugin_type":"ruby","installed":false},{"plugin_key":"stripe","plugin_name":"killbill-stripe","plugin_type":"ruby","installed":false},{"plugin_key":"zendesk","plugin_name":"killbill-zendesk","plugin_type":"ruby","installed":false}]'
 
+  test 'should not reformat raw config before upload' do
+    props = {"raw_config" => ":paypal_express:\r\n  :signature: \"THISISAREALLYLONGSIGNATGURESTRING123\"\r\n  :login: \"username-facilitator_domain.com\"\r\n  :password: \"SUPERSECRETPW\""}
+    formatted = Kaui::AdminTenant.format_plugin_config('paypal_express', 'ruby', props)
+    expected=<<-EOS.chomp
+:paypal_express:
+  :signature: "THISISAREALLYLONGSIGNATGURESTRING123"
+  :login: "username-facilitator_domain.com"
+  :password: "SUPERSECRETPW"
+    EOS
+    assert_equal expected, formatted
+  end
+
+  test 'should reformat ruby config before upload' do
+    props = {"login"=>"ljskf9\"0sdf'34%", "password"=>"lskdj\"f-12;sdf'[5%"}
+    formatted = Kaui::AdminTenant.format_plugin_config('securenet', 'ruby', props)
+    expected=<<-EOS
+---
+:securenet:
+  :login: ljskf9"0sdf'34%
+  :password: lskdj"f-12;sdf'[5%
+    EOS
+    assert_equal expected, formatted
+  end
+
   test 'can split camel dash underscore space strings' do
     adminTenantController = Kaui::AdminTenantsController.new
 
@@ -36,7 +60,6 @@ class Kaui::AdminTenantTest < ActiveSupport::TestCase
     string = 'this-IsA string_to-split'
     splitted = adminTenantController.send(:split_camel_dash_underscore_space, string)
     assert_split(splitted)
-
   end
 
   test 'can do a fuzzy match of a plugin to suggest a plugin' do
@@ -71,7 +94,6 @@ class Kaui::AdminTenantTest < ActiveSupport::TestCase
     found_plugin, weights = adminTenantController.send(:fuzzy_match, plugin_name, plugins_info)
     assert_equal weights.size, 0
     assert_equal found_plugin[:plugin_name], 'killbill-avatax'
-
   end
 
   test 'should fetch proprietary plugin config' do
@@ -84,13 +106,12 @@ class Kaui::AdminTenantTest < ActiveSupport::TestCase
     plugin_config = 'key=value'
     Kaui::AdminTenant.upload_tenant_plugin_config(plugin_name, plugin_config, options[:username], nil, nil, options)
 
-
     plugins_config = Kaui::AdminTenant.get_tenant_plugin_config({}, options)
     assert_not_nil(plugins_config)
 
     plugin_info = plugins_config.split('::')
     assert_equal plugin_name, plugin_info[0]
-    assert_equal plugin_config, plugin_info[1].gsub('raw_config=','')
+    assert_equal 'key=value|_raw=key=value', plugin_info[1].gsub('raw_config=','')
   end
 
   test 'should fetch plugin config' do
@@ -109,7 +130,6 @@ class Kaui::AdminTenantTest < ActiveSupport::TestCase
     plugin_config = Kaui::AdminTenant.format_plugin_config(plugin_key, 'ruby', plugin_properties)
     Kaui::AdminTenant.upload_tenant_plugin_config(plugin_name, plugin_config, options[:username], nil, nil, options)
 
-
     plugins_config = Kaui::AdminTenant.get_tenant_plugin_config({ :paypal_express => { 'type' => 'ruby',
                                                                   'artifact_id' => 'paypal-express-plugin'} }, options)
     assert_not_nil(plugins_config)

data/test/unit/kaui/base_test.rb

@@ -4,11 +4,16 @@ class Kaui::BaseTest < ActiveSupport::TestCase
 
   test 'can convert to money' do
     # Happy path
-    %w(GBP MXN BRL EUR AUD USD CAD JPY).each do |currency|
+    %w(GBP MXN BRL EUR AUD USD CAD).each do |currency|
       money = Kaui::Base.to_money(12.42, currency)
       assert_equal 1242, money.cents
       assert_equal currency, money.currency.iso_code
     end
+    %w(JPY KRW).each do |currency|
+      money = Kaui::Base.to_money(12, currency)
+      assert_equal 12, money.cents
+      assert_equal currency, money.currency.iso_code
+    end
 
     # Edge cases
     bad_money = Kaui::Base.to_money(12.42, 'blahblah')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails