kaui 0.5.2 → 0.5.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kaui (0.5.2)
+    kaui (0.5.3)
       cancan (~> 1.6.10)
       d3_rails (~> 3.2.8)
       devise (~> 3.0.2)

data/app/controllers/kaui/subscriptions_controller.rb

@@ -171,4 +171,20 @@ class Kaui::SubscriptionsController < Kaui::EngineController
     end
     redirect_to :back
   end
+
+  def reinstate
+    subscription_id = params[:id]
+    if subscription_id.present?
+      begin
+        Kaui::KillbillHelper::reinstate_subscription(subscription_id, current_user, params[:reason], params[:comment], options_for_klient)
+        flash[:notice] = "Subscription reinstated"
+      rescue => e
+        flash[:error] = "Error while reinstating subscription: #{as_string(e)}"
+      end
+    else
+      flash[:error] = "No subscription id given"
+    end
+    redirect_to :back
+  end
+
 end

data/app/helpers/kaui/killbill_helper.rb

@@ -216,6 +216,13 @@ module Kaui
       entitlement.cancel(extract_created_by(current_user), extract_reason_code(reason), comment, nil, policy, policy, true, options)
     end
 
+    def self.reinstate_subscription(subscription_id, current_user = nil, reason = nil, comment = nil, options = {})
+      call_killbill :put,
+                    "/1.0/kb/subscriptions/#{subscription_id}/uncancel",
+                    "",
+                    build_audit_headers(current_user, reason, comment, options)
+    end
+
     def self.compute_previous_ctd(ctd, billing_period, options = {})
       return nil if ctd.nil? or billing_period.nil?
 

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

@@ -37,7 +37,7 @@
                     <span class="caret"></span>
                   </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 (default policy)", kaui_engine.subscription_path(:id => sub.subscription_id, :policy => 'END_OF_TERM'), :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>

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -435,7 +435,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2190582630358505934
+      hash: -2070916750925486573
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25