Merge pull request #27 from pnagurny/feature/business-accounts

default business accounts

src/app/core/account.service.ts

@@ -23,6 +23,7 @@ import 'rxjs/add/operator/filter';
 import 'rxjs/add/operator/debounceTime';
 import 'rxjs/add/operator/take';
 import { Util } from '../shared/util';
+import { businessAccounts } from '../fixtures/businessAccounts';
 import { personalAccounts } from '../fixtures/personalAccounts';
 import { ErrorObservable } from 'rxjs/observable/ErrorObservable';
 
@@ -62,7 +63,7 @@ export class AccountService {
 
         if(options.createDefaultAccounts) {
           this.getAccountTree().take(1).switchMap(tree => {
-            return this.createDefaultAccounts(tree);
+            return this.createDefaultAccounts(tree, options.createDefaultAccounts);
           }).subscribe(accounts => {
             log.debug('Created default accounts');
             log.debug(accounts);
@@ -590,7 +591,7 @@ export class AccountService {
     return this.apiService.deleteAccount(id);
   }
 
-  createDefaultAccounts(tree: AccountTree): Observable<any> {
+  createDefaultAccounts(tree: AccountTree, type: string): Observable<any> {
     let assetAccount = tree.getAccountByName('Assets', 1);
     let equityAccount = tree.getAccountByName('Equity', 1);
     let liabilityAccount = tree.getAccountByName('Liabilities', 1);
@@ -608,10 +609,10 @@ export class AccountService {
       'Expenses': [expenseAccount.id, true]
     };
 
-    let newAccounts;
+    let newAccounts = type === 'business' ? businessAccounts : personalAccounts;
 
     try {
-      newAccounts = personalAccounts.map(data => {
+      newAccounts = newAccounts.map(data => {
         let id = Util.newGuid();
         let [parentId, debitBalance] = accountNameMap[data.parent];
 

src/app/core/org.service.ts

@@ -37,7 +37,7 @@ export class OrgService {
     return this.apiService.getOrgs();
   }
 
-  newOrg(org: Org, createDefaultAccounts: boolean): Observable<Org> {
+  newOrg(org: Org, createDefaultAccounts: string): Observable<Org> {
     let sessionOptions = new SessionOptions({
       createDefaultAccounts: createDefaultAccounts
     });

src/app/fixtures/businessAccounts.ts

@@ -0,0 +1,123 @@
+export const businessAccounts: any =
+[
+  {
+    "name": "Checking",
+    "parent": "Assets"
+  },
+  {
+    "name": "Petty Cash",
+    "parent": "Assets"
+  },
+  {
+    "name": "Accounting",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Accounts Receivable",
+    "parent": "Assets"
+  },
+  {
+    "name": "Capital",
+    "parent": "Equity"
+  },
+  {
+    "name": "Drawing",
+    "parent": "Equity"
+  },
+  {
+    "name": "Accounts Payable",
+    "parent": "Liabilities"
+  },
+  {
+    "name": "Credit Card",
+    "parent": "Liabilities"
+  },
+  {
+    "name": "Auto",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Bank Fees",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Computer Equipment",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Cost of Goods Sold",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Dining / Entertainment",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Internet",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Legal",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Licenses / Fees",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Marketing",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Miscellaneous",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Office Furniture",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Office Rent",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Office Supplies",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Payment Processing",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Payroll",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Phone",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Shipping",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Software",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Tax Preparation",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Travel",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Web Domains / Hosting",
+    "parent": "Expenses"
+  },
+  {
+    "name": "Sales",
+    "parent": "Income"
+  }
+];

src/app/org/neworg.html

@@ -41,9 +41,20 @@
             </option>
           </select>
       </div>
+    <p>Create default accounts (can be customized later)</p>
     <div class="form-group">
-      <label for="createDefaultAccounts">Create default accounts<br>(can be customized later)</label>
+      <div class="form-check">
-      <input formControlName="createDefaultAccounts" id="createDefaultAccounts" type="checkbox" class="form-control" />
+        <input formControlName="createDefaultAccounts" id="createDefaultAccounts1" type="radio" class="form-check-input" value="" />
+        <label for="createDefaultAccounts1" class="form-check-label">None</label>
+      </div>
+      <div class="form-check">
+        <input formControlName="createDefaultAccounts" id="createDefaultAccounts2" type="radio" class="form-check-input" value="business" />
+        <label for="createDefaultAccounts2" class="form-check-label">Business accounts</label>
+      </div>
+      <div class="form-check">
+        <input formControlName="createDefaultAccounts" id="createDefaultAccounts3" type="radio" class="form-check-input" value="personal" />
+        <label for="createDefaultAccounts2" class="form-check-label">Personal accounts</label>
+      </div>
     </div>
     <p *ngIf="error" class="error">
       {{error.message}}

src/app/org/neworg.ts

@@ -39,7 +39,7 @@ export class NewOrgPage {
       'currency': ['USD', Validators.required],
       'precision': [2, Validators.required],
       'timezone': [this.defaultTz, Validators.required],
-      'createDefaultAccounts': [true, Validators.required]
+      'createDefaultAccounts': ['business']
     });
 
     this.joinOrgForm = fb.group({

src/app/org/org.html

@@ -148,10 +148,19 @@
         </select>
       </div>
     </div>
-    <div class="form-group row">
+    <p>Create default accounts (can be customized later)</p>
-      <label for="createDefaultAccounts" class="col-sm-3 col-form-label">Create default accounts<br>(can be customized later)</label>
+    <div class="form-group">
-      <div class="col-sm-9">
+      <div class="form-check">
-        <input formControlName="createDefaultAccounts" id="createDefaultAccounts" type="checkbox" class="form-control" />
+        <input formControlName="createDefaultAccounts" id="createDefaultAccounts1" type="radio" class="form-check-input" value="" />
+        <label for="createDefaultAccounts1" class="form-check-label">None</label>
+      </div>
+      <div class="form-check">
+        <input formControlName="createDefaultAccounts" id="createDefaultAccounts2" type="radio" class="form-check-input" value="business" />
+        <label for="createDefaultAccounts2" class="form-check-label">Business accounts</label>
+      </div>
+      <div class="form-check">
+        <input formControlName="createDefaultAccounts" id="createDefaultAccounts3" type="radio" class="form-check-input" value="personal" />
+        <label for="createDefaultAccounts2" class="form-check-label">Personal accounts</label>
       </div>
     </div>
     <p *ngIf="newOrgError" class="error">{{newOrgError.message}}</p>

src/app/org/org.ts

@@ -72,7 +72,7 @@ export class OrgPage {
       'currency': ['', Validators.required],
       'precision': [null, Validators.required],
       'timezone': [this.defaultTz, Validators.required],
-      'createDefaultAccounts': [true, Validators.required]
+      'createDefaultAccounts': ['']
     });
   }
 
@@ -95,7 +95,7 @@ export class OrgPage {
         currency: this.currentOrg.currency,
         precision: this.currentOrg.precision,
         timezone: this.defaultTz,
-        createDefaultAccounts: true
+        createDefaultAccounts: ''
       }
     );
 

src/app/shared/session-options.ts

@@ -1,5 +1,5 @@
 export class SessionOptions {
-  createDefaultAccounts: boolean;
+  createDefaultAccounts: string;
   constructor(options: any = {}) {
     this.createDefaultAccounts = options.createDefaultAccounts;
   }