kaui 0.14.2 → 0.15.0

data/app/models/kaui/admin_tenant.rb

@@ -7,7 +7,7 @@ class Kaui::AdminTenant < KillBillClient::Model::Tenant
     end
 
     def upload_overdue_config(overdue_config_xml, user = nil, reason = nil, comment = nil, options = {})
-      KillBillClient::Model::Overdue.upload_tenant_overdue_config(overdue_config_xml, user, reason, comment, options)
+      KillBillClient::Model::Overdue.upload_tenant_overdue_config_xml(overdue_config_xml, user, reason, comment, options)
     end
 
     def upload_invoice_template(invoice_template, is_manual_pay, delete_if_exists, user = nil, reason = nil, comment = nil, options = {})
@@ -25,5 +25,99 @@ class Kaui::AdminTenant < KillBillClient::Model::Tenant
     def upload_tenant_plugin_config(plugin_name, plugin_config, user = nil, reason = nil, comment = nil, options = {})
       KillBillClient::Model::Tenant.upload_tenant_plugin_config(plugin_name, plugin_config, user, reason, comment, options)
     end
+
+    def get_plugin_repository
+      require 'open-uri'
+      require 'yaml'
+
+      source = URI.parse('https://raw.githubusercontent.com/killbill/killbill-cloud/master/kpm/lib/kpm/plugins_directory.yml').read
+      YAML.load(source)
+    end
+
+    def get_oss_plugin_info(plugin_directory)
+
+
+      # Serialize the plugin state for the view:
+      #  plugin_name#plugin_type:prop1,prop2,prop3;plugin_name#plugin_type:prop1,prop2,prop3;...
+      #
+      plugin_config = plugin_directory.inject({}) do |hsh, (k,v)|
+        hsh["#{k}##{v[:type]}"] = v[:require] || []
+        hsh
+      end
+      plugin_config.map { |e,v| "#{e}:#{v.join(",")}" }.join(";")
+    end
+
+    def get_tenant_plugin_config(plugin_directory, options)
+
+      require 'yaml'
+
+      raw_tenant_config = KillBillClient::Model::Tenant::search_tenant_config("PLUGIN_CONFIG_", options)
+
+      tenant_config = raw_tenant_config.inject({}) do |hsh, e|
+
+        # Strip prefix '/PLUGIN_CONFIG_'
+        killbill_key = e.key.gsub!(/PLUGIN_CONFIG_/, '')
+
+        # Extract killbill key for oss plugins based on convention 'killbill-KEY'
+        plugin_key = killbill_key.gsub(/killbill-/, '') if killbill_key.start_with?('killbill-')
+        # If such key exists, lookup in plugin directory
+        plugin_repo_entry = plugin_directory[plugin_key.to_sym] unless plugin_key.nil?
+        # Extract plugin_type based on plugin_directory entry if exists
+        plugin_type = plugin_repo_entry.nil? ? :unknown : plugin_repo_entry[:type].to_sym
+
+        # Deserialize config based on type
+        if plugin_type == :ruby
+          yml = YAML.load(e.values[0])
+          # Hash of properties
+          hsh[plugin_key] = yml[plugin_key.to_sym]
+        elsif plugin_type == :java
+          # 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|
+            k, v = p0.split('=');
+            h[k] = v;
+            h
+          end
+        else
+          # Construct simple hash with one property :raw_config
+          hsh[killbill_key] = {:raw_config => e.values[0]}
+        end
+        hsh
+      end
+
+      # Serialize the whole thing a as string of the form:
+      # plugin_key1::key1=value1,key2=value2,..;plugin_key2::...
+      tenant_config.map do |plugin_key, props|
+        serialized_props = props.inject("") do |s, (k, v)|
+          e="#{k.to_s}=#{v.to_s}";
+          s == "" ? s="#{e}" : s="#{s},#{e}";
+          s
+        end
+        "#{plugin_key}::#{serialized_props}"
+      end.join(";")
+
+    end
+
+
+    def format_plugin_config(plugin_name, plugin_type, props)
+      return nil unless props.present?
+      if plugin_type == 'ruby'
+        require 'yaml'
+        hsh = {}
+        hsh[plugin_name.to_sym] = {}
+        props.each do |k,v|
+          hsh[plugin_name.to_sym][k.to_sym] = v.to_sym
+        end
+        hsh[plugin_name.to_sym]
+        hsh.to_yaml
+      elsif plugin_type == 'java'
+        res = ""
+        props.each do |k, v|
+          res = "#{res}#{k.to_s}=#{v.to_s}\n"
+        end
+        res
+      else
+        props['raw_config']
+      end
+    end
   end
-end
+end

data/app/models/kaui/bundle.rb

@@ -7,7 +7,7 @@ class Kaui::Bundle < KillBillClient::Model::Bundle
     end
 
     # Return the active one
-    find_by_external_key(bundle_id_or_key, options)
+    find_by_external_key(bundle_id_or_key, false, options)
   end
 
   def self.list_or_search(search_key = nil, offset = 0, limit = 10, options = {})

data/app/models/kaui/catalog.rb

@@ -1,2 +1,140 @@
 class Kaui::Catalog < KillBillClient::Model::Catalog
+
+  class << self
+
+    def get_catalog_json(latest, options)
+
+      catalogs = KillBillClient::Model::Catalog.get_tenant_catalog('json', nil, options)
+      return catalogs.length > 0 ? catalogs[catalogs.length - 1] : nil if latest
+
+      # Order by latest
+      result = []
+      catalogs.sort! { |l, r| r.effective_date <=> l.effective_date }
+
+      catalogs.each_with_index do |current_catalog, idx|
+        result << {:version => idx,
+                   :version_date => current_catalog.effective_date,
+                   :currencies => current_catalog.currencies,
+                   :plans => build_existing_simple_plans(current_catalog)}
+      end
+      result
+    end
+
+    def build_ao_mapping(catalog)
+      tmp = {}
+      catalog.products.each do |p|
+        p.available.each do |ap|
+          if !tmp.has_key?(ap)
+            tmp[ap] = []
+          end
+          tmp[ap] << p.name
+        end
+      end unless catalog.nil?
+      tmp.map { |e,v| "#{e}:#{v.join(",")}" }.join(";")
+    end
+
+
+    def get_catalog_xml(options)
+
+      catalog_xml = KillBillClient::Model::Catalog.get_tenant_catalog('xml', nil, options)
+
+      parsed_catalog = parse_catalog_xml(catalog_xml)
+
+      result = []
+      parsed_catalog.keys.each_with_index do |version_date, i|
+        entry = {}
+        entry[:version] = i
+        entry[:version_date] = version_date
+        entry[:xml] = parsed_catalog[version_date]
+        result << entry
+      end
+      result
+    end
+
+    private
+
+    def build_existing_simple_plans(catalog)
+
+      tmp = catalog.products.map do |p|
+        p.plans.each do |plan|
+          class << plan
+            attr_accessor :product_name
+            attr_accessor :product_category
+          end
+          plan.product_name = p.name
+          plan.product_category = p.type
+        end
+      end.flatten!
+
+      selected = tmp.select { |p| p.phases.length.to_i <= 2 && p.phases[p.phases.length - 1].type == "EVERGREEN" }
+
+      currencies = catalog.currencies
+
+      result = []
+      selected.each do |plan|
+        has_trial = plan.phases[0].type == 'TRIAL'
+
+        simple_plan = KillBillClient::Model::SimplePlanAttributes.new
+
+        # Embellish SimplePlanAttributes to contain a map currency -> amount (required in the view)
+        class << simple_plan
+          attr_accessor :prices
+        end
+        simple_plan.prices = plan.phases[-1].prices.inject({}) { |r, e| r[e.currency] = e.value; r }
+
+        simple_plan.plan_id = plan.name
+        simple_plan.product_name = plan.product_name
+        simple_plan.product_category = plan.product_category
+        simple_plan.currency = currencies[0]
+        simple_plan.amount = simple_plan.prices[currencies[0]]
+        simple_plan.billing_period = plan.billing_period
+        simple_plan.trial_length = has_trial ? plan.phases[0].duration.number : 0
+        simple_plan.trial_time_unit = has_trial ? plan.phases[0].duration.unit : "N/A"
+
+        result << simple_plan
+      end
+      result
+    end
+
+    def parse_catalog_xml(input_xml)
+
+      require 'nokogiri'
+
+      doc = Nokogiri::XML(input_xml)
+      doc_versions = doc.xpath("//version")
+
+      doc_versions.inject({}) do |hsh, v|
+
+        # Replace node 'version' with 'catalog' and add the attributes
+        v.name = 'catalog'
+        v['xmlns:xsi'] = "http://www.w3.org/2001/XMLSchema-instance"
+        v['xsi:noNamespaceSchemaLocation'] = "CatalogSchema.xsd"
+        # Extract version
+        version = v.search("effectiveDate").text
+
+        # Add entry
+        hsh[version] = '<?xml version="1.0" encoding="utf-8"?>' + format_xml(v.to_s)
+        hsh
+      end
+    end
+
+
+    def format_xml(unformatted_xml)
+
+      require "rexml/document"
+
+      # Start by removing all spaces before using rexml
+      unformatted_xml.gsub!(/>\s+</, "><")
+
+      result = ""
+      pdoc = REXML::Document.new(unformatted_xml)
+      formatter = REXML::Formatters::Pretty.new(4)
+      formatter.compact = true
+      formatter.write(pdoc, result)
+      result
+    end
+  end
+
+
+
 end

data/app/models/kaui/invoice_payment.rb

@@ -5,17 +5,51 @@ class Kaui::InvoicePayment < KillBillClient::Model::InvoicePayment
   SAMPLE_REASON_CODES = ['600 - Alt payment method',
                          '699 - OTHER']
 
-  def self.build_from_raw_payment(raw_payment)
-    result = Kaui::InvoicePayment.new
-    KillBillClient::Model::InvoicePaymentAttributes.instance_variable_get('@json_attributes').each do |attr|
-      result.send("#{attr}=", raw_payment.send(attr))
+  class << self
+
+    def build_from_raw_payment(raw_payment)
+
+      return nil if raw_payment.nil?
+
+      result = Kaui::InvoicePayment.new
+      KillBillClient::Model::InvoicePaymentAttributes.instance_variable_get('@json_attributes').each do |attr|
+        result.send("#{attr}=", raw_payment.send(attr))
+      end
+      # Use  Kaui::Transaction to benefit from additional fields (e.g next_retry_date)
+      original_transactions = (result.transactions || [])
+      result.transactions = []
+      original_transactions.each do |transaction|
+        new_transaction = Kaui::Transaction.new
+        KillBillClient::Model::PaymentTransactionAttributes.instance_variable_get('@json_attributes').each do |attr|
+          new_transaction.send("#{attr}=", transaction.send(attr))
+        end
+        result.transactions << new_transaction
+      end
+      result.build_transactions_next_retry_date!
+      result
     end
-    result
+
   end
 
   [:auth, :captured, :purchased, :refunded, :credited].each do |type|
     define_method "#{type}_amount_to_money" do
       Kaui::Base.to_money(send("#{type}_amount"), currency)
     end
+
+
+    # For each payment transaction, compute next_retry date by joining with payment attempts
+    def build_transactions_next_retry_date!
+      (transactions || []).each do |transaction|
+        # Filter attempts matching that transaction and SCHEDULED for retry
+        transaction.next_retry_date = (payment_attempts || []).select do |attempt|
+          ((attempt.transaction_id && attempt.transaction_id == transaction.transaction_id) ||
+              (attempt.transaction_external_key && attempt.transaction_external_key == transaction.transaction_external_key)) &&
+              attempt.state_name == 'SCHEDULED'
+        end.map do |attempt|
+          attempt.effective_date
+        end.first
+      end
+    end
+
   end
 end

data/app/models/kaui/overdue.rb

@@ -0,0 +1,85 @@
+class Kaui::Overdue < KillBillClient::Model::Overdue
+
+  class << self
+
+
+    def from_overdue_form_model(view_form_model)
+      result = KillBillClient::Model::Overdue.new
+      result.initial_reevaluation_interval = nil # TODO
+      result.overdue_states = []
+      view_form_model["states"].each do |state_model|
+
+        state = KillBillClient::Model::OverdueStateConfig.new
+        state.name = state_model["name"]
+        state.auto_reevaluation_interval_days = nil
+        state.external_message = state_model["external_message"]
+        state.is_clear_state = state_model["is_clear_state"].nil? ? false : state_model["is_clear_state"]
+        state.block_changes = state_model["block_changes"]
+        if state_model["subscription_cancellation_policy"] == :NONE.to_s
+          state.disable_entitlement = false
+          state.subscription_cancellation_policy = nil
+        else
+          state.disable_entitlement = true
+          state.subscription_cancellation_policy = state_model["subscription_cancellation_policy"].blank? ? :NONE : state_model["subscription_cancellation_policy"].to_s.gsub!(/POLICY_/, '')
+        end
+
+        if state_model["condition"]
+          state.condition = KillBillClient::Model::OverdueCondition.new
+          if state_model["condition"]["time_since_earliest_unpaid_invoice_equals_or_exceeds"]
+            state.condition.time_since_earliest_unpaid_invoice_equals_or_exceeds = KillBillClient::Model::DurationAttributes.new
+            state.condition.time_since_earliest_unpaid_invoice_equals_or_exceeds.unit = "DAYS"
+            state.condition.time_since_earliest_unpaid_invoice_equals_or_exceeds.number = state_model["condition"]["time_since_earliest_unpaid_invoice_equals_or_exceeds"]
+          end
+          state.condition.control_tag_inclusion = format_tag_condition(state_model["condition"]["control_tag_inclusion"])
+          state.condition.control_tag_exclusion = format_tag_condition(state_model["condition"]["control_tag_exclusion"])
+        end
+
+        result.overdue_states << state
+      end
+      # We reversed them to display on the form , so we have to reverse them back before uploading new config
+      result.overdue_states.reverse!
+
+      result
+    end
+
+    def get_overdue_json(options)
+      result = KillBillClient::Model::Overdue.get_tenant_overdue_config('json', options)
+      class << result
+        attr_accessor :has_states
+      end
+      result.has_states = result.overdue_states.size > 0 && result.overdue_states[0].is_clear_state
+
+      result.overdue_states.each do |state|
+        class << state
+          attr_accessor :subscription_cancellation
+        end
+        if state.disable_entitlement
+          state.subscription_cancellation = state.subscription_cancellation_policy ? "POLICY_#{state.subscription_cancellation_policy}".to_sym : :NONE
+        else
+          state.subscription_cancellation = :NONE
+        end
+        if state.condition.nil?
+          state.condition = KillBillClient::Model::OverdueCondition.new
+          state.condition.time_since_earliest_unpaid_invoice_equals_or_exceeds = KillBillClient::Model::DurationAttributes.new
+          state.condition.time_since_earliest_unpaid_invoice_equals_or_exceeds.unit = "DAYS"
+          state.condition.time_since_earliest_unpaid_invoice_equals_or_exceeds.number = 0
+          state.condition.control_tag_inclusion = :NONE
+          state.condition.control_tag_exclusion = :NONE
+        end
+      end
+      result
+    end
+
+    def format_tag_condition(control_tag)
+      if control_tag.blank? || control_tag == :NONE.to_s
+        return nil
+      else
+        return control_tag
+      end
+    end
+
+
+  end
+
+end
+

data/app/models/kaui/simple_plan.rb

@@ -0,0 +1,4 @@
+class Kaui::SimplePlan < KillBillClient::Model::SimplePlanAttributes
+end
+
+

data/app/models/kaui/transaction.rb

@@ -1,5 +1,7 @@
 class Kaui::Transaction < KillBillClient::Model::Transaction
 
+  attr_accessor :next_retry_date
+
   def create(account_id = nil, payment_method_id = nil, user = nil, reason = nil, comment = nil, options = {})
     if transaction_type == 'AUTHORIZE'
       auth(account_id, payment_method_id, user, reason, comment, options)

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

@@ -204,7 +204,8 @@
     }
 
     eventsOrder = ["START_ENTITLEMENT", "START_BILLING", "PAUSE_ENTITLEMENT", "PAUSE_BILLING", "RESUME_ENTITLEMENT",
-    "RESUME_BILLING", "PHASE", "CHANGE", "STOP_ENTITLEMENT", "STOP_BILLING", "INVOICE", "PAYMENT"];
+    "RESUME_BILLING", "PHASE", "CHANGE", "STOP_ENTITLEMENT", "STOP_BILLING", "INVOICE", "AUTHORIZE", "PURCHASE", "CAPTURE",
+    "CREDIT", "REFUND", "VOID", "CHARGEBACK"];
 
     jQuery.fn.dataTableExt.oSort['timeline-event-asc'] = function(e1,e2) {
         var x = eventsOrder.indexOf(e1);

data/app/views/kaui/accounts/_billing_info.html.erb

@@ -8,28 +8,26 @@
 
       <% if can?(:trigger, Kaui::Payment) || can?(:credit, Kaui::Account) || can?(:charge, Kaui::Account) %>
           <div class="tag-bar tag-bar-breathe">
-
-            <div class="tag-select" onclick="void(0)">
-              <span><i class="fa fa-money"></i><i class="fa fa-caret-down"></i></span>
-
-              <div class="tag-select-box">
-                <!-- Payment, Credit then Charge. Same ordering as in the billing timeline -->
-                <% if can?(:trigger, Kaui::Payment) && @account.account_balance.present? && @account.account_balance > 0 %>
-                    <%= link_to '<i class="fa fa-plus-square"></i>&nbsp;Pay all invoices'.html_safe,
-                                kaui_engine.pay_all_invoices_account_path(@account.account_id),
-                                :method => :post %>
-                <% end %>
-                <% if can? :credit, Kaui::Account %>
-                    <%= link_to '<i class="fa fa-plus-square"></i>&nbsp;Add credit'.html_safe,
-                                kaui_engine.new_account_credit_path(@account.account_id, :currency => @account.currency) %>
-                <% end %>
-                <% if can? :charge, Kaui::Account %>
-                    <%= link_to '<i class="fa fa-plus-square"></i>&nbsp;Create charge'.html_safe,
-                                kaui_engine.new_account_charge_path(@account.account_id, :currency => @account.currency) %>
-                <% end %>
+            <div class="toggler">
+              <div class="toggle">
+                <div class="actions">
+                  <!-- Payment, Credit then Charge. Same ordering as in the billing timeline -->
+                  <% if can?(:trigger, Kaui::Payment) && @account.account_balance.present? && @account.account_balance > 0 %>
+                      <%= link_to '<i class="fa fa-plus-square"></i>&nbsp;Pay all invoices'.html_safe,
+                                  kaui_engine.pay_all_invoices_account_path(@account.account_id),
+                                  :method => :post %>
+                  <% end %>
+                  <% if can? :credit, Kaui::Account %>
+                      <%= link_to '<i class="fa fa-plus-square"></i>&nbsp;Add credit'.html_safe,
+                                  kaui_engine.new_account_credit_path(@account.account_id, :currency => @account.currency) %>
+                  <% end %>
+                  <% if can? :charge, Kaui::Account %>
+                      <%= link_to '<i class="fa fa-plus-square"></i>&nbsp;Create charge'.html_safe,
+                                  kaui_engine.new_account_charge_path(@account.account_id, :currency => @account.currency) %>
+                  <% end %>
+                </div>
               </div>
             </div>
-
           </div>
       <% end %>
 

data/app/views/kaui/accounts/_payment_methods.html.erb

@@ -2,26 +2,21 @@
 
   <div class="column-block">
 
-    <h1>Payment Methods</h1>
-
-    <div class="info-wrapper">
-
+    <h1>Payment Methods
       <% if can? :create, Kaui::PaymentMethod %>
-          <div class="tag-bar">
-
-            <div class="tag-select" onclick="void(0)">
-              <span><i class="fa fa-credit-card"></i><i class="fa fa-caret-down"></i></span>
-
-              <div class="tag-select-box">
-                <%= link_to '<i class="fa fa-plus-square"></i>&nbsp;Add payment method'.html_safe, kaui_engine.new_payment_method_path(:account_id => @account.account_id) %>
-              </div>
-            </div>
-          </div>
+          <%= link_to '<i class="fa fa-plus-square"></i>'.html_safe,
+                      kaui_engine.new_payment_method_path(:account_id => @account.account_id),
+                      :class => 'btn btn-xs' %>
       <% end %>
+    </h1>
+
+    <% unless @payment_methods.empty? %>
+        <div class="info-wrapper">
 
-      <%= render :partial => 'kaui/payment_methods/payment_methods_table', :locals => {:account => @account, :payment_methods => @payment_methods} %>
+          <%= render :partial => 'kaui/payment_methods/payment_methods_table', :locals => {:account => @account, :payment_methods => @payment_methods} %>
 
-    </div>
+        </div>
+    <% end %>
 
   </div>
 

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

@@ -0,0 +1,24 @@
+<% if can? :config_upload, Kaui::AdminTenant %>
+    <div class="tab-pane fade" id="CatalogTranslation">
+      <%= form_tag({:action => :upload_catalog_translation}, :method => 'post', :multipart => true, :class => 'form-horizontal') do %>
+          <%= hidden_field_tag(:id, @tenant.id) %>
+
+          <div class="form-group">
+            <div class="col-sm-10">
+              <%= file_field_tag 'catalog_translation', :class => 'form-control' %>
+            </div>
+          </div>
+          <div class="form-group">
+            <%= label_tag :translation_locale, 'Locale', :class => 'col-sm-2 control-label' %>
+            <div class="col-sm-10">
+              <%= text_field_tag :translation_locale, nil, :class => 'form-control' %>
+            </div>
+          </div>
+          <div class="form-group">
+            <div class="col-sm-10">
+              <%= submit_tag 'Upload', :class => 'btn btn-default' %>
+            </div>
+          </div>
+      <% end %>
+    </div>
+<% end %>

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

@@ -0,0 +1,28 @@
+<% if can? :config_upload, Kaui::AdminTenant %>
+    <div class="tab-pane fade" id="InvoiceTemplate">
+      <%= form_tag({:action => :upload_invoice_template}, :method => 'post', :multipart => true, :class => 'form-horizontal') do %>
+          <%= hidden_field_tag(:id, @tenant.id) %>
+
+          <div class="form-group">
+            <div class="col-sm-10">
+              <%= file_field_tag 'invoice_template', :class => 'form-control' %>
+            </div>
+          </div>
+          <div class="form-group">
+            <div class="col-sm-10">
+              <div class="checkbox">
+                <label>
+                  <%= check_box_tag :manual_pay %>
+                  <span>Manual Pay</span>
+                </label>
+              </div>
+            </div>
+          </div>
+          <div class="form-group">
+            <div class="col-sm-offset-2 col-sm-10">
+              <%= submit_tag 'Upload', :class => 'btn btn-default' %>
+            </div>
+          </div>
+      <% end %>
+    </div>
+<% end %>

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

@@ -0,0 +1,24 @@
+<% if can? :config_upload, Kaui::AdminTenant %>
+    <div class="tab-pane fade" id="InvoiceTranslation">
+      <%= form_tag({:action => :upload_invoice_translation}, :method => 'post', :multipart => true, :class => 'form-horizontal') do %>
+          <%= hidden_field_tag(:id, @tenant.id) %>
+
+          <div class="form-group">
+            <div class="col-sm-10">
+              <%= file_field_tag 'invoice_translation', :class => 'form-control' %>
+            </div>
+          </div>
+          <div class="form-group">
+            <%= label_tag :translation_locale, 'Locale', :class => 'col-sm-2 control-label' %>
+            <div class="col-sm-10">
+              <%= text_field_tag :translation_locale, nil, :class => 'form-control' %>
+            </div>
+          </div>
+          <div class="form-group">
+            <div class="col-sm-10">
+              <%= submit_tag 'Upload', :class => 'btn btn-default' %>
+            </div>
+          </div>
+      <% end %>
+    </div>
+<% end %>