Merge remote-tracking branch 'origin/develop'

Conflicts:
	app/assets/javascripts/srp
	test/nagios/soledad_sync.py
	test/nagios/webapp_login.py

1 files changed, 16 insertions, 0 deletions

diff --git a/engines/billing/app/views/customer/_customer_data.html.haml b/engines/billing/app/views/customer/_customer_data.html.haml
new file mode 100644
index 0000000..e9df040
--- /dev/null
+++ b/engines/billing/app/views/customer/_customer_data.html.haml
@@ -0,0 +1,16 @@
+%legend= t(:customer_information)
+%dl
+  %dt First Name
+  %dd= @customer.first_name
+  %dt Last Name
+  %dd= @customer.last_name
+  %dt Phone
+  %dd= @customer.phone
+%legend= t(:credit_card_information)
+%dl
+  %dt Number
+  %dd= @default_cc.masked_number
+  %dt Expiration Date
+  %dd= @default_cc.expiration_date
+  - if current_user == @user
+    = link_to t(:edit_saved_data), edit_customer_path(@user.id), :class => :btn