diff --git a/app/Livewire/Forms/Auth/ForgotPasswordForm.php b/app/Livewire/Forms/Auth/ForgotPasswordForm.php index 12ca3b3..6ccd008 100644 --- a/app/Livewire/Forms/Auth/ForgotPasswordForm.php +++ b/app/Livewire/Forms/Auth/ForgotPasswordForm.php @@ -14,11 +14,4 @@ public function rules(): array 'email' => ['required', 'string', 'email'], ]; } - - public function validationAttributes(): array - { - return [ - 'email' => 'email', - ]; - } } diff --git a/app/Livewire/Forms/Auth/RegisterForm.php b/app/Livewire/Forms/Auth/RegisterForm.php index ac33639..d7ccba7 100644 --- a/app/Livewire/Forms/Auth/RegisterForm.php +++ b/app/Livewire/Forms/Auth/RegisterForm.php @@ -33,7 +33,7 @@ class RegisterForm extends Form public string $gender = ''; - public string $referral_code = ''; + public ?string $referral_code = null; public function rulesStep1(): array { diff --git a/app/Livewire/Forms/Studio/Catalog/BottleForm.php b/app/Livewire/Forms/Studio/Catalog/BottleForm.php index cccb24e..f4989c0 100644 --- a/app/Livewire/Forms/Studio/Catalog/BottleForm.php +++ b/app/Livewire/Forms/Studio/Catalog/BottleForm.php @@ -57,7 +57,7 @@ public function validationAttributes(): array ]; } - public function setBottle(Bottle $bottle) + public function setBottle(Bottle $bottle): void { $this->bottle = $bottle; @@ -70,7 +70,7 @@ public function setBottle(Bottle $bottle) $this->image = $this->mapMediaCollection($bottle->getMedia('image')); } - public function store() + public function store(): void { $this->validate(); @@ -83,7 +83,7 @@ public function store() }); } - public function update() + public function update(): void { $this->validate(); diff --git a/app/Livewire/Forms/Studio/Finance/PayrollForm.php b/app/Livewire/Forms/Studio/Finance/PayrollForm.php index 9872f12..0b790ad 100644 --- a/app/Livewire/Forms/Studio/Finance/PayrollForm.php +++ b/app/Livewire/Forms/Studio/Finance/PayrollForm.php @@ -43,7 +43,7 @@ public function validationAttributes(): array ]; } - public function store() + public function store(): array { $this->validate(); @@ -79,6 +79,7 @@ public function store() $payroll->save(); } }); + if ($adjustment->type->value == SalaryAdjustmentType::BONUS->value) { return [ 'userIds' => $this->user_ids, @@ -91,9 +92,4 @@ public function store() ]; } } - - public function update() - { - $this->validate(); - } } diff --git a/app/Livewire/Forms/Studio/Information/FaqForm.php b/app/Livewire/Forms/Studio/Information/FaqForm.php index 42bfa97..b89f53c 100644 --- a/app/Livewire/Forms/Studio/Information/FaqForm.php +++ b/app/Livewire/Forms/Studio/Information/FaqForm.php @@ -29,7 +29,7 @@ public function validationAttributes(): array ]; } - public function setFaq(Faq $faq) + public function setFaq(Faq $faq): void { $this->faq = $faq; @@ -37,7 +37,7 @@ public function setFaq(Faq $faq) $this->answer = $faq->answer; } - public function store() + public function store(): void { $this->validate(); @@ -48,7 +48,7 @@ public function store() ]); } - public function update() + public function update(): void { $this->validate(); @@ -58,7 +58,7 @@ public function update() ]); } - public function delete() + public function delete(): void { $this->faq->delete(); @@ -70,7 +70,7 @@ public function delete() }); } - public function sortOrder(string $direction) + public function sortOrder(string $direction): void { if (in_array($direction, ['up', 'down'])) { $swap = null; @@ -99,7 +99,7 @@ public function sortOrder(string $direction) } } - protected function normalizeSortOrder() + protected function normalizeSortOrder(): void { $categories = Faq::orderBy('sort_order')->get(); foreach ($categories as $index => $faq) { diff --git a/app/Livewire/Forms/Studio/Loyalty/CustomerForm.php b/app/Livewire/Forms/Studio/Loyalty/CustomerForm.php index 3b233aa..2f57a64 100644 --- a/app/Livewire/Forms/Studio/Loyalty/CustomerForm.php +++ b/app/Livewire/Forms/Studio/Loyalty/CustomerForm.php @@ -38,7 +38,7 @@ public function validationAttributes(): array ]; } - public function setCustomer(Customer $customer) + public function setCustomer(Customer $customer): void { $this->customer = $customer; @@ -47,7 +47,7 @@ public function setCustomer(Customer $customer) $this->gender = $customer->gender->value; } - public function store() + public function store(): void { $this->validate(); @@ -59,7 +59,7 @@ public function store() ]); } - public function update() + public function update(): void { $this->validate(); diff --git a/app/Livewire/Forms/Studio/Loyalty/Tier/RewardForm.php b/app/Livewire/Forms/Studio/Loyalty/Tier/RewardForm.php index 9d89510..570aac5 100644 --- a/app/Livewire/Forms/Studio/Loyalty/Tier/RewardForm.php +++ b/app/Livewire/Forms/Studio/Loyalty/Tier/RewardForm.php @@ -34,7 +34,7 @@ public function validationAttributes(): array ]; } - public function setRewards(TierReward $tierReward) + public function setRewards(TierReward $tierReward): void { $this->tierReward = $tierReward; @@ -43,14 +43,14 @@ public function setRewards(TierReward $tierReward) $this->value = currency($tierReward->value); } - public function store() + public function store(): TierReward { $this->validate(); return TierReward::create($this->prepareSavedData()); } - public function update() + public function update(): TierReward { $this->validate(); @@ -59,7 +59,7 @@ public function update() return $this->tierReward; } - private function prepareSavedData() + private function prepareSavedData(): array { return [ 'tier_id' => $this->tier_id, diff --git a/app/Livewire/Forms/Studio/Loyalty/VoucherForm.php b/app/Livewire/Forms/Studio/Loyalty/VoucherForm.php index aa5b290..d04f778 100644 --- a/app/Livewire/Forms/Studio/Loyalty/VoucherForm.php +++ b/app/Livewire/Forms/Studio/Loyalty/VoucherForm.php @@ -97,7 +97,7 @@ public function validationAttributes(): array ]; } - public function setVoucher(Voucher $voucher) + public function setVoucher(Voucher $voucher): void { $voucher->load('outlets'); @@ -119,7 +119,7 @@ public function setVoucher(Voucher $voucher) $this->outlet_ids = $this->voucher->outlets->pluck('id')->toArray(); } - public function store() + public function store(): void { $this->validate(); @@ -138,7 +138,7 @@ public function store() }); } - public function update() + public function update(): void { $this->validate(); @@ -152,7 +152,7 @@ public function update() }); } - private function prepareSavedData() + private function prepareSavedData(): array { return [ 'name' => $this->name, diff --git a/app/Livewire/Forms/Studio/Manage/OrderForm.php b/app/Livewire/Forms/Studio/Manage/OrderForm.php index cbc56b5..1d5d521 100644 --- a/app/Livewire/Forms/Studio/Manage/OrderForm.php +++ b/app/Livewire/Forms/Studio/Manage/OrderForm.php @@ -78,7 +78,7 @@ public function validationAttributes(): array ]; } - public function store() + public function store(): array { $this->validate(); diff --git a/app/Livewire/Forms/Studio/Manage/PurchaseForm.php b/app/Livewire/Forms/Studio/Manage/PurchaseForm.php index 05837f5..65bd26e 100644 --- a/app/Livewire/Forms/Studio/Manage/PurchaseForm.php +++ b/app/Livewire/Forms/Studio/Manage/PurchaseForm.php @@ -68,7 +68,7 @@ public function validationAttributes(): array ]; } - public function setPurchase(Purchase $purchase) + public function setPurchase(Purchase $purchase): void { $this->purchase = $purchase; @@ -81,7 +81,7 @@ public function setPurchase(Purchase $purchase) $this->image = $this->mapMediaCollection($purchase->getMedia('image')); } - public function store() + public function store(): void { $this->validate(); @@ -102,7 +102,7 @@ public function store() }); } - public function update() + public function update(): void { $this->validate(); diff --git a/app/Livewire/Forms/Studio/Manage/StockOpnameForm.php b/app/Livewire/Forms/Studio/Manage/StockOpnameForm.php index 1a8659c..67a3f11 100644 --- a/app/Livewire/Forms/Studio/Manage/StockOpnameForm.php +++ b/app/Livewire/Forms/Studio/Manage/StockOpnameForm.php @@ -15,7 +15,7 @@ class StockOpnameForm extends Form public ?string $note = null; - public function rules() + public function rules(): array { return [ 'outlet_stock' => 'array', @@ -24,7 +24,7 @@ public function rules() ]; } - public function validationAttributes() + public function validationAttributes(): array { return [ 'outlet_stock' => 'stock outlet', @@ -33,7 +33,7 @@ public function validationAttributes() ]; } - public function setStockOpname(StockOpname $stockOpname) + public function setStockOpname(StockOpname $stockOpname): void { $stockOpname->load('items'); @@ -42,7 +42,7 @@ public function setStockOpname(StockOpname $stockOpname) $this->note = $stockOpname->note; } - public function update() + public function update(): void { $this->validate(); diff --git a/app/Livewire/Forms/Studio/Master/OutletForm.php b/app/Livewire/Forms/Studio/Master/OutletForm.php index 36bc1cf..5f887ca 100644 --- a/app/Livewire/Forms/Studio/Master/OutletForm.php +++ b/app/Livewire/Forms/Studio/Master/OutletForm.php @@ -28,20 +28,16 @@ class OutletForm extends Form public ?string $maps_url = null; - /** @var array */ public array $opening_hours = []; - /** @var array */ public array $facilities = ['Parkir']; public string $opened_date = ''; public int $status = OutletStatus::OPERATIONAL->value; - /** @var array> */ public array $featured_image = []; - /** @var array> */ public array $images = []; public function rules(): array