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

Merge pull request #6365 from turbo124/v5-develop

Browse Source 
fixes for live preview - flutter
This commit is contained in:
David Bomba 2021-07-30 17:38:16 +10:00 committed by GitHub
commit 75b2fcbc08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 88 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/ClientPortal/InvoiceController.php
View File

@ -185,7 +185,10 @@ class InvoiceController extends Controller
$zip = new ZipStream(date('Y-m-d').'_'.str_replace(' ', '_', trans('texts.invoices')).'.zip', $options);
foreach ($invoices as $invoice) {
$zip->addFileFromPath(basename($invoice->pdf_file_path()), TempFile::path($invoice->pdf_file_path()));
#add it to the zip
$zip->addFile(basename($invoice->pdf_file_path()), file_get_contents($invoice->pdf_file_path(null, 'url', true)));
}
// finish the zip stream

4
app/Http/Controllers/ClientPortal/QuoteController.php
View File

@ -107,7 +107,9 @@ class QuoteController extends Controller
$zip = new ZipStream(date('Y-m-d').'_'.str_replace(' ', '_', trans('texts.invoices')).'.zip', $options);
foreach ($quotes as $quote) {
$zip->addFileFromPath(basename($quote->pdf_file_path()), TempFile::path($quote->pdf_file_path()));
$zip->addFile(basename($quote->pdf_file_path()), file_get_contents($quote->pdf_file_path(null, 'url', true)));
// $zip->addFileFromPath(basename($quote->pdf_file_path()), TempFile::path($quote->pdf_file_path()));
}
// finish the zip stream

13
app/Models/Presenters/CompanyPresenter.php
View File

@ -54,12 +54,19 @@ class CompanyPresenter extends EntityPresenter
$settings = $this->entity->settings;
}
$context_options =array(
"ssl"=>array(
"verify_peer"=>false,
"verify_peer_name"=>false,
),
);
if(strlen($settings->company_logo) >= 1 && (strpos($settings->company_logo, 'http') !== false))
return "data:image/png;base64, ". base64_encode(file_get_contents($settings->company_logo));
return "data:image/png;base64, ". base64_encode(file_get_contents($settings->company_logo, false, stream_context_create($context_options)));
else if(strlen($settings->company_logo) >= 1)
return "data:image/png;base64, ". base64_encode(file_get_contents(url('') . $settings->company_logo));
return "data:image/png;base64, ". base64_encode(file_get_contents(url('') . $settings->company_logo, false, stream_context_create($context_options)));
else
return "data:image/png;base64, ". base64_encode(file_get_contents(asset('images/new_logo.png')));
return "data:image/png;base64, ". base64_encode(file_get_contents(asset('images/new_logo.png'), false, stream_context_create($context_options)));
}

5
app/Repositories/Migration/PaymentMigrationRepository.php
View File

@ -100,6 +100,11 @@ class PaymentMigrationRepository extends BaseRepository
$payment->deleted_at = $data['deleted_at'] ?: null;
$payment->save();
if(array_key_exists('currency_id', $data) && $data['currency_id'] == 0){
$payment->currency_id = $payment->company->settings->currency_id;
$payment->save();
}
/*Ensure payment number generated*/
if (! $payment->number || strlen($payment->number) == 0) {
$payment->number = $payment->client->getNextPaymentNumber($payment->client);

2
app/Services/Invoice/MarkInvoiceDeleted.php
View File

@ -108,10 +108,12 @@ class MarkInvoiceDeleted extends AbstractService
->where('paymentable_type', '=', 'invoices')
->where('paymentable_id', $this->invoice->id)
->sum(DB::raw('amount'));
//->sum(DB::raw('amount - refunded'));
}
$this->total_payments = $this->invoice->payments->sum('amount');
// $this->total_payments = $this->invoice->payments->sum('amount - refunded');
return $this;
}

22
public/js/pdf.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

22
public/js/pdf.worker.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

4
resources/views/index/index.blade.php
View File

@ -7,6 +7,10 @@
<title>Invoice Ninja</title>
<meta name="google-signin-client_id" content="{{ config('services.google.client_id') }}">
<link rel="manifest" href="manifest.json?v={{ config('ninja.app_version') }}">
<script src="{{ asset('js/pdf.min.js') }}"></script>
<script type="text/javascript">
pdfjsLib.GlobalWorkerOptions.workerSrc = "{{ asset('js/pdf.worker.min.js') }}";
</script>
</head>
<body style="background-color:#888888;">

15
resources/views/portal/ninja2020/layout/app.blade.php
View File

@ -30,15 +30,14 @@
</script>
@endif
<!-- Title -->
@auth()
<title>@yield('meta_title', '') — {{ auth('contact')->user()->user->account->isPaid() ? auth('contact')->user()->company->present()->name() : 'Invoice Ninja' }}</title>
@endauth
@guest
<title>@yield('meta_title', '') — {{ config('app.name') }}</title>
@endguest
@if(isset($account) && !$account->isPaid())
<title>@yield('meta_title', '') — Invoice Ninja</title>
@elseif(isset($company) && !is_null($company))
<title>@yield('meta_title', '') — {{ $company->present()->name() }}</title>
@else
<title>@yield('meta_title', '')</title>
@endif
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">

14
resources/views/portal/ninja2020/layout/clean.blade.php
View File

@ -31,13 +31,13 @@
@endif
<!-- Title -->
@auth()
<title>@yield('meta_title', '') — {{ auth('contact')->user()->user->account->isPaid() ? auth('contact')->user()->company->present()->name() : 'Invoice Ninja' }}</title>
@endauth
@guest
<title>@yield('meta_title', '') — {{ config('app.name') }}</title>
@endguest
@if(isset($account) && !$account->isPaid())
<title>@yield('meta_title', '') — Invoice Ninja</title>
@elseif(isset($company) && !is_null($company))
<title>@yield('meta_title', '') — {{ $company->present()->name() }}</title>
@else
<title>@yield('meta_title', '')</title>
@endif
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">

3
tests/Feature/DeleteInvoiceTest.php
View File

@ -172,10 +172,11 @@ class DeleteInvoiceTest extends TestCase
$client_hash_id = $arr['data']['id'];
$client = Client::find($this->decodePrimaryKey($client_hash_id));
//new client
$this->assertEquals($client->balance, 0);
$this->assertEquals($client->paid_to_date, 0);
//create new invoice.
//create new invoice.
$line_items = [];
$item = InvoiceItemFactory::create();