kaui 0.1.0 → 0.1.2

data/README.rdoc

@@ -1,3 +1,29 @@
 = Kaui
 
-This project rocks and uses MIT-LICENSE.
+This project rocks and uses MIT-LICENSE.
+
+== Getting started
+
+=== Running Kaui
+
+You can run Kaui locally using the dummy app in the test directory:
+
+  # Point to your killbill installation
+  export KILLBILL_URL="http://killbill.company.com:8080"
+  cd test/dummy && rails s
+
+=== Mounting Kaui into your own Rails app
+
+Kaui expects the container app to define the <tt>current_user</tt> method, which returns the
+name of the logged-in user. This is used by Killbill for auditing purposes.
+
+=== Running tests
+
+Prepare a kaui_test database locally to be able to run the test suite:
+
+  create database kaui_test;
+  grant all privileges on kaui_test.* to 'root'@'localhost' identified by '';
+
+You can run tests using rake:
+
+  rake test

data/app/controllers/kaui/account_tags_controller.rb

@@ -12,22 +12,37 @@ class Kaui::AccountTagsController < Kaui::EngineController
 
   def edit
     @account_id = params[:account_id]
-    @available_tags = Kaui::KillbillHelper::get_tag_definitions.sort {|tag_a, tag_b| tag_a.name.downcase <=> tag_b.name.downcase }
+    @available_tags = Kaui::KillbillHelper::get_tag_definitions.sort
 
     @account = Kaui::KillbillHelper::get_account(@account_id)
-    @tags = Kaui::KillbillHelper::get_tags_for_account(@account.account_id)
+    @tag_names = Kaui::KillbillHelper::get_tags_for_account(@account.account_id).map { |tag| tag.tag_definition_name }
   end
 
   def update
-    account = Kaui::KillbillHelper::get_account(params[:account_id])
-    tags = params[:tags]
+    current_tags = Kaui::KillbillHelper::get_tags_for_account(params[:account_id]).map { |tag| tag.tag_definition_id }
+    new_tags = []
+    params.each do |tag, tag_name|
+      tag_info = tag.split('_')
+      next if tag_info.size != 2 or tag_info[0] != 'tag'
+      new_tags << tag_info[1]
+    end
 
-    if account.account_id.present?
-      Kaui::KillbillHelper::set_tags_for_account(account.account_id, tags)
-      redirect_to Kaui.account_home_path.call(account.external_key)
-    else
-      flash[:error] = "No account id given"
+    # Find tags to remove
+    tags_to_remove = []
+    current_tags.each do |current_tag_definition_id|
+      tags_to_remove << current_tag_definition_id unless new_tags.include?(current_tag_definition_id)
     end
+
+    # Find tags to add
+    tags_to_add = []
+    new_tags.each do |new_tag_definition_id|
+      tags_to_add << new_tag_definition_id unless current_tags.include?(new_tag_definition_id)
+    end
+
+    Kaui::KillbillHelper::remove_tags_for_account(params[:account_id], tags_to_remove)
+    Kaui::KillbillHelper::add_tags_for_account(params[:account_id], tags_to_add)
+
+    redirect_to Kaui.account_home_path.call(params[:account_id])
   end
 
 end

data/app/controllers/kaui/account_timelines_controller.rb

@@ -12,7 +12,7 @@ class Kaui::AccountTimelinesController < Kaui::EngineController
 
       if @account.present?
         @timeline = Kaui::KillbillHelper::get_account_timeline(@account_id)
-        # @payment_attempts_by_payment_id = {}
+
         @invoices_by_id = {}
         @bundle_names = {}
         unless @timeline.nil?

data/app/controllers/kaui/accounts_controller.rb

@@ -13,12 +13,13 @@ class Kaui::AccountsController < Kaui::EngineController
     if key.present?
       # support id (UUID) and external key search
       if key =~ /[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}/
-        @account = Kaui::KillbillHelper::get_account(key)
+        @account = Kaui::KillbillHelper::get_account(key, true)
       else
-        @account = Kaui::KillbillHelper::get_account_by_external_key(key)
+        @account = Kaui::KillbillHelper::get_account_by_external_key(key, true)
       end
 
-      if @account.present?
+      if @account.present? and @account.is_a? Kaui::Account
+        @tags = Kaui::KillbillHelper::get_tags_for_account(@account.account_id).sort
         @payment_methods = Kaui::KillbillHelper::get_payment_methods(@account.account_id)
         @bundles = Kaui::KillbillHelper::get_bundles(@account.account_id)
         @subscriptions_by_bundle_id = {}
@@ -30,8 +31,8 @@ class Kaui::AccountsController < Kaui::EngineController
           end
         end
       else
-        flash[:error] = "Account #{@account_id} not found"
-        redirect_to :action => :index
+        flash[:error] = "Account #{@account_id} not found: #{@account}"
+        render :action => :index
       end
     else
       flash[:error] = "No id given"
@@ -125,4 +126,5 @@ class Kaui::AccountsController < Kaui::EngineController
     end
     redirect_to :back
   end
+
 end

data/app/controllers/kaui/bundles_controller.rb

@@ -13,7 +13,7 @@ class Kaui::BundlesController < Kaui::EngineController
       if key =~ /[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}/
         @bundle = Kaui::KillbillHelper.get_bundle(key)
       else
-        @bundle = Kaui::KillbillHelper.get_bundle_by_external_key(key)
+        @bundle = Kaui::KillbillHelper.get_bundle_by_external_key(key, params[:account_id])
       end
 
       if @bundle.present?
@@ -21,7 +21,7 @@ class Kaui::BundlesController < Kaui::EngineController
         @subscriptions = Kaui::KillbillHelper.get_subscriptions_for_bundle(@bundle.bundle_id)
       else
         flash[:error] = "Bundle #{key} not found"
-        redirect_to :action => :index
+        render :action => :index
       end
     else
       flash[:error] = "No id given"

data/app/controllers/kaui/chargebacks_controller.rb

@@ -21,9 +21,10 @@ class Kaui::ChargebacksController < Kaui::EngineController
 
     # @payment_attempt = Kaui::KillbillHelper::get_payment_attempt(@external_key, @invoice_id, @payment_id)
     @account = Kaui::KillbillHelper::get_account(@account_id)
-    # TODO: get payment by payment id (no api at the moment)
-    @payment = Kaui::KillbillHelper::get_payment(@invoice_id, @payment_id)
+    @payment = Kaui::KillbillHelper::get_payment(@payment_id)
     @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id)
+    @payment_method = Kaui::KillbillHelper::get_payment_method(@payment.payment_method_id)
+
     @chargeback = Kaui::Chargeback.new("payment_id" => @payment_id,
                                        "chargeback_amount" => @payment.amount)
   end

data/app/controllers/kaui/charges_controller.rb

@@ -0,0 +1,32 @@
+class Kaui::ChargesController < Kaui::EngineController
+
+  def new
+    @account_id = params[:account_id]
+    @invoice_id = params[:invoice_id]
+
+    @account = Kaui::KillbillHelper::get_account(@account_id)
+
+    if @invoice_id.present?
+      @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id)
+      @charge = Kaui::Charge.new("accountId" => @account_id, "invoiceId" => @invoice_id)
+    else
+      @charge = Kaui::Charge.new("accountId" => @account_id)
+    end
+
+  end
+
+  def create
+    charge = Kaui::Charge.new(params[:charge])
+
+    if charge.present?
+      success = Kaui::KillbillHelper::create_charge(charge, params[:requested_date], current_user, nil, params[:comment])
+      if success
+        flash[:info] = "Charge created"
+      end
+    else
+      flash[:error] = "No charge to process"
+    end
+    redirect_to account_timeline_path(:id => charge.account_id)
+  end
+
+end

data/app/controllers/kaui/credits_controller.rb

@@ -19,11 +19,10 @@ class Kaui::CreditsController < Kaui::EngineController
   def new
     @account_id = params[:account_id]
     @invoice_id = params[:invoice_id]
-
-    @credit = Kaui::Credit.new("accountId" => @account_id, "invoiceId" => @invoice_id)
-
     @account = Kaui::KillbillHelper::get_account(@account_id)
-    @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id)
+    @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id) unless @invoice_id.nil?
+
+    @credit = Kaui::Credit.new("accountId" => @account_id, "invoiceId" => @invoice_id, "creditAmount" => @invoice.balance)
   end
 
   def create

data/app/controllers/kaui/external_payments_controller.rb

@@ -15,8 +15,6 @@ class Kaui::ExternalPaymentsController < Kaui::EngineController
     success = Kaui::KillbillHelper::create_external_payment(external_payment, current_user, params[:reason], params[:comment])
     if success
       flash[:info] = "External Payment created"
-    # else
-    #   flash[:error] = "Error while creating external payment"
     end
     redirect_to account_timeline_path(external_payment.account_id)
   end

data/app/controllers/kaui/invoice_items_controller.rb

@@ -0,0 +1,44 @@
+class Kaui::InvoiceItemsController < Kaui::EngineController
+  def index
+    if params[:invoice_item_id].present? and params[:invoice_id].present?
+      redirect_to invoice_item_path(params[:invoice_item_id], :invoice_id => params[:invoice_id])
+    end
+  end
+
+  def show
+    find_invoice_item
+  end
+
+  def edit
+    find_invoice_item
+  end
+
+  def update
+    @invoice_item = Kaui::InvoiceItem.new(params[:invoice_item])
+    success = Kaui::KillbillHelper.adjust_invoice(@invoice_item, current_user, params[:reason], params[:comment])
+    if success
+      flash[:notice] = "Adjustment item created"
+      redirect_to invoice_path(@invoice_item.invoice_id)
+    else
+      flash[:error] = "Unable to create adjustment item"
+      render :action => "edit"
+    end
+  end
+
+  private
+
+  def find_invoice_item
+    invoice_item_id = params[:id]
+    invoice_id = params[:invoice_id]
+    if invoice_item_id.present? and invoice_id.present?
+      @invoice_item = Kaui::KillbillHelper.get_invoice_item(invoice_id, invoice_item_id)
+      unless @invoice_item.present?
+        flash[:error] = "Invoice for id #{invoice_id} and invoice item id #{invoice_item_id} not found"
+        render :action => :index
+      end
+    else
+      flash[:error] = "Both invoice item and invoice ids should be specified"
+      render :action => :index
+    end
+  end
+end

data/app/controllers/kaui/invoices_controller.rb

@@ -1,7 +1,7 @@
 class Kaui::InvoicesController < Kaui::EngineController
   def index
-    if params[:id].present?
-      redirect_to invoice_path(params[:id])
+    if params[:invoice_id].present?
+      redirect_to invoice_path(params[:invoice_id])
     end
   end
 
@@ -12,6 +12,7 @@ class Kaui::InvoicesController < Kaui::EngineController
       if @invoice.present?
         @account = Kaui::KillbillHelper.get_account(@invoice.account_id)
         @payments = Kaui::KillbillHelper.get_payments(@invoice_id)
+
         @subscriptions = {}
         @bundles = {}
         if @invoice.items.present?
@@ -28,7 +29,7 @@ class Kaui::InvoicesController < Kaui::EngineController
         end
       else
         flash[:error] = "Invoice #{@invoice_id} not found"
-        redirect_to :action => :index
+        render :action => :index
       end
     else
       flash[:error] = "No id given"

data/app/controllers/kaui/payments_controller.rb

@@ -1,29 +1,26 @@
 class Kaui::PaymentsController < Kaui::EngineController
 
   def new
-    @invoice_id = params[:invoice_id]
     @account_id = params[:account_id]
-
-    @payment = Kaui::Payment.new("invoiceId" => @invoice_id)
-
-    @account = Kaui::KillbillHelper::get_account(@account_id)
+    @invoice_id = params[:invoice_id]
     @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id)
+    @account = Kaui::KillbillHelper::get_account(@account_id)
+
+    @payment = Kaui::Payment.new("accountId" => @account_id, "invoiceId" => @invoice_id, "amount" => @invoice.balance)
   end
 
   def create
-    external_payment = Kaui::Payment.new(params[:external_payment])
+    payment = Kaui::Payment.new(params[:payment])
 
-    if external_payment.present?
-      success = Kaui::KillbillHelper::create_external_payment(payment, current_user, params[:reason], params[:comment])
+    if payment.present?
+      success = Kaui::KillbillHelper::create_payment(payment, params[:external], current_user, params[:reason], params[:comment])
       if success
-        flash[:info] = "External Payment created"
-      # else
-      #   flash[:error] = "Error while creating external payment"
+        flash[:info] = "Payment created"
       end
     else
-      flash[:error] = "No external payment to process"
+      flash[:error] = "No payment to process"
     end
-    redirect_to account_timeline_path(:id => params[:account_id])
+    redirect_to account_timeline_path(:id => payment.account_id)
   end
 
 end

data/app/controllers/kaui/refunds_controller.rb

@@ -1,15 +1,25 @@
 class Kaui::RefundsController < Kaui::EngineController
-	def show
-    @payment_id = params[:id]
-    if @payment_id.present?
-      data = Kaui::KillbillHelper::get_refunds_for_payment(@payment_id)
+  def index
+    if params[:refund_id].present?
+      redirect_to refund_path(params[:refund_id])
+    end
+  end
+
+  def show
+    if params[:id].present?
+      data = Kaui::KillbillHelper::get_refund(params[:id])
       if data.present?
-        @refund = Kaui::Refund.new(data)
+        @refunds = [data]
       else
-        Rails.logger.warn("Did not get back refunds for the payment id #{response_body}")
+        @refunds = Kaui::KillbillHelper::get_refunds_for_payment(params[:id])
+        unless @refunds.present?
+          flash[:error] = "Refund for id or payment id #{params[:id]} couldn't be found"
+          render :action => :index
+        end
       end
     else
-      flash[:notice] = "No payment id given"
+      flash[:error] = "A refund or payment id should be specifed"
+      render :action => :index
     end
   end
 
@@ -21,8 +31,9 @@ class Kaui::RefundsController < Kaui::EngineController
     @refund = Kaui::Refund.new('adjusted' => true)
 
     @account = Kaui::KillbillHelper::get_account(@account_id)
-    @payment = Kaui::KillbillHelper::get_payment(@invoice_id, @payment_id)
+    @payment = Kaui::KillbillHelper::get_payment(@payment_id)
     @invoice = Kaui::KillbillHelper::get_invoice(@invoice_id)
+    @payment_method = Kaui::KillbillHelper::get_payment_method(@payment.payment_method_id)
   end
 
   def create

data/app/controllers/kaui/subscriptions_controller.rb

@@ -76,10 +76,14 @@ class Kaui::SubscriptionsController < Kaui::EngineController
 
   def edit
     @subscription = Kaui::KillbillHelper.get_subscription(params[:id])
+
     if @subscription.present?
       @bundle = Kaui::KillbillHelper::get_bundle(@subscription.bundle_id)
+      @account = Kaui::KillbillHelper::get_account(@bundle.account_id)
       @catalog = Kaui::KillbillHelper::get_available_base_plans
+
       @current_plan = "#{@subscription.product_name} #{@subscription.billing_period}".humanize
+
       if @subscription.price_list != "DEFAULT"
         @current_plan += " (price list #{@subscription.price_list})"
       end
@@ -106,7 +110,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
       # TODO: need to use entered start_date (or current date if none entered)
 
       Kaui::KillbillHelper::update_subscription(subscription, requested_date, current_user)
-      redirect_to Kaui.bundle_home_path.call(bundle.external_key)
+      redirect_to Kaui.bundle_home_path.call(bundle.bundle_id)
     else
       flash[:error] = "No subscription given"
       redirect_to :back

data/app/controllers/kaui/tag_definitions_controller.rb

@@ -0,0 +1,85 @@
+module Kaui
+  class TagDefinitionsController < ApplicationController
+    # GET /tag_definitions
+    # GET /tag_definitions.json
+    def index
+      @tag_definitions = TagDefinition.all
+
+      respond_to do |format|
+        format.html # index.html.erb
+        format.json { render json: @tag_definitions }
+      end
+    end
+
+    # GET /tag_definitions/1
+    # GET /tag_definitions/1.json
+    def show
+      @tag_definition = TagDefinition.find(params[:id])
+
+      respond_to do |format|
+        format.html # show.html.erb
+        format.json { render json: @tag_definition }
+      end
+    end
+
+    # GET /tag_definitions/new
+    # GET /tag_definitions/new.json
+    def new
+      @tag_definition = TagDefinition.new
+
+      respond_to do |format|
+        format.html # new.html.erb
+        format.json { render json: @tag_definition }
+      end
+    end
+
+    # GET /tag_definitions/1/edit
+    def edit
+      @tag_definition = TagDefinition.find(params[:id])
+    end
+
+    # POST /tag_definitions
+    # POST /tag_definitions.json
+    def create
+      @tag_definition = TagDefinition.new(params[:tag_definition])
+
+      respond_to do |format|
+        if @tag_definition.save
+          format.html { redirect_to @tag_definition, notice: 'Tag definition was successfully created.' }
+          format.json { render json: @tag_definition, status: :created, location: @tag_definition }
+        else
+          format.html { render action: "new" }
+          format.json { render json: @tag_definition.errors, status: :unprocessable_entity }
+        end
+      end
+    end
+
+    # PUT /tag_definitions/1
+    # PUT /tag_definitions/1.json
+    def update
+      @tag_definition = TagDefinition.find(params[:id])
+
+      respond_to do |format|
+        if @tag_definition.update_attributes(params[:tag_definition])
+          format.html { redirect_to @tag_definition, notice: 'Tag definition was successfully updated.' }
+          format.json { head :no_content }
+        else
+          format.html { render action: "edit" }
+          format.json { render json: @tag_definition.errors, status: :unprocessable_entity }
+        end
+      end
+    end
+
+    # DELETE /tag_definitions/1
+    # DELETE /tag_definitions/1.json
+    def destroy
+      @tag_definition = TagDefinition.find(params[:id])
+      @tag_definition.destroy
+
+      respond_to do |format|
+        format.html { redirect_to tag_definitions_url }
+        format.json { head :no_content }
+      end
+    end
+  end
+end