diff --git a/app/Livewire/Datatable/Manage/OrdersTable.php b/app/Livewire/Datatable/Manage/OrdersTable.php index d2dbf01..8b44555 100644 --- a/app/Livewire/Datatable/Manage/OrdersTable.php +++ b/app/Livewire/Datatable/Manage/OrdersTable.php @@ -130,7 +130,6 @@ public function columns(): array if (auth()->user()->can('delete order')) { $actions .= view('components.actions.table.delete', [ 'id' => $row->hash, - 'deleteRoute' => route('studio.manage.order.delete', $row->hash), ])->render(); } diff --git a/app/Livewire/Datatable/Manage/PurchasesTable.php b/app/Livewire/Datatable/Manage/PurchasesTable.php index 037f652..0e425ae 100644 --- a/app/Livewire/Datatable/Manage/PurchasesTable.php +++ b/app/Livewire/Datatable/Manage/PurchasesTable.php @@ -67,7 +67,6 @@ public function columns(): array if (auth()->user()->can('delete purchase')) { $actions .= view('components.actions.table.delete', [ 'id' => $row->hash, - 'deleteRoute' => route('studio.manage.purchase.delete', $row->hash), ])->render(); } @@ -81,7 +80,7 @@ public function columns(): array public function builder(): Builder { return Purchase::select('purchases.id', 'outlet_id', 'invoice_number', 'purchase_date', 'total') - ->with('outlet') + ->with(['outlet', 'items', 'items.purchasable']) ->whereIn('outlet_id', auth()->user()->outlets->pluck('id')->toArray()); } } diff --git a/app/Livewire/Studio/Master/Formula.php b/app/Livewire/Studio/Master/Formula.php index 26aeb5f..01f51d6 100644 --- a/app/Livewire/Studio/Master/Formula.php +++ b/app/Livewire/Studio/Master/Formula.php @@ -13,7 +13,6 @@ use App\Traits\Utilities\WithUpdatedData; use Flux\Flux; use Illuminate\Contracts\View\View; -use Illuminate\Database\Eloquent\Collection; use Livewire\Attributes\On; use Livewire\Attributes\Title; use Livewire\Component; diff --git a/app/Models/OrderItem.php b/app/Models/OrderItem.php index f249d25..aca0e25 100644 --- a/app/Models/OrderItem.php +++ b/app/Models/OrderItem.php @@ -48,7 +48,7 @@ public function user(): BelongsTo public function orderable(): MorphTo { - return $this->morphTo(); + return $this->morphTo()->withTrashed(); } public function volumes(): HasMany diff --git a/app/Models/PurchaseItem.php b/app/Models/PurchaseItem.php index a33189c..659c3a1 100644 --- a/app/Models/PurchaseItem.php +++ b/app/Models/PurchaseItem.php @@ -43,6 +43,6 @@ public function user(): BelongsTo public function purchasable(): MorphTo { - return $this->morphTo(); + return $this->morphTo()->withTrashed(); } } diff --git a/resources/views/livewire/studio/manage/order/form.blade.php b/resources/views/livewire/studio/manage/order/form.blade.php index 708ea40..8b0596e 100644 --- a/resources/views/livewire/studio/manage/order/form.blade.php +++ b/resources/views/livewire/studio/manage/order/form.blade.php @@ -87,7 +87,7 @@
+ placeholder="Cari parfum..." wire:model.live="form.perfume_id"> @foreach ($perfumes as $key => $perfume) @@ -97,7 +97,7 @@ + wire:model.live="form.bottle_id"> @foreach ($bottles as $key => $bottle) {{ $bottle }} @@ -107,7 +107,7 @@
@if (!empty($qualities)) - @foreach ($qualities as $key => $value)
+ placeholder="Cari parfum..." wire:model.live="form.perfume_id"> @foreach ($perfumes as $key => $perfume) @@ -143,7 +143,7 @@ Ukuran Botol ml @@ -151,7 +151,7 @@
@if (!empty($qualities)) - @foreach ($qualities as $key => $value) + wire:model.live="form.product_id"> @foreach ($products as $key => $product) {{ $product }} @@ -191,7 +191,7 @@