alphebeticOrderFunds (#71)

ChurchApps · Nov 16, 2024 · 410bcd3 · 410bcd3
1 parent 76839b5
commit 410bcd3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/helpers/StripeHelper.ts b/src/helpers/StripeHelper.ts
@@ -32,7 +32,7 @@ export class StripeHelper {
       }],
       proration_behavior: 'none',
     };
-    //billing_cycle_anchor: (billing_cycle_anchor && billing_cycle_anchor > new Date().getTime()) ? billing_cycle_anchor / 1000 : "now",
+    // billing_cycle_anchor: (billing_cycle_anchor && billing_cycle_anchor > new Date().getTime()) ? billing_cycle_anchor / 1000 : "now",
     if (billing_cycle_anchor && billing_cycle_anchor > new Date().getTime()) subscriptionData.billing_cycle_anchor = billing_cycle_anchor / 1000;
     if (type === 'card') subscriptionData.default_payment_method = payment_method_id;
     if (type === 'bank') subscriptionData.default_source = payment_method_id;

diff --git a/src/repositories/FundRepository.ts b/src/repositories/FundRepository.ts
@@ -6,11 +6,11 @@ import { Fund } from "../models";
 export class FundRepository {
 
     public async getOrCreateGeneral(churchId: string) {
-        const data = await DB.queryOne("SELECT * FROM funds WHERE churchId=? AND name='General Fund' AND removed=0;", [churchId]);
+        const data = await DB.queryOne("SELECT * FROM funds WHERE churchId=? AND name='(General Fund)' AND removed=0;", [churchId]);
 
         if (data !== null) return this.convertToModel(churchId, data);
         else {
-            const fund: Fund = { churchId, name: "General Fund" };
+            const fund: Fund = { churchId, name: "(General Fund)" };
             await this.save(fund);
             return fund;
         }
@@ -44,7 +44,7 @@ export class FundRepository {
     }
 
     public loadAll(churchId: string) {
-        return DB.query("SELECT * FROM funds WHERE churchId=? AND removed=0;", [churchId]);
+        return DB.query("SELECT * FROM funds WHERE churchId=? AND removed=0 ORDER BY name;", [churchId]);
     }
 
     public convertToModel(churchId: string, data: any) {