Show orders with credit as paid in customer account

app/serializers/api/order_serializer.rb

@@ -5,7 +5,7 @@ class OrderSerializer < ActiveModel::Serializer
     attributes :number, :completed_at, :total, :state, :shipment_state, :payment_state,
                :outstanding_balance, :payments, :path, :cancel_path,
                :changes_allowed, :changes_allowed_until, :item_count,
-               :shop_id
+               :shop_id, :paid
 
     has_many :payments, serializer: Api::PaymentSerializer
 
@@ -62,5 +62,9 @@ def cancel_path
     def changes_allowed
       object.changes_allowed?
     end
+
+    def paid
+      object.paid?
+    end
   end
 end

app/views/spree/users/_past_orders.html.haml

@@ -16,8 +16,8 @@
             %a{"ng-href" => "{{::Orders.shopsByID[order.shop_id].hash}}#{main_app.shop_path}", "ng-bind" => "::Orders.shopsByID[order.shop_id].name"}
           %td.order3.show-for-large-up{"ng-bind" => "::order.completed_at"}
           %td.order4.show-for-large-up{"ng-bind" => "::order.item_count"}
-          %td.order5.text-right{"ng-class" => "{'debit': order.payment_state != 'paid', 'credit': order.payment_state == 'paid'}","ng-bind" => "::order.total | localizeCurrency"}
-          %td.order6.text-right.show-for-large-up{"ng-class" => "{'debit': order.payment_state != 'paid', 'credit': order.payment_state == 'paid'}", "ng-bind" => "::(order.payment_state == 'paid' ? 'say_yes' : 'say_no') | t"}
+          %td.order5.text-right{"ng-class" => "{'debit': !order.paid, 'credit': order.paid}","ng-bind" => "::order.total | localizeCurrency"}
+          %td.order6.text-right.show-for-large-up{"ng-class" => "{'debit': !order.paid, 'credit': order.paid}", "ng-bind" => "::(order.paid ? 'say_yes' : 'say_no') | t"}
             %td.order7.text-right{ "ng-switch" => "::order.state"  }
               %a{ "ng-switch-when" => "complete", "ng-href" => "{{::order.path}}" }= t('.completed')
               %span{ "ng-switch-when" => "canceled" }= t('.cancelled')

spec/serializers/api/order_serializer_spec.rb

@@ -37,4 +37,24 @@
       expect(serializer.serializable_hash[:outstanding_balance]).to eq(1.23)
     end
   end
+
+  describe '#paid' do
+    it "returns false when payment_state is balance_due" do
+      allow(order).to receive(:payment_state).and_return('balance_due')
+
+      expect(serializer.serializable_hash[:paid]).to eq(false)
+    end
+
+    it "returns true when payment_state is paid" do
+      allow(order).to receive(:payment_state).and_return('paid')
+
+      expect(serializer.serializable_hash[:paid]).to eq(true)
+    end
+
+    it "returns true when payment_state is credit_owed" do
+      allow(order).to receive(:payment_state).and_return('credit_owed')
+
+      expect(serializer.serializable_hash[:paid]).to eq(true)
+    end
+  end
 end

spec/system/consumer/account_spec.rb

@@ -61,6 +61,11 @@
         expect(page).to have_link(distributor_credit.name,
                                   href: "#{distributor_credit.permalink}/shop", count: 1)
 
+        # An order with credit_owed payment state should be shown as paid
+        within('tr', text: credit_order.number) do
+          expect(page).to have_css('td.order6', text: 'Yes')
+        end
+
         # Viewing transaction history
         find("a", text: /Transactions/i).click