Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 23:37:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7963 from turbo124/v5-develop

Browse Source 
Catch EPC QR failures
This commit is contained in:
David Bomba 2022-11-21 20:51:12 +11:00 committed by GitHub
commit be8603ae5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Helpers/Epc/EpcQrGenerator.php
View File

@ -48,8 +48,12 @@ class EpcQrGenerator
$this->validateFields(); $this->validateFields();
try {
$qr = $writer->writeString($this->encodeMessage()); $qr = $writer->writeString($this->encodeMessage());
}
catch(BaconQrCode\Exception\WriterException $e){
return '';
}
return "<svg viewBox='0 0 200 200' width='200' height='200' x='0' y='0' xmlns='http://www.w3.org/2000/svg'> return "<svg viewBox='0 0 200 200' width='200' height='200' x='0' y='0' xmlns='http://www.w3.org/2000/svg'>
<rect x='0' y='0' width='100%'' height='100%' />{$qr}</svg>"; <rect x='0' y='0' width='100%'' height='100%' />{$qr}</svg>";

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

@ -164,7 +164,8 @@ class CompanyController extends BaseController
*/ */
public function create(CreateCompanyRequest $request) public function create(CreateCompanyRequest $request)
{ {
$company = CompanyFactory::create(auth()->user()->company()->account->id); $cf = new \App\Factory\CompanyFactory;
$company = $cf->create(auth()->user()->company()->account->id);
return $this->itemResponse($company); return $this->itemResponse($company);
} }

6
app/Services/TaskScheduler/TaskSchedulerService.php
View File

@ -40,12 +40,8 @@ use Symfony\Component\HttpFoundation\Request;
class TaskSchedulerService class TaskSchedulerService
{ {
public Scheduler $scheduler;
public function __construct(Scheduler $scheduler) public function __construct(public Scheduler $scheduler) {}
{
$this->scheduler = $scheduler;
}
public function store(Scheduler $scheduler, CreateScheduledTaskRequest $request) public function store(Scheduler $scheduler, CreateScheduledTaskRequest $request)
{ {