From f5db1cd9213f3ab5e25b77d0429a98139466e7d9 Mon Sep 17 00:00:00 2001
From: Steve Pettitt <spettitt@gmail.com>
Date: Sun, 10 Jan 2016 15:53:14 +0000
Subject: [PATCH] Images, first attempt at column formatting

---
 .../api/orders_by_distributor_serializer.rb    |  6 +++++-
 app/views/spree/users/_fat.html.haml           |  6 +++---
 app/views/spree/users/_skinny.html.haml        | 18 +++++++++++-------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/app/serializers/api/orders_by_distributor_serializer.rb b/app/serializers/api/orders_by_distributor_serializer.rb
index 640a8837d7..3d04bf2a03 100644
--- a/app/serializers/api/orders_by_distributor_serializer.rb
+++ b/app/serializers/api/orders_by_distributor_serializer.rb
@@ -1,5 +1,5 @@
 class Api::OrdersByDistributorSerializer < ActiveModel::Serializer
-  attributes :name, :id, :hash, :balance, :distributed_orders
+  attributes :name, :id, :hash, :balance, :logo, :distributed_orders
   has_many :distributed_orders, serializer: Api::OrderSerializer
 
   def balance
@@ -10,4 +10,8 @@ class Api::OrdersByDistributorSerializer < ActiveModel::Serializer
     object.to_param
   end
 
+  def logo
+    object.logo(:small) if object.logo?
+  end
+
 end
diff --git a/app/views/spree/users/_fat.html.haml b/app/views/spree/users/_fat.html.haml
index dcaac026c4..6ed7a6ad1c 100644
--- a/app/views/spree/users/_fat.html.haml
+++ b/app/views/spree/users/_fat.html.haml
@@ -10,12 +10,12 @@
         %th{"bo-text" => "'balance' | t"}
       %tbody{"ng-repeat" => "order in distributor.distributed_orders"}
         %tr
-          %td{"bo-text" => "'Order ' + order.id"}
+          %td{"bo-text" => "('order' | t )+ ' ' + order.id"}
           %td{"bo-text" => "order.completed_at"}
           %td{"bo-text" => "order.payment_state | t"}
           %td{"bo-text" => "order.shipment_state | t"}
-          %td.text-right {{order.total_money.currency_symbol}}&nbsp{{order.total_money.amount}}
-          %td.text-right{"ng-class" => "{'credit' : order.outstanding_balance < 0, 'debit' : order.outstanding_balance > 0, 'paid' : order.outstanding_balance == 0}"} {{order.balance_money.currency_symbol}}&nbsp{{order.balance_money.amount}}
+          %td.text-right{"bo-text" => "order.total_money.currency_symbol + order.total_money.amount"}
+          %td.text-right{"ng-class" => "{'credit' : order.outstanding_balance < 0, 'debit' : order.outstanding_balance > 0, 'paid' : order.outstanding_balance == 0}", "bo-text" => "order.balance_money.currency_symbol + order.balance_money.amount"}
           %tr{"ng-repeat" => "payment in order.payments"}
             %td{"bo-text" => "'Payment '+ payment.identifier"}
             %td{"bo-text" => "payment.updated_at"}
diff --git a/app/views/spree/users/_skinny.html.haml b/app/views/spree/users/_skinny.html.haml
index 8ad8c596ce..64f1582964 100644
--- a/app/views/spree/users/_skinny.html.haml
+++ b/app/views/spree/users/_skinny.html.haml
@@ -1,10 +1,14 @@
 .row.active_table_row{"ng-click" => "toggle($event)", "ng-class" => "{'closed' : !open()}"}
-  .columns.small-12.medium-4.large-4.skinny-head
+  .skinny-head
     %span.margin-top
-      %strong{"bo-text" => "distributor.name"}
-
+      .columns.medium-2.large-2
+        %span.margin-top
+          %img{"bo-src" => "distributor.logo"}
+      .columns.small-10.medium-8.large-8
+        %span.margin-top
+          %strong{"bo-text" => "distributor.name"}
+      .columns.small-2.medium-2.large-2.text-right
+        %span.margin-top
+          %i{"ng-class" => "{'ofn-i_005-caret-down' : !open(), 'ofn-i_006-caret-up' : open()}"}
   .columns.small-6.medium-3.large-3
-    %span.margin-top{"bo-text" => "('balance' | t) + ': ' + Orders.currency_symbol + ' ' + distributor.balance", "ng-class" => "{'credit' : order.outstanding_balance < 0, 'debit' : order.outstanding_balance > 0, 'paid' : order.outstanding_balance == 0}"}
-  .columns.small-2.medium-2.large-1.text-right
-    %span.margin-top
-      %i{"ng-class" => "{'ofn-i_005-caret-down' : !open(), 'ofn-i_006-caret-up' : open()}"}
+    %span.margin-top{"bo-text" => "('balance' | t) + ': ' + Orders.currency_symbol + distributor.balance", "ng-class" => "{'credit' : order.outstanding_balance < 0, 'debit' : order.outstanding_balance > 0, 'paid' : order.outstanding_balance == 0}"}