diff --git a/post/transfer.php b/post/transfer.php index c0cca906..69321462 100644 --- a/post/transfer.php +++ b/post/transfer.php @@ -15,7 +15,7 @@ if (isset($_POST['add_transfer'])) { mysqli_query($mysqli,"INSERT INTO revenues SET revenue_date = '$date', revenue_amount = $amount, revenue_currency_code = '$session_company_currency', revenue_account_id = $account_to, revenue_category_id = 0"); $revenue_id = mysqli_insert_id($mysqli); - mysqli_query($mysqli,"INSERT INTO transfers SET transfer_expense_id = $expense_id, transfer_revenue_id = $revenue_id, transfer_notes = '$notes'"); + mysqli_query($mysqli,"INSERT INTO transfers SET transfer_expense_id = $expense_id, transfer_revenue_id = $revenue_id, transfer_method = '$transfer_method', transfer_notes = '$notes'"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Transfer', log_action = 'Create', log_description = '$date - $amount', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); @@ -39,7 +39,7 @@ if (isset($_POST['edit_transfer'])) { mysqli_query($mysqli,"UPDATE revenues SET revenue_date = '$date', revenue_amount = $amount, revenue_account_id = $account_to WHERE revenue_id = $revenue_id"); - mysqli_query($mysqli,"UPDATE transfers SET transfer_notes = '$notes' WHERE transfer_id = $transfer_id"); + mysqli_query($mysqli,"UPDATE transfers SET transfer_method = '$transfer_method', transfer_notes = '$notes' WHERE transfer_id = $transfer_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Transfer', log_action = 'Modifed', log_description = '$date - $amount', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); @@ -72,4 +72,3 @@ if (isset($_GET['delete_transfer'])) { header("Location: " . $_SERVER["HTTP_REFERER"]); } - diff --git a/post/transfer_model.php b/post/transfer_model.php index d787045a..9c6b4e19 100644 --- a/post/transfer_model.php +++ b/post/transfer_model.php @@ -3,4 +3,5 @@ $date = sanitizeInput($_POST['date']); $amount = floatval($_POST['amount']); $account_from = intval($_POST['account_from']); $account_to = intval($_POST['account_to']); +$transfer_method = sanitizeInput($_POST['transfer_method']); $notes = sanitizeInput($_POST['notes']); diff --git a/setup.php b/setup.php index 808cc21a..6bf79567 100644 --- a/setup.php +++ b/setup.php @@ -285,6 +285,7 @@ if (isset($_POST['add_company_settings'])) { mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Cash', category_type = 'Payment Method', category_color = 'blue'"); mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Check', category_type = 'Payment Method', category_color = 'red'"); + mysqli_query($mysqli,"INSERT INTO categories SET category_name = 'Bank Transfer', category_type = 'Payment Method', category_color = 'green'"); //Create Calendar mysqli_query($mysqli,"INSERT INTO calendars SET calendar_name = 'Default', calendar_color = 'blue'"); diff --git a/transfer_add_modal.php b/transfer_add_modal.php index 0aa94f8b..61ac8bc1 100644 --- a/transfer_add_modal.php +++ b/transfer_add_modal.php @@ -143,6 +143,29 @@ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
diff --git a/transfers.php b/transfers.php index 753038e7..3596cb90 100644 --- a/transfers.php +++ b/transfers.php @@ -11,11 +11,11 @@ $url_query_strings_sort = http_build_query($get_copy); $sql = mysqli_query( $mysqli, - "SELECT SQL_CALC_FOUND_ROWS transfer_created_at, expense_date AS transfer_date, expense_amount AS transfer_amount, expense_account_id AS transfer_account_from, revenue_account_id AS transfer_account_to, transfer_expense_id, transfer_revenue_id , transfer_id, transfer_notes FROM transfers, expenses, revenues + "SELECT SQL_CALC_FOUND_ROWS transfer_created_at, expense_date AS transfer_date, expense_amount AS transfer_amount, expense_account_id AS transfer_account_from, revenue_account_id AS transfer_account_to, transfer_expense_id, transfer_revenue_id , transfer_id, transfer_method, transfer_notes FROM transfers, expenses, revenues WHERE transfer_expense_id = expense_id AND transfer_revenue_id = revenue_id AND DATE(expense_date) BETWEEN '$dtf' AND '$dtt' - AND (transfer_notes LIKE '%$q%') + AND (transfer_notes LIKE '%$q%' OR transfer_method LIKE '%$q%') ORDER BY $sort $order LIMIT $record_from, $record_to" ); @@ -85,6 +85,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); Date From Account To Account + Method Notes Amount Action @@ -99,6 +100,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); $transfer_account_from = intval($row['transfer_account_from']); $transfer_account_to = intval($row['transfer_account_to']); $transfer_amount = floatval($row['transfer_amount']); + $transfer_method = nullable_htmlentities($row['transfer_method']); + if($transfer_method) { + $transfer_method_display = $transfer_method; + } else { + $transfer_method_display = "-"; + } $transfer_notes = nullable_htmlentities($row['transfer_notes']); if(empty($transfer_notes)) { $transfer_notes_display = "-"; @@ -134,6 +141,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); +