kaui 2.0.4 → 2.2.1

data/lib/kaui/installer/installer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbconfig'
 require 'active_support/core_ext/string'
 require 'thor'
@@ -5,31 +7,30 @@ require 'thor/group'
 require 'kaui/version'
 
 module KauiCmd
-
   class Installer < Thor::Group
     include Thor::Actions
 
     desc 'Install Kaui inside an existing rails project'
 
-    argument :app_path, :type => :string, :desc => 'rails app_path', :default => '.'
+    argument :app_path, type: :string, desc: 'rails app_path', default: '.'
 
-    class_option :version, :type => :string, :desc => 'Kaui Version to use'
+    class_option :version, type: :string, desc: 'Kaui Version to use'
 
-    class_option :edge, :type => :boolean
+    class_option :edge, type: :boolean
 
-    class_option :path, :type => :string, :desc => 'Kaui gem path'
-    class_option :git, :type => :string, :desc => 'Kaui gem git url'
-    class_option :ref, :type => :string, :desc => 'Kaui gem git ref'
-    class_option :branch, :type => :string, :desc => 'Kaui gem git branch'
-    class_option :tag, :type => :string, :desc => 'Kaui gem git tag'
+    class_option :path, type: :string, desc: 'Kaui gem path'
+    class_option :git, type: :string, desc: 'Kaui gem git url'
+    class_option :ref, type: :string, desc: 'Kaui gem git ref'
+    class_option :branch, type: :string, desc: 'Kaui gem git branch'
+    class_option :tag, type: :string, desc: 'Kaui gem git tag'
 
-    class_option :skip_bundle, :type => :boolean, :desc => "Don't run bundle install"
+    class_option :skip_bundle, type: :boolean, desc: "Don't run bundle install"
 
     def verify_rails
-      unless rails_project?
-        say "#{@app_path} is not a rails project."
-        exit 1
-      end
+      return if rails_project?
+
+      say "#{@app_path} is not a rails project."
+      exit 1
     end
 
     def prepare_options
@@ -55,28 +56,28 @@ module KauiCmd
     def add_gems
       inside @app_path do
         gem :kaui, @kaui_gem_options
-        run 'bundle install', :capture => true unless options[:skip_bundle]
+        run 'bundle install', capture: true unless options[:skip_bundle]
       end
     end
 
     def initialize_kaui
       inside @app_path do
-        run "rails generate kaui:install", :verbose => false
+        run 'rails generate kaui:install', verbose: false
       end
     end
 
     private
 
-      def rails_project?
-        File.exists?(File.join(@app_path, 'script', 'rails')) || File.exists?(File.join(@app_path, 'bin', 'rails'))
-      end
+    def rails_project?
+      File.exist?(File.join(@app_path, 'script', 'rails')) || File.exist?(File.join(@app_path, 'bin', 'rails'))
+    end
 
-      def gem(name, gem_options={})
-        say_status :gemfile, name
-        parts = ["'#{name}'"]
-        parts << ["'#{gem_options.delete(:version)}'"] if gem_options[:version]
-        gem_options.each { |key, value| parts << ":#{key} => '#{value}'" }
-        append_file 'Gemfile', "gem #{parts.join(', ')}\n", :verbose => false
-      end
+    def gem(name, gem_options = {})
+      say_status :gemfile, name
+      parts = ["'#{name}'"]
+      parts << ["'#{gem_options.delete(:version)}'"] if gem_options[:version]
+      gem_options.each { |key, value| parts << ":#{key} => '#{value}'" }
+      append_file 'Gemfile', "gem #{parts.join(', ')}\n", verbose: false
+    end
   end
 end

data/lib/kaui/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Kaui
-  VERSION = '2.0.4'
+  VERSION = '2.2.1'
 end

data/lib/kaui.rb

@@ -1,17 +1,28 @@
-#lib_dir = File.expand_path("..", __FILE__)
-#$LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)
+# frozen_string_literal: true
 
-require "kaui/engine"
+# lib_dir = File.expand_path("..", __FILE__)
+# $LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)
 
-module Kaui
+require 'kaui/engine'
 
+module Kaui
   mattr_accessor :home_path
   mattr_accessor :tenant_home_path
   mattr_accessor :new_user_session_path
   mattr_accessor :destroy_user_session_path
 
+  mattr_accessor :bundle_details_partial
+
+  mattr_accessor :pretty_account_identifier
   mattr_accessor :bundle_key_display_string
   mattr_accessor :creditcard_plugin_name
+
+  mattr_accessor :account_search_columns
+  mattr_accessor :invoice_search_columns
+  mattr_accessor :account_invoices_columns
+
+  mattr_accessor :customer_invoice_link
+
   mattr_accessor :layout
 
   mattr_accessor :thread_pool
@@ -36,11 +47,56 @@ module Kaui
 
   mattr_accessor :disable_sign_up_link
 
-  self.home_path = lambda { Kaui::Engine.routes.url_helpers.home_path }
-  self.tenant_home_path = lambda { Kaui::Engine.routes.url_helpers.tenants_path }
+  self.home_path = -> { Kaui::Engine.routes.url_helpers.home_path }
+  self.tenant_home_path = -> { Kaui::Engine.routes.url_helpers.tenants_path }
+
+  self.bundle_details_partial = 'kaui/bundles/bundle_details'
+
+  self.pretty_account_identifier = ->(account) { account.name.presence || account.email.presence || Kaui::UuidHelper.truncate_uuid(account.external_key) }
+  self.bundle_key_display_string = ->(bundle_key) { bundle_key }
+  self.creditcard_plugin_name =  -> { '__EXTERNAL_PAYMENT__' }
+
+  self.account_search_columns = lambda do |account = nil, view_context = nil|
+    [
+      ['External key', 'Balance'],
+      [
+        account&.external_key,
+        account.nil? || view_context.nil? ? nil : view_context.humanized_money_with_symbol(account.balance_to_money)
+      ]
+    ]
+  end
+
+  self.invoice_search_columns = lambda do |invoice = nil, view_context = nil|
+    default_label = 'label-info'
+    default_label = 'label-default' if invoice&.status == 'DRAFT'
+    default_label = 'label-success' if invoice&.status == 'COMMITTED'
+    default_label = 'label-danger' if invoice&.status == 'VOID'
+    [
+      %w[Date Status],
+      [
+        invoice&.invoice_date,
+        invoice.nil? || view_context.nil? ? nil : view_context.content_tag(:span, invoice.status, class: ['label', default_label])
+      ]
+    ]
+  end
 
-  self.bundle_key_display_string =  lambda {|bundle_key| bundle_key }
-  self.creditcard_plugin_name =  lambda { '__EXTERNAL_PAYMENT__' }
+  self.account_invoices_columns = lambda do |invoice = nil, view_context = nil|
+    default_label = 'label-info'
+    default_label = 'label-default' if invoice&.status == 'DRAFT'
+    default_label = 'label-success' if invoice&.status == 'COMMITTED'
+    default_label = 'label-danger' if invoice&.status == 'VOID'
+    [
+      %w[Date Amount Balance Status],
+      [
+        invoice&.invoice_date,
+        invoice.nil? || view_context.nil? ? nil : view_context.humanized_money_with_symbol(invoice.amount_to_money),
+        invoice.nil? || view_context.nil? ? nil : view_context.humanized_money_with_symbol(invoice.balance_to_money),
+        invoice.nil? || view_context.nil? ? nil : view_context.content_tag(:span, invoice.status, class: ['label', default_label])
+      ]
+    ]
+  end
+
+  self.customer_invoice_link = ->(invoice, ctx) { ctx.link_to 'View customer invoice html', ctx.kaui_engine.show_html_invoice_path(invoice.invoice_id), class: 'btn', target: '_blank' }
 
   self.demo_mode = false
 
@@ -98,14 +154,14 @@ module Kaui
 
   # Default URLs
   self.gateways_urls = {
-      'killbill-adyen' => 'https://ca-test.adyen.com/ca/ca/accounts/showTx.shtml?txType=Payment&pspReference=FIRST_PAYMENT_REFERENCE_ID',
-      'killbill-cybersource' => 'https://ebctest.cybersource.com/ebctest/transactionsearch/TransactionSearchDetailsLoad.do?requestId=FIRST_PAYMENT_REFERENCE_ID',
-      'killbill-stripe' => 'https://dashboard.stripe.com/test/payments/FIRST_PAYMENT_REFERENCE_ID'
+    'killbill-adyen' => 'https://ca-test.adyen.com/ca/ca/accounts/showTx.shtml?txType=Payment&pspReference=FIRST_PAYMENT_REFERENCE_ID',
+    'killbill-cybersource' => 'https://ebctest.cybersource.com/ebctest/transactionsearch/TransactionSearchDetailsLoad.do?requestId=FIRST_PAYMENT_REFERENCE_ID',
+    'killbill-stripe' => 'https://dashboard.stripe.com/test/payments/FIRST_PAYMENT_REFERENCE_ID'
   }
 
   self.disable_sign_up_link = true
 
-  def self.is_user_assigned_valid_tenant?(user, session)
+  def self.user_assigned_valid_tenant?(user, session)
     #
     # If those are set in config initializer then we bypass the check
     # For multi-tenant production deployment, those should not be set!
@@ -122,16 +178,16 @@ module Kaui
     au = Kaui::AllowedUser.find_by_kb_username(user.kb_username)
     return false if au.nil?
 
-    return au.kaui_tenants.select { |t| t.kb_tenant_id == session[:kb_tenant_id] }.first
+    au.kaui_tenants.select { |t| t.kb_tenant_id == session[:kb_tenant_id] }.first
   end
 
   def self.current_tenant_user_options(user, session)
     kb_tenant_id = session[:kb_tenant_id]
     user_tenant = Kaui::Tenant.find_by_kb_tenant_id(kb_tenant_id) if kb_tenant_id
     result = {
-        :username => user.kb_username,
-        :password => user.password,
-        :session_id => user.kb_session_id,
+      username: user.kb_username,
+      password: user.password,
+      session_id: user.kb_session_id
     }
     if user_tenant
       result[:api_key] = user_tenant.api_key
@@ -140,21 +196,9 @@ module Kaui
     result
   end
 
-
-
-
-  def self.config(&block)
+  def self.config
     {
-      :layout => layout || 'kaui/layouts/kaui_application',
+      layout: layout || 'kaui/layouts/kaui_application'
     }
   end
 end
-
-# ruby-1.8 compatibility
-module Kernel
-  def define_singleton_method(*args, &block)
-    class << self
-      self
-    end.send(:define_method, *args, &block)
-  end
-end

data/lib/tasks/kaui_tasks.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # desc "Explaining what the task does"
 # task :kaui do
 #   # Task goes here