Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 14:24:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don’t require changing back to free to be refunded

Browse Source
This commit is contained in:
Hillel Coren 2017-03-28 14:28:25 +03:00
parent dad4afff45
commit 42357bcd3d
3 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/Http/Controllers/AccountController.php
View File

@ -180,22 +180,8 @@ class AccountController extends BaseController
$newPlan['price'] = Utils::getPlanPrice($newPlan);
$credit = 0;
if (! empty($planDetails['started']) && $plan == PLAN_FREE) {
// Downgrade
$refund_deadline = clone $planDetails['started'];
$refund_deadline->modify('+30 days');
if ($plan == PLAN_FREE && $refund_deadline >= date_create()) {
if ($payment = $account->company->payment) {
$ninjaAccount = $this->accountRepo->getNinjaAccount();
$paymentDriver = $ninjaAccount->paymentDriver();
$paymentDriver->refundPayment($payment);
Session::flash('message', trans('texts.plan_refunded'));
\Log::info("Refunded Plan Payment: {$account->name} - {$user->email} - Deadline: {$refund_deadline->format('Y-m-d')}");
} else {
Session::flash('message', trans('texts.updated_plan'));
}
}
if ($plan == PLAN_FREE && $company->processRefund(Auth::user())) {
Session::flash('warning', trans('texts.plan_refunded'));
}
$hasPaid = false;
@ -235,6 +221,8 @@ class AccountController extends BaseController
$company->plan = $plan;
$company->save();
Session::flash('message', trans('texts.updated_plan'));
return Redirect::to('settings/account_management');
}
}
@ -1341,6 +1329,9 @@ class AccountController extends BaseController
$account = Auth::user()->account;
\Log::info("Canceled Account: {$account->name} - {$user->email}");
$company = $account->company;
$refunded = $company->processRefund(Auth::user());
Document::scope()->each(function ($item, $key) {
$item->delete();
});
@ -1356,6 +1347,10 @@ class AccountController extends BaseController
Auth::logout();
Session::flush();
if ($refunded) {
Session::flash('warning', trans('texts.plan_refunded'));
}
return Redirect::to('/')->with('clearGuestKey', true);
}

28
app/Models/Company.php
View File

@ -140,4 +140,32 @@ class Company extends Eloquent
return false;
}
public function processRefund($user)
{
if (! $this->payment) {
return false;
}
$account = $this->accounts()->first();
$planDetails = $account->getPlanDetails(false, false);
if (! empty($planDetails['started'])) {
$deadline = clone $planDetails['started'];
$deadline->modify('+30 days');
if ($deadline >= date_create()) {
$accountRepo = app('App\Ninja\Repositories\AccountRepository');
$ninjaAccount = $accountRepo->getNinjaAccount();
$paymentDriver = $ninjaAccount->paymentDriver();
$paymentDriver->refundPayment($this->payment);
\Log::info("Refunded Plan Payment: {$account->name} - {$user->email} - Deadline: {$deadline->format('Y-m-d')}");
return true;
}
}
return false;
}
}

7
resources/views/invoices/view.blade.php
View File

@ -127,10 +127,11 @@
@endif
@else
{!! Button::normal(trans('texts.download_pdf'))->withAttributes(['onclick' => 'onDownloadClick()'])->large() !!}
@if ($account->isNinjaAccount())
{!! Button::primary(trans('texts.return_to_app'))->asLinkTo(URL::to('/settings/account_management'))->large() !!}
@endif
@endif
@if ($account->isNinjaAccount())
{!! Button::primary(trans('texts.return_to_app'))->asLinkTo(URL::to('/settings/account_management'))->large() !!}
@endif
</div>
@endif