diff --git a/Modules/Product/Http/Controllers/ProductController.php b/Modules/Product/Http/Controllers/ProductController.php index 4d5ba8e5..8645b0a9 100644 --- a/Modules/Product/Http/Controllers/ProductController.php +++ b/Modules/Product/Http/Controllers/ProductController.php @@ -9,8 +9,8 @@ use Illuminate\Routing\Controller; use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Storage; use Modules\Product\Entities\Product; -use Modules\Product\Http\Requests\ProductCreateRequest; -use Modules\Product\Http\Requests\ProductUpdateRequest; +use Modules\Product\Http\Requests\StoreProductRequest; +use Modules\Product\Http\Requests\UpdateProductRequest; use Modules\Upload\Entities\Upload; class ProductController extends Controller @@ -30,7 +30,7 @@ class ProductController extends Controller } - public function store(ProductCreateRequest $request) { + public function store(StoreProductRequest $request) { $product = Product::create($request->except('image')); if ($request->has('image')) { @@ -64,7 +64,7 @@ class ProductController extends Controller } - public function update(ProductUpdateRequest $request, Product $product) { + public function update(UpdateProductRequest $request, Product $product) { $product->update($request->except('image')); if ($request->has('image')) { diff --git a/Modules/Product/Http/Requests/ProductCreateRequest.php b/Modules/Product/Http/Requests/StoreProductRequest.php similarity index 96% rename from Modules/Product/Http/Requests/ProductCreateRequest.php rename to Modules/Product/Http/Requests/StoreProductRequest.php index 865721f8..170bf44e 100644 --- a/Modules/Product/Http/Requests/ProductCreateRequest.php +++ b/Modules/Product/Http/Requests/StoreProductRequest.php @@ -5,7 +5,7 @@ namespace Modules\Product\Http\Requests; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Facades\Gate; -class ProductCreateRequest extends FormRequest +class StoreProductRequest extends FormRequest { /** * Get the validation rules that apply to the request. diff --git a/Modules/Product/Http/Requests/ProductUpdateRequest.php b/Modules/Product/Http/Requests/UpdateProductRequest.php similarity index 96% rename from Modules/Product/Http/Requests/ProductUpdateRequest.php rename to Modules/Product/Http/Requests/UpdateProductRequest.php index fd4d5377..8aa052b0 100644 --- a/Modules/Product/Http/Requests/ProductUpdateRequest.php +++ b/Modules/Product/Http/Requests/UpdateProductRequest.php @@ -6,7 +6,7 @@ use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Facades\Gate; use Illuminate\Validation\Rule; -class ProductUpdateRequest extends FormRequest +class UpdateProductRequest extends FormRequest { /** * Get the validation rules that apply to the request. diff --git a/Modules/Sale/Entities/Sale.php b/Modules/Sale/Entities/Sale.php index fcd84bc3..b07f364b 100644 --- a/Modules/Sale/Entities/Sale.php +++ b/Modules/Sale/Entities/Sale.php @@ -15,6 +15,10 @@ class Sale extends Model return $this->hasMany(SaleDetails::class, 'sale_id', 'id'); } + public function getReferenceAttribute($value) { + return strtoupper($value) . '_' . str_pad($this->attributes['id'], 6, '0', STR_PAD_LEFT); + } + public function getShippingAmountAttribute($value) { return $value / 100; } diff --git a/Modules/Sale/Http/Requests/StoreSaleRequest.php b/Modules/Sale/Http/Requests/StoreSaleRequest.php index 0608e202..56236188 100644 --- a/Modules/Sale/Http/Requests/StoreSaleRequest.php +++ b/Modules/Sale/Http/Requests/StoreSaleRequest.php @@ -16,7 +16,7 @@ class StoreSaleRequest extends FormRequest { return [ 'customer_id' => 'required|numeric', - 'reference' => 'required|string|max:255|unique:sales,reference', + 'reference' => 'required|string|max:255', 'tax_percentage' => 'required|integer|min:0|max:100', 'discount_percentage' => 'required|integer|min:0|max:100', 'shipping_amount' => 'required|numeric', diff --git a/Modules/Sale/Http/Requests/UpdateSaleRequest.php b/Modules/Sale/Http/Requests/UpdateSaleRequest.php index fc709b78..8cda60f0 100644 --- a/Modules/Sale/Http/Requests/UpdateSaleRequest.php +++ b/Modules/Sale/Http/Requests/UpdateSaleRequest.php @@ -16,7 +16,7 @@ class UpdateSaleRequest extends FormRequest { return [ 'customer_id' => 'required|numeric', - 'reference' => 'required|string|max:255|unique:sales,reference,' . $this->sale->id, + 'reference' => 'required|string|max:255', 'tax_percentage' => 'required|integer|min:0|max:100', 'discount_percentage' => 'required|integer|min:0|max:100', 'shipping_amount' => 'required|numeric', diff --git a/Modules/Sale/Resources/views/create.blade.php b/Modules/Sale/Resources/views/create.blade.php index a7d6753d..740c8aed 100644 --- a/Modules/Sale/Resources/views/create.blade.php +++ b/Modules/Sale/Resources/views/create.blade.php @@ -30,7 +30,7 @@
- +
diff --git a/Modules/Sale/Resources/views/edit.blade.php b/Modules/Sale/Resources/views/edit.blade.php index 8f1c4c6d..931b8ed0 100644 --- a/Modules/Sale/Resources/views/edit.blade.php +++ b/Modules/Sale/Resources/views/edit.blade.php @@ -30,7 +30,7 @@
- +
diff --git a/config/datatables-buttons.php b/config/datatables-buttons.php index 78f85bd7..d1525f91 100644 --- a/config/datatables-buttons.php +++ b/config/datatables-buttons.php @@ -1,9 +1,4 @@ <'col-md-6'f>> . - 'tr' . - <'row'<'col-md-5'i><'col-md-7'p>> - "; return [ /* @@ -81,16 +76,18 @@ return [ /* * Default columns to generate when not set. */ - 'columns' => 'id,add your columns,created_at,updated_at', + 'columns' => 'id,db columns,created_at', /* * Default buttons to generate when not set. */ - 'buttons' => 'create,export,print,reset,reload', + 'buttons' => 'excel,print,reset,reload', /* * Default DOM to generate when not set. */ - 'dom' => 'Bfrtip', + '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>>", ], ]; diff --git a/resources/views/vendor/datatables/print.blade.php b/resources/views/vendor/datatables/print.blade.php index 40655f5e..e6b69e15 100644 --- a/resources/views/vendor/datatables/print.blade.php +++ b/resources/views/vendor/datatables/print.blade.php @@ -1,13 +1,12 @@ - Print Table + All Data -