summaryrefslogtreecommitdiff
path: root/billing/app/views/customer
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2013-04-23 13:23:01 -0700
committerAzul <azul@leap.se>2013-07-17 10:47:13 +0200
commit1e557522fafc26829b8e9a873da28b7082d4df42 (patch)
treea78542bf9cc801d444168e2a88f1957c27a6d8b7 /billing/app/views/customer
parentc2330394daf004974656d8240ca6c83567401595 (diff)
Some improvements to navigation, and pulling out separate show/edit views for customers.
Diffstat (limited to 'billing/app/views/customer')
-rw-r--r--billing/app/views/customer/_transaction.html.haml2
-rw-r--r--billing/app/views/customer/edit.html.haml21
-rw-r--r--billing/app/views/customer/show.html.haml8
3 files changed, 16 insertions, 15 deletions
diff --git a/billing/app/views/customer/_transaction.html.haml b/billing/app/views/customer/_transaction.html.haml
index 97842dc..53483d9 100644
--- a/billing/app/views/customer/_transaction.html.haml
+++ b/billing/app/views/customer/_transaction.html.haml
@@ -2,7 +2,7 @@
= transaction.id
Type:
= transaction.type
- Transaction Amount:
+ Amount:
= number_to_currency(transaction.amount)
Status:
= transaction.status
diff --git a/billing/app/views/customer/edit.html.haml b/billing/app/views/customer/edit.html.haml
index 2104b09..bea3211 100644
--- a/billing/app/views/customer/edit.html.haml
+++ b/billing/app/views/customer/edit.html.haml
@@ -11,19 +11,12 @@
%dd= f.text_field :last_name
%dt= f.label :phone, 'Phone'
%dd= f.text_field :phone
- - if @default_cc
- %ul
- %li
- Stored Credit Card
+ - if @default_cc
+ = # todo, as they will need a credit card, so not sure about conditional?
+ %dt Stored Credit Card
+ %dd
= @default_cc.masked_number
- = link_to 'Change credit card', edit_credit_card_info_path(:id => @default_cc.token)
- %li
- Transaction History
- = render(:partial => "transaction", :collection => @transactions)
- - if @subscriptions.any?
- %li
- Active Subscriptions
- = # todo: won't really have multiple subscriptions
- = render(:partial => "subscription", :collection => @subscriptions)
+ = link_to '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' \ No newline at end of file
+ = f.submit 'Save Customer Info', :class => :btn
+= link_to 'Cancel', customer_path(@braintree_data.id), :class=> :btn \ No newline at end of file
diff --git a/billing/app/views/customer/show.html.haml b/billing/app/views/customer/show.html.haml
new file mode 100644
index 0000000..7416682
--- /dev/null
+++ b/billing/app/views/customer/show.html.haml
@@ -0,0 +1,8 @@
+= render :partial => 'payments/customer_data'
+= link_to 'Make Payment', new_payment_path, :class => :btn
+%h3 Transaction History
+= render(:partial => "transaction", :collection => @transactions) # show subset with link to see more
+- if @subscriptions.any?
+ %h3 Active Subscriptions
+ = # todo: won't really have multiple subscriptions
+ = render(:partial => "subscription", :collection => @subscriptions) \ No newline at end of file