Merge remote-tracking branch 'origin/develop'

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

1 files changed, 23 insertions, 0 deletions

diff --git a/engines/billing/app/views/customer/edit.html.haml b/engines/billing/app/views/customer/edit.html.haml
new file mode 100644
index 0000000..e882d53
--- /dev/null
+++ b/engines/billing/app/views/customer/edit.html.haml
@@ -0,0 +1,23 @@
+- if @result
+  #total-errors{:style => "color:red;"}
+    = h(@result.errors.size)
+    error(s)
+= braintree_form_for :customer, existing: @customer do |f|
+  = field_set_tag "Customer" do
+    %dl
+      %dt= f.label :first_name, 'First Name'
+      %dd= f.text_field :first_name
+      %dt= f.label :last_name, 'Last Name'
+      %dd= f.text_field :last_name
+      %dt= f.label :phone, 'Phone'
+      %dd= f.text_field :phone
+      - if @default_cc
+        = # todo, as they will need a credit card, so not sure about conditional?
+        %dt= t(:stored_credit_card)
+        %dd
+        = @default_cc.masked_number
+        = link_to t(:change_credit_card), edit_credit_card_info_path(:id => @default_cc.token), :class => :btn
+  = hidden_field_tag :tr_data, @tr_data
+  .form-actions
+    = f.submit t(:save_customer_info), :class => 'btn btn-primary'
+    = link_to t(:cancel), show_customer_path(@user), :class=> :btn