From 95bdc2fbd990aed1a4aeb5234ad8028ebe38e341 Mon Sep 17 00:00:00 2001
From: "johnny@pittpc.com" <admin@app.pittpc.com>
Date: Sat, 27 Feb 2021 14:21:59 -0500
Subject: [PATCH] Added Currency Selection to Add Currency and Edit

---
 add_revenue_modal.php  | 15 +++++++++++++++
 edit_revenue_modal.php | 15 +++++++++++++++
 post.php               |  6 ++++--
 revenues.php           |  1 +
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/add_revenue_modal.php b/add_revenue_modal.php
index 0d7ccad4..68040ead 100644
--- a/add_revenue_modal.php
+++ b/add_revenue_modal.php
@@ -21,6 +21,21 @@
                 <input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
               </div>
             </div>
+
+            <div class="form-group col-md">
+              <label>Currency <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-money-bill"></i></span>
+                </div>
+                <select class="form-control select2" name="currency_code" required>
+                  <option value="">- Currency -</option>
+                  <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
+                  <option <?php if($config_default_currency == $currency_code){ echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
+                  <?php } ?>
+                </select>
+              </div>
+            </div>
             
             <div class="form-group col-md">
               <label>Amount <strong class="text-danger">*</strong></label>
diff --git a/edit_revenue_modal.php b/edit_revenue_modal.php
index b669a757..4a1a9b1f 100644
--- a/edit_revenue_modal.php
+++ b/edit_revenue_modal.php
@@ -22,6 +22,21 @@
                 <input type="date" class="form-control" name="date" value="<?php echo $revenue_date; ?>" required>
               </div>
             </div>
+
+            <div class="form-group col-md">
+              <label>Currency <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-money-bill"></i></span>
+                </div>
+                <select class="form-control select2" name="currency_code" required>
+                  <option value="">- Currency -</option>
+                  <?php foreach($currencies_array as $currency_code => $currency_name) { ?>
+                  <option <?php if($revenue_currency_code == $currency_code){ echo "selected"; } ?> value="<?php echo $currency_code; ?>"><?php echo "$currency_code - $currency_name"; ?></option>
+                  <?php } ?>
+                </select>
+              </div>
+            </div>
             
             <div class="form-group col-md">
               <label>Amount <strong class="text-danger">*</strong></label>
diff --git a/post.php b/post.php
index 230a426c..1cbc317c 100644
--- a/post.php
+++ b/post.php
@@ -2960,13 +2960,14 @@ if(isset($_POST['add_revenue'])){
 
     $date = strip_tags(mysqli_real_escape_string($mysqli,$_POST['date']));
     $amount = floatval($_POST['amount']);
+    $currency_code = strip_tags(mysqli_real_escape_string($mysqli,$_POST['currency_code']));
     $account = intval($_POST['account']);
     $category = intval($_POST['category']);
     $payment_method = strip_tags(mysqli_real_escape_string($mysqli,$_POST['payment_method']));
     $description = strip_tags(mysqli_real_escape_string($mysqli,$_POST['description']));
     $reference = strip_tags(mysqli_real_escape_string($mysqli,$_POST['reference']));
 
-    mysqli_query($mysqli,"INSERT INTO revenues SET revenue_date = '$date', revenue_amount = '$amount', revenue_currency_code = '$config_default_currency', revenue_payment_method = '$payment_method', revenue_reference = '$reference', revenue_description = '$description', revenue_created_at = NOW(), category_id = $category, account_id = $account, company_id = $session_company_id");
+    mysqli_query($mysqli,"INSERT INTO revenues SET revenue_date = '$date', revenue_amount = '$amount', revenue_currency_code = '$currency_code', revenue_payment_method = '$payment_method', revenue_reference = '$reference', revenue_description = '$description', revenue_created_at = NOW(), category_id = $category, account_id = $account, company_id = $session_company_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Revenue', log_action = 'Created', log_description = '$date - $amount', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
@@ -2982,13 +2983,14 @@ if(isset($_POST['edit_revenue'])){
     $revenue_id = intval($_POST['revenue_id']);
     $date = strip_tags(mysqli_real_escape_string($mysqli,$_POST['date']));
     $amount = floatval($_POST['amount']);
+    $currency_code = strip_tags(mysqli_real_escape_string($mysqli,$_POST['currency_code']));
     $account = intval($_POST['account']);
     $category = intval($_POST['category']);
     $payment_method = strip_tags(mysqli_real_escape_string($mysqli,$_POST['payment_method']));
     $description = strip_tags(mysqli_real_escape_string($mysqli,$_POST['description']));
     $reference = strip_tags(mysqli_real_escape_string($mysqli,$_POST['reference']));
 
-    mysqli_query($mysqli,"UPDATE revenues SET revenue_date = '$date', revenue_amount = '$amount', revenue_payment_method = '$payment_method', revenue_reference = '$reference', revenue_description = '$description', revenue_updated_at = NOW(), category_id = $category, account_id = $account WHERE revenue_id = $revenue_id AND company_id = $session_company_id");
+    mysqli_query($mysqli,"UPDATE revenues SET revenue_date = '$date', revenue_amount = '$amount', revenue_currency_code = '$currency_code', revenue_payment_method = '$payment_method', revenue_reference = '$reference', revenue_description = '$description', revenue_updated_at = NOW(), category_id = $category, account_id = $account WHERE revenue_id = $revenue_id AND company_id = $session_company_id");
 
     //Logging
     mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Revenue', log_action = 'Modified', log_description = '$revenue_id', log_created_at = NOW(), company_id = $session_company_id, user_id = $session_user_id");
diff --git a/revenues.php b/revenues.php
index c9861b2d..e2c863fb 100644
--- a/revenues.php
+++ b/revenues.php
@@ -122,6 +122,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $revenue_date = $row['revenue_date'];
             $revenue_payment_method = $row['revenue_payment_method'];
             $revenue_amount = $row['revenue_amount'];
+            $revenue_currency_code = $row['revenue_currency_code'];
             $revenue_created_at = $row['revenue_created_at'];
             $account_id = $row['account_id'];
             $account_name = $row['account_name'];