From 979aa417aa722c5e550219bff90ec757ac098a0f Mon Sep 17 00:00:00 2001 From: jessib Date: Tue, 23 Jul 2013 13:26:55 -0700 Subject: Some clean-up of billing display. --- billing/app/views/customer/edit.html.haml | 9 +++++---- billing/app/views/customer/show.html.haml | 18 ++++++++++-------- 2 files changed, 15 insertions(+), 12 deletions(-) (limited to 'billing/app/views/customer') diff --git a/billing/app/views/customer/edit.html.haml b/billing/app/views/customer/edit.html.haml index 76c678b..8a232c5 100644 --- a/billing/app/views/customer/edit.html.haml +++ b/billing/app/views/customer/edit.html.haml @@ -13,10 +13,11 @@ %dd= f.text_field :phone - if @default_cc = # todo, as they will need a credit card, so not sure about conditional? - %dt Stored Credit Card + %dt= t(:stored_credit_card) %dd = @default_cc.masked_number - = link_to 'Change credit card', edit_credit_card_info_path(:id => @default_cc.token), :class => :btn + = link_to t(:change_credit_card), edit_credit_card_info_path(:id => @default_cc.token), :class => :btn = hidden_field_tag :tr_data, @tr_data - = f.submit 'Save Customer Info', :class => :btn -= link_to 'Show Customer Information', show_customer_path(@customer), :class=> :btn + .form-actions + = f.submit t(:save_customer_info), :class => 'btn btn-primary' + = link_to t(:cancel), show_customer_path(@customer), :class=> :btn diff --git a/billing/app/views/customer/show.html.haml b/billing/app/views/customer/show.html.haml index 8ef5517..639d180 100644 --- a/billing/app/views/customer/show.html.haml +++ b/billing/app/views/customer/show.html.haml @@ -1,20 +1,22 @@ +.form-actions + = link_to t(:make_payment), new_payment_path, :class => 'btn btn-primary' = render :partial => 'payments/customer_data' -= link_to 'Make Payment', new_payment_path, :class => :btn -%h3 Last three transactions +%legend= t(:last_three_transactions) - counter = 0 = # these will be ordered with most recently created first, per http://stackoverflow.com/questions/16425475/ -- @braintree_data.transactions.each do |t| +- @transactions.each do |t| - break if counter > 2 # not ruby-like, but object is a Braintree::ResourceCollection so limited methods available = render :partial => "payments/transaction_details", :locals => {:transaction => t} - counter += 1 -= link_to 'Transaction History', payments_path -%h3 Subscriptions += link_to t(:transaction_history), payments_path +%legend= t(:subscriptions) - if @active_subscription = render :partial => "subscriptions/subscription_details", :locals => {:subscription => @active_subscription} - else %p - No active subscription + = t(:no_active_subscription) %p - = link_to 'subscribe to plan', new_subscription_path, :class => :btn + .form-actions + = link_to t(:subscribe_to_plan), new_subscription_path, :class => :btn %p - = link_to 'All subscriptions', subscriptions_path + = link_to t(:all_subscriptions), subscriptions_path -- cgit v1.2.3