taxtank-core 0.16.7 → 0.16.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/taxtank-core.umd.js +40 -19
- package/bundles/taxtank-core.umd.js.map +1 -1
- package/esm2015/lib/db/Enums/income-source-type-list-salary.enum.js +1 -1
- package/esm2015/lib/db/Enums/income-source-type-list-sole.enum.js +5 -0
- package/esm2015/lib/db/Enums/income-source-type-list-work.enum.js +1 -1
- package/esm2015/lib/db/Enums/income-source-type.enum.js +1 -1
- package/esm2015/lib/models/account-setup/account-setup-items.const.js +2 -2
- package/esm2015/lib/services/account-setup/account-setup.service.js +31 -17
- package/esm2015/lib/services/http/firm/client-income/client-income-types.service.js +3 -1
- package/esm2015/lib/services/http/rest/rest.service.js +2 -1
- package/esm2015/public-api.js +2 -2
- package/fesm2015/taxtank-core.js +38 -17
- package/fesm2015/taxtank-core.js.map +1 -1
- package/lib/db/Enums/income-source-type-list-sole.enum.d.ts +3 -0
- package/package.json +1 -1
- package/public-api.d.ts +1 -1
package/fesm2015/taxtank-core.js
CHANGED
|
@@ -4,7 +4,7 @@ import * as i1$1 from '@angular/common';
|
|
|
4
4
|
import { CommonModule } from '@angular/common';
|
|
5
5
|
import * as i1 from '@angular/common/http';
|
|
6
6
|
import { HttpParams, HttpErrorResponse, HTTP_INTERCEPTORS } from '@angular/common/http';
|
|
7
|
-
import { ReplaySubject, BehaviorSubject, throwError, Subject, combineLatest, Observable, forkJoin } from 'rxjs';
|
|
7
|
+
import { ReplaySubject, BehaviorSubject, throwError, Subject, combineLatest, of, Observable, forkJoin } from 'rxjs';
|
|
8
8
|
import { map, catchError, filter, take, switchMap, finalize, mergeMap } from 'rxjs/operators';
|
|
9
9
|
import { plainToClass, Type, Exclude, Transform, Expose, classToPlain } from 'class-transformer';
|
|
10
10
|
import { JwtHelperService } from '@auth0/angular-jwt';
|
|
@@ -4602,6 +4602,11 @@ var DepreciationWriteOffAmountEnum;
|
|
|
4602
4602
|
DepreciationWriteOffAmountEnum[DepreciationWriteOffAmountEnum["BORROWING_EXPENSES"] = 100] = "BORROWING_EXPENSES";
|
|
4603
4603
|
})(DepreciationWriteOffAmountEnum || (DepreciationWriteOffAmountEnum = {}));
|
|
4604
4604
|
|
|
4605
|
+
var IncomeSourceTypeListSoleEnum;
|
|
4606
|
+
(function (IncomeSourceTypeListSoleEnum) {
|
|
4607
|
+
IncomeSourceTypeListSoleEnum[IncomeSourceTypeListSoleEnum["SOLE_TRADER"] = 7] = "SOLE_TRADER";
|
|
4608
|
+
})(IncomeSourceTypeListSoleEnum || (IncomeSourceTypeListSoleEnum = {}));
|
|
4609
|
+
|
|
4605
4610
|
var InviteStatusEnum;
|
|
4606
4611
|
(function (InviteStatusEnum) {
|
|
4607
4612
|
InviteStatusEnum[InviteStatusEnum["PENDING"] = 1] = "PENDING";
|
|
@@ -6916,7 +6921,7 @@ const ACCOUNT_SETUP_ITEMS = {
|
|
|
6916
6921
|
clientIncomeTypes: ['sole']
|
|
6917
6922
|
}),
|
|
6918
6923
|
[AccountSetupItemsEnum.TRANSACTION]: plainToClass(AccountSetupItem, {
|
|
6919
|
-
title: '
|
|
6924
|
+
title: 'Allocate transactions',
|
|
6920
6925
|
description: 'Select one or multiple transactions, the category from the dropdown and attach your receipt. It’s that simple to capture every possible deduction, and keep organised all throughout the year.',
|
|
6921
6926
|
url: '/client/bank-feeds',
|
|
6922
6927
|
urlFragment: 'allocationProductTour',
|
|
@@ -6934,6 +6939,8 @@ class ClientIncomeTypesService {
|
|
|
6934
6939
|
}
|
|
6935
6940
|
get() {
|
|
6936
6941
|
if (!this.cache) {
|
|
6942
|
+
// @TODO alex fix everywhere, start with rest service
|
|
6943
|
+
this.cache = plainToClass(ClientIncomeTypes, {});
|
|
6937
6944
|
this.http.get(`${this.environment.apiV2}/client-income-types`)
|
|
6938
6945
|
.pipe(map((response) => {
|
|
6939
6946
|
return plainToClass(ClientIncomeTypes, response['hydra:member'][0], { excludePrefixes: ['@'] });
|
|
@@ -7066,6 +7073,7 @@ class RestService {
|
|
|
7066
7073
|
*/
|
|
7067
7074
|
get() {
|
|
7068
7075
|
if (!this.cache) {
|
|
7076
|
+
this.cache = [];
|
|
7069
7077
|
this.fetch().subscribe();
|
|
7070
7078
|
}
|
|
7071
7079
|
return this.cacheSubject.asObservable();
|
|
@@ -7991,12 +7999,22 @@ class AccountSetupService {
|
|
|
7991
7999
|
*/
|
|
7992
8000
|
get() {
|
|
7993
8001
|
if (!this.cache) {
|
|
7994
|
-
this.
|
|
8002
|
+
this.cache = new AccountSetupItemCollection([]);
|
|
8003
|
+
this.clientIncomeTypesService.get()
|
|
8004
|
+
.pipe(
|
|
8005
|
+
// we need account setup only when user selected at least one income type
|
|
8006
|
+
filter((incomeTypes) => !!incomeTypes.length), mergeMap((incomeTypes) => {
|
|
7995
8007
|
this.clientIncomeTypesId = incomeTypes.id;
|
|
7996
|
-
|
|
7997
|
-
|
|
7998
|
-
|
|
7999
|
-
|
|
8008
|
+
return this.createBatch(incomeTypes);
|
|
8009
|
+
}))
|
|
8010
|
+
.subscribe((items) => {
|
|
8011
|
+
switch (true) {
|
|
8012
|
+
case !this.cache:
|
|
8013
|
+
case this.cache.getBy('isCompleted', true).length !== items.getBy('isCompleted', true).length:
|
|
8014
|
+
case this.cache.length !== items.length:
|
|
8015
|
+
this.cache = cloneDeep$1(items);
|
|
8016
|
+
this.cacheSubject.next(this.cache);
|
|
8017
|
+
}
|
|
8000
8018
|
});
|
|
8001
8019
|
}
|
|
8002
8020
|
return this.cacheSubject.asObservable();
|
|
@@ -8016,6 +8034,9 @@ class AccountSetupService {
|
|
|
8016
8034
|
if (result.length) {
|
|
8017
8035
|
item.isCompleted = true;
|
|
8018
8036
|
}
|
|
8037
|
+
else {
|
|
8038
|
+
item.isCompleted = false;
|
|
8039
|
+
}
|
|
8019
8040
|
return item;
|
|
8020
8041
|
}));
|
|
8021
8042
|
}
|
|
@@ -8027,7 +8048,7 @@ class AccountSetupService {
|
|
|
8027
8048
|
const batch = [];
|
|
8028
8049
|
// Salary item is completed when user added salary income source
|
|
8029
8050
|
if (incomeTypes.salary) {
|
|
8030
|
-
batch.push(this.create(AccountSetupItemsEnum.SALARY, this.getIncomeSourcesByType(IncomeSourceTypeEnum.
|
|
8051
|
+
batch.push(this.create(AccountSetupItemsEnum.SALARY, this.getIncomeSourcesByType(IncomeSourceTypeEnum.WORK)));
|
|
8031
8052
|
}
|
|
8032
8053
|
// Other income item is completed when user added at least one other income source
|
|
8033
8054
|
if (incomeTypes.dividends || incomeTypes.other) {
|
|
@@ -8053,7 +8074,7 @@ class AccountSetupService {
|
|
|
8053
8074
|
// }
|
|
8054
8075
|
// Allocation item is completed when user added at least one transaction allocation
|
|
8055
8076
|
batch.push(this.create(AccountSetupItemsEnum.TRANSACTION, this.transactionAllocationService.get()));
|
|
8056
|
-
return batch;
|
|
8077
|
+
return combineLatest(batch).pipe(map((items) => new AccountSetupItemCollection(items)));
|
|
8057
8078
|
}
|
|
8058
8079
|
/**
|
|
8059
8080
|
* @TODO work with collection when services refactored
|
|
@@ -8067,14 +8088,14 @@ class AccountSetupService {
|
|
|
8067
8088
|
* Show logbook item when user has at least 1 vehicle transaction
|
|
8068
8089
|
*/
|
|
8069
8090
|
getLogbookItem() {
|
|
8070
|
-
return
|
|
8071
|
-
|
|
8072
|
-
|
|
8073
|
-
|
|
8074
|
-
if (
|
|
8075
|
-
return
|
|
8091
|
+
return this.transactionService.get()
|
|
8092
|
+
.pipe(
|
|
8093
|
+
// @TODO Alex: remove map when services start work with collections
|
|
8094
|
+
map((transactions) => new TransactionCollection(transactions)), mergeMap((transactions) => {
|
|
8095
|
+
if (transactions.getVehicleTransactions().length) {
|
|
8096
|
+
return this.create(AccountSetupItemsEnum.WORK_LOGBOOK, this.vehicleClaimService.get());
|
|
8076
8097
|
}
|
|
8077
|
-
return null;
|
|
8098
|
+
return of(null);
|
|
8078
8099
|
}));
|
|
8079
8100
|
}
|
|
8080
8101
|
}
|
|
@@ -11783,5 +11804,5 @@ class VehicleClaimForm extends AbstractForm {
|
|
|
11783
11804
|
* Generated bundle index. Do not edit.
|
|
11784
11805
|
*/
|
|
11785
11806
|
|
|
11786
|
-
export { AbstractForm, AccountSetupItem, AccountSetupItemCollection, AccountSetupService, Address, AddressService, AddressTypeEnum, AlphabetColorsEnum, AppEvent, AppEventTypeEnum, AssetEntityTypeEnum, AssetTypeEnum, AssetsService, AuthService, BANK_ACCOUNT_TYPES, Bank, BankAccount, BankAccountCalculationService, BankAccountChartData, BankAccountCollection, BankAccountProperty, BankAccountService, BankAccountStatusEnum, BankAccountTypeEnum, BankConnection, BankConnectionService, BankConnectionStatusEnum, BankService, BankTransaction, BankTransactionCalculationService, BankTransactionChartData, BankTransactionCollection, BankTransactionService, BankTransactionSummaryFieldsEnum, BankTransactionTypeEnum, BasiqConfig, BasiqJob, BasiqService, BasiqToken, BorrowingExpense, BorrowingExpenseLoan, BorrowingExpenseService, CAPITAL_COSTS_ITEMS, CHART_ACCOUNTS_CATEGORIES, CalculationFormItem, CalculationFormTypeEnum, ChartAccounts, ChartAccountsCategoryEnum, ChartAccountsDepreciation, ChartAccountsDepreciationService, ChartAccountsEtpEnum, ChartAccountsHeading, ChartAccountsHeadingListEnum, ChartAccountsHeadingTaxDeductibleEnum, ChartAccountsHeadingTaxableEnum, ChartAccountsHeadingVehicleListEnum, ChartAccountsListEnum, ChartAccountsMetadata, ChartAccountsMetadataListEnum, ChartAccountsMetadataTypeEnum, ChartAccountsService, ChartAccountsTaxLabelsEnum, ChartAccountsTypeEnum, ChartAccountsValue, ChartData, ChartSerie, Chat, ChatService, ChatStatusEnum, ChatViewTypeEnum, ClientCollection, ClientDetails, ClientDetailsMedicareExemptionEnum, ClientDetailsWorkDepreciationCalculationEnum, ClientDetailsWorkingHolidayMakerEnum, ClientIncomeTypes, ClientIncomeTypesForm, ClientIncomeTypesService, ClientInvite, ClientInviteService, ClientInviteStatusEnum, ClientInviteTypeEnum, ClientMovement, ClientMovementCollection, ClientMovementService, ClientPortfolioChartData, ClientPortfolioReport, ClientPortfolioReportCollection, ClientPortfolioReportService, Collection, CollectionDictionary, CorelogicService, CorelogicSuggestion, Country, DEFAULT_VEHICLE_EXPENSE, DEPRECIATION_GROUPS, DOCUMENT_FILE_TYPES, DataTableService, Depreciation, DepreciationCalculationEnum, DepreciationCalculationPercentEnum, DepreciationCapitalProject, DepreciationCapitalProjectService, DepreciationCollection, DepreciationForecast, DepreciationForecastCollection, DepreciationGroup, DepreciationGroupEnum, DepreciationGroupItem, DepreciationLvpAssetTypeEnum, DepreciationLvpReportItem, DepreciationLvpReportItemCollection, DepreciationReceipt, DepreciationReportItem, DepreciationReportItemCollection, DepreciationService, DepreciationTypeEnum, DepreciationWriteOffAmountEnum, Document, DocumentApiUrlPrefixEnum, DocumentFolder, DocumentFolderService, ENDPOINTS, EXPORT_DATA_TABLE_COLUMNS, EmployeeCollection, EmployeeDetails, EmployeeInvite, EmployeeInviteService, EmployeeService, Endpoint, EquityPositionChartService, EventDispatcherService, ExportDataTable, ExportFormatEnum, FinancialYear, Firm, FirmService, FirmTypeEnum, HeaderTitleService, IconsFileEnum, IncomeAmountTypeEnum, IncomePosition, IncomeSource, IncomeSourceChartData, IncomeSourceCollection, IncomeSourceForecast, IncomeSourceForecastService, IncomeSourceService, IncomeSourceType, IncomeSourceTypeEnum, IncomeSourceTypeListOtherEnum,
|
|
11807
|
+
export { AbstractForm, AccountSetupItem, AccountSetupItemCollection, AccountSetupService, Address, AddressService, AddressTypeEnum, AlphabetColorsEnum, AppEvent, AppEventTypeEnum, AssetEntityTypeEnum, AssetTypeEnum, AssetsService, AuthService, BANK_ACCOUNT_TYPES, Bank, BankAccount, BankAccountCalculationService, BankAccountChartData, BankAccountCollection, BankAccountProperty, BankAccountService, BankAccountStatusEnum, BankAccountTypeEnum, BankConnection, BankConnectionService, BankConnectionStatusEnum, BankService, BankTransaction, BankTransactionCalculationService, BankTransactionChartData, BankTransactionCollection, BankTransactionService, BankTransactionSummaryFieldsEnum, BankTransactionTypeEnum, BasiqConfig, BasiqJob, BasiqService, BasiqToken, BorrowingExpense, BorrowingExpenseLoan, BorrowingExpenseService, CAPITAL_COSTS_ITEMS, CHART_ACCOUNTS_CATEGORIES, CalculationFormItem, CalculationFormTypeEnum, ChartAccounts, ChartAccountsCategoryEnum, ChartAccountsDepreciation, ChartAccountsDepreciationService, ChartAccountsEtpEnum, ChartAccountsHeading, ChartAccountsHeadingListEnum, ChartAccountsHeadingTaxDeductibleEnum, ChartAccountsHeadingTaxableEnum, ChartAccountsHeadingVehicleListEnum, ChartAccountsListEnum, ChartAccountsMetadata, ChartAccountsMetadataListEnum, ChartAccountsMetadataTypeEnum, ChartAccountsService, ChartAccountsTaxLabelsEnum, ChartAccountsTypeEnum, ChartAccountsValue, ChartData, ChartSerie, Chat, ChatService, ChatStatusEnum, ChatViewTypeEnum, ClientCollection, ClientDetails, ClientDetailsMedicareExemptionEnum, ClientDetailsWorkDepreciationCalculationEnum, ClientDetailsWorkingHolidayMakerEnum, ClientIncomeTypes, ClientIncomeTypesForm, ClientIncomeTypesService, ClientInvite, ClientInviteService, ClientInviteStatusEnum, ClientInviteTypeEnum, ClientMovement, ClientMovementCollection, ClientMovementService, ClientPortfolioChartData, ClientPortfolioReport, ClientPortfolioReportCollection, ClientPortfolioReportService, Collection, CollectionDictionary, CorelogicService, CorelogicSuggestion, Country, DEFAULT_VEHICLE_EXPENSE, DEPRECIATION_GROUPS, DOCUMENT_FILE_TYPES, DataTableService, Depreciation, DepreciationCalculationEnum, DepreciationCalculationPercentEnum, DepreciationCapitalProject, DepreciationCapitalProjectService, DepreciationCollection, DepreciationForecast, DepreciationForecastCollection, DepreciationGroup, DepreciationGroupEnum, DepreciationGroupItem, DepreciationLvpAssetTypeEnum, DepreciationLvpReportItem, DepreciationLvpReportItemCollection, DepreciationReceipt, DepreciationReportItem, DepreciationReportItemCollection, DepreciationService, DepreciationTypeEnum, DepreciationWriteOffAmountEnum, Document, DocumentApiUrlPrefixEnum, DocumentFolder, DocumentFolderService, ENDPOINTS, EXPORT_DATA_TABLE_COLUMNS, EmployeeCollection, EmployeeDetails, EmployeeInvite, EmployeeInviteService, EmployeeService, Endpoint, EquityPositionChartService, EventDispatcherService, ExportDataTable, ExportFormatEnum, FinancialYear, Firm, FirmService, FirmTypeEnum, HeaderTitleService, IconsFileEnum, IncomeAmountTypeEnum, IncomePosition, IncomeSource, IncomeSourceChartData, IncomeSourceCollection, IncomeSourceForecast, IncomeSourceForecastService, IncomeSourceService, IncomeSourceType, IncomeSourceTypeEnum, IncomeSourceTypeListOtherEnum, IncomeSourceTypeListSoleEnum, IncomeSourceTypeListWorkEnum, InterceptorsModule, IntercomService, InviteStatusEnum, JwtService, KompassifyService, Loan, LoanBankTypeEnum, LoanCollection, LoanFrequencyEnum, LoanInterestTypeEnum, LoanMaxNumberOfPaymentsEnum, LoanPayment, LoanPayout, LoanPayoutTypeEnum, LoanRepaymentFrequencyEnum, LoanRepaymentTypeEnum, LoanService, LoanTypeEnum, LoanVehicleTypeEnum, LogbookPeriod, LoginForm, MODULE_URL_LIST, MONTHS, Message, MessageCollection, MessageDocument, MessageDocumentCollection, MessageDocumentService, MessageService, MonthNameShortEnum, MonthNumberEnum, MyAccountHistory, MyAccountHistoryInitiatedByEnum, MyAccountHistoryStatusEnum, MyAccountHistoryTypeEnum, Notification, Occupation, OccupationService, PasswordForm, PdfOrientationEnum, PdfService, PdfSettings, Phone, PhoneTypeEnum, PreloaderService, Property, PropertyCalculationService, PropertyCategory, PropertyCategoryListEnum, PropertyCategoryMovement, PropertyCategoryMovementService, PropertyCategoryService, PropertyCollection, PropertyDepreciationCalculationEnum, PropertyDocument, PropertyDocumentService, PropertyEquityChartData, PropertyEquityChartItem, PropertyForecast, PropertyHoldingCostsService, PropertyReportItem, PropertyReportItemCollection, PropertyReportItemDepreciationCollection, PropertyReportItemTransaction, PropertyReportItemTransactionCollection, PropertySale, PropertySaleService, PropertySaleTaxExemptionMetadata, PropertyService, PropertyShare, PropertyShareAccessEnum, PropertyShareService, PropertyShareStatusEnum, PropertySubscription, PropertyTransactionReportService, PropertyValuation, RegisterClientForm, RegisterFirmForm, RegistrationInvite, RegistrationInviteStatusEnum, ReportItem, ReportItemCollection, ReportItemDetails, ResetPasswordForm, SUBSCRIPTION_DESCRIPTION, SUBSCRIPTION_TITLE, SalaryForecast, SalaryForecastFrequencyEnum, SalaryForecastService, ServiceNotificationService, ServiceNotificationStatusEnum, ServiceNotificationTypeEnum, ServicePayment, ServicePaymentStatusEnum, ServicePrice, ServicePriceRecurringIntervalEnum, ServicePriceService, ServicePriceTypeEnum, ServiceProduct, ServiceProductIdEnum, ServiceProductStatusEnum, ServiceSubscription, ServiceSubscriptionCollection, ServiceSubscriptionItem, ServiceSubscriptionStatusEnum, ShareFilterOptionsEnum, SoleForecast, SoleForecastService, SpareDocumentSpareTypeEnum, SseService, SubscriptionService, SubscriptionTypeEnum, TYPE_LOAN, TankTypeEnum, TaxCalculationMedicareExemptionEnum, TaxCalculationTypeEnum, TaxExemption, TaxExemptionEnum, TaxExemptionMetadata, TaxExemptionMetadataEnum, TaxExemptionService, TaxReturnCategoryListEnum, TaxReturnCategorySectionEnum, TaxReview, TaxReviewCollection, TaxReviewHistoryService, TaxReviewService, TaxReviewStatusEnum, TaxSummary, TaxSummaryListEnum, TaxSummarySection, TaxSummarySectionEnum, TaxSummaryService, TaxSummaryTaxSummaryEnum, TaxSummaryTypeEnum, TicketFeedbackEnum, TicketStatusEnum, TicketTypesEnum, Toast, ToastService, ToastTypeEnum, Transaction, TransactionAllocation, TransactionAllocationCollection, TransactionAllocationService, TransactionBase, TransactionCalculationService, TransactionCategoryEnum, TransactionCollection, TransactionMetadata, TransactionOperationEnum, TransactionReceipt, TransactionService, TransactionSourceEnum, TransactionTypeEnum, TtCoreModule, USER_ROLES, USER_WORK_POSITION, User, UserEventSetting, UserEventSettingCollection, UserEventSettingFieldEnum, UserEventSettingService, UserEventStatusEnum, UserEventType, UserEventTypeCategory, UserEventTypeClientTypeEnum, UserEventTypeEmployeeTypeEnum, UserEventTypeFrequencyEnum, UserEventTypeService, UserEventTypeUserTypeEnum, UserMedicareExemptionEnum, UserRolesEnum, UserService, UserStatusEnum, UserSwitcherService, UserTitleEnum, UserToRegister, UserWorkDepreciationCalculationEnum, UserWorkingHolidayMakerEnum, Vehicle, VehicleClaim, VehicleClaimForm, VehicleClaimMethodEnum, VehicleClaimService, VehicleCollection, VehicleExpense, VehicleExpenseCollection, VehicleForm, VehicleLogbook, VehicleLogbookCollection, VehicleLogbookPurposeEnum, VehicleLogbookService, VehicleService, WORK_TANK_LOGBOOK_PURPOSE_OPTIONS, XlsxService, cloneDeep, compare, compareMatOptions, createDate, displayMatOptions, enumToList, getDocIcon, replace, roundTo, sort, sortDeep, taxReviewFilterPredicate };
|
|
11787
11808
|
//# sourceMappingURL=taxtank-core.js.map
|