kaui 0.1.7 → 0.1.8

data/app/models/kaui/account_email.rb

@@ -13,25 +13,36 @@ class Kaui::AccountEmail < Kaui::Base
   end
 
   def self.where(conditions)
-    account_emails = Kaui::KillbillHelper.get_account_emails(conditions[:account_id]) || []
-    return account_emails.sort unless conditions[:email].present?
-
-    account_emails.each do |account_email|
-      return account_email if account_email.email == conditions[:email]
+    begin
+      account_emails = Kaui::KillbillHelper.get_account_emails(conditions[:account_id]) || []
+      return account_emails.sort unless conditions[:email].present?
+
+      account_emails.each do |account_email|
+        return account_email if account_email.email == conditions[:email]
+      end
+    rescue => e
+      @errors.add(:where, "Error while getting account emails: #{e.message} #{e.response}")
     end
     []
   end
 
   def save
-    success = Kaui::KillbillHelper.add_account_email(self)
-    @errors.add(:save, 'Unable to save the email') unless success
-    success
+    begin
+      Kaui::KillbillHelper.add_account_email(self)
+      true
+    rescue => e
+      @errors.add(:save, "Error while trying to add an account email: #{e.message} #{e.response}")
+      false
+    end
   end
 
   def destroy
-    success = Kaui::KillbillHelper.remove_account_email(self)
-    @errors.add(:destroy, 'Unable to destroy the email') unless success
-    success
+    begin
+      Kaui::KillbillHelper.remove_account_email(self)
+      true
+    rescue => e
+      @errors.add(:destroy, "Error while trying to delete an account email: #{e.message} #{e.response}")
+    end
   end
 
   def id

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

@@ -43,7 +43,9 @@
       <label class="control-label">Payment method</label>
       <div class="controls">
         <label class="checkbox">
-          <%= @payment_method.type %> <%= @payment_method.card_type %> <%= @payment_method.mask_number %>
+          <% if @payment_method.present? %>
+            <%= @payment_method.type %> <%= @payment_method.card_type %> <%= @payment_method.mask_number %>
+          <% end %>
         </label>
       </div>
     </div>

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

@@ -42,7 +42,9 @@
       <label class="control-label">Payment method</label>
       <div class="controls">
         <label class="checkbox">
-          <%= @payment_method.type %> <%= @payment_method.card_type %> <%= @payment_method.mask_number %>
+          <% if @payment_method.present? %>
+            <%= @payment_method.type %> <%= @payment_method.card_type %> <%= @payment_method.mask_number %>
+          <% end %>
         </label>
       </div>
     </div>
@@ -93,4 +95,4 @@
       preventNonNumericValues(event);
     });
   });
-<% end %>
+<% end %>

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

@@ -6,7 +6,6 @@
     <tr>
       <th>Product category</th>
       <th>Product name</th>
-      <th>Billing period</th>
       <th>Start date</th>
       <th>Charged through date</th>
       <th>Notes</th>
@@ -18,8 +17,7 @@
       <% subscriptions.each do |sub| %>
         <tr>
           <td><%= sub.product_category.downcase.capitalize if sub.product_category.present? %></td>
-          <td><%= sub.product_name.downcase.capitalize if sub.product_name.present? %></td>
-          <td><%= sub.billing_period.downcase.capitalize if sub.billing_period.present? %></td>
+          <td><%= sub.product_name.downcase.capitalize if sub.product_name.present? %> <%= sub.billing_period.downcase.capitalize if sub.billing_period.present? %> <% if sub.price_list.present? && sub.price_list.upcase != "DEFAULT" %> ( <%= sub.price_list.downcase.capitalize %> pricelist ) <% end %></td>
           <td><%= format_date(sub.start_date).html_safe  if sub.start_date.present? %></td>
           <td><%= format_date(sub.charged_through_date).html_safe if sub.charged_through_date.present? %></td>
           <td>
@@ -31,7 +29,7 @@
             <nobr>
               <% if sub.product_category == 'BASE' %>
                 <% if sub.canceled_date.present? && Time.parse(sub.canceled_date) > Time.now %>
-                  <%= link_to "Reinstate", kaui_engine.reinstate_subscription_path(:id => sub.subscription_id), :method => :put, :class => "btn btn-mini" %>                    
+                  <%= link_to "Reinstate", kaui_engine.reinstate_subscription_path(:id => sub.subscription_id), :method => :put, :class => "btn btn-mini" %>
                 <% elsif !sub.canceled_date.present? %>
                   <%= link_to "Change", kaui_engine.edit_subscription_path(sub.subscription_id), :class => "btn btn-mini" %>
                   <%= link_to "Cancel", kaui_engine.subscription_path(:id => sub.subscription_id), :method => :delete, :class => "btn btn-mini" %>

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end