mirror of
https://github.com/crater-invoice/crater.git
synced 2025-10-29 20:51:09 -04:00
Implement PHP CS Fixer and a coding standard to follow (#471)
* 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:
@ -2,9 +2,9 @@
|
||||
|
||||
namespace Crater\Http\Controllers\V1\Estimate;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use Crater\Http\Controllers\Controller;
|
||||
use Crater\Models\Estimate;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class ChangeEstimateStatusController extends Controller
|
||||
{
|
||||
@ -15,12 +15,12 @@ class ChangeEstimateStatusController extends Controller
|
||||
* @param Estimate $estimate
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function __invoke(Request $request, Estimate $estimate)
|
||||
{
|
||||
public function __invoke(Request $request, Estimate $estimate)
|
||||
{
|
||||
$estimate->update($request->only('status'));
|
||||
|
||||
return response()->json([
|
||||
'success' => true
|
||||
'success' => true,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
namespace Crater\Http\Controllers\V1\Estimate;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use Carbon\Carbon;
|
||||
use Crater\Http\Controllers\Controller;
|
||||
use Crater\Models\CompanySetting;
|
||||
use Crater\Models\Estimate;
|
||||
use Crater\Models\Invoice;
|
||||
use Carbon\Carbon;
|
||||
use Crater\Models\CompanySetting;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
class ConvertEstimateController extends Controller
|
||||
@ -35,7 +35,7 @@ class ConvertEstimateController extends Controller
|
||||
'creator_id' => Auth::id(),
|
||||
'invoice_date' => $invoice_date->format('Y-m-d'),
|
||||
'due_date' => $due_date->format('Y-m-d'),
|
||||
'invoice_number' => $invoice_prefix . "-" . Invoice::getNextInvoiceNumber($invoice_prefix),
|
||||
'invoice_number' => $invoice_prefix."-".Invoice::getNextInvoiceNumber($invoice_prefix),
|
||||
'reference_number' => $estimate->reference_number,
|
||||
'user_id' => $estimate->user_id,
|
||||
'company_id' => $request->header('company'),
|
||||
@ -52,7 +52,7 @@ class ConvertEstimateController extends Controller
|
||||
'discount_per_item' => $estimate->discount_per_item,
|
||||
'tax' => $estimate->tax,
|
||||
'notes' => $estimate->notes,
|
||||
'unique_hash' => str_random(60)
|
||||
'unique_hash' => str_random(60),
|
||||
]);
|
||||
|
||||
$invoiceItems = $estimate->items->toArray();
|
||||
@ -85,11 +85,11 @@ class ConvertEstimateController extends Controller
|
||||
'items',
|
||||
'user',
|
||||
'invoiceTemplate',
|
||||
'taxes'
|
||||
'taxes',
|
||||
])->find($invoice->id);
|
||||
|
||||
return response()->json([
|
||||
'invoice' => $invoice
|
||||
'invoice' => $invoice,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
namespace Crater\Http\Controllers\V1\Estimate;
|
||||
|
||||
use Crater\Models\Estimate;
|
||||
use Crater\Http\Controllers\Controller;
|
||||
use Crater\Models\Estimate;
|
||||
|
||||
class EstimatePdfController extends Controller
|
||||
{
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
namespace Crater\Http\Controllers\V1\Estimate;
|
||||
|
||||
use Crater\Models\EstimateTemplate;
|
||||
use Crater\Http\Controllers\Controller;
|
||||
use Crater\Models\EstimateTemplate;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class EstimateTemplatesController extends Controller
|
||||
@ -17,7 +17,7 @@ class EstimateTemplatesController extends Controller
|
||||
public function __invoke(Request $request)
|
||||
{
|
||||
return response()->json([
|
||||
'templates' => EstimateTemplate::all()
|
||||
'templates' => EstimateTemplate::all(),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
namespace Crater\Http\Controllers\V1\Estimate;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use Crater\Models\Estimate;
|
||||
use Crater\Http\Requests\EstimatesRequest;
|
||||
use Crater\Http\Controllers\Controller;
|
||||
use Crater\Http\Requests\DeleteEstimatesRequest;
|
||||
use Crater\Http\Requests\EstimatesRequest;
|
||||
use Crater\Jobs\GenerateEstimatePdfJob;
|
||||
use Crater\Models\Estimate;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class EstimatesController extends Controller
|
||||
{
|
||||
@ -20,7 +20,7 @@ class EstimatesController extends Controller
|
||||
'user',
|
||||
'estimateTemplate',
|
||||
'taxes',
|
||||
'creator'
|
||||
'creator',
|
||||
])
|
||||
->join('users', 'users.id', '=', 'estimates.user_id')
|
||||
->applyFilters($request->only([
|
||||
@ -32,7 +32,7 @@ class EstimatesController extends Controller
|
||||
'to_date',
|
||||
'search',
|
||||
'orderByField',
|
||||
'orderBy'
|
||||
'orderBy',
|
||||
]))
|
||||
->whereCompany($request->header('company'))
|
||||
->select('estimates.*', 'users.name')
|
||||
@ -41,7 +41,7 @@ class EstimatesController extends Controller
|
||||
|
||||
$siteData = [
|
||||
'estimates' => $estimates,
|
||||
'estimateTotalCount' => Estimate::count()
|
||||
'estimateTotalCount' => Estimate::count(),
|
||||
];
|
||||
|
||||
return response()->json($siteData);
|
||||
@ -58,7 +58,7 @@ class EstimatesController extends Controller
|
||||
GenerateEstimatePdfJob::dispatch($estimate);
|
||||
|
||||
return response()->json([
|
||||
'estimate' => $estimate
|
||||
'estimate' => $estimate,
|
||||
]);
|
||||
}
|
||||
|
||||
@ -72,7 +72,7 @@ class EstimatesController extends Controller
|
||||
'creator',
|
||||
'taxes',
|
||||
'taxes.taxType',
|
||||
'fields.customField'
|
||||
'fields.customField',
|
||||
]);
|
||||
|
||||
return response()->json([
|
||||
@ -89,7 +89,7 @@ class EstimatesController extends Controller
|
||||
GenerateEstimatePdfJob::dispatch($estimate, true);
|
||||
|
||||
return response()->json([
|
||||
'estimate' => $estimate
|
||||
'estimate' => $estimate,
|
||||
]);
|
||||
}
|
||||
|
||||
@ -98,7 +98,7 @@ class EstimatesController extends Controller
|
||||
Estimate::destroy($request->ids);
|
||||
|
||||
return response()->json([
|
||||
'success' => true
|
||||
'success' => true,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
namespace Crater\Http\Controllers\V1\Estimate;
|
||||
|
||||
use Crater\Http\Controllers\Controller;
|
||||
use Crater\Models\Estimate;
|
||||
use Crater\Http\Requests\SendEstimatesRequest;
|
||||
use Crater\Models\Estimate;
|
||||
|
||||
class SendEstimateController extends Controller
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user