From 3be4ad66174236eb883a6450ac60e545f4ac31f6 Mon Sep 17 00:00:00 2001
From: dan <ofbadmin@ofbbutte.com>
Date: Sat, 23 Nov 2019 11:56:21 -0700
Subject: [PATCH] Fix errors

---
 .../add-transaction-popup.component.html                   | 5 ++---
 Server/src/database/transactions.js                        | 7 ++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Client/src/app/components/add-transaction-page/add-transaction-popup/add-transaction-popup.component.html b/Client/src/app/components/add-transaction-page/add-transaction-popup/add-transaction-popup.component.html
index 0937392..12d5625 100644
--- a/Client/src/app/components/add-transaction-page/add-transaction-popup/add-transaction-popup.component.html
+++ b/Client/src/app/components/add-transaction-page/add-transaction-popup/add-transaction-popup.component.html
@@ -41,9 +41,8 @@
       <input matInput placeholder="Description" type="text" formControlName="description"  >
     </mat-form-field>
     <br>
-    <mat-form-field class="w-100">
-      <mat-checkbox formControlName="goodsOrServices">Goods or Services Received</mat-checkbox>
-    </mat-form-field>
+    <mat-checkbox formControlName="goodsOrServices">Goods Or Services Received?</mat-checkbox>
+    <br>
     <br>
     <button mat-raised-button class="m-5" type="button" (click)="cancel()" >Cancel</button>
     <button mat-raised-button class="m-5" type="submit" [disabled]="!form.valid || saveBtnDisabled">{{ saveBtnTxt }}</button>
diff --git a/Server/src/database/transactions.js b/Server/src/database/transactions.js
index eecbc77..bcc4d14 100644
--- a/Server/src/database/transactions.js
+++ b/Server/src/database/transactions.js
@@ -33,7 +33,7 @@ exports.addArray = async function(transactions) {
     try {
         for(let i = 0; i < transactions.length; i++) {
             const t = transactions[i];
-            const newTrans = getTransaction(t.date, t.typeId, t.checkNumber, t.contributorId, t.fundId, t.description, t.amount, t.taxYear);
+            const newTrans = getTransaction(t.date, t.typeId, t.checkNumber, t.contributorId, t.fundId, t.description, t.amount, t.taxYear, t.goodsOrServices);
             const result = await conn.nonQuery('INSERT INTO Transactions Set ?', newTrans);
             results.push(result);
         }
@@ -44,7 +44,7 @@ exports.addArray = async function(transactions) {
     return results;
 }
 
-function getTransaction(date, typeId, checkNumber, contributorId, fundId, description, amount, taxYear) {
+function getTransaction(date, typeId, checkNumber, contributorId, fundId, description, amount, taxYear, goodsOrServices) {
     const newTrans = {
         Date: date,
         TypeId: typeId,
@@ -53,7 +53,8 @@ function getTransaction(date, typeId, checkNumber, contributorId, fundId, descri
         FundId: fundId,
         Description: description,
         Amount: amount,
-        TaxYear: taxYear
+        TaxYear: taxYear,
+        GoodsOrServices: goodsOrServices
     };
     return newTrans;
 }