kaui 0.1.15 → 0.1.16

data/app/controllers/kaui/subscriptions_controller.rb

@@ -157,9 +157,9 @@ class Kaui::SubscriptionsController < Kaui::EngineController
     subscription_id = params[:id]
     if subscription_id.present?
       begin
-        Kaui::KillbillHelper::delete_subscription(subscription_id, params[:policy], current_user)
+        Kaui::KillbillHelper::delete_subscription(subscription_id, params[:policy], params[:ctd], params[:billing_period], current_user)
       rescue => e
-        flash[:error] = "Error while reinstating subscription: #{as_string(e)}"
+        flash[:error] = "Error while canceling subscription: #{as_string(e)}"
       end
     else
       flash[:error] = "No subscription id given"

data/app/helpers/kaui/killbill_helper.rb

@@ -1,4 +1,5 @@
 require 'rest_client'
+require 'time'
 
 module Kaui
   module KillbillHelper
@@ -205,8 +206,11 @@ module Kaui
                     "X-Killbill-Comment" => "#{comment}"
     end
 
-    def self.delete_subscription(subscription_id, policy = nil, current_user = nil, reason = nil, comment = nil)
-      params = "?policy=#{policy}" unless policy.blank?
+    def self.delete_subscription(subscription_id, policy = nil, ctd = nil, billing_period = nil, current_user = nil, reason = nil, comment = nil)
+      prev_ctd = compute_previous_ctd(ctd, billing_period)
+      params = "?"
+      params += "policy=#{policy}&" unless policy.blank?
+      params += "requestedDate=#{prev_ctd.strftime('%Y-%m-%dT%H:%M:%S')}" unless prev_ctd.nil?
       call_killbill :delete,
                     "/1.0/kb/subscriptions/#{subscription_id}#{params}",
                     "X-Killbill-CreatedBy" => current_user,
@@ -214,6 +218,22 @@ module Kaui
                     "X-Killbill-Comment" => "#{comment}"
     end
 
+    def self.compute_previous_ctd(ctd, billing_period)
+      return nil if ctd.nil? or billing_period.nil?
+
+      ctd = DateTime.parse(ctd)
+      billing_period = billing_period.upcase
+      if billing_period == 'MONTHLY'
+        ctd.prev_month(1)
+      elsif billing_period == 'QUARTERLY'
+        ctd.prev_month(3)
+      elsif billing_period == 'ANNUAL'
+        ctd.prev_month(12)
+      else
+        nil
+      end
+    end
+
     ############## INVOICE ##############
 
     def self.get_invoice(invoice_id)

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

@@ -39,7 +39,8 @@
                     </a>
                     <ul class="dropdown-menu">
                       <li><%= link_to "Cancel (default policy)", kaui_engine.subscription_path(:id => sub.subscription_id), :method => :delete %></li>
-                      <li><%= link_to "Cancel immediately", kaui_engine.subscription_path(:id => sub.subscription_id, :policy => 'IMMEDIATE'), :method => :delete %></li>
+                      <li><%= link_to "Cancel at previous CTD (no proration)", kaui_engine.subscription_path(:id => sub.subscription_id, :policy => 'IMMEDIATE', :ctd => sub.charged_through_date, :billing_period => sub.billing_period), :method => :delete %></li>
+                      <li><%= link_to "Cancel immediately (generate proration)", kaui_engine.subscription_path(:id => sub.subscription_id, :policy => 'IMMEDIATE'), :method => :delete %></li>
                       <li><%= link_to "Cancel end of term", kaui_engine.subscription_path(:id => sub.subscription_id, :policy => 'END_OF_TERM'), :method => :delete %></li>
                     </ul>
                   </div>

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

@@ -1,6 +1,6 @@
 <% if @subscription.present? %>
   <div class="page-header">
-    <h2>Subscription <%= @subscription.id %></h2>
+    <h2>Subscription <%= @subscription.subscription_id %></h2>
   </div>
   <dl class="dl-horizontal">
     <dt>Category</dt>

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.1.15"
+  VERSION = "0.1.16"
 end