diff --git a/app/Entities/Subscriptions/Subscription.php b/app/Entities/Subscriptions/Subscription.php index 7a12182..9fd1421 100755 --- a/app/Entities/Subscriptions/Subscription.php +++ b/app/Entities/Subscriptions/Subscription.php @@ -70,4 +70,9 @@ class Subscription extends Model { return Type::getColorById($this->type_id); } + + public function getTypeLabelAttribute() + { + return ''.$this->type.''; + } } diff --git a/resources/views/customers/subscriptions.blade.php b/resources/views/customers/subscriptions.blade.php index b1f0de3..b07c629 100755 --- a/resources/views/customers/subscriptions.blade.php +++ b/resources/views/customers/subscriptions.blade.php @@ -21,11 +21,7 @@ {{ 1 + $key }} {{ $subscription->nameLink() }} - - - {{ $subscription->type }} - - + {!! $subscription->type_label !!} {{ $subscription->customer->name }} {{ dateId($subscription->due_date) }} {!! $subscription->nearOfDueDateSign() !!} diff --git a/resources/views/subscriptions/index.blade.php b/resources/views/subscriptions/index.blade.php index fe72f3f..e93be92 100755 --- a/resources/views/subscriptions/index.blade.php +++ b/resources/views/subscriptions/index.blade.php @@ -31,11 +31,7 @@ {{ $subscriptions->firstItem() + $key }} {{ $subscription->nameLink() }} - - - {{ $subscription->type }} - - + {!! $subscription->type_label !!} {{ $subscription->customer->name }} {{ dateId($subscription->due_date) }} {!! $subscription->nearOfDueDateSign() !!} diff --git a/tests/Unit/Models/SubscriptionTest.php b/tests/Unit/Models/SubscriptionTest.php index 1ab6846..34cddfa 100644 --- a/tests/Unit/Models/SubscriptionTest.php +++ b/tests/Unit/Models/SubscriptionTest.php @@ -120,4 +120,22 @@ class SubscriptionTest extends TestCase $this->assertEquals(2, $subscription->type_id); $this->assertEquals(Type::getColorById(2), $subscription->type_color); } + + /** @test */ + public function a_subscription_has_type_label_attribute() + { + $subscription = factory(Subscription::class)->make(); + + $type = Type::getNameById(1); + $color = Type::getColorById(1); + $label = ''.$type.''; + $this->assertEquals($label, $subscription->type_label); + + $subscription = factory(Subscription::class)->make(['type_id' => 2]); + + $type = Type::getNameById(2); + $color = Type::getColorById(2); + $label = ''.$type.''; + $this->assertEquals($label, $subscription->type_label); + } }