dst/dstpabuaran.com
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: update AnalysisService and index.tsx to streamline stock calculations and remove unused values

Browse Source
This commit is contained in:
Yoga Pangestu 2026-08-14 06:07:47 +07:00
parent 5fd0ab135d
commit b954e3cb84
2 changed files with 42 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
app/Services/AnalysisService.php
View File

@ -18,9 +18,9 @@
use App\Models\LeaveRequest; use App\Models\LeaveRequest;
use App\Models\Order; use App\Models\Order;
use App\Models\Payroll; use App\Models\Payroll;
use App\Models\ProductVariant;
use App\Models\Purchase; use App\Models\Purchase;
use App\Models\PurchaseItem; use App\Models\RawMaterialPrice;
use App\Models\RestockItem;
use App\Models\User; use App\Models\User;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
@ -82,10 +82,16 @@ public function getAttendanceStats(?string $startDate, ?string $endDate, ?User $
]; ];
} }
$employees = Employee::whereHas('user', fn ($q) => $q $employees = Employee::whereHas(
'user',
fn($q) => $q
->where('is_active', true) ->where('is_active', true)
->whereHas('roles', fn ($r) => $r ->whereHas(
->whereHas('permissions', fn ($p) => $p 'roles',
fn($r) => $r
->whereHas(
'permissions',
fn($p) => $p
->where('name', 'attendances.create') ->where('name', 'attendances.create')
) )
) )
@ -199,49 +205,42 @@ public function getCashOverview(?string $startDate, ?string $endDate): array
public function getRawMaterialStock(): array public function getRawMaterialStock(): array
{ {
$query = PurchaseItem::query() $items = RawMaterialPrice::query()
->join('purchases', 'purchase_items.purchase_id', '=', 'purchases.id') ->join('raw_materials', 'raw_material_prices.raw_material_id', '=', 'raw_materials.id')
->leftJoin('raw_material_prices', 'purchase_items.raw_material_price_id', '=', 'raw_material_prices.id') ->select('raw_material_prices.stock', 'raw_materials.unit')
->leftJoin('raw_materials', 'raw_material_prices.raw_material_id', '=', 'raw_materials.id');
$items = $query->select('purchase_items.*', 'raw_materials.unit')
->get(); ->get();
$totalQty = $items->sum('quantity'); $totalQty = $items->sum('stock');
$totalValue = $items->sum('subtotal');
$byUnit = [ $byUnit = [
'yard' => $items->filter(fn ($i) => $i->unit === RawMaterialUnit::YARD)->sum('quantity'), 'yard' => $items->filter(fn ($i) => $i->unit === RawMaterialUnit::YARD->value)->sum('stock'),
'meter' => $items->filter(fn ($i) => $i->unit === RawMaterialUnit::METER)->sum('quantity'), 'meter' => $items->filter(fn ($i) => $i->unit === RawMaterialUnit::METER->value)->sum('stock'),
'kilogram' => $items->filter(fn ($i) => $i->unit === RawMaterialUnit::KG)->sum('quantity'), 'kilogram' => $items->filter(fn ($i) => $i->unit === RawMaterialUnit::KG->value)->sum('stock'),
]; ];
return [ return [
'total_stock' => $totalQty, 'total_stock' => $totalQty,
'total_value' => $totalValue,
'by_unit' => $byUnit, 'by_unit' => $byUnit,
]; ];
} }
public function getProductStock(): array public function getProductStock(): array
{ {
$query = RestockItem::query() $variants = ProductVariant::query()
->join('restocks', 'restock_items.restock_id', '=', 'restocks.id'); ->select('stock', 'reject_stock', 'retail_stock')
$items = $query->select('restock_items.*', 'restocks.stock_type')
->get(); ->get();
$totalQty = $items->sum('quantity'); $totalStock = $variants->sum('stock');
$totalValue = $items->sum('subtotal'); $totalRejectStock = $variants->sum('reject_stock');
$totalRetailStock = $variants->sum('retail_stock');
$byType = $items->groupBy(fn ($i) => $i->stock_type ?? 'unknown')
->map(fn ($group) => $group->sum('quantity'))
->toArray();
return [ return [
'total_stock' => $totalQty, 'total_stock' => $totalStock + $totalRejectStock + $totalRetailStock,
'total_value' => $totalValue, 'by_type' => [
'by_type' => $byType, 'stock' => $totalStock,
'reject_stock' => $totalRejectStock,
'retail_stock' => $totalRetailStock,
],
]; ];
} }

16
resources/js/pages/admin/analysis/index.tsx
View File

@ -67,7 +67,6 @@ type AnalysisProps = {
}; };
rawMaterialStock: { rawMaterialStock: {
total_stock: number; total_stock: number;
total_value: number;
by_unit: { by_unit: {
yard: number; yard: number;
meter: number; meter: number;
@ -76,11 +75,10 @@ type AnalysisProps = {
}; };
productStock: { productStock: {
total_stock: number; total_stock: number;
total_value: number;
by_type: { by_type: {
good?: number; stock?: number;
reject?: number; reject_stock?: number;
retail?: number; retail_stock?: number;
}; };
}; };
revenueSummary: { revenueSummary: {
@ -591,7 +589,6 @@ export default function Analysis({
icon={Package} icon={Package}
mainLabel="Total Stok" mainLabel="Total Stok"
mainValue={rawMaterialStock.total_stock.toLocaleString('id-ID')} mainValue={rawMaterialStock.total_stock.toLocaleString('id-ID')}
subLabel={`Rp${formatRupiah(rawMaterialStock.total_value)}`}
description="Tidak terpengaruh filter tanggal" description="Tidak terpengaruh filter tanggal"
items={[ items={[
{ label: 'Yard', value: rawMaterialStock.by_unit?.yard?.toLocaleString('id-ID') ?? '0' }, { label: 'Yard', value: rawMaterialStock.by_unit?.yard?.toLocaleString('id-ID') ?? '0' },
@ -607,12 +604,11 @@ export default function Analysis({
icon={ShoppingCart} icon={ShoppingCart}
mainLabel="Total Stok" mainLabel="Total Stok"
mainValue={productStock.total_stock.toLocaleString('id-ID')} mainValue={productStock.total_stock.toLocaleString('id-ID')}
subLabel={`Rp${formatRupiah(productStock.total_value)}`}
description="Tidak terpengaruh filter tanggal" description="Tidak terpengaruh filter tanggal"
items={[ items={[
{ label: 'Bagus', value: (productStock.by_type?.good ?? 0).toLocaleString('id-ID') }, { label: 'Bagus', value: (productStock.by_type?.stock ?? 0).toLocaleString('id-ID') },
{ label: 'Reject', value: (productStock.by_type?.reject ?? 0).toLocaleString('id-ID') }, { label: 'Reject', value: (productStock.by_type?.reject_stock ?? 0).toLocaleString('id-ID') },
{ label: 'Ecer', value: (productStock.by_type?.retail ?? 0).toLocaleString('id-ID') }, { label: 'Ecer', value: (productStock.by_type?.retail_stock ?? 0).toLocaleString('id-ID') },
]} ]}
/> />
)} )}