From ddb63dff8a2eb5b45c943336d70503b6ca490019 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Tue, 20 Apr 2021 16:09:48 +0200 Subject: [PATCH] Add name of the customers into subscriptions table - Thus, we can filter subscriptions by customer email --- app/serializers/api/admin/subscription_serializer.rb | 6 +++++- app/views/admin/subscriptions/_table.html.haml | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/serializers/api/admin/subscription_serializer.rb b/app/serializers/api/admin/subscription_serializer.rb index 7088fd6908..4a2cb33db9 100644 --- a/app/serializers/api/admin/subscription_serializer.rb +++ b/app/serializers/api/admin/subscription_serializer.rb @@ -5,7 +5,7 @@ module Api class SubscriptionSerializer < ActiveModel::Serializer attributes :id, :shop_id, :customer_id, :schedule_id, :payment_method_id, :shipping_method_id, :begins_at, :ends_at, - :customer_email, :schedule_name, :edit_path, :canceled_at, :paused_at, :state, + :customer_email, :customer_name, :schedule_name, :edit_path, :canceled_at, :paused_at, :state, :shipping_fee_estimate, :payment_fee_estimate has_many :subscription_line_items, serializer: Api::Admin::SubscriptionLineItemSerializer @@ -34,6 +34,10 @@ module Api object.customer.andand.email end + def customer_name + object.customer.andand.name + end + def schedule_name object.schedule.andand.name end diff --git a/app/views/admin/subscriptions/_table.html.haml b/app/views/admin/subscriptions/_table.html.haml index 902515f385..c4eb12b891 100644 --- a/app/views/admin/subscriptions/_table.html.haml +++ b/app/views/admin/subscriptions/_table.html.haml @@ -38,7 +38,10 @@   %tbody.panel-ctrl{ object: 'subscription', ng: { repeat: "subscription in subscriptions | filter:query as filteredSubscriptions track by subscription.id" } } %tr.subscription{ :id => "so_{{subscription.id}}", ng: { class: { even: "'even'", odd: "'odd'" } } } - %td.customer.text-center{ ng: { show: 'columns.customer.visible', bind: '::subscription.customer_email' } } + %td.customer.text-center{ ng: { show: 'columns.customer.visible'}} + %span{ "ng-bind": '::subscription.customer_email' } + %br + %span{ "ng-bind": '::subscription.customer_name' } %td.schedule.text-center{ ng: { show: 'columns.schedule.visible', bind: '::subscription.schedule_name' } } %td.items.panel-toggle.text-center{ name: 'products', ng: { show: 'columns.items.visible' } } %h5{ ng: { bind: 'itemCount(subscription)' } }