viscous/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2026-03-03 02:47:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11715 from turbo124/v5-develop

Browse Source 
v5.12.65
This commit is contained in:
David Bomba
2026-02-21 12:03:07 +11:00
committed by GitHub
parent fa18a5c12a 2d4369f8b6
commit 6cf04ad3c4
6 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@@ -1 +1 @@
5.12.64
5.12.65

3
app/Filters/UserFilters.php
View File

@@ -72,12 +72,9 @@ class UserFilters extends QueryFilters
$user = auth()->user();
if($user->isOwner() && request()->input('showAccountUsers', false) == 'true'){
nlog("returning early");
return $this->builder;
}
nlog("blow past");
return $this->builder->whereHas('company_users', function ($q) use ($user) {
$q->where('company_id', '=', $user->company()->id);
});

3
app/PaymentDrivers/GoCardlessPaymentDriver.php
View File

@@ -262,7 +262,7 @@ class GoCardlessPaymentDriver extends BaseDriver
$this->init();
nlog('GoCardless Event');
nlog($request->all());
// nlog($request->all());
if (! $request->has('events')) {
nlog('No GoCardless events to process in response?');
@@ -272,6 +272,7 @@ class GoCardlessPaymentDriver extends BaseDriver
sleep(1);
foreach ($request->events as $event) {
nlog($event);
if (
($event['resource_type'] == 'payments' && $event['action'] == 'confirmed')
|| $event['action'] === 'paid_out') {

1
app/Services/Pdf/PdfService.php
View File

@@ -142,6 +142,7 @@ class PdfService
if (config('ninja.log_pdf_html')) {
nlog($html);
}
return $html;
}

4
config/ninja.php
View File

@@ -17,8 +17,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION', '5.12.64'),
'app_tag' => env('APP_TAG', '5.12.64'),
'app_version' => env('APP_VERSION', '5.12.65'),
'app_tag' => env('APP_TAG', '5.12.65'),
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false),

2
routes/api.php
View File

@@ -442,7 +442,7 @@ Route::group(['middleware' => ['throttle:api', 'token_auth', 'valid_json','local
Route::post('/users/{user}/disconnect_mailer', [UserController::class, 'disconnectOauthMailer']);
Route::post('/users/{user}/disconnect_oauth', [UserController::class, 'disconnectOauth']);
Route::post('/user/{user}/reconfirm', [UserController::class, 'reconfirm']);
Route::post('/user/{user}/purge', [UserController::class, 'purge'])->middleware('password_protected');
Route::post('/users/{user}/purge', [UserController::class, 'purge'])->middleware('password_protected');
Route::resource('webhooks', WebhookController::class);
Route::post('webhooks/bulk', [WebhookController::class, 'bulk'])->name('webhooks.bulk');