feat: Implement order management with datatable display and updated forms
This commit is contained in:
@@ -34,6 +34,7 @@ use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Carbon;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Yajra\DataTables\Facades\DataTables;
|
||||
|
||||
|
||||
class OrderController extends Controller
|
||||
@@ -55,11 +56,9 @@ class OrderController extends Controller
|
||||
) {}
|
||||
public function index(Request $request)
|
||||
{
|
||||
$orders = $this->orderRepository->filter($request->merge(['page' => $request->get('page', 1)])->all(), ['payment', 'customer', 'invoice']);
|
||||
|
||||
$title = 'List all orders';
|
||||
|
||||
return view('administrator.pages.order.index', compact('title', 'orders'));
|
||||
return view('administrator.pages.order.index', compact('title'));
|
||||
}
|
||||
|
||||
// Tính billing
|
||||
@@ -261,12 +260,12 @@ class OrderController extends Controller
|
||||
public function create()
|
||||
{
|
||||
$title = 'Add new Order for Customer';
|
||||
$customer = Customer::select('id', 'firstname', 'lastname')->where('status', 1)->get();
|
||||
$customer = Customer::select('id', 'fullname')->where('status', 1)->get();
|
||||
$payment = Payment::select('id', 'name')->where('status', 1)->get();
|
||||
$discount = Discount::select('id', 'code', 'save', 'type')->where('status', 1)->get();
|
||||
$type = Type::select('id', 'name')->where('status', 1)->get();
|
||||
// $type = Type::select('id', 'name')->where('status', 1)->get();
|
||||
|
||||
return view('administrator.pages.order.add', compact('title', 'customer', 'payment', 'discount', 'type'));
|
||||
return view('administrator.pages.order.add', compact('title', 'customer', 'payment', 'discount'));
|
||||
}
|
||||
|
||||
public function edit(int $id = 0)
|
||||
@@ -407,4 +406,43 @@ class OrderController extends Controller
|
||||
|
||||
return back()->with('success', 'Delete Success');
|
||||
}
|
||||
|
||||
public function datatable(Request $request)
|
||||
{
|
||||
$query = $this->orderRepository->filter(
|
||||
$request->all(),
|
||||
['payment', 'customer', 'invoice'],
|
||||
[],
|
||||
['*'],
|
||||
true
|
||||
);
|
||||
|
||||
return DataTables::eloquent($query)
|
||||
->addColumn('order_num', function ($d) {
|
||||
return view('administrator.pages.order.datatable.order_num', ['row' => $d])->render();
|
||||
})
|
||||
->addColumn('date', function ($d) {
|
||||
return view('administrator.pages.order.datatable.date', ['row' => $d])->render();
|
||||
})
|
||||
->addColumn('customer', function ($d) {
|
||||
return view('administrator.pages.order.datatable.customer', ['row' => $d])->render();
|
||||
})
|
||||
->addColumn('payment', function ($d) {
|
||||
return view('administrator.pages.order.datatable.payment', ['row' => $d])->render();
|
||||
})
|
||||
->addColumn('amount', function ($d) {
|
||||
return view('administrator.pages.order.datatable.amount', ['row' => $d])->render();
|
||||
})
|
||||
->addColumn('invoice_status', function ($d) {
|
||||
return view('administrator.pages.order.datatable.invoice_status', ['row' => $d])->render();
|
||||
})
|
||||
->addColumn('status', function ($d) {
|
||||
return view('administrator.pages.order.datatable.status', ['row' => $d])->render();
|
||||
})
|
||||
->addColumn('action', function ($d) {
|
||||
return view('administrator.pages.order.datatable.action', ['row' => $d])->render();
|
||||
})
|
||||
->rawColumns(['order_num', 'date', 'customer', 'payment', 'amount', 'invoice_status', 'status', 'action'])
|
||||
->make(true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,8 +16,12 @@ class OrderCachedRepository extends BaseCachedRepository implements OrderReposit
|
||||
{
|
||||
return $this->orderRepository->getModel();
|
||||
}
|
||||
public function filter(array $data = [], array $relationships = [], array $withCount = [], array $select = ['*'])
|
||||
public function filter(array $data = [], array $relationships = [], array $withCount = [], array $select = ['*'], bool $returnQuery = false)
|
||||
{
|
||||
if ($returnQuery) {
|
||||
return $this->orderRepository->filter($data, $relationships, $withCount, $select, true);
|
||||
}
|
||||
|
||||
$cacheKey = $this->getCacheKey(md5(json_encode([
|
||||
'filterItem' => [
|
||||
'data' => $data,
|
||||
|
||||
@@ -12,7 +12,7 @@ class OrderRepository extends BaseRepository implements OrderRepositoryInterface
|
||||
{
|
||||
return Order::class;
|
||||
}
|
||||
public function filter(array $data = [], array $relationships = [], array $withCount = [], array $select = ['*'])
|
||||
public function filter(array $data = [], array $relationships = [], array $withCount = [], array $select = ['*'], bool $returnQuery = false)
|
||||
{
|
||||
$model = $this->model->with($relationships)->select($select);
|
||||
if (isset($data['client']) && ! empty($data['client'])) {
|
||||
@@ -66,6 +66,11 @@ class OrderRepository extends BaseRepository implements OrderRepositoryInterface
|
||||
if (count($withCount) > 0) {
|
||||
$model = $model->withCount($withCount);
|
||||
}
|
||||
|
||||
if ($returnQuery) {
|
||||
return $model;
|
||||
}
|
||||
|
||||
if (isset($data['limit']) && $data['limit']) {
|
||||
return $model->latest('id')->take($data['limit'])->get();
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ namespace App\Repositories\Order;
|
||||
use App\Repositories\BaseRepositoryInterface;
|
||||
|
||||
interface OrderRepositoryInterface extends BaseRepositoryInterface{
|
||||
public function filter(array $data = [],array $relationships = [],array $withCount = [],array $select = ['*']);
|
||||
public function filter(array $data = [],array $relationships = [],array $withCount = [],array $select = ['*'], bool $returnQuery = false);
|
||||
public function findWithRelationships(int $id = 0, array $relationships = [],array $withCount = [], array $withSum = []);
|
||||
public function updateBy(string $key = '',string|int $value = '',array $data =[]);
|
||||
}
|
||||
Reference in New Issue
Block a user