feat: improve owner verification notifications by adding search parameters to index routes and updating product variant UI layout.
This commit is contained in:
parent
16fe9a3d9f
commit
62e6995191
@ -511,6 +511,63 @@ private function requestTitle(OwnerVerificationRequest $request): string
|
|||||||
return 'Item Baru';
|
return 'Item Baru';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function requestSearchTerm(OwnerVerificationRequest $request): ?string
|
||||||
|
{
|
||||||
|
if ($request->subject_type === Product::class) {
|
||||||
|
if ($request->subject instanceof Product) {
|
||||||
|
return $request->subject->name;
|
||||||
|
}
|
||||||
|
$payload = is_array($request->payload) ? $request->payload : [];
|
||||||
|
foreach (['new', 'old'] as $key) {
|
||||||
|
$section = $payload[$key] ?? null;
|
||||||
|
if (is_array($section) && isset($section['name'])) {
|
||||||
|
return (string) $section['name'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($request->subject_type === ProductVariant::class) {
|
||||||
|
$payload = is_array($request->payload) ? $request->payload : [];
|
||||||
|
$newData = $payload['new'] ?? [];
|
||||||
|
if (isset($newData['product_name']) && $newData['product_name'] !== '-') {
|
||||||
|
return $newData['product_name'];
|
||||||
|
}
|
||||||
|
if ($request->subject instanceof ProductVariant) {
|
||||||
|
return $request->subject->product?->name ?? $request->subject->name;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($request->subject_type === RawMaterial::class) {
|
||||||
|
if ($request->subject instanceof RawMaterial) {
|
||||||
|
return $request->subject->name;
|
||||||
|
}
|
||||||
|
$payload = is_array($request->payload) ? $request->payload : [];
|
||||||
|
foreach (['new', 'old'] as $key) {
|
||||||
|
$section = $payload[$key] ?? null;
|
||||||
|
if (is_array($section) && isset($section['name'])) {
|
||||||
|
return (string) $section['name'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($request->subject_type === Purchase::class) {
|
||||||
|
if ($request->subject instanceof Purchase) {
|
||||||
|
$request->subject->loadMissing('supplier');
|
||||||
|
|
||||||
|
return $request->subject->supplier?->name;
|
||||||
|
}
|
||||||
|
$payload = is_array($request->payload) ? $request->payload : [];
|
||||||
|
foreach (['new', 'old'] as $key) {
|
||||||
|
$section = $payload[$key] ?? null;
|
||||||
|
if (is_array($section) && isset($section['supplier_name'])) {
|
||||||
|
return (string) $section['supplier_name'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
private function notifyRequestSubmitter(
|
private function notifyRequestSubmitter(
|
||||||
OwnerVerificationRequest $request,
|
OwnerVerificationRequest $request,
|
||||||
string $title,
|
string $title,
|
||||||
@ -520,10 +577,13 @@ private function notifyRequestSubmitter(
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$searchTerm = $this->requestSearchTerm($request);
|
||||||
|
$routeParams = $searchTerm !== null ? ['search' => $searchTerm] : [];
|
||||||
|
|
||||||
$url = match ($request->subject_type) {
|
$url = match ($request->subject_type) {
|
||||||
Product::class, ProductVariant::class => route('admin.master.products.index'),
|
Product::class, ProductVariant::class => route('admin.master.products.index', $routeParams),
|
||||||
RawMaterial::class => route('admin.master.raw_materials.index'),
|
RawMaterial::class => route('admin.master.raw_materials.index', $routeParams),
|
||||||
Purchase::class => route('admin.manage.purchases.index'),
|
Purchase::class => route('admin.manage.purchases.index', $routeParams),
|
||||||
MarketplaceSettings::class => route('admin.system.settings.index'),
|
MarketplaceSettings::class => route('admin.system.settings.index'),
|
||||||
default => route('admin.dashboard'),
|
default => route('admin.dashboard'),
|
||||||
};
|
};
|
||||||
|
|||||||
@ -269,7 +269,8 @@ public function create(array $validated, User $user): Purchase
|
|||||||
$user,
|
$user,
|
||||||
'Tambah Belanja',
|
'Tambah Belanja',
|
||||||
"Pengajuan belanja dari supplier {$purchase->supplier->name} senilai {$purchase->total_formatted} menunggu verifikasi owner.",
|
"Pengajuan belanja dari supplier {$purchase->supplier->name} senilai {$purchase->total_formatted} menunggu verifikasi owner.",
|
||||||
route('admin.manage.purchases.index'),
|
route('admin.manage.purchases.index', ['search' => $purchase->supplier->name]),
|
||||||
|
$purchase->supplier->name,
|
||||||
);
|
);
|
||||||
|
|
||||||
return $purchase;
|
return $purchase;
|
||||||
@ -315,7 +316,8 @@ public function update(Purchase $purchase, array $validated, User $user): void
|
|||||||
$user,
|
$user,
|
||||||
'Ubah Belanja',
|
'Ubah Belanja',
|
||||||
"Pengajuan ubah belanja dari supplier {$purchase->supplier->name} menunggu verifikasi owner.",
|
"Pengajuan ubah belanja dari supplier {$purchase->supplier->name} menunggu verifikasi owner.",
|
||||||
route('admin.manage.purchases.index'),
|
route('admin.manage.purchases.index', ['search' => $purchase->supplier->name]),
|
||||||
|
$purchase->supplier->name,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -351,7 +353,8 @@ public function delete(Purchase $purchase, User $user): void
|
|||||||
$user,
|
$user,
|
||||||
'Hapus Belanja',
|
'Hapus Belanja',
|
||||||
"Pengajuan hapus belanja dari supplier {$purchase->supplier->name} menunggu verifikasi owner.",
|
"Pengajuan hapus belanja dari supplier {$purchase->supplier->name} menunggu verifikasi owner.",
|
||||||
route('admin.manage.purchases.index'),
|
route('admin.manage.purchases.index', ['search' => $purchase->supplier->name]),
|
||||||
|
$purchase->supplier->name,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -502,13 +505,18 @@ private function decrementStock(PurchaseItem $item): void
|
|||||||
->decrement('stock', $item->quantity);
|
->decrement('stock', $item->quantity);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function notifyForPendingRequest(User $user, string $typeLabel, string $body, string $submitterUrl): void
|
private function notifyForPendingRequest(User $user, string $typeLabel, string $body, string $submitterUrl, ?string $search = null): void
|
||||||
{
|
{
|
||||||
|
$ownerUrl = route('admin.manage.purchases.index');
|
||||||
|
if ($search !== null) {
|
||||||
|
$ownerUrl = route('admin.manage.purchases.index', ['search' => $search]);
|
||||||
|
}
|
||||||
|
|
||||||
$this->pushNotificationService->sendToRoles(
|
$this->pushNotificationService->sendToRoles(
|
||||||
"📦 {$typeLabel} Menunggu Persetujuan Owner",
|
"📦 {$typeLabel} Menunggu Persetujuan Owner",
|
||||||
$body,
|
$body,
|
||||||
['owner', 'developer'],
|
['owner', 'developer'],
|
||||||
route('admin.manage.purchases.index'),
|
$ownerUrl,
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->pushNotificationService->sendToUser(
|
$this->pushNotificationService->sendToUser(
|
||||||
|
|||||||
@ -27,7 +27,7 @@ public function transfer(int $variantId, int $quantity, User $user, ?string $not
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
$variant = ProductVariant::query()->findOrFail($variantId);
|
$variant = ProductVariant::query()->with('product')->findOrFail($variantId);
|
||||||
|
|
||||||
if ($variant->stock < $quantity) {
|
if ($variant->stock < $quantity) {
|
||||||
throw ValidationException::withMessages([
|
throw ValidationException::withMessages([
|
||||||
@ -71,18 +71,20 @@ public function transfer(int $variantId, int $quantity, User $user, ?string $not
|
|||||||
],
|
],
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
$productName = $variant->product?->name ?? $variant->name;
|
||||||
|
|
||||||
$this->pushNotificationService->sendToRoles(
|
$this->pushNotificationService->sendToRoles(
|
||||||
'📦 Transfer Stok Ecer Menunggu Persetujuan Owner',
|
'📦 Transfer Stok Ecer Menunggu Persetujuan Owner',
|
||||||
"Pengajuan transfer {$quantity} pcs stok ecer untuk varian '{$variant->name}' menunggu verifikasi owner.",
|
"Pengajuan transfer {$quantity} pcs stok ecer untuk varian '{$variant->name}' menunggu verifikasi owner.",
|
||||||
['owner', 'developer'],
|
['owner', 'developer'],
|
||||||
route('admin.master.products.index'),
|
route('admin.master.products.index', ['search' => $productName]),
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->pushNotificationService->sendToUser(
|
$this->pushNotificationService->sendToUser(
|
||||||
'📤 Pengajuan Transfer Terkirim',
|
'📤 Pengajuan Transfer Terkirim',
|
||||||
"Pengajuan transfer {$quantity} pcs stok ecer untuk varian '{$variant->name}' telah dikirim dan menunggu verifikasi owner.",
|
"Pengajuan transfer {$quantity} pcs stok ecer untuk varian '{$variant->name}' telah dikirim dan menunggu verifikasi owner.",
|
||||||
$user->id,
|
$user->id,
|
||||||
route('admin.master.products.index'),
|
route('admin.master.products.index', ['search' => $productName]),
|
||||||
);
|
);
|
||||||
|
|
||||||
return $request;
|
return $request;
|
||||||
|
|||||||
@ -163,7 +163,8 @@ public function create(array $validated, User $user): void
|
|||||||
$user,
|
$user,
|
||||||
'Tambah Produk',
|
'Tambah Produk',
|
||||||
"Pengajuan tambah produk '{$validated['name']}' menunggu verifikasi owner.",
|
"Pengajuan tambah produk '{$validated['name']}' menunggu verifikasi owner.",
|
||||||
route('admin.master.products.index'),
|
route('admin.master.products.index', ['search' => $validated['name']]),
|
||||||
|
$validated['name'],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -204,7 +205,8 @@ public function update(Product $product, array $validated, User $user): void
|
|||||||
$user,
|
$user,
|
||||||
'Ubah Produk',
|
'Ubah Produk',
|
||||||
"Pengajuan ubah produk '{$product->name}' menunggu verifikasi owner.",
|
"Pengajuan ubah produk '{$product->name}' menunggu verifikasi owner.",
|
||||||
route('admin.master.products.index'),
|
route('admin.master.products.index', ['search' => $product->name]),
|
||||||
|
$product->name,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -236,7 +238,8 @@ public function delete(Product $product, User $user): void
|
|||||||
$user,
|
$user,
|
||||||
'Hapus Produk',
|
'Hapus Produk',
|
||||||
"Pengajuan hapus produk '{$product->name}' menunggu verifikasi owner.",
|
"Pengajuan hapus produk '{$product->name}' menunggu verifikasi owner.",
|
||||||
route('admin.master.products.index'),
|
route('admin.master.products.index', ['search' => $product->name]),
|
||||||
|
$product->name,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -276,7 +279,8 @@ public function toggleStatus(Product $product, array $validated, User $user): vo
|
|||||||
$user,
|
$user,
|
||||||
'Ubah Status Produk',
|
'Ubah Status Produk',
|
||||||
"Pengajuan ubah status produk '{$product->name}' menjadi {$statusLabel} menunggu verifikasi owner.",
|
"Pengajuan ubah status produk '{$product->name}' menjadi {$statusLabel} menunggu verifikasi owner.",
|
||||||
route('admin.master.products.index'),
|
route('admin.master.products.index', ['search' => $product->name]),
|
||||||
|
$product->name,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -441,13 +445,18 @@ public function applyToggleStatus(OwnerVerificationRequest $verificationRequest)
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function notifyForPendingRequest(User $user, string $typeLabel, string $body, string $submitterUrl): void
|
private function notifyForPendingRequest(User $user, string $typeLabel, string $body, string $submitterUrl, ?string $search = null): void
|
||||||
{
|
{
|
||||||
|
$ownerUrl = route('admin.master.products.index');
|
||||||
|
if ($search !== null) {
|
||||||
|
$ownerUrl = route('admin.master.products.index', ['search' => $search]);
|
||||||
|
}
|
||||||
|
|
||||||
$this->pushNotificationService->sendToRoles(
|
$this->pushNotificationService->sendToRoles(
|
||||||
"📦 {$typeLabel} Menunggu Persetujuan Owner",
|
"📦 {$typeLabel} Menunggu Persetujuan Owner",
|
||||||
$body,
|
$body,
|
||||||
['owner', 'developer'],
|
['owner', 'developer'],
|
||||||
route('admin.master.products.index'),
|
$ownerUrl,
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->pushNotificationService->sendToUser(
|
$this->pushNotificationService->sendToUser(
|
||||||
|
|||||||
@ -149,7 +149,8 @@ public function create(array $validated, User $user): void
|
|||||||
$user,
|
$user,
|
||||||
'Tambah Bahan Baku',
|
'Tambah Bahan Baku',
|
||||||
"Pengajuan tambah bahan baku '{$validated['name']}' menunggu verifikasi owner.",
|
"Pengajuan tambah bahan baku '{$validated['name']}' menunggu verifikasi owner.",
|
||||||
route('admin.master.raw_materials.index'),
|
route('admin.master.raw_materials.index', ['search' => $validated['name']]),
|
||||||
|
$validated['name'],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -190,7 +191,8 @@ public function update(RawMaterial $rawMaterial, array $validated, User $user):
|
|||||||
$user,
|
$user,
|
||||||
'Ubah Bahan Baku',
|
'Ubah Bahan Baku',
|
||||||
"Pengajuan ubah bahan baku '{$rawMaterial->name}' menunggu verifikasi owner.",
|
"Pengajuan ubah bahan baku '{$rawMaterial->name}' menunggu verifikasi owner.",
|
||||||
route('admin.master.raw_materials.index'),
|
route('admin.master.raw_materials.index', ['search' => $rawMaterial->name]),
|
||||||
|
$rawMaterial->name,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -222,7 +224,8 @@ public function delete(RawMaterial $rawMaterial, User $user): void
|
|||||||
$user,
|
$user,
|
||||||
'Hapus Bahan Baku',
|
'Hapus Bahan Baku',
|
||||||
"Pengajuan hapus bahan baku '{$rawMaterial->name}' menunggu verifikasi owner.",
|
"Pengajuan hapus bahan baku '{$rawMaterial->name}' menunggu verifikasi owner.",
|
||||||
route('admin.master.raw_materials.index'),
|
route('admin.master.raw_materials.index', ['search' => $rawMaterial->name]),
|
||||||
|
$rawMaterial->name,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -262,7 +265,8 @@ public function toggleStatus(RawMaterial $rawMaterial, array $validated, User $u
|
|||||||
$user,
|
$user,
|
||||||
'Ubah Status Bahan Baku',
|
'Ubah Status Bahan Baku',
|
||||||
"Pengajuan ubah status bahan baku '{$rawMaterial->name}' menjadi {$statusLabel} menunggu verifikasi owner.",
|
"Pengajuan ubah status bahan baku '{$rawMaterial->name}' menjadi {$statusLabel} menunggu verifikasi owner.",
|
||||||
route('admin.master.raw_materials.index'),
|
route('admin.master.raw_materials.index', ['search' => $rawMaterial->name]),
|
||||||
|
$rawMaterial->name,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -302,13 +306,18 @@ public function clearVerificationRequestMedia(OwnerVerificationRequest $verifica
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function notifyForPendingRequest(User $user, string $typeLabel, string $body, string $submitterUrl): void
|
private function notifyForPendingRequest(User $user, string $typeLabel, string $body, string $submitterUrl, ?string $search = null): void
|
||||||
{
|
{
|
||||||
|
$ownerUrl = route('admin.master.raw_materials.index');
|
||||||
|
if ($search !== null) {
|
||||||
|
$ownerUrl = route('admin.master.raw_materials.index', ['search' => $search]);
|
||||||
|
}
|
||||||
|
|
||||||
$this->pushNotificationService->sendToRoles(
|
$this->pushNotificationService->sendToRoles(
|
||||||
"📦 {$typeLabel} Menunggu Persetujuan Owner",
|
"📦 {$typeLabel} Menunggu Persetujuan Owner",
|
||||||
$body,
|
$body,
|
||||||
['owner', 'developer'],
|
['owner', 'developer'],
|
||||||
route('admin.master.raw_materials.index'),
|
$ownerUrl,
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->pushNotificationService->sendToUser(
|
$this->pushNotificationService->sendToUser(
|
||||||
|
|||||||
@ -76,6 +76,9 @@ async function markAsRead(notification: NotificationItem): Promise<void> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function openNotification(notification: NotificationItem): void {
|
function openNotification(notification: NotificationItem): void {
|
||||||
|
if (!notification.is_read) {
|
||||||
|
void markAsRead(notification);
|
||||||
|
}
|
||||||
if (notification.url) {
|
if (notification.url) {
|
||||||
isOpen.value = false;
|
isOpen.value = false;
|
||||||
router.visit(notification.url);
|
router.visit(notification.url);
|
||||||
@ -201,7 +204,7 @@ onUnmounted(() => {
|
|||||||
<CheckCheck class="size-3.5" />
|
<CheckCheck class="size-3.5" />
|
||||||
</button>
|
</button>
|
||||||
</TooltipTrigger>
|
</TooltipTrigger>
|
||||||
<TooltipContent>Tandai semua dibaca</TooltipContent>
|
<TooltipContent class="z-[300]">Tandai semua dibaca</TooltipContent>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
<Tooltip v-if="notifications.length > 0">
|
<Tooltip v-if="notifications.length > 0">
|
||||||
<TooltipTrigger as-child>
|
<TooltipTrigger as-child>
|
||||||
@ -212,7 +215,7 @@ onUnmounted(() => {
|
|||||||
<Trash2 class="size-3.5" />
|
<Trash2 class="size-3.5" />
|
||||||
</button>
|
</button>
|
||||||
</TooltipTrigger>
|
</TooltipTrigger>
|
||||||
<TooltipContent>Hapus semua</TooltipContent>
|
<TooltipContent class="z-[300]">Hapus semua</TooltipContent>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -269,7 +272,7 @@ onUnmounted(() => {
|
|||||||
<Eye class="size-3.5" />
|
<Eye class="size-3.5" />
|
||||||
</button>
|
</button>
|
||||||
</TooltipTrigger>
|
</TooltipTrigger>
|
||||||
<TooltipContent>Tandai dibaca</TooltipContent>
|
<TooltipContent class="z-[300]">Tandai dibaca</TooltipContent>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
<Tooltip>
|
<Tooltip>
|
||||||
<TooltipTrigger as-child>
|
<TooltipTrigger as-child>
|
||||||
@ -280,7 +283,7 @@ onUnmounted(() => {
|
|||||||
<X class="size-3.5" />
|
<X class="size-3.5" />
|
||||||
</button>
|
</button>
|
||||||
</TooltipTrigger>
|
</TooltipTrigger>
|
||||||
<TooltipContent>Hapus</TooltipContent>
|
<TooltipContent class="z-[300]">Hapus</TooltipContent>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -52,7 +52,7 @@ const emit = defineEmits<{
|
|||||||
</CardHeader>
|
</CardHeader>
|
||||||
<CardContent>
|
<CardContent>
|
||||||
<FieldGroup>
|
<FieldGroup>
|
||||||
<FieldSet class="grid gap-4 md:grid-cols-2">
|
<FieldSet class="grid gap-4 md:grid-cols-3">
|
||||||
<Field>
|
<Field>
|
||||||
<FieldLabel :for="`variant_name_${variant.client_id}`" required>
|
<FieldLabel :for="`variant_name_${variant.client_id}`" required>
|
||||||
Nama Varian
|
Nama Varian
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user