diff --git a/app/views/customers/_details.html.erb b/app/views/customers/_details.html.erb index 940f7f3..57f8d60 100644 --- a/app/views/customers/_details.html.erb +++ b/app/views/customers/_details.html.erb @@ -2,59 +2,55 @@ - <%=t(:label_name)%> + <%= t(:label_name) %> <%= customer.name %> - <%=t(:label_email)%> + <%= t(:label_email) %> <%= customer.email %> - <%=t(:label_primary_phone)%> + <%= t(:label_primary_phone) %> <%= number_to_phone(customer&.primary_phone&.gsub(/[^\d]/, '').to_i, area_code: true) %> - <%=t(:label_mobile_phone)%> + <%= t(:label_mobile_phone) %> <%= number_to_phone(customer&.mobile_phone&.gsub(/[^\d]/, '').to_i, area_code: true) %> - - <%=t(:label_billing_address)%> -
<%= @billing_address %>
- - - - <%=t(:label_shipping_address)%> -
<%= @shipping_address %>
+ + <%= t(:label_billing_address) %> +
<%= @billing_address %>
- <%=t(:label_account_balance)%> - $<%= customer.balance %> + <%= t(:label_shipping_address) %> +
<%= @shipping_address %>
-

<%=t(:field_notes)%> + <%= t(:label_account_balance) %> + $<%= customer.balance %> + + <% if customer.notes.present? %> + +

<%= t(:field_notes) %>

+ - - -
-          <%= customer.notes %>
-        
- - - - + + +
+ <%= textilizable(customer, :notes) %> +
+ + + <% end %>
-
+
\ No newline at end of file diff --git a/app/views/customers/_form.html.erb b/app/views/customers/_form.html.erb index abda586..04a0e37 100644 --- a/app/views/customers/_form.html.erb +++ b/app/views/customers/_form.html.erb @@ -32,20 +32,17 @@ -
+
<%=t(:field_notes)%>:
-

- <%= content_tag :span, id: "issue_description_and_toolbar" do %> - <%= f.text_area :notes, - cols: 60, - rows: 10, - accesskey: accesskey(:edit), - class: 'wiki-edit', - no_label: true %> - <% end %> -

- <%= wikitoolbar_for :issue_description %> +

+ <%= f.text_area :notes, + rows: 8, + class: 'wiki-edit', + style: 'width: 95%;', + id: 'customer_appointment_description' %> + <%= wikitoolbar_for 'customer_appointment_description' %> +