From ac69bef459ca0bdfa63bb0fda03677daee9388e6 Mon Sep 17 00:00:00 2001
From: Steve Roberts <steve@commoncode.io>
Date: Tue, 7 Jul 2020 22:25:11 +1000
Subject: [PATCH] Fix issues raised by linter

---
 app/assets/stylesheets/mail/payment_list.scss | 47 -------------------
 .../stylesheets/mail/payments_list.scss       | 45 ++++++++++++++++++
 app/helpers/order_helper.rb                   |  2 +-
 .../spree/shared/_payments_list.html.haml     |  4 +-
 4 files changed, 48 insertions(+), 50 deletions(-)
 delete mode 100644 app/assets/stylesheets/mail/payment_list.scss
 create mode 100644 app/assets/stylesheets/mail/payments_list.scss

diff --git a/app/assets/stylesheets/mail/payment_list.scss b/app/assets/stylesheets/mail/payment_list.scss
deleted file mode 100644
index 7cf6b3ba8e..0000000000
--- a/app/assets/stylesheets/mail/payment_list.scss
+++ /dev/null
@@ -1,47 +0,0 @@
-@import '../admin/variables';
-
-// payment list, used in both invoice pdfs and order confirmation emails
-
-table.payment-list {
-    width: 100%;
-    border-collapse: separate;
-    border-spacing: 0px;
-    font-size: 12px;
-    margin-bottom: 20px;
-  
-    tbody tr td {
-      padding: 5px;
-      border-bottom: 1px solid $medium-grey;
-  
-      .payment-method-name {
-        display: block;
-        font-weight: bold;
-      }
-  
-      .payment-method-description {
-        display: block;
-      }
-    }
-  
-    thead tr th {
-      border-bottom: 1px solid $medium-grey;
-      padding: 10px 5px 5px;
-      text-transform: uppercase;
-      text-align: left;
-    }
-  
-    th.amount, td.amount {
-      text-align: right;
-      padding-right: 15px;
-    }
-  
-    th.payment-state {
-      text-align: right;
-    }
-  
-    td.payment-state {
-      text-align: right;
-      text-transform: uppercase;
-    }
-  }
-  
\ No newline at end of file
diff --git a/app/assets/stylesheets/mail/payments_list.scss b/app/assets/stylesheets/mail/payments_list.scss
new file mode 100644
index 0000000000..1ddd89def8
--- /dev/null
+++ b/app/assets/stylesheets/mail/payments_list.scss
@@ -0,0 +1,45 @@
+@import "../admin/variables";
+
+// payment list, used in both invoice pdfs and order confirmation emails
+
+.payments-list {
+  width: 100%;
+  border-collapse: separate;
+  border-spacing: 0px;
+  font-size: 12px;
+  margin-bottom: 20px;
+
+  tbody tr td {
+    padding: 5px;
+    border-bottom: 1px solid $medium-grey;
+
+    .payment-method-name {
+      display: block;
+      font-weight: bold;
+    }
+
+    .payment-method-description {
+      display: block;
+    }
+  }
+
+  thead tr th {
+    border-bottom: 1px solid $medium-grey;
+    padding: 10px 5px 5px;
+    text-transform: uppercase;
+    text-align: left;
+  }
+
+  .amount {
+    text-align: right;
+    padding-right: 15px;
+  }
+
+  .payment-state {
+    text-align: right;
+  }
+
+  .payment-state-value {
+    text-transform: uppercase;
+  }
+}
diff --git a/app/helpers/order_helper.rb b/app/helpers/order_helper.rb
index ba47bcdd25..c6ab5807bb 100644
--- a/app/helpers/order_helper.rb
+++ b/app/helpers/order_helper.rb
@@ -6,6 +6,6 @@ module OrderHelper
   end
 
   def outstanding_balance_label(order)
-    order.outstanding_balance < 0 ? t(:credit_owed) : t(:balance_due)
+    order.outstanding_balance.negative? ? t(:credit_owed) : t(:balance_due)
   end
 end
diff --git a/app/views/spree/shared/_payments_list.html.haml b/app/views/spree/shared/_payments_list.html.haml
index 32bec2e1b1..ca475aff2b 100644
--- a/app/views/spree/shared/_payments_list.html.haml
+++ b/app/views/spree/shared/_payments_list.html.haml
@@ -1,4 +1,4 @@
-%table.payment-list
+%table.payments-list
   %thead
     %tr
       %th= t('.date_time')
@@ -10,5 +10,5 @@
       %tr
         %td= l(payment.created_at, format: "%b %d, %Y %H:%M")
         %td.payment-method-name= payment_method_name(payment)
-        %td.payment-state= t(payment.state, scope: :payment_states, default: payment.state.capitalize)
+        %td.payment-state.payment-state-value= t(payment.state, scope: :payment_states, default: payment.state.capitalize)
         %td.amount= payment.display_amount.to_html