taxtank-core 0.30.3 → 0.30.7

package/fesm2020/taxtank-core.mjs

@@ -16,7 +16,7 @@ import first from 'lodash/first';
 import last from 'lodash/last';
 import uniqBy from 'lodash/uniqBy';
 import differenceBy from 'lodash/differenceBy';
-import * as moment from 'moment';
+import moment from 'moment';
 import { DateRange } from 'moment-range';
 import intersection from 'lodash/intersection';
 import { Validators, UntypedFormGroup, UntypedFormControl, UntypedFormArray, FormArray, FormGroup, FormControl } from '@angular/forms';
@@ -33,7 +33,8 @@ import merge from 'lodash/merge';
 import { loadStripe } from '@stripe/stripe-js';
 import fromPairs from 'lodash/fromPairs';
 import { jsPDF } from 'jspdf';
-import * as html2pdf from 'html2pdf.js';
+import { applyPlugin } from 'jspdf-autotable';
+import html2pdf from 'html2pdf.js';
 import isEqual from 'lodash/isEqual';
 import * as xlsx from 'xlsx';
 import * as FileSaver from 'file-saver';
@@ -2802,13 +2803,12 @@ var ChartAccountValues = [
 	}
 ];
 
+/**
+ * @TODO vik performance problems, try https://angular.io/guide/dependency-injection-providers?
+ */
 const CHART_ACCOUNTS_VALUES = new CollectionDictionary(new Collection(ChartAccountValues.map((value) => plainToClass(ChartAccountsValue$1, value))), 'chartAccounts.id');
 
 class ChartAccounts extends ChartAccounts$1 {
-    constructor() {
-        super(...arguments);
-        this.values = [];
-    }
     /**
      * Return name as string
      */
@@ -2942,7 +2942,6 @@ class ChartAccounts extends ChartAccounts$1 {
      * Get chart accounts value for current financial year
      */
     getCurrentYearValue() {
-        console.log(this);
         return this.getValueByYear(new FinancialYear().year);
     }
     /**
@@ -3012,10 +3011,9 @@ __decorate([
 ], ChartAccounts.prototype, "metadata", void 0);
 __decorate([
     Type(() => ChartAccountsValue),
-    Transform(({ obj }) => {
-        console.log('Transform chart accounts values');
-        return CHART_ACCOUNTS_VALUES.get(obj.id).toArray();
-    }, { toClassOnly: true })
+    Transform(({ obj }) => CHART_ACCOUNTS_VALUES.get(obj.id).toArray(), { toClassOnly: true }),
+    Transform(() => null, { toPlainOnly: true }),
+    Expose()
 ], ChartAccounts.prototype, "values", void 0);
 
 class ChartAccountsDepreciation extends ChartAccountsDepreciation$1 {
@@ -8190,6 +8188,7 @@ const ENDPOINTS = {
     CLIENT_MOVEMENTS_CLOSE: new Endpoint('PUT', '\\/client-movements\\/\\d+\\/close'),
     CLIENT_MOVEMENTS_GET: new Endpoint('GET', '\\/client-movements'),
     CLIENT_MOVEMENTS_POST: new Endpoint('POST', '\\/client-movements'),
+    CLIENT_INCOME_TYPES_POST: new Endpoint('POST', '\\/client-income-types'),
     COUNTRIES_GET: new Endpoint('GET', '\\/countries'),
     CORELOGIC_TOKEN_GET: new Endpoint('GET', '/access\\/oauth\\/token.*$'),
     DEPRECIATIONS_OPENING_GET: new Endpoint('GET', '\\/depreciations\\/\\opening-balance\.\*'),
@@ -8505,9 +8504,9 @@ let RestService$1 = class RestService {
      */
     post(model) {
         this.handleAccessError('post');
-        return this.http.post(this.apiUrl, model)
+        return this.http.post(this.apiUrl, classToPlain(model))
             .pipe(map((response) => {
-            const result = this.createModelInstance(this.modelClass, response);
+            const result = this.createModelInstance(response);
             this.handleResponse([result], 'post');
             return result;
         }));
@@ -8517,9 +8516,9 @@ let RestService$1 = class RestService {
      */
     postBatch(models) {
         this.handleAccessError('postBatch');
-        return this.http.post(this.apiUrl, models)
+        return this.http.post(this.apiUrl, classToPlain(models))
             .pipe(map((response) => {
-            const result = response.map((item) => this.createModelInstance(this.modelClass, item));
+            const result = response.map((item) => this.createModelInstance(item));
             this.handleResponse(result, 'post');
             return result;
         }));
@@ -8529,9 +8528,9 @@ let RestService$1 = class RestService {
      */
     put(model) {
         this.handleAccessError('put');
-        return this.http.put(`${this.apiUrl}/${model.id}`, model)
+        return this.http.put(`${this.apiUrl}/${model.id}`, classToPlain(model))
             .pipe(map((response) => {
-            const result = this.createModelInstance(this.modelClass, response);
+            const result = this.createModelInstance(response);
             this.handleResponse([result], 'put');
             return result;
         }));
@@ -8541,9 +8540,9 @@ let RestService$1 = class RestService {
      */
     putBatch(models) {
         this.handleAccessError('putBatch');
-        return this.http.put(this.apiUrl, models)
+        return this.http.put(this.apiUrl, classToPlain(models))
             .pipe(map((response) => {
-            const result = response.map((item) => this.createModelInstance(this.modelClass, item));
+            const result = response.map((item) => this.createModelInstance(item));
             this.handleResponse(result, 'put');
             return result;
         }));
@@ -8563,7 +8562,7 @@ let RestService$1 = class RestService {
      */
     deleteBatch(models) {
         this.handleAccessError('deleteBatch');
-        return this.http.post(`${this.apiUrl}/delete`, models)
+        return this.http.post(`${this.apiUrl}/delete`, classToPlain(models))
             .pipe(map(() => {
             this.handleResponse(models, 'delete');
         }));
@@ -8580,7 +8579,7 @@ let RestService$1 = class RestService {
     fetch() {
         return this.http.get(this.apiUrl)
             .pipe(map((response) => this.isApiPlatform ? response['hydra:member'] : toArray(response)), map((response) => {
-            const items = response.map((item) => this.createModelInstance(this.modelClass, item));
+            const items = response.map((item) => this.createModelInstance(item));
             this.cache = this.createCollectionInstance(this.collectionClass, items);
             this.cacheSubject.next(this.cache);
             return this.cache;
@@ -8628,13 +8627,13 @@ let RestService$1 = class RestService {
         this.eventDispatcherService.dispatch2(new AppEvent2(eventName, items));
     }
     /**
+     * @TODO use excludeExtraneousValues when all models refactored (exposed all needed properties)
      * Create new instance of class
-     * @param model The class whose instance to be created
-     * @param plain Single object or array from which will be created model instance(s)
+     * @param model Single object or array from which will be created model instance(s)
      */
-    createModelInstance(model, plain) {
+    createModelInstance(model) {
         // excludePrefixes - class-transformer option is using to ignore hydra fields
-        return plainToClass(model, plain, { excludePrefixes: ['@'] });
+        return plainToClass(this.modelClass, model, { excludePrefixes: ['@'] });
     }
     createCollectionInstance(collectionClass, items) {
         return new collectionClass(items);
@@ -11910,12 +11909,12 @@ class RestService {
      * add new instance and update cache
      */
     create(data, shouldUpdateCache = true) {
-        return this.http.post(`${this.environment.apiV2}/${this.url}`, data)
+        return this.http.post(`${this.environment.apiV2}/${this.url}`, classToPlain(data))
             .pipe(map((newItem) => {
             if (!shouldUpdateCache) {
                 return null;
             }
-            const newInstance = this.createModelInstance(this.modelClass, newItem);
+            const newInstance = this.createModelInstance(newItem);
             if (this.cache) {
                 this.cache.push(newInstance);
                 this.updateCache();
@@ -11952,7 +11951,7 @@ class RestService {
     addBatch(models, queryParams = {}) {
         return this.http.post(`${this.environment.apiV2}/${this.url}`, classToPlain(models), queryParams)
             .pipe(map((newItems) => {
-            const newInstances = newItems.map((item) => this.createModelInstance(this.modelClass, item));
+            const newInstances = newItems.map((item) => this.createModelInstance(item));
             if (this.cache) {
                 this.cache.push(...newInstances);
                 this.updateCache();
@@ -11972,7 +11971,7 @@ class RestService {
     update(model, queryParams = {}) {
         return this.http.put(`${this.environment.apiV2}/${this.url}/${model['id']}`, classToPlain(model), queryParams)
             .pipe(map((updatedItem) => {
-            const updatedInstance = this.createModelInstance(this.modelClass, updatedItem);
+            const updatedInstance = this.createModelInstance(updatedItem);
             replace(this.cache, updatedInstance);
             this.updateCache();
             if (this.messageUpdated) {
@@ -11990,7 +11989,7 @@ class RestService {
     updateBatch(models, queryParams = {}) {
         return this.http.put(`${this.environment.apiV2}/${this.url}`, classToPlain(models), queryParams)
             .pipe(map((updatedItems) => {
-            const updatedInstances = updatedItems.map((item) => this.createModelInstance(this.modelClass, item));
+            const updatedInstances = updatedItems.map((item) => this.createModelInstance(item));
             updatedInstances.forEach((instance) => {
                 replace(this.cache, instance);
             });
@@ -12020,7 +12019,7 @@ class RestService {
      * @param models Class instances array for deleting
      */
     deleteBatch(models) {
-        return this.http.post(`${this.environment.apiV2}/${this.url}/delete`, models)
+        return this.http.post(`${this.environment.apiV2}/${this.url}/delete`, classToPlain(models))
             .pipe(map(() => {
             const ids = models.map((model) => model['id']);
             this.cache = this.cache.filter((item) => !ids.includes(item['id']));
@@ -12044,7 +12043,7 @@ class RestService {
             .pipe(map((response) => {
             const items = (this.isHydra ? response['hydra:member'] : response)
                 .map((item) => {
-                return this.createModelInstance(this.modelClass, item);
+                return this.createModelInstance(item);
             });
             this.cache = items;
             this.updateCache();
@@ -12058,22 +12057,12 @@ class RestService {
         this.cacheSubject.next(this.cache.slice());
     }
     /**
+     * @TODO use excludeExtraneousValues when all models refactored (exposed all needed properties)
      * Create new instance of class
-     * @param model The class for which you want to create an instance
-     * @param baseModel base model instance that we will use as constructor options
-     * @param data additional data
-     */
-    createModelInstance(model, baseModel, data = {}) {
-        return plainToClass(model, Object.assign(data, baseModel), { excludePrefixes: ['@'] });
-    }
-    /**
-     * @TODO Alex is there any point to pass model param instead of this.modelClass?
-     * Create new instance of class
-     * @param baseModel base model instance that we will use as constructor options
-     * @param data additional data
+     * @param model instance that we will use as constructor options
      */
-    createModelInstance2(baseModel, data = {}) {
-        return plainToClass(this.modelClass, Object.assign(data, baseModel), { excludePrefixes: ['@'] });
+    createModelInstance(model) {
+        return plainToClass(this.modelClass, model, { excludePrefixes: ['@'] });
     }
     /**
      * Method that call all listeners. Empty by default. Should be redefined by child services if required
@@ -12943,7 +12932,7 @@ class IncomeSourceService extends RestService {
     updateBatch(incomeSources, queryParams = {}) {
         return this.http.put(`${this.environment.apiV2}/${this.url}`, incomeSources, queryParams)
             .pipe(map((updatedItems) => {
-            const updatedInstances = updatedItems.map((item) => this.createModelInstance(this.modelClass, item));
+            const updatedInstances = updatedItems.map((item) => this.createModelInstance(item));
             updatedInstances.forEach((instance) => {
                 replace(this.cache, instance);
             });
@@ -14426,9 +14415,9 @@ class TransactionService extends RestService {
      */
     addBatch(transactions) {
         transactions = _.cloneDeep(transactions);
-        return this.http.post(`${this.environment.apiV2}/${this.url}`, transactions)
+        return this.http.post(`${this.environment.apiV2}/${this.url}`, classToPlain(transactions))
             .pipe(map((response) => {
-            const addedTransactions = response.map((item) => this.createModelInstance2(item));
+            const addedTransactions = response.map((item) => this.createModelInstance(item));
             transactions.forEach((transaction, index) => {
                 // @TODO backend: need to upload file in the same backend endpoint with transaction add/update
                 // check if passed receipt and upload file
@@ -14441,7 +14430,7 @@ class TransactionService extends RestService {
                 // add child transactions if exist
                 if (transaction.transactions.length) {
                     transaction.transactions.forEach((childTransaction) => {
-                        childTransaction.parentTransaction = this.createModelInstance2({ id: addedTransactions[index].id });
+                        childTransaction.parentTransaction = this.createModelInstance({ id: addedTransactions[index].id });
                     });
                     this.addBatch(transaction.transactions).subscribe();
                 }
@@ -14463,9 +14452,9 @@ class TransactionService extends RestService {
      * @param transaction Transaction instance for updating
      */
     update(transaction) {
-        return this.http.put(`${this.environment.apiV2}/${this.url}/${transaction.id}`, transaction)
+        return this.http.put(`${this.environment.apiV2}/${this.url}/${transaction.id}`, classToPlain(transaction))
             .pipe(map((response) => {
-            const updatedTransaction = this.createModelInstance2(response);
+            const updatedTransaction = this.createModelInstance(response);
             // @TODO need to upload file in the same backend endpoint with transaction add/update
             // check if passed new receipt and upload file
             if (transaction.file) {
@@ -14480,7 +14469,7 @@ class TransactionService extends RestService {
             if (transaction.transactions.length) {
                 // add parent transaction to child transactions
                 transaction.transactions.forEach((childTransaction) => {
-                    childTransaction.parentTransaction = this.createModelInstance2({ id: updatedTransaction.id });
+                    childTransaction.parentTransaction = this.createModelInstance({ id: updatedTransaction.id });
                 });
                 // separate child transactions by id existing to define add or update action.
                 const childTransactionsToUpdate = transaction.transactions.filter((t) => t.id);
@@ -14503,9 +14492,9 @@ class TransactionService extends RestService {
      * @param transactions list of transactions for updating
      */
     updateBatch(transactions) {
-        return this.http.put(`${this.environment.apiV2}/${this.url}`, transactions)
+        return this.http.put(`${this.environment.apiV2}/${this.url}`, classToPlain(transactions))
             .pipe(map((response) => {
-            const updatedTransactions = response.map((item) => this.createModelInstance2(item));
+            const updatedTransactions = response.map((item) => this.createModelInstance(item));
             updatedTransactions.forEach((updatedTransaction) => {
                 replace(this.cache, updatedTransaction);
             });
@@ -14543,6 +14532,7 @@ class TransactionService extends RestService {
         }));
     }
     /**
+     * @TODO Alex wrong place for this logic, move to model
      * calculate gross income amount based on transaction amount and taxes (fees)
      * @param transaction Transaction instance for calculation
      */
@@ -14620,9 +14610,6 @@ class TransactionService extends RestService {
             this.resetCache();
         });
     }
-    createModelInstance2(baseModel, data = {}) {
-        return super.createModelInstance2(baseModel, { values: [] });
-    }
 }
 TransactionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TransactionService, deps: [{ token: i1.HttpClient }, { token: EventDispatcherService }, { token: 'environment' }, { token: ToastService }, { token: TransactionReceiptService }], target: i0.ɵɵFactoryTarget.Injectable });
 TransactionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.5", ngImport: i0, type: TransactionService, providedIn: 'root' });
@@ -15431,6 +15418,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.5", ngImpor
                     args: ['environment']
                 }] }]; } });
 
+applyPlugin(jsPDF);
 /**
  * jspdf-autotable is a plugin, adding table functionality to jspdf object without new class,
  * we need to let ts knows about that by defining an interface and extending jsPdf class (to avoid ts error)
@@ -16193,6 +16181,7 @@ class AbstractForm extends UntypedFormGroup {
         this.unsaved = false;
         this.onSubmit = new EventEmitter();
         this.model = model || this.createModelInstance();
+        // @TODO Alex no idea how it works, since modelClass used in createModelInstance
         this.modelClass = this.model.constructor;
         this.initialValue = this.value;
         if (model && !model['id']) {
@@ -16233,6 +16222,10 @@ class AbstractForm extends UntypedFormGroup {
     markAsSaved() {
         this.unsaved = false;
     }
+    /**
+     * @TODO use excludeExtraneousValues when all models refactored (exposed all needed properties)
+     * @param data
+     */
     createModelInstance(data = {}) {
         return plainToClass(this.modelClass, data);
     }
@@ -17101,7 +17094,7 @@ class SoleInvoiceForm extends AbstractForm {
      */
     get currentValue() {
         const formRawValue = this.getRawValue();
-        return plainToClass(SoleInvoice, Object.assign({}, this.model, { ...formRawValue.commonData, items: formRawValue.items }));
+        return this.createModelInstance(Object.assign({}, this.model, { ...formRawValue.commonData, items: formRawValue.items }));
     }
 }
 
@@ -18492,7 +18485,6 @@ class TransactionForm extends TransactionBaseForm {
 
 class WorkTransactionForm extends TransactionForm {
     constructor(transaction, registeredForGst, allocations, controls = {}) {
-        console.log(transaction);
         super(transaction, registeredForGst, allocations, Object.assign(controls, {
             // additional data related to work (like tax instalments)
             metadata: new FormArray((transaction.metadata || []).map((transactionMetadata) => {
@@ -18610,6 +18602,13 @@ class WorkIncomeForm extends WorkTransactionForm {
 }
 
 class WorkExpenseForm extends WorkTransactionForm {
+    constructor(transaction, registeredForGst, allocations, controls = {}) {
+        super(transaction, registeredForGst, allocations, controls);
+        // amount set automatically for chartAccounts with hours metadata
+        if (transaction.getMetadataFieldValue(ChartAccountsMetadataListEnum.HOURS)) {
+            this.get('amount').disable();
+        }
+    }
     listenEvents() {
         this.watchChartAccountsMetadata();
     }
@@ -18622,7 +18621,7 @@ class WorkExpenseForm extends WorkTransactionForm {
             // for home office hours expense amount is a fixed rate per hour
             this.get('amount').reset();
             this.get('amount').disable();
-            this.get('amount').setValue(this.get('chartAccounts').value.getCurrentYearValue().value * +hoursMetadata.value);
+            this.get('amount').setValue((this.get('chartAccounts').value.getCurrentYearValue().value * +hoursMetadata.value).toFixed(2));
         });
     }
 }