diff --git a/Modules/Adjustment/Entities/Adjustment.php b/Modules/Adjustment/Entities/Adjustment.php index 30a9cd05..946baff1 100644 --- a/Modules/Adjustment/Entities/Adjustment.php +++ b/Modules/Adjustment/Entities/Adjustment.php @@ -20,4 +20,8 @@ class Adjustment extends Model return $this->hasMany(AdjustedProduct::class, 'adjustment_id', 'id'); } + public function getReferenceAttribute($value) { + return strtoupper($value) . '_' . str_pad($this->attributes['id'], 6, '0', STR_PAD_LEFT ); + } + } diff --git a/Modules/Adjustment/Http/Controllers/AdjustmentController.php b/Modules/Adjustment/Http/Controllers/AdjustmentController.php index 61c7da83..91cc75c8 100644 --- a/Modules/Adjustment/Http/Controllers/AdjustmentController.php +++ b/Modules/Adjustment/Http/Controllers/AdjustmentController.php @@ -33,7 +33,7 @@ class AdjustmentController extends Controller abort_if(Gate::denies('create_adjustments'), 403); $request->validate([ - 'reference' => 'required|string|max:255|unique:adjustments,reference', + 'reference' => 'required|string|max:255', 'date' => 'required|date', 'note' => 'nullable|string|max:1000', 'product_ids' => 'required', @@ -94,7 +94,7 @@ class AdjustmentController extends Controller abort_if(Gate::denies('edit_adjustments'), 403); $request->validate([ - 'reference' => 'required|string|max:255|unique:adjustments,reference,' . $adjustment->id, + 'reference' => 'required|string|max:255', 'date' => 'required|date', 'note' => 'nullable|string|max:1000', 'product_ids' => 'required', diff --git a/Modules/Adjustment/Resources/views/create.blade.php b/Modules/Adjustment/Resources/views/create.blade.php index 97cc5376..d692df8a 100644 --- a/Modules/Adjustment/Resources/views/create.blade.php +++ b/Modules/Adjustment/Resources/views/create.blade.php @@ -29,14 +29,14 @@
- +
- +
diff --git a/Modules/Adjustment/Resources/views/edit.blade.php b/Modules/Adjustment/Resources/views/edit.blade.php index 13ed4fc1..ac871be3 100644 --- a/Modules/Adjustment/Resources/views/edit.blade.php +++ b/Modules/Adjustment/Resources/views/edit.blade.php @@ -34,7 +34,7 @@
- +
diff --git a/Modules/Sale/Resources/views/print.blade.php b/Modules/Sale/Resources/views/print.blade.php index 4ccff96c..0e4bc463 100644 --- a/Modules/Sale/Resources/views/print.blade.php +++ b/Modules/Sale/Resources/views/print.blade.php @@ -124,6 +124,11 @@
+
+
+

Computer generated invoice. {{ settings()->company_name }} © {{ date('Y') }}.

+
+
diff --git a/app/DataTables/AdjustmentsDataTable.php b/app/DataTables/AdjustmentsDataTable.php index 0a7f046f..42981f67 100644 --- a/app/DataTables/AdjustmentsDataTable.php +++ b/app/DataTables/AdjustmentsDataTable.php @@ -32,7 +32,7 @@ class AdjustmentsDataTable extends DataTable ->dom("<'row'<'col-md-3'l><'col-md-5 mb-2'B><'col-md-4'f>> . 'tr' . <'row'<'col-md-5'i><'col-md-7 mt-2'p>>") - ->orderBy(0) + ->orderBy(4) ->buttons( Button::make('excel') ->text(' Excel'), @@ -60,7 +60,10 @@ class AdjustmentsDataTable extends DataTable Column::computed('action') ->exportable(false) ->printable(false) - ->className('text-center align-middle') + ->className('text-center align-middle'), + + Column::make('created_at') + ->visible(false) ]; } diff --git a/resources/views/layouts/header.blade.php b/resources/views/layouts/header.blade.php index b55598b7..fa84460c 100644 --- a/resources/views/layouts/header.blade.php +++ b/resources/views/layouts/header.blade.php @@ -22,9 +22,9 @@ 0