diff --git a/Modules/Sale/Database/Migrations/2021_07_31_201003_create_sales_table.php b/Modules/Sale/Database/Migrations/2021_07_31_201003_create_sales_table.php
index 8b9bbf4c..d5a0e82b 100644
--- a/Modules/Sale/Database/Migrations/2021_07_31_201003_create_sales_table.php
+++ b/Modules/Sale/Database/Migrations/2021_07_31_201003_create_sales_table.php
@@ -19,15 +19,11 @@ class CreateSalesTable extends Migration
$table->string('reference');
$table->unsignedBigInteger('customer_id')->nullable();
$table->string('customer_name');
- $table->integer('tax_percentage')->default(0);
- $table->integer('tax_amount')->default(0);
$table->integer('discount_percentage')->default(0);
$table->integer('discount_amount')->default(0);
- $table->integer('shipping_amount')->default(0);
$table->integer('total_amount');
$table->integer('paid_amount');
$table->integer('due_amount');
- $table->string('status');
$table->string('payment_status');
$table->string('payment_method');
$table->text('note')->nullable();
diff --git a/Modules/Sale/Entities/Sale.php b/Modules/Sale/Entities/Sale.php
index 9998fb8a..4cbb3539 100644
--- a/Modules/Sale/Entities/Sale.php
+++ b/Modules/Sale/Entities/Sale.php
@@ -9,7 +9,20 @@ class Sale extends Model
{
use HasFactory;
- protected $guarded = [];
+ protected $fillable = [
+ 'date',
+ 'reference',
+ 'customer_id',
+ 'customer_name',
+ 'discount_percentage',
+ 'discount_amount',
+ 'total_amount',
+ 'paid_amount',
+ 'due_amount',
+ 'payment_status',
+ 'payment_method',
+ 'note'
+ ];
public function saleDetails() {
return $this->hasMany(SaleDetails::class, 'sale_id', 'id');
@@ -32,10 +45,6 @@ class Sale extends Model
return $query->where('status', 'Completed');
}
- public function getShippingAmountAttribute($value) {
- return $value / 100;
- }
-
public function getPaidAmountAttribute($value) {
return $value / 100;
}
@@ -48,10 +57,6 @@ class Sale extends Model
return $value / 100;
}
- public function getTaxAmountAttribute($value) {
- return $value / 100;
- }
-
public function getDiscountAmountAttribute($value) {
return $value / 100;
}
diff --git a/Modules/Sale/Http/Controllers/PosController.php b/Modules/Sale/Http/Controllers/PosController.php
index 4b4ede75..d144cd0e 100644
--- a/Modules/Sale/Http/Controllers/PosController.php
+++ b/Modules/Sale/Http/Controllers/PosController.php
@@ -44,14 +44,13 @@ class PosController extends Controller
'date' => now()->format('Y-m-d'),
'reference' => 'PSL',
'customer_id' => $request->customer_id,
- 'customer_name' => Customer::findOrFail($request->customer_id)->customer_name,
+ 'customer_name' => $request->customer_id ? Customer::findOrFail($request->customer_id)->customer_name : 'Walk-in Customer',
'tax_percentage' => $request->tax_percentage,
'discount_percentage' => $request->discount_percentage,
'shipping_amount' => $request->shipping_amount * 100,
'paid_amount' => $request->paid_amount * 100,
'total_amount' => $request->total_amount * 100,
'due_amount' => $due_amount * 100,
- 'status' => 'Completed',
'payment_status' => $payment_status,
'payment_method' => $request->payment_method,
'note' => $request->note,
diff --git a/Modules/Sale/Http/Controllers/SaleController.php b/Modules/Sale/Http/Controllers/SaleController.php
index 20aef6fd..27292632 100644
--- a/Modules/Sale/Http/Controllers/SaleController.php
+++ b/Modules/Sale/Http/Controllers/SaleController.php
@@ -48,6 +48,7 @@ class SaleController extends Controller
$sale = Sale::create([
'date' => $request->date,
+ 'reference' => $request->reference,
'customer_id' => $request->customer_id,
'customer_name' => Customer::findOrFail($request->customer_id)->customer_name,
'tax_percentage' => $request->tax_percentage,
@@ -56,7 +57,6 @@ class SaleController extends Controller
'paid_amount' => $request->paid_amount * 100,
'total_amount' => $request->total_amount * 100,
'due_amount' => $due_amount * 100,
- 'status' => $request->status,
'payment_status' => $payment_status,
'payment_method' => $request->payment_method,
'note' => $request->note,
@@ -181,7 +181,6 @@ class SaleController extends Controller
'paid_amount' => $request->paid_amount * 100,
'total_amount' => $request->total_amount * 100,
'due_amount' => $due_amount * 100,
- 'status' => $request->status,
'payment_status' => $payment_status,
'payment_method' => $request->payment_method,
'note' => $request->note,
diff --git a/Modules/Sale/Resources/views/create.blade.php b/Modules/Sale/Resources/views/create.blade.php
index 740c8aed..9d256b2d 100644
--- a/Modules/Sale/Resources/views/create.blade.php
+++ b/Modules/Sale/Resources/views/create.blade.php
@@ -60,28 +60,16 @@