shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'akaunting:master' into master

Browse Source
This commit is contained in:
merve karaman 2023-07-03 11:37:34 +03:00 committed by GitHub
commit b2f446b8b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Install/Database.php
View File

@ -39,9 +39,10 @@ class Database extends Controller
$database = $request['database']; $database = $request['database'];
$username = $request['username']; $username = $request['username'];
$password = $request['password']; $password = $request['password'];
$prefix = config("database.connections.$connection.prefix", null);
// Check database connection // Check database connection
if (!Installer::createDbTables($host, $port, $database, $username, $password)) { if (!Installer::createDbTables($host, $port, $database, $username, $password, $prefix)) {
$response = [ $response = [
'status' => null, 'status' => null,
'success' => false, 'success' => false,

1
app/Http/Resources/Document/DocumentItem.php
View File

@ -22,6 +22,7 @@ class DocumentItem extends JsonResource
'document_id' => $this->document_id, 'document_id' => $this->document_id,
'item_id' => $this->item_id, 'item_id' => $this->item_id,
'name' => $this->name, 'name' => $this->name,
'description' => $this->description,
'price' => $this->price, 'price' => $this->price,
'price_formatted' => money($this->price, $this->document->currency_code, true)->format(), 'price_formatted' => money($this->price, $this->document->currency_code, true)->format(),
'total' => $this->total, 'total' => $this->total,

8
app/Listeners/Email/DisablePersonDueToInvalidEmail.php
View File

@ -36,6 +36,14 @@ class DisablePersonDueToInvalidEmail
return; return;
} }
$companies = $event->user->companies;
foreach ($companies as $company) {
if ($company->users->count() <= 1) {
return;
}
}
$event->user->enabled = false; $event->user->enabled = false;
$event->user->save(); $event->user->save();
} }

4
resources/views/components/documents/template/classic.blade.php
View File

@ -17,9 +17,9 @@
@stack('company_logo_input_start') @stack('company_logo_input_start')
@if (! $hideCompanyLogo) @if (! $hideCompanyLogo)
@if (!empty($document->contact->logo) && !empty($document->contact->logo->id)) @if (!empty($document->contact->logo) && !empty($document->contact->logo->id))
<img class="c-logo w-image" src="{{ $logo }}" alt="{{ $document->contact_name }}"/> <img class="c-logo" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
@else @else
<img class="c-logo w-image" src="{{ $logo }}" alt="{{ setting('company.name') }}" /> <img class="c-logo" src="{{ $logo }}" alt="{{ setting('company.name') }}" />
@endif @endif
@endif @endif
@stack('company_logo_input_end') @stack('company_logo_input_end')

4
resources/views/components/documents/template/default.blade.php
View File

@ -17,9 +17,9 @@
@stack('company_logo_input_start') @stack('company_logo_input_start')
@if (! $hideCompanyLogo) @if (! $hideCompanyLogo)
@if (! empty($document->contact->logo) && ! empty($document->contact->logo->id)) @if (! empty($document->contact->logo) && ! empty($document->contact->logo->id))
<img class="d-logo w-image" src="{{ $logo }}" alt="{{ $document->contact_name }}"/> <img class="d-logo" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
@else @else
<img class="d-logo w-image" src="{{ $logo }}" alt="{{ setting('company.name') }}"/> <img class="d-logo" src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
@endif @endif
@endif @endif
@stack('company_logo_input_end') @stack('company_logo_input_end')

4
resources/views/components/documents/template/modern.blade.php
View File

@ -17,9 +17,9 @@
@stack('company_logo_input_start') @stack('company_logo_input_start')
@if (! $hideCompanyLogo) @if (! $hideCompanyLogo)
@if (! empty($document->contact->logo) && ! empty($document->contact->logo->id)) @if (! empty($document->contact->logo) && ! empty($document->contact->logo->id))
<img class="w-image radius-circle" src="{{ $logo }}" alt="{{ $document->contact_name }}"/> <img class="radius-circle" src="{{ $logo }}" alt="{{ $document->contact_name }}"/>
@else @else
<img class="w-image radius-circle" src="{{ $logo }}" alt="{{ setting('company.name') }}" /> <img class="radius-circle" src="{{ $logo }}" alt="{{ setting('company.name') }}" />
@endif @endif
@endif @endif
@stack('company_logo_input_end') @stack('company_logo_input_end')