diff --git a/app/views/estimates/_list.html.erb b/app/views/estimates/_list.html.erb index 5bb8059..aea470b 100644 --- a/app/views/estimates/_list.html.erb +++ b/app/views/estimates/_list.html.erb @@ -1,12 +1,19 @@ <% unless estimates.empty? %> + <%= render partial: 'qbo_estimates/status_styles' %> +
<% estimates.sort.reverse.each do |estimate| %>
<%= check_box_tag "estimate_ids[]", estimate.id, false, onchange: "updateLink()", data: { text: "Estimate ##{estimate.doc_number}", new_issue_param: 'issue[estimate_id]' }, class: "estimate-checkbox appointment" %> <%= link_to "##{estimate.doc_number}", estimate_path(estimate), target: :_blank %> <%= estimate.txn_date %> + <%# QuickBooks status, cached by the estimate sync (kept current by the webhook) %> + <% if estimate.txn_status.present? %> + <%= estimate.txn_status %> + <% end %> <%= render partial: 'qbo_estimates/estimate_actions', locals: { estimate: estimate } if RedmineQboBilling.writer? %>
<% end %> +
<% else %>

<%=t(:label_no_estimates)%>.

diff --git a/app/views/qbo_estimates/_status_styles.html.erb b/app/views/qbo_estimates/_status_styles.html.erb new file mode 100644 index 0000000..d4f20d4 --- /dev/null +++ b/app/views/qbo_estimates/_status_styles.html.erb @@ -0,0 +1,10 @@ +<%# QuickBooks status badges: the estimate page's header and the estimate lists (customer and vehicle pages) %> + diff --git a/app/views/qbo_estimates/_styles.html.erb b/app/views/qbo_estimates/_styles.html.erb index 24105d0..13ccfdc 100644 --- a/app/views/qbo_estimates/_styles.html.erb +++ b/app/views/qbo_estimates/_styles.html.erb @@ -111,16 +111,10 @@ .qbo-estimate .qbo-button-primary { background: var(--qbo-green); border-color: var(--qbo-green); color: #fff; } .qbo-estimate .qbo-button-primary:hover { background: var(--qbo-green-dark); border-color: var(--qbo-green-dark); color: #fff; } - .qbo-estimate-status { display: inline-block; font-size: .6em; font-weight: 600; vertical-align: middle; padding: 2px 8px; border-radius: 10px; - background: #eceef1; color: #393a3d; margin-left: 6px; } - .qbo-estimate-status-sent { background: #e6f4e4; color: #108000; } - .qbo-estimate-status-accepted { background: #e6f4e4; color: #108000; } - .qbo-estimate-status-closed, .qbo-estimate-status-converted { background: #e8eefa; color: #0d47a1; } /* Warnings with a list (linked issues, invoices): the text, then one item per line */ div.warning.qbo-estimate-notice { text-align: left; } div.warning.qbo-estimate-notice ul { margin: 6px 0 0; padding-left: 22px; } div.warning.qbo-estimate-notice li { margin: 2px 0; } - .qbo-estimate-status-rejected { background: #fdecea; color: #b71c1c; } .qbo-estimate-edit-link { margin-left: 4px; vertical-align: middle; } /* Phones: each line becomes a small card (number, product and delete; description; qty, rate, amount and tax) */ @@ -160,3 +154,4 @@ .qbo-estimate-actions { padding: 10px 14px; } } +<%= render partial: 'qbo_estimates/status_styles' %>