kaui 0.4.1 → 0.4.2

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    kaui (0.4.1)
+    kaui (0.4.2)
       cancan (~> 1.6.10)
       d3_rails (~> 3.2.8)
       devise (~> 3.0.2)
       jquery-rails (~> 3.0.4)
-      killbill-client (~> 0.3.1)
+      killbill-client (~> 0.3.2)
       money-rails (~> 0.8.1)
       rails (~> 3.2.14)
       rest-client (~> 1.6.7)
@@ -42,7 +42,7 @@ GEM
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.2)
-    bcrypt-ruby (3.1.1)
+    bcrypt-ruby (3.1.2)
     builder (3.0.4)
     cancan (1.6.10)
     d3_rails (3.2.8)
@@ -60,7 +60,7 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.0)
-    killbill-client (0.3.1)
+    killbill-client (0.3.2)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)

data/app/controllers/kaui/subscriptions_controller.rb

@@ -26,45 +26,49 @@ class Kaui::SubscriptionsController < Kaui::EngineController
   end
 
   def new
+    @account_id = params[:account_id]
     bundle_id = params[:bundle_id]
     @base_subscription = params[:base_subscription]
+    @product_category = params[:product_category]
     begin
-      @bundle = Kaui::KillbillHelper::get_bundle(bundle_id, options_for_klient)
 
-      if @base_subscription.present?
+      if @product_category == "ADD_ON"
+        @bundle = Kaui::KillbillHelper::get_bundle(bundle_id, options_for_klient)
         @catalog = Kaui::KillbillHelper::get_available_addons(@base_subscription, options_for_klient)
-      else
+      elsif @product_category == "BASE"
         @catalog = Kaui::KillbillHelper::get_available_base_plans(options_for_klient)
       end
     rescue => e
       flash.now[:error] = "Error while trying to start new subscription creation: #{as_string(e)}"
     end
-    @subscription = Kaui::Subscription.new("bundleId" => bundle_id)
+    @subscription = Kaui::Subscription.new("bundleId" => bundle_id, "accountId" => @account_id, "product_category" => @product_category)
   end
 
   def create
-    @base_subscription = params[:base_subscription]
+
+    @subscription = Kaui::Subscription.new(params[:subscription])
+
     @plan_name = params[:plan_name]
 
     begin
-      @subscription = Kaui::Subscription.new(params[:subscription])
-      @bundle = Kaui::KillbillHelper::get_bundle(@subscription.bundle_id, options_for_klient)
-      if @base_subscription.present?
+      if @subscription.product_category == "ADD_ON"
+        @base_subscription = params[:base_subscription]
+        @bundle = Kaui::KillbillHelper::get_bundle(@subscription.bundle_id, options_for_klient)
         @catalog = Kaui::KillbillHelper::get_available_addons(@base_subscription, options_for_klient)
-        @subscription.product_category = "ADD_ON"
+        @subscription.account_id = @bundle.account_id
       else
         @catalog = Kaui::KillbillHelper::get_available_base_plans(options_for_klient)
-        @subscription.product_category = "BASE"
+        @subscription.external_key = params[:external_key]
       end
 
       plan = @catalog[@plan_name]
-      @subscription.account_id =  @bundle.account_id
       @subscription.billing_period = plan["billingPeriod"]
       @subscription.product_name = plan["productName"]
       @subscription.price_list = plan["priceListName"]
 
-      Kaui::KillbillHelper::create_subscription(@subscription, current_user, params[:reason], params[:comment], options_for_klient)
-      redirect_to Kaui.bundle_home_path.call(@bundle.bundle_id)
+      res = Kaui::KillbillHelper::create_subscription(@subscription, current_user, params[:reason], params[:comment], options_for_klient)
+
+      redirect_to Kaui.bundle_home_path.call(res.bundle_id)
     rescue => e
       flash.now[:error] = "Error while creating the new subscription: #{as_string(e)}"
       render :new
@@ -147,26 +151,19 @@ class Kaui::SubscriptionsController < Kaui::EngineController
     redirect_to Kaui.bundle_home_path.call(bundle.bundle_id)
   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
-
   def destroy
+
+
     subscription_id = params[:id]
+
+    puts "calling destroy id = #{subscription_id}"
+
     if subscription_id.present?
       begin
-        Kaui::KillbillHelper::delete_subscription(subscription_id, params[:policy], params[:ctd], params[:billing_period], current_user, params[:reason], params[:comment], options_for_klient)
+
+        puts "current_user = #{current_user}"
+
+        Kaui::KillbillHelper::delete_subscription(subscription_id, current_user, params[:reason], params[:comment], params[:policy], options_for_klient)
       rescue => e
         flash[:error] = "Error while canceling subscription: #{as_string(e)}"
       end

data/app/helpers/kaui/killbill_helper.rb

@@ -184,45 +184,34 @@ module Kaui
     end
 
     def self.create_subscription(subscription, current_user = nil, reason = nil, comment = nil, options = {})
-      subscription_data = Kaui::Subscription.camelize(subscription.to_hash)
-      # We don't want to pass events
-      subscription_data.delete(:events)
-      call_killbill :post,
-                    "/1.0/kb/entitlements",
-                    ActiveSupport::JSON.encode(subscription_data, :root => false),
-                    build_audit_headers(current_user, reason, comment, options)
-    end
 
-    def self.update_subscription(subscription, requested_date = nil, policy = nil, current_user = nil, reason = nil, comment = nil, options = {})
-      subscription_data = Kaui::Subscription.camelize(subscription.to_hash)
+      entitlement = KillBillClient::Model::EntitlementNoEvents.new
+      entitlement.account_id = subscription.account_id
+      entitlement.bundle_id = subscription.bundle_id
+      entitlement.external_key = subscription.external_key
+      entitlement.product_name = subscription.product_name
+      entitlement.product_category = subscription.product_category
+      entitlement.billing_period = subscription.billing_period
+      entitlement.price_list = subscription.price_list
 
-      params = "?"
-      params = "#{params}requestedDate=#{requested_date.to_s}&" unless requested_date.blank?
-      params = "#{params}policy=#{policy}" unless policy.blank?
 
-      # We don't want to pass events
-      subscription_data.delete(:events)
-      call_killbill :put,
-                    "/1.0/kb/entitlements/#{subscription.subscription_id}#{params}",
-                    ActiveSupport::JSON.encode(subscription_data, :root => false),
-                    build_audit_headers(current_user, reason, comment, options)
+      entitlement.create(extract_created_by(current_user), extract_reason_code(reason), comment, options)
     end
 
-    def self.reinstate_subscription(subscription_id, current_user = nil, reason = nil, comment = nil, options = {})
-      call_killbill :put,
-                    "/1.0/kb/entitlements/#{subscription_id}/uncancel",
-                    "",
-                    build_audit_headers(current_user, reason, comment, options)
+    def self.update_subscription(subscription, requested_date = nil, policy = nil, current_user = nil, reason = nil, comment = nil, options = {})
+
+      requested_date = requested_date.to_s unless requested_date.blank?
+      entitlement = KillBillClient::Model::EntitlementNoEvents.new
+      entitlement.subscription_id = subscription.subscription_id
+      entitlement.change_plan({:productName => subscription.product_name, :billingPeriod => subscription.billing_period, :priceList => subscription.price_list},
+                              extract_created_by(current_user), extract_reason_code(reason), comment, requested_date, policy, false, options)
     end
 
-    def self.delete_subscription(subscription_id, policy = nil, ctd = nil, billing_period = nil, current_user = nil, reason = nil, comment = nil, options = {})
-      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/entitlements/#{subscription_id}#{params}",
-                    build_audit_headers(current_user, reason, comment, options)
+    def self.delete_subscription(subscription_id, current_user = nil, reason = nil, comment = nil,  policy = nil, options = {})
+
+      entitlement = KillBillClient::Model::EntitlementNoEvents.new
+      entitlement.subscription_id = subscription_id
+      entitlement.cancel(extract_created_by(current_user), extract_reason_code(reason), comment, nil, policy, options)
     end
 
     def self.compute_previous_ctd(ctd, billing_period, options = {})

data/app/models/kaui/subscription.rb

@@ -2,6 +2,7 @@ class Kaui::Subscription < Kaui::Base
   define_attr :account_id
   define_attr :subscription_id
   define_attr :bundle_id
+  define_attr :external_key
   define_attr :product_category
   define_attr :product_name
   define_attr :billing_period
@@ -16,6 +17,7 @@ class Kaui::Subscription < Kaui::Base
     super(:account_id =>  data['accountId'] || data['account_id'],
           :subscription_id => data['subscriptionId'] || data['subscription_id'],
           :bundle_id => data['bundleId'] || data['bundle_id'],
+          :external_key => data['externalKey'] || data['external_key'],
           :product_category => data['productCategory'] || data['product_category'],
           :product_name => data['productName'] || data['product_name'],
           :billing_period => data['billingPeriod'] || data['billing_period'],

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

@@ -84,6 +84,8 @@
                :locals => { :tags => @tags, :tags_url_or_path => kaui_engine.edit_account_tags_path(:params => { :account_id => @account.account_id }) } %>
     <%= render :partial => "kaui/account_emails/account_emails_table",
                :locals => { :account_emails => @account_emails, :account_id => @account.account_id } %>
+    <dt>New base subscription:</dt>
+    <dd><%= link_to "Create", kaui_engine.new_subscription_path(:params => { :account_id => @account.account_id, :product_category => "BASE" }), :class => "btn btn-mini" %></dd>
   </dl>
   <h2><%= link_to "Billing timeline", kaui_engine.account_timeline_path(@account.account_id) %></h2>
   <% if @payment_methods.present? %>

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

@@ -44,7 +44,7 @@
                   </ul>
                 </div>
                 <% if sub.product_category == 'BASE' %>
-                  <%= link_to "Add Addons", kaui_engine.new_subscription_path(:params => { :bundle_id => sub.bundle_id, :base_subscription => sub.product_name }), :class => "btn btn-mini" %>
+                  <%= link_to "Add Addons", kaui_engine.new_subscription_path(:params => { :bundle_id => sub.bundle_id, :base_subscription => sub.product_name, :product_category => "ADD_ON" }), :class => "btn btn-mini" %>
                 <% end %>
               <% end %>
             </nobr>

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

@@ -1,22 +1,49 @@
 <div class="page-header">
-  <h1>Add subscription <% if @bundle.external_key %> to <%= Kaui.bundle_key_display_string.call(@bundle.external_key) %> <% end %></h1>
+  <% if @product_category == "ADD_ON" %>
+      <h1>Add ADD_ON subscription
+        <% if @bundle.external_key %> to <%= Kaui.bundle_key_display_string.call(@bundle.external_key) %>
+        <% end %></h1>
+  <% else %>
+      <h1>Create new base subscription
+        <% if @account_id %> to account  <%= @account_id %>
+        <% end %></h1>
+  <% end %>
 </div>
-<%= form_for(@subscription, :url => { :action => :create }, :html => { :class => "form-horizontal" }) do |f| %>
-  <fieldset>
-    <%= f.hidden_field :bundle_id %>
-    <%= hidden_field_tag :base_subscription, @base_subscription %>
-    <div class="control-group">
-      <%= label_tag :plan_name, "Available Plans:", :class => "control-label" %>
-      <div class="controls">
-        <%= select_tag :plan_name, options_for_select(@catalog.keys, @plan_name) %>
-        <p class="help-block">
-          Proration on customer's invoice will be done automatically.
-        </p>
+<%= form_for(@subscription, :url => {:action => :create}, :html => {:class => "form-horizontal"}) do |f| %>
+    <fieldset>
+      <% if @product_category == "ADD_ON" %>
+          <%= f.hidden_field :bundle_id %>
+          <%= f.hidden_field :product_category %>
+          <%= hidden_field_tag :base_subscription, @base_subscription %>
+          <div class="control-group">
+            <%= label_tag :plan_name, "Available Plans:", :class => "control-label" %>
+            <div class="controls">
+              <%= select_tag :plan_name, options_for_select(@catalog.keys, @plan_name) %>
+              <p class="help-block">
+                Proration on customer's invoice will be done automatically.
+              </p>
+            </div>
+          </div>
+      <% else %>
+          <%= f.hidden_field :account_id %>
+          <%= f.hidden_field :product_category %>
+          <div class="control-group">
+            <%= label_tag :external_key, "Bundle External Key:", :class => "control-label" %>
+            <div class="controls">
+              <%= text_field_tag :external_key, params[:external_key], :class => 'input-xlarge', :id => "external_key" %>
+            </div>
+          </div>
+          <div class="control-group">
+            <%= label_tag :plan_name, "Available Plans:", :class => "control-label" %>
+            <div class="controls">
+              <%= select_tag :plan_name, options_for_select(@catalog.keys, @plan_name) %>
+            </div>
+          </div>
+      <% end %>
+      <div class="form-actions">
+        <%= f.submit 'Create Subscription', :class => 'btn btn-primary' %>
+        <%= link_to 'Back', :back, :class => 'btn' %>
       </div>
-    </div>
-    <div class="form-actions">
-      <%= f.submit 'Add', :class => 'btn btn-primary' %>
-      <%= link_to 'Back', :back, :class => 'btn' %>
-    </div>
-  </fieldset>
+
+    </fieldset>
 <% end %>

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

@@ -19,7 +19,7 @@
   <hr/>
   <%= link_to "Change", kaui_engine.edit_subscription_path(@subscription.subscription_id), :class => "btn btn-mini" %>
   <%= link_to "Cancel", kaui_engine.subscription_path(@subscription.subscription_id), :method => :delete, :confirm => "Are you sure?", :class => "btn btn-mini" %>
-  <%= link_to "Add Addons", kaui_engine.new_subscription_path(:params => { :bundle_id => @subscription.bundle_id, :base_subscription => @subscription.product_name }), :class => "btn btn-mini" %>
+  <%= link_to "Add Addons", kaui_engine.new_subscription_path(:params => { :bundle_id => @subscription.bundle_id, :base_subscription => @subscription.product_name, :product_category => "ADD_ON" }), :class => "btn btn-mini" %>
 <% else %>
   <p>Subscription not found</p>
 <% end %>

data/kaui.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rest-client', '~> 1.6.7'
   s.add_dependency 'money-rails', '~> 0.8.1'
   s.add_dependency 'd3_rails', '~> 3.2.8'
-  s.add_dependency 'killbill-client', '~> 0.3.1'
+  s.add_dependency 'killbill-client', '~> 0.3.2'
   s.add_dependency 'devise', '~> 3.0.2'
   s.add_dependency 'cancan', '~> 1.6.10'
 

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -435,7 +435,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 730929266616147309
+      hash: -1588433820236604683
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25