kaui 0.1.3 → 0.1.4

data/app/controllers/kaui/account_emails_controller.rb

@@ -30,7 +30,7 @@ module Kaui
 
       respond_to do |format|
         if @account_email.save
-          format.html { redirect_to account_email_path(@account_email), :notice => 'Account email was successfully created.' }
+          format.html { redirect_to kaui_engine.account_email_path(@account_email), :notice => 'Account email was successfully created.' }
           format.json { render :json => @account_email, :status => :created, :location => @account_email }
         else
           format.html { render :action => "new" }
@@ -46,7 +46,7 @@ module Kaui
       @account_email.destroy
 
       respond_to do |format|
-        format.html { redirect_to account_email_path(params[:id]) }
+        format.html { redirect_to kaui_engine.account_email_path(params[:id]) }
         format.json { head :no_content }
       end
     end

data/app/controllers/kaui/account_tags_controller.rb

@@ -42,7 +42,7 @@ class Kaui::AccountTagsController < Kaui::EngineController
     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])
+    redirect_to kaui_engine.account_path(params[:account_id])
   end
 
 end

data/app/controllers/kaui/account_timelines_controller.rb

@@ -1,7 +1,7 @@
 class Kaui::AccountTimelinesController < Kaui::EngineController
   def index
     if params[:account_id].present?
-      redirect_to account_timeline_path(params[:account_id])
+      redirect_to kaui_engine.account_timeline_path(params[:account_id])
     end
   end
 

data/app/controllers/kaui/accounts_controller.rb

@@ -4,7 +4,7 @@ require 'json'
 class Kaui::AccountsController < Kaui::EngineController
   def index
     if params[:account_id].present?
-      redirect_to account_path(params[:account_id])
+      redirect_to kaui_engine.account_path(params[:account_id])
     end
   end
 
@@ -108,7 +108,7 @@ class Kaui::AccountsController < Kaui::EngineController
 
       if success
         flash[:info] = "Payment method created"
-        redirect_to account_timeline_path(@account.account_id)
+        redirect_to kaui_engine.account_timeline_path(@account.account_id)
         return
       else
         flash[:error] = "Error while adding payment method"

data/app/controllers/kaui/bundle_tags_controller.rb

@@ -22,7 +22,7 @@ class Kaui::BundleTagsController < Kaui::EngineController
     tags = params[:tags]
 
     Kaui::KillbillHelper::set_tags_for_bundle(bundle.bundle_id, tags)
-    redirect_to Kaui.bundle_home_path.call(bundle.external_key)
+    redirect_to kaui_engine.bundle_home_path.call(bundle.external_key)
   end
 
 end

data/app/controllers/kaui/bundles_controller.rb

@@ -2,7 +2,7 @@ class Kaui::BundlesController < Kaui::EngineController
 
   def index
     if params[:bundle_id].present?
-      redirect_to bundle_path(params[:bundle_id])
+      redirect_to kaui_engine.bundle_path(params[:bundle_id])
     end
   end
 
@@ -53,7 +53,7 @@ class Kaui::BundlesController < Kaui::EngineController
         success = Kaui::KillbillHelper::transfer_bundle(bundle_id, @new_account.account_id)
         if success
           flash[:info] = "Bundle transfered successfully"
-          redirect_to Kaui.account_home_path.call(@new_account.external_key)
+          redirect_to kaui_engine.account_home_path.call(@new_account.external_key)
           return
         else
           flash[:error] = "Error transfering bundle"

data/app/controllers/kaui/chargebacks_controller.rb

@@ -42,6 +42,6 @@ class Kaui::ChargebacksController < Kaui::EngineController
     else
       flash[:error] = "No chargeback to process"
     end
-    redirect_to account_timeline_path(:id => params[:account_id])
+    redirect_to kaui_engine.account_timeline_path(:id => params[:account_id])
   end
 end

data/app/controllers/kaui/charges_controller.rb

@@ -26,7 +26,7 @@ class Kaui::ChargesController < Kaui::EngineController
     else
       flash[:error] = "No charge to process"
     end
-    redirect_to account_timeline_path(:id => charge.account_id)
+    redirect_to kaui_engine.account_timeline_path(:id => charge.account_id)
   end
 
 end

data/app/controllers/kaui/credits_controller.rb

@@ -33,6 +33,6 @@ class Kaui::CreditsController < Kaui::EngineController
     else
       flash[:error] = "Error while creating credit"
     end
-    redirect_to account_timeline_path(credit.account_id)
+    redirect_to kaui_engine.account_timeline_path(credit.account_id)
   end
 end

data/app/controllers/kaui/external_payments_controller.rb

@@ -16,6 +16,6 @@ class Kaui::ExternalPaymentsController < Kaui::EngineController
     if success
       flash[:info] = "External Payment created"
     end
-    redirect_to account_timeline_path(external_payment.account_id)
+    redirect_to kaui_engine.account_timeline_path(external_payment.account_id)
   end
 end

data/app/controllers/kaui/invoice_items_controller.rb

@@ -1,7 +1,7 @@
 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])
+      redirect_to kaui_engine.invoice_item_path(params[:invoice_item_id], :invoice_id => params[:invoice_id])
     end
   end
 
@@ -18,7 +18,7 @@ class Kaui::InvoiceItemsController < Kaui::EngineController
     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)
+      redirect_to kaui_engine.invoice_path(@invoice_item.invoice_id)
     else
       flash[:error] = "Unable to create adjustment item"
       render :action => "edit"

data/app/controllers/kaui/invoices_controller.rb

@@ -1,7 +1,7 @@
 class Kaui::InvoicesController < Kaui::EngineController
   def index
     if params[:invoice_id].present?
-      redirect_to invoice_path(params[:invoice_id])
+      redirect_to kaui_engine.invoice_path(params[:invoice_id])
     end
   end
 

data/app/controllers/kaui/payments_controller.rb

@@ -20,7 +20,7 @@ class Kaui::PaymentsController < Kaui::EngineController
     else
       flash[:error] = "No payment to process"
     end
-    redirect_to account_timeline_path(:id => payment.account_id)
+    redirect_to kaui_engine.account_timeline_path(:id => payment.account_id)
   end
 
 end

data/app/controllers/kaui/refunds_controller.rb

@@ -1,7 +1,7 @@
 class Kaui::RefundsController < Kaui::EngineController
   def index
     if params[:refund_id].present?
-      redirect_to refund_path(params[:refund_id])
+      redirect_to kaui_engine.refund_path(params[:refund_id])
     end
   end
 
@@ -52,7 +52,7 @@ class Kaui::RefundsController < Kaui::EngineController
     else
       flash[:error] = "No refund to process"
     end
-    redirect_to account_timeline_path(:id => params[:account_id])
+    redirect_to kaui_engine.account_timeline_path(:id => params[:account_id])
   end
 
 end

data/app/controllers/kaui/subscriptions_controller.rb

@@ -3,7 +3,7 @@ require 'kaui/product'
 class Kaui::SubscriptionsController < Kaui::EngineController
   def index
     if params[:subscription_id].present?
-      redirect_to subscription_path(params[:subscription_id])
+      redirect_to kaui_engine.subscription_path(params[:subscription_id])
     end
   end
 
@@ -110,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.bundle_id)
+      redirect_to kaui_engine.bundle_home_path.call(bundle.bundle_id)
     else
       flash[:error] = "No subscription given"
       redirect_to :back

data/app/helpers/kaui/killbill_helper.rb

@@ -213,6 +213,8 @@ module Kaui
     def self.create_subscription(subscription, current_user = nil, reason = nil, comment = nil)
       begin
         subscription_data = Kaui::Subscription.camelize(subscription.to_hash)
+        # We don't want to pass events
+        subscription_data.delete(:events)
         data = call_killbill :post,
                              "/1.0/kb/subscriptions",
                              ActiveSupport::JSON.encode(subscription_data, :root => false),

data/app/views/kaui/account_emails/_account_emails_table.html.erb

@@ -6,5 +6,5 @@
     <% end %>
     <br/>
   <% end %>
-  <%= link_to 'Add/Remove', account_email_path(account_id), :class => 'btn btn-mini' %>
+  <%= link_to 'Add/Remove', kaui_engine.account_email_path(account_id), :class => 'btn btn-mini' %>
 </dd>

data/app/views/kaui/account_emails/edit.html.erb

@@ -3,4 +3,4 @@
 <%= render 'form' %>
 
 <%= link_to 'Show', @account_email %> |
-<%= link_to 'Back', account_emails_path %>
+<%= link_to 'Back', kaui_engine.account_emails_path %>

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

@@ -11,9 +11,9 @@
   <tbody>
     <% @account_emails.each do |account_email| %>
       <tr>
-        <td><%= link_to account_email.account_id, account_path(account_email.account_id) %></td>
+        <td><%= link_to account_email.account_id, kaui_engine.account_path(account_email.account_id) %></td>
         <td><%= account_email.email %></td>
-        <td><%= link_to 'Destroy', account_email_path(account_email.account_id, :email => account_email.email), :confirm => 'Are you sure?', :method => :delete %></td>
+        <td><%= link_to 'Destroy', kaui_engine.account_email_path(account_email.account_id, :email => account_email.email), :confirm => 'Are you sure?', :method => :delete %></td>
       </tr>
     <% end %>
   </tbody>
@@ -21,4 +21,5 @@
 
 <br />
 
-<%= link_to 'New Account email', new_account_email_path(:account_id => @account_id), :class => 'btn btn-primary' %>
+<%= link_to 'New account email', kaui_engine.new_account_email_path(:account_id => @account_id), :class => 'btn btn-primary' %>
+<%= link_to 'Back to account', kaui_engine.account_path(@account_id), :class => 'btn' %>

data/app/views/kaui/account_tags/_account_tags_table.html.erb

@@ -6,5 +6,5 @@
     <% end %>
     <br/>
   <% end %>
-  <%= link_to 'Add/Remove', tags_url_or_path, :class => "btn btn-mini" %>
+  <%= link_to 'Add/Remove', kaui_engine.tags_url_or_path, :class => "btn btn-mini" %>
 </dd>

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

@@ -266,6 +266,8 @@
       <% @timeline.bundles.each do |bundle| %>
         <% bundle.subscriptions.each do |sub| %>
           <% sub.events.each do |event| %>
+            <!-- SKIP UNCANCEL SINCE MATCHING CANCEL EVENT IS NOT RETURNED AS IT WAS INVALIDED -->
+            <% next if event.event_type == 'UNCANCEL' %>
             <tr title="<%= @bundle_names[bundle.external_key] %>">
               <td>
                 <% if event.requested_date.present? %>

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

@@ -31,4 +31,4 @@
 
 <br />
 
-<%= link_to 'New Tag definition', new_tag_definition_path, :class => 'btn btn-primary' %>
+<%= link_to 'New Tag definition', kaui_engine.new_tag_definition_path, :class => 'btn btn-primary' %>

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

@@ -8,5 +8,5 @@
   <dd><%= @tag_definition.description %>&nbsp;</dd>
 </dl>
 
-<!-- <%= link_to 'Edit', edit_tag_definition_path(@tag_definition), :class => 'btn btn-primary' %> -->
-<%= link_to 'Back', tag_definitions_path, :class => 'btn' %>
+<!-- <%= link_to 'Edit', kaui_engine.edit_tag_definition_path(@tag_definition), :class => 'btn btn-primary' %> -->
+<%= link_to 'Back', kaui_engine.tag_definitions_path, :class => 'btn' %>

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/test/dummy/log/development.log

@@ -53351,3 +53351,114 @@ Served asset /jquery_ujs.js - 304 Not Modified (0ms)
 
 Started GET "/assets/jquery.dataTables.v1.9.3.min.js?body=1" for 127.0.0.1 at Fri Aug 17 19:37:19 -0700 2012
 Served asset /jquery.dataTables.v1.9.3.min.js - 304 Not Modified (0ms)
+
+
+Started GET "/kaui/accounts" for 127.0.0.1 at Fri Aug 17 20:00:15 -0700 2012
+Processing by Kaui::AccountsController#index as HTML
+  Rendered /Users/pierre/open-source/ning/killbill-admin-ui/app/views/kaui/accounts/index.html.erb within layouts/application (302.0ms)
+Completed 200 OK in 340ms (Views: 335.0ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at Fri Aug 17 20:00:15 -0700 2012
+Served asset /application.css - 304 Not Modified (0ms)
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at Fri Aug 17 20:00:15 -0700 2012
+Served asset /jquery.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/bootstrap.v2.0.4.min.css?body=1" for 127.0.0.1 at Fri Aug 17 20:00:15 -0700 2012
+Served asset /bootstrap.v2.0.4.min.css - 304 Not Modified (1ms)
+
+
+Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at Fri Aug 17 20:00:15 -0700 2012
+Served asset /jquery_ujs.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at Fri Aug 17 20:00:15 -0700 2012
+Served asset /application.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/bootstrap.v2.0.4.min.js?body=1" for 127.0.0.1 at Fri Aug 17 20:00:15 -0700 2012
+Served asset /bootstrap.v2.0.4.min.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/jquery.dataTables.v1.9.3.min.js?body=1" for 127.0.0.1 at Fri Aug 17 20:00:15 -0700 2012
+Served asset /jquery.dataTables.v1.9.3.min.js - 304 Not Modified (1ms)
+
+
+Started GET "/kaui/refunds" for 127.0.0.1 at Fri Aug 17 20:00:18 -0700 2012
+Processing by Kaui::RefundsController#index as HTML
+  Rendered /Users/pierre/open-source/ning/killbill-admin-ui/app/views/kaui/refunds/index.html.erb within layouts/application (7.0ms)
+Completed 200 OK in 74ms (Views: 69.0ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at Fri Aug 17 20:00:18 -0700 2012
+Served asset /application.css - 304 Not Modified (0ms)
+
+
+Started GET "/assets/bootstrap.v2.0.4.min.css?body=1" for 127.0.0.1 at Fri Aug 17 20:00:18 -0700 2012
+Served asset /bootstrap.v2.0.4.min.css - 304 Not Modified (2ms)
+
+
+Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at Fri Aug 17 20:00:18 -0700 2012
+Served asset /jquery_ujs.js - 304 Not Modified (1ms)
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at Fri Aug 17 20:00:18 -0700 2012
+Served asset /application.js - 304 Not Modified (1ms)
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at Fri Aug 17 20:00:18 -0700 2012
+Served asset /jquery.js - 304 Not Modified (1ms)
+
+
+Started GET "/assets/bootstrap.v2.0.4.min.js?body=1" for 127.0.0.1 at Fri Aug 17 20:00:18 -0700 2012
+Served asset /bootstrap.v2.0.4.min.js - 304 Not Modified (1ms)
+
+
+Started GET "/assets/jquery.dataTables.v1.9.3.min.js?body=1" for 127.0.0.1 at Fri Aug 17 20:00:18 -0700 2012
+Served asset /jquery.dataTables.v1.9.3.min.js - 304 Not Modified (1ms)
+
+
+Started GET "/kaui/refunds?utf8=%E2%9C%93&refund_id=a85108be-4132-4384-b15e-9a650dc3a4ef&button=" for 127.0.0.1 at Fri Aug 17 20:00:26 -0700 2012
+Processing by Kaui::RefundsController#index as HTML
+  Parameters: {"utf8"=>"✓", "refund_id"=>"a85108be-4132-4384-b15e-9a650dc3a4ef", "button"=>""}
+Redirected to http://127.0.0.1:3000/kaui/refunds/a85108be-4132-4384-b15e-9a650dc3a4ef
+Completed 302 Found in 11ms (ActiveRecord: 0.0ms)
+
+
+Started GET "/kaui/refunds/a85108be-4132-4384-b15e-9a650dc3a4ef" for 127.0.0.1 at Fri Aug 17 20:00:26 -0700 2012
+Processing by Kaui::RefundsController#show as HTML
+  Parameters: {"id"=>"a85108be-4132-4384-b15e-9a650dc3a4ef"}
+Performing get request to http://z20046c.ningops.com:8080/1.0/kb/refunds/a85108be-4132-4384-b15e-9a650dc3a4ef
+  Rendered /Users/pierre/open-source/ning/killbill-admin-ui/app/views/kaui/refunds/show.html.erb within layouts/application (13.0ms)
+Completed 200 OK in 174ms (Views: 45.0ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/bootstrap.v2.0.4.min.css?body=1" for 127.0.0.1 at Fri Aug 17 20:00:26 -0700 2012
+Served asset /bootstrap.v2.0.4.min.css - 304 Not Modified (0ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at Fri Aug 17 20:00:26 -0700 2012
+Served asset /application.css - 304 Not Modified (0ms)
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at Fri Aug 17 20:00:26 -0700 2012
+Served asset /jquery.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at Fri Aug 17 20:00:26 -0700 2012
+Served asset /jquery_ujs.js - 304 Not Modified (1ms)
+
+
+Started GET "/assets/bootstrap.v2.0.4.min.js?body=1" for 127.0.0.1 at Fri Aug 17 20:00:26 -0700 2012
+Served asset /bootstrap.v2.0.4.min.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at Fri Aug 17 20:00:26 -0700 2012
+Served asset /application.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/jquery.dataTables.v1.9.3.min.js?body=1" for 127.0.0.1 at Fri Aug 17 20:00:26 -0700 2012
+Served asset /jquery.dataTables.v1.9.3.min.js - 304 Not Modified (1ms)