fix: calculator validation

itsemon245 · May 4, 2024 · d6ed4ac · d6ed4ac
1 parent 4ae8fb3
commit d6ed4ac
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/app/Http/Controllers/Frontend/TaxCalculatorController.php b/app/Http/Controllers/Frontend/TaxCalculatorController.php
@@ -43,9 +43,9 @@ public function calculate(Request $request)
                 $tax = 0;
                 $taxSetting = TaxSetting::where(['for' => $request->tax_for, 'type' => 'tax'])->first();
                 $minTax = $taxSetting->min_tax;
-                $income = (int) $request->yearly_income;
-                $turnover = (int) $request->yearly_turnover;
-                $asset = (int) $request->total_asset;
+                $income = (int) ($request->yearly_income ?? 0);
+                $turnover = (int) ($request->yearly_turnover ?? 0);
+                $asset = (int) ($request->total_asset ?? 0);
                 $incomeTaxAll = $this->calcTax($income, $request, 'income');
                 $turnoverTaxAll = $this->calcTax($turnover, $request, 'turnover');
                 $incomeTax = $incomeTaxAll['tax'];
@@ -64,11 +64,11 @@ public function calculate(Request $request)
                 $formatMinTax = currencyFormat($minTax);
                 $formattedOriginalTax = currencyFormat($originalTax);
                 $afterRebateFormatted = currencyFormat($afterRebate);
-                $formattedDeduction = currencyFormat($request->deduction);
+                $formattedDeduction = currencyFormat($afterDeduction);
                 $data = [
                     'taxes' => [
                         'a) Tax On Turnover' =>  currencyFormat($turnoverTax),
-                        "b) Tax On Income<br>".($originalTax != 0 ? "<small>Actual Tax ({$formattedOriginalTax})</small>" : '') =>  currencyFormat($incomeTax),
+                        "b) Tax On Income<br>".($originalTax > 0 && $minTax > $originalTax ? "<small>Actual Tax ({$formattedOriginalTax})</small>" : '') =>  currencyFormat($incomeTax),
                         'actual-tax' => $originalTax,
                         '*Tax Paid a or b which is higher'.($minTaxApplied ? "<br> <small>Min. Tax Applied({$formatMinTax})</small>" : '') => currencyFormat($tax),
                     ],
@@ -77,10 +77,10 @@ public function calculate(Request $request)
                         '*Total Payable Tax' =>  currencyFormat($totalTax),
                     ],
                     'less' => [
-                        'Rebate' => currencyFormat($request->rebate ?? 0),
-                        'After Rebate' => $originalTax == 0 ? "<div class='text-center' style='border-bottom: 2px solid rgb(14 159 110);'>No Rebate applicable</div>" : $afterRebateFormatted,
+                        'Rebate' => "-".currencyFormat($request->rebate ?? 0),
+                        'After Rebate' => $originalTax == 0 ? "<div class='text-center' style='border-bottom: 2px solid rgb(14 159 110);'>{$afterRebateFormatted}</div>" : $afterRebateFormatted,
                         'Apply Min-Tax' => $afterRebate < $minTax && $originalTax > 0 ? currencyFormat($minTax) : 'Not Applied',
-                        "Others Paid" => $originalTax == 0 ? "<div class='text-center' style='border-bottom: 2px solid rgb(14 159 110);'>No Deduction applicable</div>" : $formattedDeduction
+                        "Others Paid" => $originalTax == 0 ? "<div class='text-center' style='border-bottom: 2px solid rgb(14 159 110);'>No Deduction applicable</div>" : "-".$formattedDeduction
                         // 'Others Paid' => "-".$formattedDeduction,
                         // '*Total Deduction' =>  currencyFormat($totalTax - $afterDeduction)
                     ],

diff --git a/resources/views/frontend/pages/taxCalculator.blade.php b/resources/views/frontend/pages/taxCalculator.blade.php
@@ -78,11 +78,11 @@ class="row">
                                                 <div>
                                                     <label for="gender" class="d-block form-label">Gender</label>
                                                     <label for="male" class=" mx-2">
-                                                        <input id="male" type="radio" name="gender" value="male">
+                                                        <input id="male" type="radio" name="gender" value="male" required>
                                                         Male
                                                     </label>
                                                     <label for="female" class=" mx-2">
-                                                        <input id="female" type="radio" name="gender" value="female">
+                                                        <input id="female" type="radio" name="gender" value="female" required>
                                                         Female
                                                     </label>
                                                 </div>
@@ -91,17 +91,17 @@ class="row">
                                         <div class="col-md-6">
                                             <h5>Tax & Computation Information</h5>
                                             <x-backend.form.text-input label="Yearly Turnover" :value="old('yearly_turnover')"
-                                                name="yearly_turnover">
+                                                name="yearly_turnover" type="number">
                                             </x-backend.form.text-input>
                                             <x-backend.form.text-input label="Yearly Income" :value="old('yearly_income')"
-                                                name="yearly_income">
+                                                name="yearly_income" type="number">
                                             </x-backend.form.text-input>
                                             <x-backend.form.text-input label="Total Assets" type="number" :value="old('total_asset')"
                                                 name="total_asset">
                                             </x-backend.form.text-input>
                                             @if ($for === 'individual')
                                                 <x-backend.form.text-input label="Investment of Rebate" :value="old('rebate')"
-                                                    name="rebate">
+                                                    name="rebate" type="number">
                                                 </x-backend.form.text-input>
                                             @endif