Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00
Code Issues Releases Activity

Merge pull request #7295 from turbo124/v5-develop

Browse Source 
v5.3.70
This commit is contained in:
David Bomba 2022-03-17 15:49:08 +11:00 committed by GitHub
commit 01e586a898
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.3.69
5.3.70

3
app/Http/Controllers/DocumentController.php
View File

@ -189,12 +189,11 @@ class DocumentController extends BaseController
*/
$documents->each(function ($document, $key) use ($action) {
if (auth()->user()->can('edit', $document)) {
$this->{$action}($document);
$this->document_repo->{$action}($document);
}
});
/* Need to understand which permission are required for the given bulk action ie. view / edit */
return $this->listResponse(Document::withTrashed()->whereIn('id', $this->transformKeys($ids))->company());
}
}

2
app/Http/Controllers/QuoteController.php
View File

@ -676,7 +676,7 @@ class QuoteController extends BaseController
return response()->json(['message' => ctrans('texts.quote_unapprovable')], 400);
}
return $this->itemResponse($quote->service()->approve()->save());
return $this->itemResponse($quote->service()->approveWithNoCoversion()->save());
break;
case 'history':
// code...

19
app/Repositories/DocumentRepository.php
View File

@ -19,6 +19,7 @@ use App\Utils\Ninja;
*/
class DocumentRepository extends BaseRepository
{
public function delete($document)
{
$document->deleteFile();
@ -27,14 +28,18 @@ class DocumentRepository extends BaseRepository
public function restore($document)
{
if (! $document->trashed()) {
return;
// if (! $document->trashed()) {
// return;
// }
// $document->restore();
}
public function archive($document)
{
return;
}
$document->restore();
// if (class_exists($className)) {
// event(new $className($document, $document->company, Ninja::eventVars()));
// }
}
}

4
app/Repositories/TaskRepository.php
View File

@ -185,6 +185,10 @@ class TaskRepository extends BaseRepository
public function start(Task $task)
{
//do no allow an task to be restarted if it has been invoiced
if($task->invoice_id)
return;
if(strlen($task->time_log) < 5)
{
$log = [];

15
app/Services/Quote/QuoteService.php
View File

@ -126,6 +126,21 @@ class QuoteService
return $this;
}
public function approveWithNoCoversion($contact = null) :self
{
$this->setStatus(Quote::STATUS_APPROVED)->save();
if (!$contact) {
$contact = $this->quote->invitations->first()->contact;
}
event(new QuoteWasApproved($contact, $this->quote, $this->quote->company, Ninja::eventVars()));
return $this;
}
public function convertToInvoice()
{

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.3.69',
'app_tag' => '5.3.69',
'app_version' => '5.3.70',
'app_tag' => '5.3.70',
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''),

4
resources/views/portal/ninja2020/components/general/sidebar/main.blade.php
View File

@ -4,7 +4,7 @@
@keydown.window.escape="sidebarOpen = false"
id="main-sidebar">
@if($settings->enable_client_portal)
@if($settings && $settings->enable_client_portal)
<!-- Off-canvas menu for mobile -->
@include('portal.ninja2020.components.general.sidebar.mobile')
@ -15,7 +15,7 @@
@endif
<div class="flex flex-col w-0 flex-1 overflow-hidden">
@if($settings->enable_client_portal)
@if($settings && $settings->enable_client_portal)
@include('portal.ninja2020.components.general.sidebar.header')
@endif