TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-27 19:51:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement PHP CS Fixer and a coding standard to follow (#471)

Browse Source 
* Create PHP CS Fixer config and add to CI workflow

* Run php cs fixer on project

* Add newline at end of file

* Update to use PHP CS Fixer v3

* Run v3 config on project

* Run seperate config in CI
This commit is contained in:
Mwikala Kangwa
2021-05-21 12:57:51 +01:00
committed by GitHub
parent 633cad9b89
commit 9e98a96d61
316 changed files with 4715 additions and 3195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/Traits/GeneratesPdfTrait.php
View File

@ -4,9 +4,8 @@ namespace Crater\Traits;
use Carbon\Carbon;
use Crater\Models\Address;
use Crater\Models\FileDisk;
use Crater\Models\CompanySetting;
use Illuminate\Support\Facades\Auth;
use Crater\Models\FileDisk;
use Illuminate\Support\Facades\App;
trait GeneratesPdfTrait
@ -14,10 +13,10 @@ trait GeneratesPdfTrait
public function getGeneratedPDFOrStream($collection_name)
{
$pdf = $this->getGeneratedPDF($collection_name);
if($pdf && file_exists($pdf['path'])) {
if ($pdf && file_exists($pdf['path'])) {
return response()->make(file_get_contents($pdf['path']), 200, [
'Content-Type' => 'application/pdf',
'Content-Disposition' => 'inline; filename="'.$pdf['file_name'].'.pdf"'
'Content-Type' => 'application/pdf',
'Content-Disposition' => 'inline; filename="'.$pdf['file_name'].'.pdf"',
]);
}
@ -28,8 +27,8 @@ trait GeneratesPdfTrait
$pdf = $this->getPDFData();
return response()->make($pdf->stream(), 200, [
'Content-Type' => 'application/pdf',
'Content-Disposition' => 'inline; filename="'.$this[$collection_name.'_number'].'.pdf"'
'Content-Type' => 'application/pdf',
'Content-Disposition' => 'inline; filename="'.$this[$collection_name.'_number'].'.pdf"',
]);
}
@ -41,7 +40,7 @@ trait GeneratesPdfTrait
if ($media) {
$file_disk = FileDisk::find($media->custom_properties['file_disk_id']);
if (!$file_disk) {
if (! $file_disk) {
return false;
}
@ -49,7 +48,7 @@ trait GeneratesPdfTrait
$path = null;
if($file_disk->driver == 'local'){
if ($file_disk->driver == 'local') {
$path = $media->getPath();
} else {
$path = $media->getTemporaryUrl(Carbon::now()->addMinutes(5));
@ -57,22 +56,21 @@ trait GeneratesPdfTrait
return collect([
'path' => $path,
'file_name' => $media->file_name
'file_name' => $media->file_name,
]);
}
} catch(\Exception $e){
} catch (\Exception $e) {
return false;
}
return false;
}
public function generatePDF($collection_name, $file_name, $deleteExistingFile = false)
{
$save_pdf_to_disk = CompanySetting::getSetting('save_pdf_to_disk', $this->company_id);
if($save_pdf_to_disk == 'NO') {
if ($save_pdf_to_disk == 'NO') {
return 0;
}
@ -84,7 +82,7 @@ trait GeneratesPdfTrait
\Storage::disk('local')->put('temp/'.$collection_name.'/'.$this->id.'/temp.pdf', $pdf->output());
if($deleteExistingFile) {
if ($deleteExistingFile) {
$this->clearMediaCollection($collection_name);
}

7
app/Traits/HasCustomFieldsTrait.php
View File

@ -2,10 +2,7 @@
namespace Crater\Traits;
use Carbon\Carbon;
use Crater\Models\CustomField;
use Crater\Models\CustomFieldValue;
trait HasCustomFieldsTrait
{
@ -23,7 +20,7 @@ trait HasCustomFieldsTrait
'type' => $customField->type,
'custom_field_id' => $customField->id,
'company_id' => $customField->company_id,
getCustomFieldValueKey($customField->type) => $field['value']
getCustomFieldValueKey($customField->type) => $field['value'],
];
$this->fields()->create($customFieldValue);
@ -37,7 +34,7 @@ trait HasCustomFieldsTrait
$customFieldValue = $this->fields()->firstOrCreate([
'custom_field_id' => $customField->id,
'type' => $customField->type,
'company_id' => $this->company_id
'company_id' => $this->company_id,
]);
$type = getCustomFieldValueKey($customField->type);