yadiparfum/parfum
yadiparfum/parfum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(permission): menghapus permission view cogs dan menyesuaikan kembali semua kondisi yang memakai itu dan diganti dengan roles

Browse Source
This commit is contained in:
Yoga Pangestu 2025-11-17 16:07:59 +07:00
parent 70d7dc45b6
commit ae8a5e4ce8
10 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Livewire/Chart/OutletExpense.php
View File

@ -24,7 +24,7 @@ public function mount(array $outlets)
foreach ($outlets as $id => $name) { foreach ($outlets as $id => $name) {
$expenseTotal = Expense::where('outlet_id', $id)->sum('amount'); $expenseTotal = Expense::where('outlet_id', $id)->sum('amount');
$purchaseTotal = auth()->user()?->hasPermissionTo('view cogs') ? Purchase::where('outlet_id', $id)->sum('total') : 0; $purchaseTotal = auth()->user()->hasRole(['Developer', 'Owner']) ? Purchase::where('outlet_id', $id)->sum('total') : 0;
$payrollTotal = Payroll::whereHas('user.outlets', fn ($q) => $q->where('outlet_id', $id))->sum('total_salary'); $payrollTotal = Payroll::whereHas('user.outlets', fn ($q) => $q->where('outlet_id', $id))->sum('total_salary');

2
app/Livewire/Forms/Studio/Catalog/BottleForm.php
View File

@ -34,7 +34,7 @@ public function rules(): array
return [ return [
'name' => ['required', 'string', 'max:50'], 'name' => ['required', 'string', 'max:50'],
'size' => ['required', new UnsignedInteger], 'size' => ['required', new UnsignedInteger],
'cost_price' => [Rule::requiredIf(auth()->user()->can('view cogs')), new UnsignedInteger], 'cost_price' => [Rule::requiredIf(auth()->user()->hasRole(['Developer', 'Owner'])), new UnsignedInteger],
'sale_price' => ['required', new UnsignedInteger], 'sale_price' => ['required', new UnsignedInteger],
'description' => ['nullable', 'string'], 'description' => ['nullable', 'string'],
'outlet_ids' => ['required', 'array', 'min:1'], 'outlet_ids' => ['required', 'array', 'min:1'],

2
app/Livewire/Forms/Studio/Catalog/PerfumeForm.php
View File

@ -53,7 +53,7 @@ public function rules(): array
Rule::unique('perfumes', 'sku')->ignore($this->perfume), Rule::unique('perfumes', 'sku')->ignore($this->perfume),
], ],
'brand_id' => ['nullable', Rule::exists('brands', 'id')], 'brand_id' => ['nullable', Rule::exists('brands', 'id')],
'cost_price' => [Rule::requiredIf(auth()->user()->can('view cogs')), new UnsignedInteger], 'cost_price' => [Rule::requiredIf(auth()->user()->hasRole(['Developer', 'Owner'])), new UnsignedInteger],
'sale_price' => ['required', new UnsignedInteger], 'sale_price' => ['required', new UnsignedInteger],
'base_notes' => ['nullable', 'string', 'max:255'], 'base_notes' => ['nullable', 'string', 'max:255'],
'middle_notes' => ['nullable', 'string', 'max:255'], 'middle_notes' => ['nullable', 'string', 'max:255'],

2
app/Livewire/Forms/Studio/Catalog/ProductForm.php
View File

@ -39,7 +39,7 @@ public function rules(): array
'max:20', 'max:20',
Rule::unique('products', 'sku')->ignore($this->product), Rule::unique('products', 'sku')->ignore($this->product),
], ],
'cost_price' => [Rule::requiredIf(auth()->user()->can('view cogs')), new UnsignedInteger], 'cost_price' => [Rule::requiredIf(auth()->user()->hasRole(['Developer', 'Owner'])), new UnsignedInteger],
'sale_price' => ['required', new UnsignedInteger], 'sale_price' => ['required', new UnsignedInteger],
'description' => ['nullable', 'string'], 'description' => ['nullable', 'string'],
'outlet_ids' => ['required', 'array', 'min:1'], 'outlet_ids' => ['required', 'array', 'min:1'],

4
app/Livewire/Studio/Dashboard/Analysis.php
View File

@ -185,7 +185,7 @@ protected function loadData()
), ),
], ],
auth()->user()?->hasPermissionTo('view cogs') ? [ auth()->user()->hasRole(['Developer', 'Owner']) ? [
'title' => 'HPP', 'title' => 'HPP',
'value' => currency( 'value' => currency(
Order::when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) Order::when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds))
@ -249,7 +249,7 @@ protected function loadData()
), ),
], ],
auth()->user()?->hasPermissionTo('view cogs') ? [ auth()->user()->hasRole(['Developer', 'Owner']) ? [
'title' => 'Belanja Barang', 'title' => 'Belanja Barang',
'value' => currency( 'value' => currency(
Purchase::when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds)) Purchase::when(! empty($outletIds), fn ($q) => $q->whereIn('outlet_id', $outletIds))

8
app/Livewire/Studio/Dashboard/Overview.php
View File

@ -162,7 +162,7 @@ protected function loadStats()
'formatted' => currency($todayIncome, 'Rp'), 'formatted' => currency($todayIncome, 'Rp'),
], ],
auth()->user()?->hasPermissionTo('view cogs') ? [ auth()->user()->hasRole(['Developer', 'Owner']) ? [
'title' => 'HPP', 'title' => 'HPP',
'value' => currency($todayCogs, 'Rp'), 'value' => currency($todayCogs, 'Rp'),
'previous' => currency($yesterdayCogs, 'Rp'), 'previous' => currency($yesterdayCogs, 'Rp'),
@ -202,7 +202,7 @@ protected function loadStats()
'trendUp' => $todayExpense > $yesterdayExpense, 'trendUp' => $todayExpense > $yesterdayExpense,
], ],
auth()->user()?->hasPermissionTo('view cogs') ? [ auth()->user()->hasRole(['Developer', 'Owner']) ? [
'title' => 'Belanja Barang', 'title' => 'Belanja Barang',
'value' => currency($todayPurchase, 'Rp'), 'value' => currency($todayPurchase, 'Rp'),
'previous' => currency($yesterdayPurchase, 'Rp'), 'previous' => currency($yesterdayPurchase, 'Rp'),
@ -212,7 +212,7 @@ protected function loadStats()
'trendUp' => $todayPurchase > $yesterdayPurchase, 'trendUp' => $todayPurchase > $yesterdayPurchase,
] : null, ] : null,
auth()->user()?->hasPermissionTo('view cogs') ? [ auth()->user()->hasRole(['Developer', 'Owner']) ? [
'title' => 'Laba Kotor', 'title' => 'Laba Kotor',
'value' => currency($todayGrossProfit, 'Rp'), 'value' => currency($todayGrossProfit, 'Rp'),
'previous' => currency($yesterdayGrossProfit, 'Rp'), 'previous' => currency($yesterdayGrossProfit, 'Rp'),
@ -222,7 +222,7 @@ protected function loadStats()
'trendUp' => $todayGrossProfit > $yesterdayGrossProfit, 'trendUp' => $todayGrossProfit > $yesterdayGrossProfit,
] : null, ] : null,
auth()->user()?->hasPermissionTo('view cogs') ? [ auth()->user()->hasRole(['Developer', 'Owner']) ? [
'title' => 'Laba Bersih', 'title' => 'Laba Bersih',
'value' => currency($todayNetProfit, 'Rp'), 'value' => currency($todayNetProfit, 'Rp'),
'previous' => currency($yesterdayNetProfit, 'Rp'), 'previous' => currency($yesterdayNetProfit, 'Rp'),

5
database/seeders/RolePermissionSeeder.php
View File

@ -158,9 +158,6 @@ public function run(): void
// partner // partner
'view partner overview', 'view partner overview',
// other
'view cogs',
]; ];
foreach ($permissions as $permission) { foreach ($permissions as $permission) {
@ -271,7 +268,6 @@ public function run(): void
'view social settings', 'view social settings',
'update social settings', 'update social settings',
'view cogs',
])); ]));
$admin->syncPermissions(array_diff($permissions, [ $admin->syncPermissions(array_diff($permissions, [
@ -383,7 +379,6 @@ public function run(): void
'view social settings', 'view social settings',
'update social settings', 'update social settings',
'view cogs',
])); ]));
$partner->syncPermissions([ $partner->syncPermissions([

3
resources/views/livewire/studio/catalog/bottle/form.blade.php
View File

@ -45,7 +45,8 @@
</flux:field> </flux:field>
@endcan @endcan
<flux:field class="col-span-{{ auth()->user()->can('view cogs') ? '1' : '2' }}"> <flux:field
class="col-span-{{ auth()->user()->hasRole(['Developer', 'Owner'])? '1': '2' }}">
<flux:label>Harga Jual <span class="text-red-500 ms-1">*</span></flux:label> <flux:label>Harga Jual <span class="text-red-500 ms-1">*</span></flux:label>
<flux:input.group> <flux:input.group>
<flux:input.group.prefix>Rp</flux:input.group.prefix> <flux:input.group.prefix>Rp</flux:input.group.prefix>

2
resources/views/livewire/studio/catalog/perfume/form.blade.php
View File

@ -34,7 +34,7 @@
<div class="lg:col-span-2"> <div class="lg:col-span-2">
<div <div
class="grid grid-cols-1 md:grid-cols-{{ auth()->user()->can('view cogs') ? '3' : '2' }} gap-6"> class="grid grid-cols-1 md:grid-cols-{{ auth()->user()->hasRole(['Developer', 'Owner'])? '3': '2' }} gap-6">
<flux:select variant="listbox" searchable placeholder="Pilih Merek" <flux:select variant="listbox" searchable placeholder="Pilih Merek"
label="Merek" wire:model.live.debounce.500ms="form.brand_id"> label="Merek" wire:model.live.debounce.500ms="form.brand_id">
@foreach ($brands as $key => $value) @foreach ($brands as $key => $value)

3
resources/views/livewire/studio/catalog/product/form.blade.php
View File

@ -45,7 +45,8 @@
</flux:field> </flux:field>
@endcan @endcan
<flux:field class="col-span-{{ auth()->user()->can('view cogs') ? '1' : '2' }}"> <flux:field
class="col-span-{{ auth()->user()->hasRole(['Developer', 'Owner'])? '1': '2' }}">
<flux:label>Harga Jual <span class="text-red-500 ms-1">*</span></flux:label> <flux:label>Harga Jual <span class="text-red-500 ms-1">*</span></flux:label>
<flux:input.group> <flux:input.group>
<flux:input.group.prefix>Rp</flux:input.group.prefix> <flux:input.group.prefix>Rp</flux:input.group.prefix>