From 1258206d23b66310c723e0a81c0c5dd81e36c915 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 28 Nov 2017 10:36:43 +0200 Subject: [PATCH] Adjust promotions --- app/Models/Company.php | 4 ++-- app/Ninja/Repositories/AccountRepository.php | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Models/Company.php b/app/Models/Company.php index 948a2b251627..5d1f6f70a6da 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -145,7 +145,7 @@ class Company extends Eloquent foreach ($discounts as $weeks => $promo) { list($discount, $validFor) = $promo; $difference = $this->created_at->diffInWeeks(); - if ($difference >= $weeks && $discount > $this->discount) { + if ($difference >= $weeks) { $this->discount = $discount; $this->promo_expires = date_create()->modify($validFor . ' days')->format('Y-m-d'); $this->save(); @@ -194,7 +194,7 @@ class Company extends Eloquent public function applyDiscount($amount) { $this->discount = $amount; - $this->promo_expires = date_create()->modify('14 days')->format('Y-m-d'); + $this->promo_expires = date_create()->modify('5 days')->format('Y-m-d'); } public function applyFreeYear() diff --git a/app/Ninja/Repositories/AccountRepository.php b/app/Ninja/Repositories/AccountRepository.php index 1ae0f807d9ee..327a278d1ec0 100644 --- a/app/Ninja/Repositories/AccountRepository.php +++ b/app/Ninja/Repositories/AccountRepository.php @@ -48,6 +48,9 @@ class AccountRepository if (env('PARTNER_CAMPAIGN') && hash_equals(Input::get('utm_campaign'), env('PARTNER_CAMPAIGN'))) { $company->applyFreeYear(); } + } else { + $company->applyDiscount(.5); + session()->flash('warning', $company->present()->promoMessage()); } $company->save();