Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 08:21:34 +02:00
Code Issues Releases Activity

Merge pull request #5870 from turbo124/v5-develop

Browse Source 
v5.1.70
This commit is contained in:
David Bomba 2021-06-01 09:04:22 +10:00 committed by GitHub
commit ece1c9bfd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.1.69
5.1.70

7
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@ -132,8 +132,11 @@ class ForgotPasswordController extends Controller
: $this->sendResetLinkFailedResponse($request, $response);
}
public function showLinkRequestForm()
public function showLinkRequestForm(Request $request)
{
return $this->render('auth.passwords.request', ['root' => 'themes']);
$account_id = $request->get('account_id');
$account = Account::find($account_id);
return $this->render('auth.passwords.request', ['root' => 'themes', 'account' => $account]);
}
}

6
app/Http/Controllers/Auth/ResetPasswordController.php
View File

@ -12,6 +12,7 @@
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Models\Account;
use Illuminate\Foundation\Auth\ResetsPasswords;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\RedirectResponse;
@ -52,7 +53,10 @@ class ResetPasswordController extends Controller
public function showResetForm(Request $request, $token = null)
{
return $this->render('auth.passwords.reset', ['root' => 'themes', 'token' => $token]);
$account_id = $request->get('account_id');
$account = Account::find($account_id);
return $this->render('auth.passwords.reset', ['root' => 'themes', 'token' => $token, 'account' => $account]);
}
/**

5
app/Services/Subscription/SubscriptionService.php
View File

@ -486,7 +486,8 @@ class SubscriptionService
/**
* Handle a plan change where no payment is required
*
* @param array $data
* @param array $data
* @deprecated - no usage found
*/
public function handlePlanChangeNoPayment($data)
{
@ -655,7 +656,7 @@ class SubscriptionService
$status = $response->getStatusCode();
//$response_body = $response->getReasonPhrase();
$body = array_merge($body, ['status' => $status, 'response_body' => $response_body]);
//$body = array_merge($body, ['status' => $status, 'response_body' => $response_body]);
}

4
config/ninja.php
View File

@ -14,8 +14,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => '5.1.69',
'app_tag' => '5.1.69-release',
'app_version' => '5.1.70',
'app_tag' => '5.1.70-release',
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''),

4
routes/web.php
View File

@ -15,9 +15,9 @@ Route::post('setup/check_db', 'SetupController@checkDB')->middleware('guest');
Route::post('setup/check_mail', 'SetupController@checkMail')->middleware('guest');
Route::post('setup/check_pdf', 'SetupController@checkPdf')->middleware('guest');
Route::get('password/reset', 'Auth\ForgotPasswordController@showLinkRequestForm')->name('password.request');
Route::get('password/reset', 'Auth\ForgotPasswordController@showLinkRequestForm')->middleware('domain_db')->name('password.request');
Route::post('password/email', 'Auth\ForgotPasswordController@sendResetLinkEmail')->name('password.email');
Route::get('password/reset/{token}', 'Auth\ResetPasswordController@showResetForm')->middleware('email_db')->name('password.reset');
Route::get('password/reset/{token}', 'Auth\ResetPasswordController@showResetForm')->middleware(['domain_db','email_db'])->name('password.reset');
Route::post('password/reset', 'Auth\ResetPasswordController@reset')->middleware('email_db')->name('password.update');
/*