kaui 0.15.4 → 0.15.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 640b0cf3c6014bcee7e66e2d8c41b65f0a12daa5
-  data.tar.gz: bb749feea622246695e1b323c7b4b6fb5a66f09d
+  metadata.gz: 156564f2fffc9ed94c485edefc7d203528625c26
+  data.tar.gz: f0384c9f2e24c0a68346becaa2c6a823ec4b5ed9
 SHA512:
-  metadata.gz: bd63327cffa882058a5344d1e2df1f6d69f80fe237031436a6d2a08bd3d4c584e6599076d72ed78d775bd4b520cfd92ce7b625340dd53daaa6e789f283b62cab
-  data.tar.gz: ef9411ec7d175aaf73287eb40413d532452748272aba16a74367a61302c7010495491cce0e89e080ed001fae9e30d4c8ccba18a1534e25025c399ea8dd32272d
+  metadata.gz: 3e4931a11ef92ca0dd389d9b63ca96a73213fb978c8c77aa7f6da209b6f2beec685c07fb7806cf51fcb7a4c0cd4948968156a7045779eff2ab65341ed4aca7bc
+  data.tar.gz: 040d8c650dd2a709828d98f4270eccf9a6d981a3c7df388273680ae2d6aef65d0fa6c9e760cfa547bdecf7abdcd9ea6e2fb06328701a82fb18df3ea34532d2c1

data/app/controllers/kaui/bundles_controller.rb

@@ -38,4 +38,36 @@ class Kaui::BundlesController < Kaui::EngineController
     bundle = Kaui::Bundle.find_by_id_or_key(params.require(:id), options_for_klient)
     redirect_to kaui_engine.account_bundles_path(bundle.account_id)
   end
+
+  def pause_resume
+    @bundle = Kaui::Bundle.find_by_id_or_key(params.require(:id), options_for_klient)
+    @base_subscription = @bundle.subscriptions.find { |sub| sub.product_category == 'BASE' }
+  end
+
+  def do_pause_resume
+    bundle = Kaui::Bundle::new(:bundle_id => params.require(:id))
+
+    paused = false
+    resumed = false
+
+    if params[:pause_requested_date].present?
+      bundle.pause(params[:pause_requested_date], current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+      paused = true
+    end
+
+    if params[:resume_requested_date].present?
+      bundle.resume(params[:resume_requested_date], current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+      resumed = true
+    end
+
+    msg = 'Bundle was successfully '
+    if paused && !resumed
+      msg += 'paused'
+    elsif !paused && resumed
+      msg += 'resumed'
+    else
+      msg += 'updated'
+    end
+    redirect_to kaui_engine.account_bundles_path(@account.account_id), :notice => msg
+  end
 end

data/app/controllers/kaui/credits_controller.rb

@@ -22,7 +22,7 @@ class Kaui::CreditsController < Kaui::EngineController
     # No need to show the newly created invoice for account level credits
     should_redirect_to_invoice = credit.invoice_id.present?
 
-    credit = credit.create(current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+    credit = credit.create(true, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
     flash[:notice] = 'Credit was successfully created'
 
     if should_redirect_to_invoice

data/app/helpers/kaui/subscription_helper.rb

@@ -131,7 +131,7 @@ module Kaui
 
 
     def is_subscription_future_cancelled?(sub)
-      sub.present? and sub.billing_end_date.present? and Time.parse(sub.billing_end_date) > Time.now
+      sub.present? && sub.state != 'CANCELLED' && sub.billing_end_date.present? && Time.parse(sub.billing_end_date) > Time.now
     end
 
     def is_subscription_cancelled?(sub)

data/app/views/kaui/bundles/index.html.erb

@@ -43,7 +43,8 @@
             </div>
           </div>
 
-          <% if !is_subscription_cancelled?(@base_subscription[bundle.bundle_id]) && (can?(:create, Kaui::Subscription) || can?(:transfer, Kaui::Subscription)) %>
+          <% if !is_subscription_cancelled?(@base_subscription[bundle.bundle_id]) &&
+              (can?(:create, Kaui::Subscription) || can?(:transfer, Kaui::Subscription) || can?(:pause_resume, Kaui::Subscription)) %>
               <div class="tag-select" onclick="void(0)">
                 <span><i class="fa fa-gift"></i><i class="fa fa-caret-down"></i></span>
 
@@ -54,6 +55,9 @@
                   <% if can? :transfer, Kaui::Subscription %>
                       <%= link_to '<i class="fa fa-random"></i>&nbsp;Transfer Ownership'.html_safe, kaui_engine.transfer_bundle_path(bundle.bundle_id) %>
                   <% end %>
+                  <% if can? :pause_resume, Kaui::Subscription %>
+                      <%= link_to '<i class="fa fa-pause"></i>&nbsp;Pause / resume'.html_safe, kaui_engine.pause_resume_bundle_path(:account_id => bundle.account_id, :id => bundle.bundle_id) %>
+                  <% end %>
                 </div>
               </div>
           <% end %>

data/app/views/kaui/bundles/pause_resume.html.erb

@@ -0,0 +1,42 @@
+<div class="register">
+  <div class="col-md-8 col-md-offset-2">
+
+    <div class="column-block">
+      <% if @base_subscription.state == 'BLOCKED' %>
+          <h1>Resume</h1>
+      <% else %>
+          <h1>Pause / Resume</h1>
+      <% end %>
+
+      <%= form_tag do_pause_resume_bundle_path(:account_id => @account.account_id, :id => @bundle.bundle_id), :class => 'form-horizontal', :method => :put do %>
+          <% if @base_subscription.state != 'BLOCKED' %>
+              <div class="form-group">
+                <%= label_tag :pause_requested_date, 'Pause date', :class => 'col-sm-2 control-label' %>
+                <div class="col-sm-3">
+                  <input class="form-control" name="pause_requested_date" type="text" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-today-highlight="true">
+                </div>
+              </div>
+          <% end %>
+          <div class="form-group">
+            <%= label_tag :resume_requested_date, 'Resume date', :class => 'col-sm-2 control-label' %>
+            <div class="col-sm-3">
+              <input class="form-control" name="resume_requested_date" type="text" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-today-highlight="true">
+            </div>
+          </div>
+          <div class="form-group">
+            <%= label_tag :comment, 'Comment', :class => 'col-sm-2 control-label' %>
+            <div class="col-sm-10">
+              <%= text_area_tag :comment, nil, :rows => 3, :class => 'form-control' %>
+            </div>
+          </div>
+          <div class="form-group">
+            <div class="col-sm-offset-2 col-sm-10">
+              <%= submit_tag @base_subscription.state == 'BLOCKED' ? 'Resume' : 'Pause / Resume', :class => 'btn btn-default' %>
+            </div>
+          </div>
+      <% end %>
+
+    </div>
+
+  </div>
+</div>

data/config/routes.rb

@@ -88,6 +88,8 @@ Kaui::Engine.routes.draw do
   end
 
   scope '/bundles' do
+    put '/:id/do_pause_resume', :to => 'bundles#do_pause_resume', :as => 'do_pause_resume_bundle'
+    get '/:id/pause_resume', :to => 'bundles#pause_resume', :as => 'pause_resume_bundle'
     put '/:id/do_transfer', :to => 'bundles#do_transfer', :as => 'do_transfer_bundle'
     get '/:id/transfer', :to => 'bundles#transfer', :as => 'transfer_bundle'
     match '/:id' => 'bundles#restful_show', :via => :get, :as => 'bundle'

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = '0.15.4'
+  VERSION = '0.15.5'
 end

data/test/functional/kaui/bundles_controller_test.rb

@@ -12,10 +12,10 @@ class Kaui::BundlesControllerTest < Kaui::FunctionalTestHelper
   test 'should get index with existing tags' do
 
     tag_definition_ids = []
-    def1 = create_tag_definition(SecureRandom.uuid.to_s, @tenant);
+    def1 = create_tag_definition(SecureRandom.uuid.to_s[0..19], @tenant);
     tag_definition_ids << def1
     tag_definition_ids << def1
-    def2 = create_tag_definition(SecureRandom.uuid.to_s, @tenant);
+    def2 = create_tag_definition(SecureRandom.uuid.to_s[0..19], @tenant);
     tag_definition_ids << def2
 
     add_tags(@bundle, tag_definition_ids, @tenant);

data/test/killbill_test_helper.rb

@@ -146,7 +146,7 @@ module Kaui
       account = create_account(tenant, username, password, user, reason, comment) if account.nil?
 
       credit = KillBillClient::Model::Credit.new(:invoice_id => invoice_id, :account_id => account.account_id, :credit_amount => 23.22)
-      credit = credit.create(user, reason, comment, build_options(tenant, username, password))
+      credit = credit.create(true, user, reason, comment, build_options(tenant, username, password))
 
       invoice = KillBillClient::Model::Invoice.find_by_id_or_number(credit.invoice_id, true, 'NONE', build_options(tenant, username, password))
       invoice.items.find { |ii| ii.amount == -credit.credit_amount }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.15.4
+  version: 0.15.5
 platform: ruby
 authors:
 - Killbill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -570,6 +570,7 @@ files:
 - app/views/kaui/bundle_tags/_form_bar.html.erb
 - app/views/kaui/bundle_tags/edit.html.erb
 - app/views/kaui/bundles/index.html.erb
+- app/views/kaui/bundles/pause_resume.html.erb
 - app/views/kaui/bundles/transfer.html.erb
 - app/views/kaui/chargebacks/_form.html.erb
 - app/views/kaui/chargebacks/new.html.erb