changing order of income and deduction

changing order of income and deduction

app/Views/payroll/emppaytransactionview.php

@@ -63,18 +63,18 @@
                   </div>
                   <div class="form-group">
                     <div class="form-check">
-                        <input class="form-check-input" type="radio" id="rdoInFixedAmount" name="amount_type" value="fixed" checked>
+                        <input class="form-check-input" type="radio" id="rdoInDaysBasedAmount" name="amount_type" value="daysbased" checked>
+                        <label for="rdoInDaysBasedAmount" class="form-check-label">Daily based amount.</label>
+                        <p class="text-muted"><small><i>Your amount entered multiplied by number of days</i></small></p>
+                    </div>
+                    <div class="form-check">
+                        <input class="form-check-input" type="radio" id="rdoInFixedAmount" name="amount_type" value="fixed">
                         <label for="rdoInFixedAmount" class="form-check-label">Fixed amount.</label>
                     </div>
                     <div class="form-check">
                         <input class="form-check-input" type="radio" id="rdoInPercentageAmount" name="amount_type" value="perc">
                         <label for="rdoInPercentageAmount" class="form-check-label">Amount is in percentage.</label>
                     </div>
-                    <div class="form-check">
-                        <input class="form-check-input" type="radio" id="rdoInDaysBasedAmount" name="amount_type" value="daysbased">
-                        <label for="rdoInDaysBasedAmount" class="form-check-label">Daily based amount.</label>
-                        <p class="text-muted"><small><i>Your amount entered multiplied by number of days</i></small></p>
-                    </div>
                   </div>
                   <div class="form-group">
                     <label for="txtInAmount">Amount</label>
@@ -130,18 +130,19 @@
                   </div>
                   <div class="form-group">
                     <div class="form-check">
-                        <input class="form-check-input" type="radio" id="rdoDedFixedAmount" name="amount_type" value="fixed" checked>
+                        <input class="form-check-input" type="radio" id="rdoDedDaysBasedAmount" name="amount_type" value="daysbased" checked>
+                        <label for="rdoDedDaysBasedAmount" class="form-check-label">Daily based amount.</label>
+                        <p class="text-muted"><small><i>Your amount entered multiplied by number of days</i></small></p>
+                    </div>
+                    <div class="form-check">
+                        <input class="form-check-input" type="radio" id="rdoDedFixedAmount" name="amount_type" value="fixed">
                         <label for="rdoDedFixedAmount" class="form-check-label">Fixed amount.</label>
                     </div>
                     <div class="form-check">
                         <input class="form-check-input" type="radio" id="rdoDedPercentageAmount" name="amount_type" value="perc">
                         <label for="rdoDedPercentageAmount" class="form-check-label">Amount is in percentage.</label>
                     </div>
-                    <div class="form-check">
-                        <input class="form-check-input" type="radio" id="rdoDedDaysBasedAmount" name="amount_type" value="daysbased">
-                        <label for="rdoDedDaysBasedAmount" class="form-check-label">Daily based amount.</label>
-                        <p class="text-muted"><small><i>Your amount entered multiplied by number of days</i></small></p>
-                    </div>
+                    
                   </div>
                   <div class="form-group">
                     <label for="txtDedAmount">Amount</label>
@@ -195,18 +196,18 @@
                   </div>
                   <div class="form-group">
                     <div class="form-check">
-                        <input class="form-check-input" type="radio" id="rdoEditInDedFixedAmount" name="amount_type" value="fixed" checked>
+                        <input class="form-check-input" type="radio" id="rdoEditInDedDaysBasedAmount" name="amount_type" value="daysbased" checked>
+                        <label for="rdoEditInDedDaysBasedAmount" class="form-check-label">Daily based amount.</label>
+                        <p class="text-muted"><small><i>Your amount entered multiplied by number of days</i></small></p>
+                    </div>
+                    <div class="form-check">
+                        <input class="form-check-input" type="radio" id="rdoEditInDedFixedAmount" name="amount_type" value="fixed">
                         <label for="rdoEditInDedFixedAmount" class="form-check-label">Fixed amount.</label>
                     </div>
                     <div class="form-check">
                         <input class="form-check-input" type="radio" id="rdoEditInDedPercentageAmount" name="amount_type" value="perc">
                         <label for="rdoEditInDedPercentageAmount" class="form-check-label">Amount is in percentage.</label>
                     </div>
-                    <div class="form-check">
-                        <input class="form-check-input" type="radio" id="rdoEditInDedDaysBasedAmount" name="amount_type" value="daysbased">
-                        <label for="rdoEditInDedDaysBasedAmount" class="form-check-label">Daily based amount.</label>
-                        <p class="text-muted"><small><i>Your amount entered multiplied by number of days</i></small></p>
-                    </div>
                   </div>
                   <div class="form-group">
                     <label for="txtEditInDedAmount">Amount</label>