From 4a2684e3d97a4f4a832c88f6cae53da7cd15ea05 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Fri, 16 Oct 2020 15:59:51 +0100 Subject: [PATCH] Fix rubocop issues --- .rubocop_todo.yml | 2 -- app/serializers/api/admin/customer_serializer.rb | 11 +++++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 93648258a3..7ea61bca6b 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -563,7 +563,6 @@ Style/ClassAndModuleChildren: - 'app/serializers/api/admin/calculator/flat_percent_item_total_serializer.rb' - 'app/serializers/api/admin/calculator_serializer.rb' - 'app/serializers/api/admin/column_preference_serializer.rb' - - 'app/serializers/api/admin/customer_serializer.rb' - 'app/serializers/api/admin/enterprise_fee_serializer.rb' - 'app/serializers/api/admin/enterprise_relationship_permission_serializer.rb' - 'app/serializers/api/admin/enterprise_relationship_serializer.rb' @@ -851,7 +850,6 @@ Style/FrozenStringLiteralComment: - 'app/serializers/api/admin/calculator/flat_percent_item_total_serializer.rb' - 'app/serializers/api/admin/calculator_serializer.rb' - 'app/serializers/api/admin/column_preference_serializer.rb' - - 'app/serializers/api/admin/customer_serializer.rb' - 'app/serializers/api/admin/enterprise_fee_serializer.rb' - 'app/serializers/api/admin/enterprise_relationship_permission_serializer.rb' - 'app/serializers/api/admin/enterprise_relationship_serializer.rb' diff --git a/app/serializers/api/admin/customer_serializer.rb b/app/serializers/api/admin/customer_serializer.rb index 7ee110eb9e..7d7033d4e9 100644 --- a/app/serializers/api/admin/customer_serializer.rb +++ b/app/serializers/api/admin/customer_serializer.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Api::Admin::CustomerSerializer < ActiveModel::Serializer attributes :id, :email, :enterprise_id, :user_id, :code, :tags, :tag_list, :name, :allow_charges, :default_card_present?, :balance, :balance_status @@ -14,13 +16,13 @@ class Api::Admin::CustomerSerializer < ActiveModel::Serializer end def balance - Spree::Money.new(balance_value, { currency: Spree::Config[:currency] }).to_s + Spree::Money.new(balance_value, currency: Spree::Config[:currency]).to_s end def balance_status - if balance_value > 0 + if balance_value.positive? "credit_owed" - elsif balance_value < 0 + elsif balance_value.negative? "balance_due" else "" @@ -49,6 +51,7 @@ class Api::Admin::CustomerSerializer < ActiveModel::Serializer end def balance_value - @balance_value ||= OpenFoodNetwork::UserBalanceCalculator.new(object.email, object.enterprise).balance + @balance_value ||= + OpenFoodNetwork::UserBalanceCalculator.new(object.email, object.enterprise).balance end end