diff --git a/app/Livewire/Datatable/Studio/Manage/OrdersTable.php b/app/Livewire/Datatable/Studio/Manage/OrdersTable.php index 12d2ba7..45ae93e 100644 --- a/app/Livewire/Datatable/Studio/Manage/OrdersTable.php +++ b/app/Livewire/Datatable/Studio/Manage/OrdersTable.php @@ -137,7 +137,25 @@ public function columns(): array public function builder(): Builder { - return Order::select('orders.id', 'orders.user_id', 'invoice_number', 'customer_id', 'orders.ordered_at', 'cogs', 'subtotal', 'discount', 'total', 'orders.status', 'channel', 'orders.voucher_id', 'orders.created_at') - ->with(['user', 'user.employee', 'customer', 'voucher']); + return Order::select( + 'orders.id', + 'orders.user_id', + 'invoice_number', + 'customer_id', + 'orders.ordered_at', + 'cogs', + 'subtotal', + 'discount', + 'total', + 'orders.status', + 'channel', + 'orders.voucher_id', + 'orders.created_at' + ) + ->with(['user', 'user.employee', 'customer', 'voucher']) + ->whereHas( + 'outlet', + fn ($q) => $q->whereIn('outlets.id', auth()->user()->outlets()->pluck('outlets.id')) + ); } } diff --git a/app/Livewire/Studio/Manage/Order/Create.php b/app/Livewire/Studio/Manage/Order/Create.php index ffc7295..8d7fb25 100644 --- a/app/Livewire/Studio/Manage/Order/Create.php +++ b/app/Livewire/Studio/Manage/Order/Create.php @@ -96,7 +96,7 @@ public function save() PushNotification::whereIn('user_id', $userIds)->get(), [ 'title' => 'Order', - 'body' => 'Ada order baru masuk dengan nominal '.$result->total, + 'body' => 'Ada order baru masuk dengan nominal '.$result['data']['total'], 'url' => route('studio.manage.order.index'), ], );