Tweaks: In Adjustment & Expense
This commit is contained in:
parent
f12b52f6e7
commit
ed44d7cec9
|
@ -33,7 +33,7 @@ class AdjustmentController extends Controller
|
||||||
abort_if(Gate::denies('create_adjustments'), 403);
|
abort_if(Gate::denies('create_adjustments'), 403);
|
||||||
|
|
||||||
$request->validate([
|
$request->validate([
|
||||||
'reference' => 'required|string|max:255',
|
'reference' => 'required|string|max:255|unique:adjustments,reference',
|
||||||
'date' => 'required|date',
|
'date' => 'required|date',
|
||||||
'note' => 'nullable|string|max:1000',
|
'note' => 'nullable|string|max:1000',
|
||||||
'product_ids' => 'required',
|
'product_ids' => 'required',
|
||||||
|
@ -94,7 +94,7 @@ class AdjustmentController extends Controller
|
||||||
abort_if(Gate::denies('edit_adjustments'), 403);
|
abort_if(Gate::denies('edit_adjustments'), 403);
|
||||||
|
|
||||||
$request->validate([
|
$request->validate([
|
||||||
'reference' => 'required|string|max:255',
|
'reference' => 'required|string|max:255|unique:adjustments,reference,' . $adjustment->id,
|
||||||
'date' => 'required|date',
|
'date' => 'required|date',
|
||||||
'note' => 'nullable|string|max:1000',
|
'note' => 'nullable|string|max:1000',
|
||||||
'product_ids' => 'required',
|
'product_ids' => 'required',
|
||||||
|
|
|
@ -6,6 +6,7 @@ use App\DataTables\ExpensesDataTable;
|
||||||
use Illuminate\Contracts\Support\Renderable;
|
use Illuminate\Contracts\Support\Renderable;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Routing\Controller;
|
use Illuminate\Routing\Controller;
|
||||||
|
use Illuminate\Support\Facades\Gate;
|
||||||
use Modules\Expense\Entities\Expense;
|
use Modules\Expense\Entities\Expense;
|
||||||
use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Exp;
|
use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\Exp;
|
||||||
|
|
||||||
|
@ -13,16 +14,22 @@ class ExpenseController extends Controller
|
||||||
{
|
{
|
||||||
|
|
||||||
public function index(ExpensesDataTable $dataTable) {
|
public function index(ExpensesDataTable $dataTable) {
|
||||||
|
abort_if(Gate::denies('access_expenses'), 403);
|
||||||
|
|
||||||
return $dataTable->render('expense::expenses.index');
|
return $dataTable->render('expense::expenses.index');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function create() {
|
public function create() {
|
||||||
|
abort_if(Gate::denies('create_expenses'), 403);
|
||||||
|
|
||||||
return view('expense::expenses.create');
|
return view('expense::expenses.create');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function store(Request $request) {
|
public function store(Request $request) {
|
||||||
|
abort_if(Gate::denies('create_expenses'), 403);
|
||||||
|
|
||||||
$request->validate([
|
$request->validate([
|
||||||
'date' => 'required|date',
|
'date' => 'required|date',
|
||||||
'reference' => 'required|string|max:255|unique:expenses,reference',
|
'reference' => 'required|string|max:255|unique:expenses,reference',
|
||||||
|
@ -46,11 +53,15 @@ class ExpenseController extends Controller
|
||||||
|
|
||||||
|
|
||||||
public function edit(Expense $expense) {
|
public function edit(Expense $expense) {
|
||||||
|
abort_if(Gate::denies('edit_expenses'), 403);
|
||||||
|
|
||||||
return view('expense::expenses.edit', compact('expense'));
|
return view('expense::expenses.edit', compact('expense'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function update(Request $request, Expense $expense) {
|
public function update(Request $request, Expense $expense) {
|
||||||
|
abort_if(Gate::denies('edit_expenses'), 403);
|
||||||
|
|
||||||
$request->validate([
|
$request->validate([
|
||||||
'date' => 'required|date',
|
'date' => 'required|date',
|
||||||
'reference' => 'required|string|max:255|unique:expenses,reference,' . $expense->id,
|
'reference' => 'required|string|max:255|unique:expenses,reference,' . $expense->id,
|
||||||
|
@ -74,6 +85,8 @@ class ExpenseController extends Controller
|
||||||
|
|
||||||
|
|
||||||
public function destroy(Expense $expense) {
|
public function destroy(Expense $expense) {
|
||||||
|
abort_if(Gate::denies('delete_expenses'), 403);
|
||||||
|
|
||||||
$expense->delete();
|
$expense->delete();
|
||||||
|
|
||||||
toast('Expense Deleted!', 'warning');
|
toast('Expense Deleted!', 'warning');
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
|
@can('edit_expenses')
|
||||||
<a href="{{ route('expenses.edit', $data->id) }}" class="btn btn-info btn-sm">
|
<a href="{{ route('expenses.edit', $data->id) }}" class="btn btn-info btn-sm">
|
||||||
<i class="bi bi-pencil"></i>
|
<i class="bi bi-pencil"></i>
|
||||||
</a>
|
</a>
|
||||||
|
@endcan
|
||||||
|
@can('delete_expenses')
|
||||||
<button id="delete" class="btn btn-danger btn-sm" onclick="
|
<button id="delete" class="btn btn-danger btn-sm" onclick="
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
if (confirm('Are you sure? It will delete the data permanently!')) {
|
if (confirm('Are you sure? It will delete the data permanently!')) {
|
||||||
|
@ -13,3 +16,4 @@
|
||||||
@method('delete')
|
@method('delete')
|
||||||
</form>
|
</form>
|
||||||
</button>
|
</button>
|
||||||
|
@endcan
|
||||||
|
|
|
@ -33,6 +33,10 @@ class PermissionsTableSeeder extends Seeder
|
||||||
'show_adjustments',
|
'show_adjustments',
|
||||||
'edit_adjustments',
|
'edit_adjustments',
|
||||||
'delete_adjustments',
|
'delete_adjustments',
|
||||||
|
'access_expenses',
|
||||||
|
'create_expenses',
|
||||||
|
'edit_expenses',
|
||||||
|
'delete_expenses',
|
||||||
];
|
];
|
||||||
|
|
||||||
foreach ($permissions as $permission) {
|
foreach ($permissions as $permission) {
|
||||||
|
|
|
@ -66,7 +66,7 @@
|
||||||
"preferred-install": "dist",
|
"preferred-install": "dist",
|
||||||
"sort-packages": true,
|
"sort-packages": true,
|
||||||
"platform": {
|
"platform": {
|
||||||
"php": "7.4"
|
"php": "8.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"minimum-stability": "dev",
|
"minimum-stability": "dev",
|
||||||
|
|
Loading…
Reference in New Issue