taxtank-core 0.28.59 → 0.28.61

package/bundles/taxtank-core.umd.js

@@ -4455,7 +4455,7 @@
         classTransformer.Type(function () { return BankTransaction; })
     ], Depreciation.prototype, "bankTransaction", void 0);
 
-    // @TODO refactor with baseModel in constructor
+    // @TODO Alex: refactor: move here allocations methods, netAmount = amount, grossAmount calculation, remove unused methods, etc.
     var Transaction = /** @class */ (function (_super) {
         __extends(Transaction, _super);
         function Transaction() {
@@ -4531,6 +4531,7 @@
         };
         /**
          * Get net amount (clean amount after all deductions)
+         * @TODO Alex: remove, this.amount should be netAmount actually
          */
         Transaction.prototype.getNetAmount = function () {
             // @TODO fix hack while transactions refactoring (use class-transformer)
@@ -4658,20 +4659,31 @@
          * Check if transaction is completely allocated
          */
         Transaction.prototype.isAllocated = function (allocations) {
-            return this.getNetAmount() === this.getAllocatedAmount(allocations);
+            return this.grossAmount === this.getAllocatedAmount(allocations);
         };
         /**
          * Get transaction allocated amount
          */
         Transaction.prototype.getAllocatedAmount = function (allocations) {
-            return allocations.getByTransactionsIds([this.id]).amount;
+            return allocations.filterBy('transaction.id', this.id).sumBy('amount');
         };
         /**
          * Get transaction unallocated amount
          */
         Transaction.prototype.getUnallocatedAmount = function (allocations) {
-            return this.getNetAmount() - this.getAllocatedAmount(allocations);
+            return this.grossAmount - this.getAllocatedAmount(allocations);
         };
+        Object.defineProperty(Transaction.prototype, "grossAmount", {
+            /**
+             * Total transaction amount including taxes and other additional amounts
+             * @TODO Alex: refactor everything related to amounts
+             */
+            get: function () {
+                return this.isIncome() ? this.getGrossIncome() : this.amount;
+            },
+            enumerable: false,
+            configurable: true
+        });
         return Transaction;
     }(Transaction$1));
     __decorate([
@@ -7729,7 +7741,9 @@
          * Difference between allocated amount and total amount
          */
         TransactionCollection.prototype.getUnallocatedAmount = function (allocations) {
-            return +(this.amount - allocations.getByTransactionsIds(this.getIds()).amount).toFixed(2);
+            return this.items.reduce(function (sum, transaction) {
+                return sum + transaction.getUnallocatedAmount(allocations.filterBy('transaction.id', transaction.id));
+            }, 0);
         };
         Object.defineProperty(TransactionCollection.prototype, "cashPosition", {
             /**
@@ -15256,6 +15270,19 @@
         ClientInviteService.prototype.listenEvents = function () {
             this.listenNotifications();
         };
+        /**
+         * Get clients from the different endpoints depending on whether the current user is a client or an employee
+         */
+        ClientInviteService.prototype.get = function (fromEmployee) {
+            var _this = this;
+            this.http.get(this.environment.apiV2 + "/" + this.url + "/" + (fromEmployee ? 'all' : ''))
+                .pipe(operators.map(function (clientInvitesBase) { return classTransformer.plainToClass(ClientInvite, clientInvitesBase); }))
+                .subscribe(function (clientInvites) {
+                _this.cache = clientInvites;
+                _this.updateCache();
+            });
+            return this.cacheSubject.asObservable();
+        };
         /**
          * Import employees for firm from CSV file
          * @param file
@@ -17604,7 +17631,7 @@
         } });
 
     /**
-     * @TODO move to collection
+     * @TODO Alex: refactor, move methods to collections and models, remove this service
      */
     var TransactionCalculationService = /** @class */ (function () {
         function TransactionCalculationService() {
@@ -17619,16 +17646,15 @@
          * Check if transaction is allocated
          */
         TransactionCalculationService.prototype.isAllocated = function (transaction, allocations) {
-            return transaction.getNetAmount() === this.getAllocatedAmount(new TransactionCollection([transaction]), allocations);
+            return transaction.isAllocated(allocations);
         };
         /**
          * Get collection of allocated transactions
          * @TODO Alex: consider to move to collection
          */
         TransactionCalculationService.prototype.getAllocatedTransactions = function (transactions, allocations) {
-            var _this = this;
             return new TransactionCollection(transactions.items.filter(function (transaction) {
-                return _this.isAllocated(transaction, allocations);
+                return transaction.isAllocated(allocations);
             }));
         };
         /**
@@ -17636,9 +17662,8 @@
          * @TODO Alex: consider to move to collection
          */
         TransactionCalculationService.prototype.getUnallocatedTransactions = function (transactions, allocations) {
-            var _this = this;
             return new TransactionCollection(transactions.items.filter(function (transaction) {
-                return !_this.isAllocated(transaction, allocations);
+                return !transaction.isAllocated(allocations);
             }));
         };
         TransactionCalculationService.prototype.getUnallocatedInvoices = function (invoices, allocations) {