From 27f329671916cefb5b1b0f1e04a6b145881539bf Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jan 2019 11:07:09 +0100 Subject: [PATCH] rubocop coupon --- app/models/coupon.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/models/coupon.rb b/app/models/coupon.rb index bf0b1a730..5208cabed 100644 --- a/app/models/coupon.rb +++ b/app/models/coupon.rb @@ -1,3 +1,6 @@ +# frozen_string_literal: true + +# Coupon is a textual code associated with a discount rate or an amount of discount class Coupon < ActiveRecord::Base has_many :invoices @@ -6,7 +9,7 @@ class Coupon < ActiveRecord::Base validates :name, presence: true validates :code, presence: true - validates :code, format: { with: /\A[A-Z0-9\-]+\z/, message: 'only caps letters, numbers, and dashes'} + validates :code, format: { with: /\A[A-Z0-9\-]+\z/, message: 'only caps letters, numbers, and dashes' } validates :code, uniqueness: true validates :validity_per_user, presence: true validates :validity_per_user, inclusion: { in: %w[once forever] } @@ -52,9 +55,9 @@ class Coupon < ActiveRecord::Base end def type - if amount_off.nil? and !percent_off.nil? + if amount_off.nil? && !percent_off.nil? 'percent_off' - elsif percent_off.nil? and !amount_off.nil? + elsif percent_off.nil? && !amount_off.nil? 'amount_off' end end