diff --git a/app/assets/stylesheets/admin.css.scss b/app/assets/stylesheets/admin.css.scss index d6d3cc0..73760f7 100644 --- a/app/assets/stylesheets/admin.css.scss +++ b/app/assets/stylesheets/admin.css.scss @@ -845,3 +845,24 @@ height:auto !important; } +.cancel{ + + color:#C5C1C5; + a .icon{ + color:#C5C1C5; + border-color:#C5C1C5; + + } + &:hover{ + a .icon{ + color:#428bca; + border-color:#428bca; + &:hover{ + color:white; + + } + } + color:black; + } +} + diff --git a/app/views/admin/orders/_order.html.haml b/app/views/admin/orders/_order.html.haml index e1126b3..3be56fe 100644 --- a/app/views/admin/orders/_order.html.haml +++ b/app/views/admin/orders/_order.html.haml @@ -9,6 +9,8 @@ = "Paypal" if order.payment_type== 1.to_s = "Offert" if order.payment_type== 2.to_s = "Chèque" if order.payment_type== 3.to_s + -elsif order.paypal_payment_status == "Refunded" + Remboursé -else Paiement abandonné %td=number_to_currency order.total if order.paid @@ -21,7 +23,7 @@ - %td{:style => "width:100px;"} + %td{:style => "width:120px;"} =# link_to i(:trash), [:admin, order], :confirm => 'Voulez-vous vraiment supprimer cette order ?', :method => :delete, :remote => true =link_to i(:eye), public_order_url(:id => order.token), :target => "_blank" diff --git a/app/views/admin/orders/index.html.haml b/app/views/admin/orders/index.html.haml index 1f54a4d..84aef53 100644 --- a/app/views/admin/orders/index.html.haml +++ b/app/views/admin/orders/index.html.haml @@ -20,7 +20,16 @@ %td =@orders.count - @orders.where(:paid => true).count -%table.table.table-striped#orders - - =render @orders +%table.table.table-striped + %tr + %th Date + %th Email + %th Nom + %th Paiement + %th Total + %th Frais + %th Nbr + %th + %tbody#orders + =render @orders