dst/store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dst:a29e6af43085371170485b4536df4db1f998c7b0
Branches Tags
dst:master
..
compare: dst:2e578cd9766459bb414eaed34167dc1e58b4853a
Branches Tags
dst:master

No commits in common. "a29e6af43085371170485b4536df4db1f998c7b0" and "2e578cd9766459bb414eaed34167dc1e58b4853a" have entirely different histories.
a29e6af430 ... 2e578cd976

16 changed files with 716 additions and 702 deletions
Show Stats Expand all files Collapse all files

25
app/Services/Finance/CashService.php
View File

@ -95,8 +95,6 @@ function () use ($cashAccount, $validated, $user): CashTransaction {
'Gagal melakukan setoran kas',
);
$this->cacheForget('finance:default_account');
$this->pushNotificationService->sendToRoles(
'💰 Setoran Kas',
"Setoran kas baru {$transaction->amount_formatted} dengan keterangan: {$transaction->description} oleh {$user->profile?->full_name}.",
@ -140,8 +138,6 @@ function () use ($cashAccount, $validated, $user): CashTransaction {
'Gagal melakukan tarik kas',
);
$this->cacheForget('finance:default_account');
$this->pushNotificationService->sendToRoles(
'🏦 Tarik Kas',
"Tarik kas {$transaction->amount_formatted} dengan keterangan: {$transaction->description} oleh {$user->profile?->full_name}.",
@ -159,7 +155,7 @@ public function recordOutgoing(
User $user,
?CashAccount $cashAccount = null,
): CashTransaction {
$transaction = $this->runInTransaction(
return $this->runInTransaction(
function () use ($reference, $amount, $description, $user, $cashAccount): CashTransaction {
$account = CashAccount::query()->lockForUpdate()->findOrFail(
($cashAccount ?? $this->getDefaultAccount())->id,
@ -191,10 +187,6 @@ function () use ($reference, $amount, $description, $user, $cashAccount): CashTr
},
'Gagal mencatat transaksi keluar kas',
);
$this->cacheForget('finance:default_account');
return $transaction;
}
public function recordIncoming(
@ -204,7 +196,7 @@ public function recordIncoming(
User $user,
?CashAccount $cashAccount = null,
): CashTransaction {
$transaction = $this->runInTransaction(
return $this->runInTransaction(
function () use ($reference, $amount, $description, $user, $cashAccount): CashTransaction {
$account = CashAccount::query()->lockForUpdate()->findOrFail(
($cashAccount ?? $this->getDefaultAccount())->id,
@ -230,10 +222,6 @@ function () use ($reference, $amount, $description, $user, $cashAccount): CashTr
},
'Gagal mencatat transaksi masuk kas',
);
$this->cacheForget('finance:default_account');
return $transaction;
}
public function updateDeposit(CashTransaction $transaction, array $validated, User $user): void
@ -262,8 +250,6 @@ function () use ($transaction, $validated): void {
'Gagal memperbarui setoran kas',
);
$this->cacheForget('finance:default_account');
$this->pushNotificationService->sendToRoles(
'✏️ Transaksi Kas Diperbarui',
"Transaksi kas dengan keterangan {$transaction->description} diperbarui menjadi senilai {$transaction->amount_formatted} oleh {$user->profile?->full_name}.",
@ -283,6 +269,7 @@ function () use ($transaction): void {
$account = $transaction->cashAccount;
$transaction->clearMediaCollection('photos');
$transaction->delete();
$this->recalculateBalances($account);
@ -296,8 +283,6 @@ function () use ($transaction): void {
'Gagal menghapus transaksi kas',
);
$this->cacheForget('finance:default_account');
$this->pushNotificationService->sendToRoles(
'🗑️ Transaksi Kas Dihapus',
"Transaksi kas senilai {$amountFormatted} dengan keterangan {$description} telah dihapus oleh {$user->profile?->full_name}.",
@ -332,8 +317,6 @@ function () use ($transaction, $amount, $description): void {
},
'Gagal memperbarui transaksi kas referensi',
);
$this->cacheForget('finance:default_account');
}
public function deleteReferencedTransaction(CashTransaction $transaction): void
@ -355,8 +338,6 @@ function () use ($transaction): void {
},
'Gagal menghapus transaksi kas referensi',
);
$this->cacheForget('finance:default_account');
}
private function recalculateBalances(CashAccount $cashAccount): void

1
app/Services/Finance/ExpenseService.php
View File

@ -133,6 +133,7 @@ function () use ($expense): void {
$this->cashService->deleteReferencedTransaction($expense->cashTransaction);
}
$expense->clearMediaCollection('photos');
$expense->delete();
},
'Gagal menghapus pengeluaran',

2
app/Services/Hr/AttendanceService.php
View File

@ -172,6 +172,8 @@ public function delete(Attendance $attendance, User $user): void
$this->runInTransaction(
function () use ($attendance): void {
$attendance->clearMediaCollection('checkin');
$attendance->clearMediaCollection('checkout');
$attendance->delete();
},
'Gagal menghapus presensi',

5
app/Services/Hr/EmployeeService.php
View File

@ -128,7 +128,6 @@ function () use ($validated): User {
'Gagal membuat karyawan',
);
$this->cacheForget('system:assignable_roles');
$this->cacheForgetByPattern('hr:employees:*');
$this->notifyOwner(
@ -190,7 +189,6 @@ function () use ($validated, $user, $employee): void {
'Gagal memperbarui karyawan',
);
$this->cacheForget('system:assignable_roles');
$this->cacheForgetByPattern('hr:employees:*');
$this->notifyOwner(
@ -215,7 +213,6 @@ function () use ($user, $validated): void {
'Gagal memperbarui status karyawan',
);
$this->cacheForget('system:assignable_roles');
$this->cacheForgetByPattern('hr:employees:*');
$statusLabel = $validated['is_active'] ? 'aktif' : 'nonaktif';
@ -240,7 +237,6 @@ function () use ($user): void {
'Gagal mereset kata sandi karyawan',
);
$this->cacheForget('system:assignable_roles');
$this->cacheForgetByPattern('hr:employees:*');
$this->notifyOwner(
@ -263,7 +259,6 @@ function () use ($user): void {
'Gagal menghapus karyawan',
);
$this->cacheForget('system:assignable_roles');
$this->cacheForgetByPattern('hr:employees:*');
$this->notifyOwner(

1
app/Services/Manage/CuttingService.php
View File

@ -680,6 +680,7 @@ function () use ($cutting): void {
$cutting->materials()->delete();
$cutting->results()->delete();
$cutting->clearMediaCollection('images');
$cutting->delete();
},
'Gagal menghapus proses cutting',

2
app/Services/Manage/PurchaseService.php
View File

@ -716,6 +716,7 @@ private function rejectCreate(OwnerVerificationRequest $verificationRequest): vo
$this->runInTransaction(
function () use ($purchase): void {
$purchase->clearMediaCollection('photos');
$purchase->items()->delete();
$purchase->delete();
},
@ -733,6 +734,7 @@ function () use ($purchase): void {
$this->decrementStock($item);
}
$purchase->clearMediaCollection('photos');
$purchase->items()->delete();
$purchase->delete();
},

2
app/Services/Manage/RestockService.php
View File

@ -573,6 +573,7 @@ private function rejectCreate(OwnerVerificationRequest $verificationRequest): vo
$this->runInTransaction(
function () use ($restock): void {
$restock->clearMediaCollection('photos');
$restock->items()->delete();
$restock->delete();
},
@ -592,6 +593,7 @@ function () use ($restock): void {
$this->decrementStock($item, $stockType);
}
$restock->clearMediaCollection('photos');
$restock->items()->delete();
$restock->delete();
},

4
app/Services/Manage/StockService.php
View File

@ -156,7 +156,9 @@ public function submitVerification(
}
$this->cacheForgetByPattern('manage:stocks:*');
$this->cacheForgetByPattern('prices:*');
if ($isOwner) {
$this->cacheForgetByPattern('prices:*');
}
}
public function approveVerification(

11
app/Services/Master/ProductService.php
View File

@ -254,7 +254,6 @@ function () use ($validated, $product, $user, $isOwner): void {
);
$this->cacheForgetByPattern('master:products:*');
$this->cacheForgetByPattern('prices:*');
$this->cacheForget('homepage:page_data');
if ($isOwner) {
@ -329,7 +328,6 @@ public function delete(Product $product, User $user): void
$name = $product->name;
$this->applyDeleteSubject($product);
$this->cacheForgetByPattern('master:products:*');
$this->cacheForgetByPattern('prices:*');
$this->cacheForget('homepage:page_data');
$this->notifyOwner(
@ -437,7 +435,6 @@ public function applyVerificationRequest(OwnerVerificationRequest $verificationR
};
$this->cacheForgetByPattern('master:products:*');
$this->cacheForgetByPattern('prices:*');
}
public function rejectVerificationRequest(OwnerVerificationRequest $verificationRequest): void
@ -452,7 +449,6 @@ public function rejectVerificationRequest(OwnerVerificationRequest $verification
};
$this->cacheForgetByPattern('master:products:*');
$this->cacheForgetByPattern('prices:*');
$this->cacheForget('homepage:page_data');
}
@ -523,6 +519,7 @@ private function applyPayloadToProduct(
->whereNotIn('id', $submittedVariantIds)
->get()
->each(function (ProductVariant $variant): void {
$variant->clearMediaCollection('images');
$variant->delete();
});
@ -589,6 +586,9 @@ private function applyDeleteSubject(Product $product): void
{
$this->runInTransaction(
function () use ($product): void {
$product->variants()->each(function (ProductVariant $variant): void {
$variant->clearMediaCollection('images');
});
$product->variants()->delete();
$product->categories()->detach();
$product->delete();
@ -656,6 +656,9 @@ private function rejectCreate(OwnerVerificationRequest $verificationRequest): vo
$this->runInTransaction(
function () use ($product): void {
$product->variants()->each(function (ProductVariant $variant): void {
$variant->clearMediaCollection('images');
});
$product->variants()->delete();
$product->categories()->detach();
$product->delete();

49
app/Services/Master/RawMaterialService.php
View File

@ -37,24 +37,6 @@ public function paginateForIndex(array $tableQuery, string $isActive, string $st
->with('media')
->when($tableQuery['search'] !== '', function ($query) use ($tableQuery): void {
$query->where('variant', 'like', "%{$tableQuery['search']}%");
})
->when($stockStatus === 'out_of_stock', fn ($q) => $q->where('stock', '<=', 0))
->when($stockStatus === 'low_stock', function ($q): void {
$q->where('stock', '>', 0)
->where(function ($q): void {
$q->orWhere(function ($q): void {
$q->whereHas('rawMaterial', fn ($q) => $q->where('unit', RawMaterialUnit::YARD->value))
->where('stock', '<', 20);
})
->orWhere(function ($q): void {
$q->whereHas('rawMaterial', fn ($q) => $q->where('unit', RawMaterialUnit::METER->value))
->where('stock', '<', 10);
})
->orWhere(function ($q): void {
$q->whereHas('rawMaterial', fn ($q) => $q->where('unit', RawMaterialUnit::KILOGRAM->value))
->where('stock', '<', 5);
});
});
}),
])
->when(($tableQuery['search_id'] ?? '') !== '', function (Builder $query) use ($tableQuery): void {
@ -70,15 +52,21 @@ public function paginateForIndex(array $tableQuery, string $isActive, string $st
$query->whereHas('prices', fn (Builder $priceQuery) => $priceQuery->where('stock', '<=', 0));
})
->when($stockStatus === 'low_stock', function (Builder $query): void {
$query->where(function (Builder $query): void {
$query->where('unit', RawMaterialUnit::YARD->value)
->whereHas('prices', fn (Builder $q) => $q->where('stock', '>', 0)->where('stock', '<', 20));
})->orWhere(function (Builder $query): void {
$query->where('unit', RawMaterialUnit::METER->value)
->whereHas('prices', fn (Builder $q) => $q->where('stock', '>', 0)->where('stock', '<', 10));
})->orWhere(function (Builder $query): void {
$query->where('unit', RawMaterialUnit::KILOGRAM->value)
->whereHas('prices', fn (Builder $q) => $q->where('stock', '>', 0)->where('stock', '<', 5));
$minStock = [
RawMaterialUnit::YARD->value => 20,
RawMaterialUnit::METER->value => 10,
RawMaterialUnit::KILOGRAM->value => 5,
];
$query->whereHas('prices', function (Builder $priceQuery) use ($minStock): void {
$priceQuery->where('stock', '>', 0)->where(function (Builder $priceQuery) use ($minStock): void {
foreach (RawMaterialUnit::cases() as $unit) {
$priceQuery->orWhere(function (Builder $priceQuery) use ($unit, $minStock): void {
$priceQuery->whereHas('rawMaterial', fn (Builder $rawMaterialQuery) => $rawMaterialQuery->where('unit', $unit->value))
->where('stock', '<', $minStock[$unit->value]);
});
}
});
});
});
@ -286,6 +274,9 @@ private function applyDeleteSubject(RawMaterial $rawMaterial): void
{
$this->runInTransaction(
function () use ($rawMaterial): void {
$rawMaterial->prices()->each(function (RawMaterialPrice $price): void {
$price->clearMediaCollection('images');
});
$rawMaterial->prices()->delete();
$rawMaterial->delete();
},
@ -337,6 +328,7 @@ private function applyPayloadToRawMaterial(
->whereNotIn('id', $submittedPriceIds)
->get()
->each(function (RawMaterialPrice $price): void {
$price->clearMediaCollection('images');
$price->delete();
});
@ -382,6 +374,9 @@ private function rejectCreate(OwnerVerificationRequest $verificationRequest): vo
$this->runInTransaction(
function () use ($rawMaterial): void {
$rawMaterial->prices()->each(function (RawMaterialPrice $price): void {
$price->clearMediaCollection('images');
});
$rawMaterial->prices()->delete();
$rawMaterial->delete();
},

1221
app/Services/System/AnalysisService.php
View File

File diff suppressed because it is too large Load Diff

47
app/Services/System/HomepageService.php
View File

@ -6,6 +6,7 @@
use App\Models\Category;
use App\Models\Product;
use App\Models\SystemConfiguration;
use App\Services\Concerns\CachesQuery;
use App\Services\Manage\CuttingResultPriceResolver;
use App\Services\System\Setting\HomepageSettingService;
use App\Settings\SocialMediaSettings;
@ -14,6 +15,8 @@
class HomepageService
{
use CachesQuery;
public function __construct(
private readonly CuttingResultPriceResolver $cuttingResultPriceResolver,
private readonly HomepageSettingService $homepageSettingService,
@ -21,30 +24,32 @@ public function __construct(
public function pageData(): array
{
$categories = Category::getActiveWithProducts();
$products = $this->getProducts();
return $this->cacheRemember('homepage:page_data', 900, function () {
$categories = Category::getActiveWithProducts();
$products = $this->getProducts();
$configuration = SystemConfiguration::instance();
$logo = MediaPresenter::first($configuration, 'logo');
$logoUrl = $logo['url'] ?? null;
$configuration = SystemConfiguration::instance();
$logo = MediaPresenter::first($configuration, 'logo');
$logoUrl = $logo['url'] ?? null;
$settings = app(SystemSettings::class);
$socialSettings = app(SocialMediaSettings::class);
$settings = app(SystemSettings::class);
$socialSettings = app(SocialMediaSettings::class);
return [
'categories' => $categories,
'products' => $products,
'appName' => $settings->app_name ?? 'DST Collection',
'aboutApp' => $settings->about_app ?? '',
'contactEmail' => $settings->email ?? '',
'contactPhone' => $settings->phone ?? '',
'contactAddress' => $settings->address ?? '',
'logoUrl' => $logoUrl,
'instagramUrl' => $socialSettings->instagram_url ?? null,
'facebookUrl' => $socialSettings->facebook_url ?? null,
'tiktokUrl' => $socialSettings->tiktok_url ?? null,
'homepage' => $this->homepageSettingService->homepageData(),
];
return [
'categories' => $categories,
'products' => $products,
'appName' => $settings->app_name ?? 'DST Collection',
'aboutApp' => $settings->about_app ?? '',
'contactEmail' => $settings->email ?? '',
'contactPhone' => $settings->phone ?? '',
'contactAddress' => $settings->address ?? '',
'logoUrl' => $logoUrl,
'instagramUrl' => $socialSettings->instagram_url ?? null,
'facebookUrl' => $socialSettings->facebook_url ?? null,
'tiktokUrl' => $socialSettings->tiktok_url ?? null,
'homepage' => $this->homepageSettingService->homepageData(),
];
});
}
private function getProducts(): array

6
app/Services/System/RoleService.php
View File

@ -87,8 +87,6 @@ public function create(array $validated): void
]);
}
$this->cacheForget('system:permissions');
$this->cacheForget('system:assignable_roles');
$this->cacheForgetByPattern('system:roles:*');
}
@ -116,8 +114,6 @@ public function update(Role $role, array $validated): void
]);
}
$this->cacheForget('system:permissions');
$this->cacheForget('system:assignable_roles');
$this->cacheForgetByPattern('system:roles:*');
}
@ -125,8 +121,6 @@ public function delete(Role $role): void
{
$role->delete();
$this->cacheForget('system:permissions');
$this->cacheForget('system:assignable_roles');
$this->cacheForgetByPattern('system:roles:*');
}

2
config/inertia.php
View File

@ -16,7 +16,7 @@
*/
'ssr' => [
'enabled' => false,
'enabled' => true,
'url' => 'http://127.0.0.1:13714',
// 'bundle' => base_path('bootstrap/ssr/ssr.mjs'),

34
resources/js/app.ts
View File

@ -5,26 +5,24 @@ import { Toaster } from '@/components/ui/sonner';
import { useFlashToast } from '@/composables/useFlashToast';
import { restoreConnection } from '@/lib/thermal-printer/stable-transport';
if (typeof window !== 'undefined') {
if ('serviceWorker' in navigator) {
navigator.serviceWorker
.register('/sw.js', { scope: '/' })
.then((reg) => {
console.log('[SW] Registered:', reg.scope);
})
.catch((err) => {
console.error('[SW] Registration failed:', err);
});
}
window.addEventListener('beforeinstallprompt', (e) => {
e.preventDefault();
(window as any).deferredPwaPrompt = e;
});
void restoreConnection();
if ('serviceWorker' in navigator) {
navigator.serviceWorker
.register('/sw.js', { scope: '/' })
.then((reg) => {
console.log('[SW] Registered:', reg.scope);
})
.catch((err) => {
console.error('[SW] Registration failed:', err);
});
}
window.addEventListener('beforeinstallprompt', (e) => {
e.preventDefault();
(window as any).deferredPwaPrompt = e;
});
void restoreConnection();
const appName = import.meta.env.VITE_APP_NAME || 'Laravel';
createInertiaApp({

6
resources/js/pages/admin/Analysis.vue
View File

@ -529,11 +529,11 @@ const productBarData = computed<ProductData[]>(() => {
function applyFilters() {
router.get(
admin.analysis.url(),
{
admin.analysis.url({
start_date: startDate.value,
end_date: endDate.value,
},
}),
{},
{
preserveState: true,
preserveScroll: true,