Merge pull request #761 from o-psi/edit-currnet-expenses-amount-regex

Allow for commas in recurring expense modals
itflow-org · Oct 14, 2023 · 21a5006 · 21a5006
2 parents 45acc58 + 29279d0
commit 21a5006
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/post/expense.php b/post/expense.php
@@ -166,7 +166,7 @@
     $frequency = intval($_POST['frequency']);
     $day = intval($_POST['day']);
     $month = intval($_POST['month']);
-    $amount = floatval($_POST['amount']);
+    $amount =  floatval(str_replace(',', '', $_POST['amount']));
     $account = intval($_POST['account']);
     $vendor = intval($_POST['vendor']);
     $client = intval($_POST['client']);
@@ -195,7 +195,7 @@
     $frequency = intval($_POST['frequency']);
     $day = intval($_POST['day']);
     $month = intval($_POST['month']);
-    $amount = floatval($_POST['amount']);
+    $amount =  floatval(str_replace(',', '', $_POST['amount']));
     $account = intval($_POST['account']);
     $vendor = intval($_POST['vendor']);
     $client = intval($_POST['client']);

diff --git a/recurring_expense_create_modal.php b/recurring_expense_create_modal.php
@@ -68,7 +68,7 @@
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                                 </div>
-                                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" placeholder="0.00" required>
+                                <input type="text" class="form-control" inputmode="numeric" pattern="^(?:\d{1,3}(?:,\d{3})*|\d+)(?:\.\d{0,2})?$" name="amount" placeholder="0.00" required>
                             </div>
                         </div>
                     </div>

diff --git a/recurring_expense_edit_modal.php b/recurring_expense_edit_modal.php
@@ -63,17 +63,15 @@
                     </div>
 
                     <div class="form-row">
-
                         <div class="form-group col-md">
                             <label>Amount <strong class="text-danger">*</strong></label>
                             <div class="input-group">
                                 <div class="input-group-prepend">
                                     <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
                                 </div>
-                                <input type="text" class="form-control" inputmode="numeric" pattern="[0-9]*\.?[0-9]{0,2}" name="amount" value="<?php echo number_format($recurring_expense_amount,2); ?>" required>
+                                <input type="text" class="form-control" inputmode="numeric" pattern="^(?:\d{1,3}(?:,\d{3})*|\d+)(?:\.\d{0,2})?$" name="amount" value="<?php echo number_format($recurring_expense_amount,2); ?>" required>
                             </div>
                         </div>
-
                     </div>
 
                     <div class="form-row">