taxtank-core 0.33.80 → 0.33.82

package/fesm2022/taxtank-core.mjs

@@ -1026,6 +1026,7 @@ var ChartAccountsListEnum;
     ChartAccountsListEnum[ChartAccountsListEnum["FORESTRY_MANAGED_INVESTMENT_SCHEMES_DEDUCTION"] = 593] = "FORESTRY_MANAGED_INVESTMENT_SCHEMES_DEDUCTION";
     ChartAccountsListEnum[ChartAccountsListEnum["ASSESSABLE_AMOUNT_CAPPED_DEFINED_BENEFIT"] = 639] = "ASSESSABLE_AMOUNT_CAPPED_DEFINED_BENEFIT";
     ChartAccountsListEnum[ChartAccountsListEnum["CODE_A_SUPERANNUATION_INCOME_STREAMS_DEATH"] = 640] = "CODE_A_SUPERANNUATION_INCOME_STREAMS_DEATH";
+    ChartAccountsListEnum[ChartAccountsListEnum["PRE_TAX_DEDUCTIONS_OTHER"] = 645] = "PRE_TAX_DEDUCTIONS_OTHER";
     ChartAccountsListEnum[ChartAccountsListEnum["TRANSFER"] = 615] = "TRANSFER";
     ChartAccountsListEnum[ChartAccountsListEnum["PERSONAL_EXPENSES"] = 628] = "PERSONAL_EXPENSES";
     ChartAccountsListEnum[ChartAccountsListEnum["PERSONAL_INCOME"] = 630] = "PERSONAL_INCOME";
@@ -6429,7 +6430,9 @@ class Transaction extends Transaction$1 {
             return grossAmount;
         }
         // included transactions affect parent transaction amount and as a result grossAmount, skip to avoid double sum
-        const adjustments = new Collection(this.transactions).filter(transaction => ![ChartAccountsAdjustmentIncludedListEnum.FUNDS_OVER_ADJUSTMENT, ChartAccountsAdjustmentIncludedListEnum.LANDLORD_REIMBURSEMENT].includes(transaction.chartAccounts?.id));
+        const adjustments = new Collection(this.transactions)
+            // @TODO move to enum when there are other exceptions
+            .filter(transaction => !transaction.chartAccounts?.isAdjustmentIncluded() && transaction.chartAccounts?.id !== ChartAccountsListEnum.PRE_TAX_DEDUCTIONS_OTHER);
         const income = adjustments.filter(transaction => transaction.isIncome()).sumBy('amount');
         const expense = adjustments.filter(transaction => transaction.isExpense()).sumBy('amount', true);
         // all adjustments except property income increase grossIncome
@@ -11320,7 +11323,7 @@ const HTTP_ERROR_MESSAGES = {
     405: 'Method Not Allowed – The request method is not supported by the server. Please, connect with technical support',
     408: 'Request Timeout – The request took too long to complete. Please try again.',
     429: 'Too Many Requests – Too many requests were made. Please wait and try again later.',
-    500: 'Internal Server Error – The server encountered an error. Please try again later.',
+    500: 'Oops! Something went wrong. Please try again in a moment, or contact support if the issue keeps happening.',
     502: 'Bad Gateway – The server received an invalid response. Please try again.',
     503: 'Service Unavailable – The server is currently unavailable. Please try again later.',
     504: 'Gateway Timeout – The server timed out waiting for a response. Please try again.'
@@ -11535,7 +11538,12 @@ let RestService$1 = class RestService extends DataService {
     handleError(error) {
         if (error instanceof HttpErrorResponse) {
             if (this.useBackendError) {
-                this.toastService.error(error.error.map((error) => error.message).join(' '));
+                if (error.error.detail) {
+                    this.toastService.error(error.error.detail);
+                }
+                else {
+                    this.toastService.error(error.error.map((error) => error.message).join(' '));
+                }
             }
             else {
                 this.toastService.error(this.httpErrorMessages[error.status] || 'Unexpected error occurred.');
@@ -12830,6 +12838,7 @@ class ClientInviteService extends RestService$1 {
         this.endpointUri = 'client-invites';
         this.collectionClass = ClientInviteCollection;
         this.modelClass = ClientInvite;
+        this.useBackendError = true;
         this.listenEvents();
     }
     listenEvents() {
@@ -12886,16 +12895,7 @@ class ClientInviteService extends RestService$1 {
      * Send invitation from client to firm
      */
     inviteFirmByUser(invite) {
-        return super.post(invite, `${this.environment.apiV2}/firm-invites`)
-            .pipe(catchError((error) => {
-            if (error.error.email) {
-                this.toastService.error(error.error.email[0]);
-            }
-            else {
-                this.toastService.error(error.error);
-            }
-            return throwError(error);
-        }));
+        return super.post(invite, `${this.environment.apiV2}/firm-invites`);
     }
     listenNotifications() {
         this.eventDispatcherService.on(AppEventTypeEnum.NOTIFICATION_ADDED).subscribe((notification) => {
@@ -24336,15 +24336,15 @@ class WorkTransactionForm extends TransactionForm {
 class WorkIncomeForm extends WorkTransactionForm {
     constructor(transaction, registeredForGst, allocations) {
         super(transaction, registeredForGst, allocations, {
-            netAmount: new UntypedFormControl(transaction.netAmount, Validators.required),
             tax: new UntypedFormControl({
                 value: transaction.tax,
                 disabled: !transaction.chartAccounts || transaction.chartAccounts.isNRAS(),
             }, Validators.required),
             incomeSource: new UntypedFormControl(transaction.incomeSource, [Validators.required, autocompleteValidator()]),
         });
-        if (allocations.length) {
-            this.get('netAmount').disable();
+        // @TODO we use amount field as netAmount to avoid extra watcher for amount recalculation
+        if (transaction.id) {
+            this.get('amount').setValue(transaction.netAmount);
         }
         // forbid to edit some fields for allocated transaction
         if (allocations.length) {
@@ -24368,12 +24368,6 @@ class WorkIncomeForm extends WorkTransactionForm {
     listenEvents() {
         super.listenEvents();
         this.watchIncomeSource();
-        this.watchNetAmount();
-    }
-    watchNetAmount() {
-        this.get('netAmount').valueChanges.subscribe(() => {
-            this.get('amount').setValue(this.getAmount());
-        });
     }
     watchIncomeSource() {
         this.get('incomeSource').valueChanges.subscribe((incomeSource) => {
@@ -24414,10 +24408,13 @@ class WorkIncomeForm extends WorkTransactionForm {
      * ie bankTransaction=1000$ with 900$ salary and 100$ tips will create 2 transactions with 900$ and 100$
      */
     getAmount() {
-        return this.get('netAmount').value - new Collection(this.currentValue.transactions)
+        return this.get('amount').value - new Collection(this.currentValue.transactions)
             .filter((t) => t.chartAccounts?.isAdjustmentIncluded())
             .sumBy('amount');
     }
+    submit(data = {}) {
+        return super.submit(Object.assign(data, { amount: this.getAmount() }));
+    }
 }
 
 class WorkExpenseForm extends WorkTransactionForm {