merge Conflict

This commit is contained in:
Abhishek Mali
2025-12-01 11:49:24 +05:30
23 changed files with 8554 additions and 2743 deletions

View File

@@ -4,11 +4,13 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
class Order extends Model
{
use HasFactory;
use HasFactory,SoftDeletes;
protected $fillable = [
'order_id',
'mark_no',

View File

@@ -4,10 +4,11 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
class OrderItem extends Model
{
use HasFactory;
use HasFactory, SoftDeletes;
protected $fillable = [
'order_id',