From e152e7a8156632f210af52c22bc845b71bec5e16 Mon Sep 17 00:00:00 2001 From: Ashutosh singh <55102089+Ashutosh619-sudo@users.noreply.github.com> Date: Tue, 6 Feb 2024 13:56:19 +0530 Subject: [PATCH 1/2] Export merchant as vendor in journal line item (#516) * Export Merchant as Journal Entry Line Item * comment resolved * Revert "Export Merchant as Journal Entry Line Item (#478)" This reverts commit 0f312d1088f3dd548f61aac57dc3f353385048b4. * Export merchant as vendor in Journal Line Item * reverted code * font size on condition * resolved comment --- .../models/si/si-configuration/export-settings.model.ts | 6 ++++-- .../configuration-toggle-field.component.html | 2 +- .../configuration-export-settings.component.html | 8 ++++++++ .../configuration-export-settings.component.ts | 3 ++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/app/core/models/si/si-configuration/export-settings.model.ts b/src/app/core/models/si/si-configuration/export-settings.model.ts index a5729e44a..475567232 100644 --- a/src/app/core/models/si/si-configuration/export-settings.model.ts +++ b/src/app/core/models/si/si-configuration/export-settings.model.ts @@ -12,7 +12,8 @@ export type ExportSettingConfiguration = { employee_field_mapping: string, auto_map_employees: string, reimbursable_expenses_object: IntacctReimbursableExpensesObject | null, - corporate_credit_card_expenses_object: CorporateCreditCardExpensesObject | null + corporate_credit_card_expenses_object: CorporateCreditCardExpensesObject | null, + use_merchant_in_journal_line: boolean } export type ExportSettingGeneralMapping = { @@ -79,7 +80,8 @@ export type ExportSettingOptionSearch = { reimbursable_expenses_object: getValueOrDefault(exportSettingsForm.get('reimbursableExportType')), corporate_credit_card_expenses_object: cccExportType, employee_field_mapping: exportSettingsForm.get('employeeFieldMapping')?.value ? exportSettingsForm.get('employeeFieldMapping')?.value.toUpperCase() : null, - auto_map_employees: getValueOrDefault(exportSettingsForm.get('autoMapEmployees')) + auto_map_employees: getValueOrDefault(exportSettingsForm.get('autoMapEmployees')), + use_merchant_in_journal_line: exportSettingsForm.get('useMerchantInJournalLine')?.value }, general_mappings: { default_gl_account: exportSettingsForm.get('glAccount')?.value?.value ? {id: exportSettingsForm.get('glAccount')?.value.destination_id, name: exportSettingsForm.get('glAccount')?.value.value} : emptyDestinationAttribute, diff --git a/src/app/shared/components/configuration/configuration-toggle-field/configuration-toggle-field.component.html b/src/app/shared/components/configuration/configuration-toggle-field/configuration-toggle-field.component.html index ccc3a4033..235503e3d 100644 --- a/src/app/shared/components/configuration/configuration-toggle-field/configuration-toggle-field.component.html +++ b/src/app/shared/components/configuration/configuration-toggle-field/configuration-toggle-field.component.html @@ -4,7 +4,7 @@
-

{{ label }}

+

{{label}}

+
+ +
Date: Tue, 6 Feb 2024 18:04:35 +0530 Subject: [PATCH 2/2] Intacct Whitelabel: Export Settings - 001 (#515) * rename to Intacct * Folder Changes rename from si to intacct * intacct shared component - export setting * Intacct Shared Component: Export Setting Code * rename, intacct * module rename * IntacctOnboardingModule * removed older shared export setting component * Shared Module * rename, intacct shared export setting, stepper intacct generic use * lint fix --- .../core/models/db/accounting-export.model.ts | 4 +- src/app/core/models/db/expense-group.model.ts | 2 +- .../db/category-mapping-response.model.ts | 0 .../db/category-mapping.model.ts | 0 .../{si => intacct}/db/configuration.model.ts | 0 .../db/destination-attribute-detail.model.ts | 0 .../db/destination-attribute.model.ts | 0 .../db/employee-mapping.model.ts | 0 .../models/{si => intacct}/db/error.model.ts | 0 .../db/expense-attribute-detail.model.ts | 0 .../db/expense-attribute.model.ts | 0 .../{si => intacct}/db/expense-field.model.ts | 0 .../{si => intacct}/db/expense-group.model.ts | 0 .../{si => intacct}/db/expense.model.ts | 0 .../{si => intacct}/db/export-log.model.ts | 0 .../db/fyle-credentials.model.ts | 0 .../db/generic-mapping-v2.model.ts | 0 .../{si => intacct}/db/last-export.model.ts | 0 .../db/location-entity-mapping.model.ts | 0 .../db/mapping-destination.model.ts | 0 .../db/mapping-setting.model.ts | 0 .../db/mapping-source.model.ts | 0 .../{si => intacct}/db/mapping.model.ts | 0 .../{si => intacct}/db/mappings.model.ts | 0 .../db/sage-credentials.model.ts | 0 .../{si => intacct}/db/task-log.model.ts | 0 .../{si => intacct}/db/workspaces.model.ts | 0 .../advanced-settings.model.ts | 0 .../intacct-configuration}/connector.model.ts | 0 .../export-settings.model.ts | 0 .../import-settings.model.ts | 0 .../intacct-onboarding.model.ts | 78 +++++++++++++++++++ .../misc/si-export-logs.model.ts | 0 .../{si => intacct}/misc/skip-export.model.ts | 2 +- src/app/core/models/misc/tracking.model.ts | 6 +- .../services/common/export-log.service.ts | 2 +- .../services/integration/appcues.service.ts | 2 +- .../services/integration/tracking.service.ts | 8 +- .../si/export-log/export-log.service.ts | 4 +- .../si-advanced-setting.service.ts | 2 +- .../si-export-setting.service.ts | 2 +- .../si-import-setting.service.ts | 2 +- .../services/si/si-core/dashboard.service.ts | 8 +- .../si/si-core/intacct-connector.service.ts | 4 +- .../si/si-core/si-mappings.service.ts | 18 ++--- .../si/si-core/si-workspace.service.ts | 4 +- ...s-central-complete-export-log.component.ts | 2 +- ...ss-central-skipped-export-log.component.ts | 2 +- ...ntacct-onboarding-connector.component.html | 2 +- ...ntacct-onboarding-connector.component.scss | 0 ...cct-onboarding-connector.component.spec.ts | 0 .../intacct-onboarding-connector.component.ts | 29 +++++++ ...t-onboarding-export-setting.component.html | 2 + ...-onboarding-export-setting.component.scss} | 0 ...nboarding-export-setting.component.spec.ts | 23 ++++++ ...cct-onboarding-export-setting.component.ts | 23 ++++++ .../intacct-onboarding-landing.component.html | 0 .../intacct-onboarding-landing.component.scss | 0 ...tacct-onboarding-landing.component.spec.ts | 0 .../intacct-onboarding-landing.component.ts | 0 .../intacct-onboarding-routing.module.ts} | 8 +- .../intacct-onboarding.component.html} | 0 .../intacct-onboarding.component.scss} | 0 .../intacct-onboarding.component.spec.ts} | 10 +-- .../intacct-onboarding.component.ts | 15 ++++ .../intacct-onboarding.module.ts} | 15 ++-- ...onboarding-advanced-setting.component.html | 0 ...nboarding-advanced-setting.component.scss} | 0 ...oarding-advanced-setting.component.spec.ts | 0 .../onboarding-advanced-setting.component.ts | 0 .../onboarding-done.component.html | 0 .../onboarding-done.component.scss | 0 .../onboarding-done.component.spec.ts | 0 .../onboarding-done.component.ts | 0 .../onboarding-import-setting.component.html | 0 .../onboarding-import-setting.component.scss} | 0 ...nboarding-import-setting.component.spec.ts | 0 .../onboarding-import-setting.component.ts | 0 .../intacct-routing.module.ts} | 6 +- .../intacct-export-settings.component.html} | 0 .../intacct-export-settings.component.scss} | 0 .../intacct-export-settings.component.spec.ts | 23 ++++++ .../intacct-export-settings.component.ts} | 14 ++-- .../intacct-shared/intacct-shared.module.ts | 24 ++++++ .../intacct.component.html} | 0 .../intacct.component.scss} | 0 .../intacct.component.spec.ts} | 12 +-- .../intacct.component.ts} | 10 +-- .../intacct.fixture.ts} | 2 +- .../intacct.module.ts} | 44 ++++++----- ...figuration-advanced-setting.component.html | 0 ...iguration-advanced-setting.component.scss} | 0 ...uration-advanced-setting.component.spec.ts | 0 ...onfiguration-advanced-setting.component.ts | 0 ...onfiguration-export-setting.component.html | 1 + ...nfiguration-export-setting.component.scss} | 0 ...iguration-export-setting.component.spec.ts | 0 .../configuration-export-setting.component.ts | 0 ...onfiguration-import-setting.component.html | 0 ...nfiguration-import-setting.component.scss} | 0 ...iguration-import-setting.component.spec.ts | 0 .../configuration-import-setting.component.ts | 0 .../configuration-routing.module.ts | 0 .../configuration.component.html | 0 .../configuration.component.scss | 0 .../configuration.component.spec.ts | 0 .../configuration/configuration.component.ts | 0 .../configuration/configuration.module.ts | 0 .../dashboard/dashboard-routing.module.ts | 0 .../main/dashboard/dashboard.component.html | 0 .../main/dashboard/dashboard.component.scss | 0 .../dashboard/dashboard.component.spec.ts | 0 .../main/dashboard/dashboard.component.ts | 10 +-- .../main/dashboard/dashboard.module.ts | 0 .../completed-export-log.component.html | 0 .../completed-export-log.component.scss | 0 .../completed-export-log.component.spec.ts | 0 .../completed-export-log.component.ts | 4 +- .../export-log/export-log-routing.module.ts | 0 .../main/export-log/export-log.component.html | 0 .../main/export-log/export-log.component.scss | 0 .../export-log/export-log.component.spec.ts | 0 .../main/export-log/export-log.component.ts | 0 .../main/export-log/export-log.module.ts | 0 .../skip-export-log.component.html | 0 .../skip-export-log.component.scss | 0 .../skip-export-log.component.spec.ts | 0 .../skip-export-log.component.ts | 4 +- .../main/main-routing.module.ts | 0 .../{si => intacct}/main/main.component.html | 0 .../main/main.component.scss} | 0 .../main/main.component.spec.ts | 0 .../{si => intacct}/main/main.component.ts | 0 .../{si => intacct}/main/main.module.ts | 0 .../category-mapping.component.html | 0 .../category-mapping.component.scss | 0 .../category-mapping.component.spec.ts | 0 .../category-mapping.component.ts | 8 +- .../employee-mapping.component.html | 0 .../employee-mapping.component.scss | 0 .../employee-mapping.component.spec.ts | 0 .../employee-mapping.component.ts | 8 +- .../generic-mapping.component.html | 0 .../generic-mapping.component.scss | 0 .../generic-mapping.component.spec.ts | 0 .../generic-mapping.component.ts | 8 +- .../main/mapping/mapping-routing.module.ts | 0 .../main/mapping/mapping.component.html | 0 .../main/mapping/mapping.component.scss | 0 .../main/mapping/mapping.component.spec.ts | 0 .../main/mapping/mapping.component.ts | 0 .../main/mapping/mapping.module.ts | 0 .../integrations-routing.module.ts | 2 +- .../qbo-complete-export-log.component.ts | 2 +- .../qbo-skipped-export-log.component.ts | 2 +- .../sage300-complete-export-log.component.ts | 2 +- .../sage300-skipped-export-log.component.ts | 2 +- .../intacct-onboarding-connector.component.ts | 22 ------ .../onboarding-export-setting.component.html | 2 - ...nboarding-export-setting.component.spec.ts | 23 ------ .../onboarding-export-setting.component.ts | 15 ---- .../onboarding.component.ts | 15 ---- ...onfiguration-export-setting.component.html | 1 - .../configuration-import-field.component.ts | 2 +- .../configuration-select-field.component.ts | 6 +- .../configuration-skip-export.component.ts | 2 +- .../email-multi-select-field.component.ts | 2 +- ...board-accounting-error-dialog.component.ts | 2 +- .../dashboard-error-section.component.ts | 2 +- ...export-log-child-table-dialog.component.ts | 2 +- .../export-log-table.component.ts | 2 +- .../skipped-export-log-table.component.ts | 2 +- .../mapping-table/mapping-table.component.ts | 4 +- ...nfiguration-advanced-settings.component.ts | 6 +- ...guration-export-settings.component.spec.ts | 55 ------------- ...configuration-import-settings.component.ts | 8 +- .../intacct-connector.component.spec.ts | 6 +- .../intacct-location-entity.component.ts | 6 +- .../dashboard-intacct-errors.component.ts | 4 +- .../dashboard-mapping-resolve.component.ts | 10 +-- .../skip-export/skip-export.component.ts | 4 +- src/app/shared/shared.module.ts | 4 +- 182 files changed, 380 insertions(+), 294 deletions(-) rename src/app/core/models/{si => intacct}/db/category-mapping-response.model.ts (100%) rename src/app/core/models/{si => intacct}/db/category-mapping.model.ts (100%) rename src/app/core/models/{si => intacct}/db/configuration.model.ts (100%) rename src/app/core/models/{si => intacct}/db/destination-attribute-detail.model.ts (100%) rename src/app/core/models/{si => intacct}/db/destination-attribute.model.ts (100%) rename src/app/core/models/{si => intacct}/db/employee-mapping.model.ts (100%) rename src/app/core/models/{si => intacct}/db/error.model.ts (100%) rename src/app/core/models/{si => intacct}/db/expense-attribute-detail.model.ts (100%) rename src/app/core/models/{si => intacct}/db/expense-attribute.model.ts (100%) rename src/app/core/models/{si => intacct}/db/expense-field.model.ts (100%) rename src/app/core/models/{si => intacct}/db/expense-group.model.ts (100%) rename src/app/core/models/{si => intacct}/db/expense.model.ts (100%) rename src/app/core/models/{si => intacct}/db/export-log.model.ts (100%) rename src/app/core/models/{si => intacct}/db/fyle-credentials.model.ts (100%) rename src/app/core/models/{si => intacct}/db/generic-mapping-v2.model.ts (100%) rename src/app/core/models/{si => intacct}/db/last-export.model.ts (100%) rename src/app/core/models/{si => intacct}/db/location-entity-mapping.model.ts (100%) rename src/app/core/models/{si => intacct}/db/mapping-destination.model.ts (100%) rename src/app/core/models/{si => intacct}/db/mapping-setting.model.ts (100%) rename src/app/core/models/{si => intacct}/db/mapping-source.model.ts (100%) rename src/app/core/models/{si => intacct}/db/mapping.model.ts (100%) rename src/app/core/models/{si => intacct}/db/mappings.model.ts (100%) rename src/app/core/models/{si => intacct}/db/sage-credentials.model.ts (100%) rename src/app/core/models/{si => intacct}/db/task-log.model.ts (100%) rename src/app/core/models/{si => intacct}/db/workspaces.model.ts (100%) rename src/app/core/models/{si/si-configuration => intacct/intacct-configuration}/advanced-settings.model.ts (100%) rename src/app/core/models/{si/si-configuration => intacct/intacct-configuration}/connector.model.ts (100%) rename src/app/core/models/{si/si-configuration => intacct/intacct-configuration}/export-settings.model.ts (100%) rename src/app/core/models/{si/si-configuration => intacct/intacct-configuration}/import-settings.model.ts (100%) create mode 100644 src/app/core/models/intacct/intacct-configuration/intacct-onboarding.model.ts rename src/app/core/models/{si => intacct}/misc/si-export-logs.model.ts (100%) rename src/app/core/models/{si => intacct}/misc/skip-export.model.ts (94%) rename src/app/integrations/{si => intacct}/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.html (71%) rename src/app/integrations/{si => intacct}/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.scss (100%) rename src/app/integrations/{si => intacct}/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.spec.ts (100%) create mode 100644 src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.ts create mode 100644 src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-export-setting/intacct-onboarding-export-setting.component.html rename src/app/integrations/{si/intacct-onboarding/onboarding-advanced-setting/onboarding-advanced-setting.component.scss => intacct/intacct-onboarding/intacct-onboarding-export-setting/intacct-onboarding-export-setting.component.scss} (100%) create mode 100644 src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-export-setting/intacct-onboarding-export-setting.component.spec.ts create mode 100644 src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-export-setting/intacct-onboarding-export-setting.component.ts rename src/app/integrations/{si => intacct}/intacct-onboarding/intacct-onboarding-landing/intacct-onboarding-landing.component.html (100%) rename src/app/integrations/{si => intacct}/intacct-onboarding/intacct-onboarding-landing/intacct-onboarding-landing.component.scss (100%) rename src/app/integrations/{si => intacct}/intacct-onboarding/intacct-onboarding-landing/intacct-onboarding-landing.component.spec.ts (100%) rename src/app/integrations/{si => intacct}/intacct-onboarding/intacct-onboarding-landing/intacct-onboarding-landing.component.ts (100%) rename src/app/integrations/{si/intacct-onboarding/onboarding-routing.module.ts => intacct/intacct-onboarding/intacct-onboarding-routing.module.ts} (82%) rename src/app/integrations/{si/intacct-onboarding/onboarding.component.html => intacct/intacct-onboarding/intacct-onboarding.component.html} (100%) rename src/app/integrations/{si/intacct-onboarding/onboarding-export-setting/onboarding-export-setting.component.scss => intacct/intacct-onboarding/intacct-onboarding.component.scss} (100%) rename src/app/integrations/{si/intacct-onboarding/onboarding.component.spec.ts => intacct/intacct-onboarding/intacct-onboarding.component.spec.ts} (55%) create mode 100644 src/app/integrations/intacct/intacct-onboarding/intacct-onboarding.component.ts rename src/app/integrations/{si/intacct-onboarding/onboarding.module.ts => intacct/intacct-onboarding/intacct-onboarding.module.ts} (68%) rename src/app/integrations/{si => intacct}/intacct-onboarding/onboarding-advanced-setting/onboarding-advanced-setting.component.html (100%) rename src/app/integrations/{si/intacct-onboarding/onboarding-import-setting/onboarding-import-setting.component.scss => intacct/intacct-onboarding/onboarding-advanced-setting/onboarding-advanced-setting.component.scss} (100%) rename src/app/integrations/{si => intacct}/intacct-onboarding/onboarding-advanced-setting/onboarding-advanced-setting.component.spec.ts (100%) rename src/app/integrations/{si => intacct}/intacct-onboarding/onboarding-advanced-setting/onboarding-advanced-setting.component.ts (100%) rename src/app/integrations/{si => intacct}/intacct-onboarding/onboarding-done/onboarding-done.component.html (100%) rename src/app/integrations/{si => intacct}/intacct-onboarding/onboarding-done/onboarding-done.component.scss (100%) rename src/app/integrations/{si => intacct}/intacct-onboarding/onboarding-done/onboarding-done.component.spec.ts (100%) rename src/app/integrations/{si => intacct}/intacct-onboarding/onboarding-done/onboarding-done.component.ts (100%) rename src/app/integrations/{si => intacct}/intacct-onboarding/onboarding-import-setting/onboarding-import-setting.component.html (100%) rename src/app/integrations/{si/intacct-onboarding/onboarding.component.scss => intacct/intacct-onboarding/onboarding-import-setting/onboarding-import-setting.component.scss} (100%) rename src/app/integrations/{si => intacct}/intacct-onboarding/onboarding-import-setting/onboarding-import-setting.component.spec.ts (100%) rename src/app/integrations/{si => intacct}/intacct-onboarding/onboarding-import-setting/onboarding-import-setting.component.ts (100%) rename src/app/integrations/{si/si-routing.module.ts => intacct/intacct-routing.module.ts} (68%) rename src/app/{shared/components/si/configuration/configuration-export-settings/configuration-export-settings.component.html => integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.html} (100%) rename src/app/{shared/components/si/configuration/configuration-export-settings/configuration-export-settings.component.scss => integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.scss} (100%) create mode 100644 src/app/integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.spec.ts rename src/app/{shared/components/si/configuration/configuration-export-settings/configuration-export-settings.component.ts => integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.ts} (98%) create mode 100644 src/app/integrations/intacct/intacct-shared/intacct-shared.module.ts rename src/app/integrations/{si/si.component.html => intacct/intacct.component.html} (100%) rename src/app/integrations/{si/main/configuration/configuration-advanced-setting/configuration-advanced-setting.component.scss => intacct/intacct.component.scss} (100%) rename src/app/integrations/{si/si.component.spec.ts => intacct/intacct.component.spec.ts} (82%) rename src/app/integrations/{si/si.component.ts => intacct/intacct.component.ts} (93%) rename src/app/integrations/{si/si.fixture.ts => intacct/intacct.fixture.ts} (91%) rename src/app/integrations/{si/si.module.ts => intacct/intacct.module.ts} (57%) rename src/app/integrations/{si => intacct}/main/configuration/configuration-advanced-setting/configuration-advanced-setting.component.html (100%) rename src/app/integrations/{si/main/configuration/configuration-export-setting/configuration-export-setting.component.scss => intacct/main/configuration/configuration-advanced-setting/configuration-advanced-setting.component.scss} (100%) rename src/app/integrations/{si => intacct}/main/configuration/configuration-advanced-setting/configuration-advanced-setting.component.spec.ts (100%) rename src/app/integrations/{si => intacct}/main/configuration/configuration-advanced-setting/configuration-advanced-setting.component.ts (100%) create mode 100644 src/app/integrations/intacct/main/configuration/configuration-export-setting/configuration-export-setting.component.html rename src/app/integrations/{si/main/configuration/configuration-import-setting/configuration-import-setting.component.scss => intacct/main/configuration/configuration-export-setting/configuration-export-setting.component.scss} (100%) rename src/app/integrations/{si => intacct}/main/configuration/configuration-export-setting/configuration-export-setting.component.spec.ts (100%) rename src/app/integrations/{si => intacct}/main/configuration/configuration-export-setting/configuration-export-setting.component.ts (100%) rename src/app/integrations/{si => intacct}/main/configuration/configuration-import-setting/configuration-import-setting.component.html (100%) rename src/app/integrations/{si/main/main.component.scss => intacct/main/configuration/configuration-import-setting/configuration-import-setting.component.scss} (100%) rename src/app/integrations/{si => intacct}/main/configuration/configuration-import-setting/configuration-import-setting.component.spec.ts (100%) rename src/app/integrations/{si => intacct}/main/configuration/configuration-import-setting/configuration-import-setting.component.ts (100%) rename src/app/integrations/{si => intacct}/main/configuration/configuration-routing.module.ts (100%) rename src/app/integrations/{si => intacct}/main/configuration/configuration.component.html (100%) rename src/app/integrations/{si => intacct}/main/configuration/configuration.component.scss (100%) rename src/app/integrations/{si => intacct}/main/configuration/configuration.component.spec.ts (100%) rename src/app/integrations/{si => intacct}/main/configuration/configuration.component.ts (100%) rename src/app/integrations/{si => intacct}/main/configuration/configuration.module.ts (100%) rename src/app/integrations/{si => intacct}/main/dashboard/dashboard-routing.module.ts (100%) rename src/app/integrations/{si => intacct}/main/dashboard/dashboard.component.html (100%) rename src/app/integrations/{si => intacct}/main/dashboard/dashboard.component.scss (100%) rename src/app/integrations/{si => intacct}/main/dashboard/dashboard.component.spec.ts (100%) rename src/app/integrations/{si => intacct}/main/dashboard/dashboard.component.ts (97%) rename src/app/integrations/{si => intacct}/main/dashboard/dashboard.module.ts (100%) rename src/app/integrations/{si => intacct}/main/export-log/completed-export-log/completed-export-log.component.html (100%) rename src/app/integrations/{si => intacct}/main/export-log/completed-export-log/completed-export-log.component.scss (100%) rename src/app/integrations/{si => intacct}/main/export-log/completed-export-log/completed-export-log.component.spec.ts (100%) rename src/app/integrations/{si => intacct}/main/export-log/completed-export-log/completed-export-log.component.ts (98%) rename src/app/integrations/{si => intacct}/main/export-log/export-log-routing.module.ts (100%) rename src/app/integrations/{si => intacct}/main/export-log/export-log.component.html (100%) rename src/app/integrations/{si => intacct}/main/export-log/export-log.component.scss (100%) rename src/app/integrations/{si => intacct}/main/export-log/export-log.component.spec.ts (100%) rename src/app/integrations/{si => intacct}/main/export-log/export-log.component.ts (100%) rename src/app/integrations/{si => intacct}/main/export-log/export-log.module.ts (100%) rename src/app/integrations/{si => intacct}/main/export-log/skip-export-log/skip-export-log.component.html (100%) rename src/app/integrations/{si => intacct}/main/export-log/skip-export-log/skip-export-log.component.scss (100%) rename src/app/integrations/{si => intacct}/main/export-log/skip-export-log/skip-export-log.component.spec.ts (100%) rename src/app/integrations/{si => intacct}/main/export-log/skip-export-log/skip-export-log.component.ts (98%) rename src/app/integrations/{si => intacct}/main/main-routing.module.ts (100%) rename src/app/integrations/{si => intacct}/main/main.component.html (100%) rename src/app/integrations/{si/si.component.scss => intacct/main/main.component.scss} (100%) rename src/app/integrations/{si => intacct}/main/main.component.spec.ts (100%) rename src/app/integrations/{si => intacct}/main/main.component.ts (100%) rename src/app/integrations/{si => intacct}/main/main.module.ts (100%) rename src/app/integrations/{si => intacct}/main/mapping/category-mapping/category-mapping.component.html (100%) rename src/app/integrations/{si => intacct}/main/mapping/category-mapping/category-mapping.component.scss (100%) rename src/app/integrations/{si => intacct}/main/mapping/category-mapping/category-mapping.component.spec.ts (100%) rename src/app/integrations/{si => intacct}/main/mapping/category-mapping/category-mapping.component.ts (96%) rename src/app/integrations/{si => intacct}/main/mapping/employee-mapping/employee-mapping.component.html (100%) rename src/app/integrations/{si => intacct}/main/mapping/employee-mapping/employee-mapping.component.scss (100%) rename src/app/integrations/{si => intacct}/main/mapping/employee-mapping/employee-mapping.component.spec.ts (100%) rename src/app/integrations/{si => intacct}/main/mapping/employee-mapping/employee-mapping.component.ts (97%) rename src/app/integrations/{si => intacct}/main/mapping/generic-mapping/generic-mapping.component.html (100%) rename src/app/integrations/{si => intacct}/main/mapping/generic-mapping/generic-mapping.component.scss (100%) rename src/app/integrations/{si => intacct}/main/mapping/generic-mapping/generic-mapping.component.spec.ts (100%) rename src/app/integrations/{si => intacct}/main/mapping/generic-mapping/generic-mapping.component.ts (96%) rename src/app/integrations/{si => intacct}/main/mapping/mapping-routing.module.ts (100%) rename src/app/integrations/{si => intacct}/main/mapping/mapping.component.html (100%) rename src/app/integrations/{si => intacct}/main/mapping/mapping.component.scss (100%) rename src/app/integrations/{si => intacct}/main/mapping/mapping.component.spec.ts (100%) rename src/app/integrations/{si => intacct}/main/mapping/mapping.component.ts (100%) rename src/app/integrations/{si => intacct}/main/mapping/mapping.module.ts (100%) delete mode 100644 src/app/integrations/si/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.ts delete mode 100644 src/app/integrations/si/intacct-onboarding/onboarding-export-setting/onboarding-export-setting.component.html delete mode 100644 src/app/integrations/si/intacct-onboarding/onboarding-export-setting/onboarding-export-setting.component.spec.ts delete mode 100644 src/app/integrations/si/intacct-onboarding/onboarding-export-setting/onboarding-export-setting.component.ts delete mode 100644 src/app/integrations/si/intacct-onboarding/onboarding.component.ts delete mode 100644 src/app/integrations/si/main/configuration/configuration-export-setting/configuration-export-setting.component.html delete mode 100644 src/app/shared/components/si/configuration/configuration-export-settings/configuration-export-settings.component.spec.ts diff --git a/src/app/core/models/db/accounting-export.model.ts b/src/app/core/models/db/accounting-export.model.ts index 5c8ecf4ed..0474052a4 100644 --- a/src/app/core/models/db/accounting-export.model.ts +++ b/src/app/core/models/db/accounting-export.model.ts @@ -1,7 +1,7 @@ import { SnakeCaseToSpaceCasePipe } from "src/app/shared/pipes/snake-case-to-space-case.pipe"; import { AccountingExportStatus, AccountingExportType, FundSource, FyleReferenceType } from "../enum/enum.model"; -import { ExpenseGroupDescription, SkipExportList, SkipExportLog } from "../si/db/expense-group.model"; -import { Expense } from "../si/db/expense.model"; +import { ExpenseGroupDescription, SkipExportList, SkipExportLog } from "../intacct/db/expense-group.model"; +import { Expense } from "../intacct/db/expense.model"; import { TitleCasePipe } from "@angular/common"; import { ExportLogService } from "../../services/common/export-log.service"; import { DateFilter } from "../qbd/misc/date-filter.model"; diff --git a/src/app/core/models/db/expense-group.model.ts b/src/app/core/models/db/expense-group.model.ts index b5f875920..37ec61dce 100644 --- a/src/app/core/models/db/expense-group.model.ts +++ b/src/app/core/models/db/expense-group.model.ts @@ -1,4 +1,4 @@ -import { Expense } from "../si/db/expense.model"; +import { Expense } from "../intacct/db/expense.model"; import { PaginatedResponse } from "./paginated-response.model"; export type ExpenseGroupDescription = { diff --git a/src/app/core/models/si/db/category-mapping-response.model.ts b/src/app/core/models/intacct/db/category-mapping-response.model.ts similarity index 100% rename from src/app/core/models/si/db/category-mapping-response.model.ts rename to src/app/core/models/intacct/db/category-mapping-response.model.ts diff --git a/src/app/core/models/si/db/category-mapping.model.ts b/src/app/core/models/intacct/db/category-mapping.model.ts similarity index 100% rename from src/app/core/models/si/db/category-mapping.model.ts rename to src/app/core/models/intacct/db/category-mapping.model.ts diff --git a/src/app/core/models/si/db/configuration.model.ts b/src/app/core/models/intacct/db/configuration.model.ts similarity index 100% rename from src/app/core/models/si/db/configuration.model.ts rename to src/app/core/models/intacct/db/configuration.model.ts diff --git a/src/app/core/models/si/db/destination-attribute-detail.model.ts b/src/app/core/models/intacct/db/destination-attribute-detail.model.ts similarity index 100% rename from src/app/core/models/si/db/destination-attribute-detail.model.ts rename to src/app/core/models/intacct/db/destination-attribute-detail.model.ts diff --git a/src/app/core/models/si/db/destination-attribute.model.ts b/src/app/core/models/intacct/db/destination-attribute.model.ts similarity index 100% rename from src/app/core/models/si/db/destination-attribute.model.ts rename to src/app/core/models/intacct/db/destination-attribute.model.ts diff --git a/src/app/core/models/si/db/employee-mapping.model.ts b/src/app/core/models/intacct/db/employee-mapping.model.ts similarity index 100% rename from src/app/core/models/si/db/employee-mapping.model.ts rename to src/app/core/models/intacct/db/employee-mapping.model.ts diff --git a/src/app/core/models/si/db/error.model.ts b/src/app/core/models/intacct/db/error.model.ts similarity index 100% rename from src/app/core/models/si/db/error.model.ts rename to src/app/core/models/intacct/db/error.model.ts diff --git a/src/app/core/models/si/db/expense-attribute-detail.model.ts b/src/app/core/models/intacct/db/expense-attribute-detail.model.ts similarity index 100% rename from src/app/core/models/si/db/expense-attribute-detail.model.ts rename to src/app/core/models/intacct/db/expense-attribute-detail.model.ts diff --git a/src/app/core/models/si/db/expense-attribute.model.ts b/src/app/core/models/intacct/db/expense-attribute.model.ts similarity index 100% rename from src/app/core/models/si/db/expense-attribute.model.ts rename to src/app/core/models/intacct/db/expense-attribute.model.ts diff --git a/src/app/core/models/si/db/expense-field.model.ts b/src/app/core/models/intacct/db/expense-field.model.ts similarity index 100% rename from src/app/core/models/si/db/expense-field.model.ts rename to src/app/core/models/intacct/db/expense-field.model.ts diff --git a/src/app/core/models/si/db/expense-group.model.ts b/src/app/core/models/intacct/db/expense-group.model.ts similarity index 100% rename from src/app/core/models/si/db/expense-group.model.ts rename to src/app/core/models/intacct/db/expense-group.model.ts diff --git a/src/app/core/models/si/db/expense.model.ts b/src/app/core/models/intacct/db/expense.model.ts similarity index 100% rename from src/app/core/models/si/db/expense.model.ts rename to src/app/core/models/intacct/db/expense.model.ts diff --git a/src/app/core/models/si/db/export-log.model.ts b/src/app/core/models/intacct/db/export-log.model.ts similarity index 100% rename from src/app/core/models/si/db/export-log.model.ts rename to src/app/core/models/intacct/db/export-log.model.ts diff --git a/src/app/core/models/si/db/fyle-credentials.model.ts b/src/app/core/models/intacct/db/fyle-credentials.model.ts similarity index 100% rename from src/app/core/models/si/db/fyle-credentials.model.ts rename to src/app/core/models/intacct/db/fyle-credentials.model.ts diff --git a/src/app/core/models/si/db/generic-mapping-v2.model.ts b/src/app/core/models/intacct/db/generic-mapping-v2.model.ts similarity index 100% rename from src/app/core/models/si/db/generic-mapping-v2.model.ts rename to src/app/core/models/intacct/db/generic-mapping-v2.model.ts diff --git a/src/app/core/models/si/db/last-export.model.ts b/src/app/core/models/intacct/db/last-export.model.ts similarity index 100% rename from src/app/core/models/si/db/last-export.model.ts rename to src/app/core/models/intacct/db/last-export.model.ts diff --git a/src/app/core/models/si/db/location-entity-mapping.model.ts b/src/app/core/models/intacct/db/location-entity-mapping.model.ts similarity index 100% rename from src/app/core/models/si/db/location-entity-mapping.model.ts rename to src/app/core/models/intacct/db/location-entity-mapping.model.ts diff --git a/src/app/core/models/si/db/mapping-destination.model.ts b/src/app/core/models/intacct/db/mapping-destination.model.ts similarity index 100% rename from src/app/core/models/si/db/mapping-destination.model.ts rename to src/app/core/models/intacct/db/mapping-destination.model.ts diff --git a/src/app/core/models/si/db/mapping-setting.model.ts b/src/app/core/models/intacct/db/mapping-setting.model.ts similarity index 100% rename from src/app/core/models/si/db/mapping-setting.model.ts rename to src/app/core/models/intacct/db/mapping-setting.model.ts diff --git a/src/app/core/models/si/db/mapping-source.model.ts b/src/app/core/models/intacct/db/mapping-source.model.ts similarity index 100% rename from src/app/core/models/si/db/mapping-source.model.ts rename to src/app/core/models/intacct/db/mapping-source.model.ts diff --git a/src/app/core/models/si/db/mapping.model.ts b/src/app/core/models/intacct/db/mapping.model.ts similarity index 100% rename from src/app/core/models/si/db/mapping.model.ts rename to src/app/core/models/intacct/db/mapping.model.ts diff --git a/src/app/core/models/si/db/mappings.model.ts b/src/app/core/models/intacct/db/mappings.model.ts similarity index 100% rename from src/app/core/models/si/db/mappings.model.ts rename to src/app/core/models/intacct/db/mappings.model.ts diff --git a/src/app/core/models/si/db/sage-credentials.model.ts b/src/app/core/models/intacct/db/sage-credentials.model.ts similarity index 100% rename from src/app/core/models/si/db/sage-credentials.model.ts rename to src/app/core/models/intacct/db/sage-credentials.model.ts diff --git a/src/app/core/models/si/db/task-log.model.ts b/src/app/core/models/intacct/db/task-log.model.ts similarity index 100% rename from src/app/core/models/si/db/task-log.model.ts rename to src/app/core/models/intacct/db/task-log.model.ts diff --git a/src/app/core/models/si/db/workspaces.model.ts b/src/app/core/models/intacct/db/workspaces.model.ts similarity index 100% rename from src/app/core/models/si/db/workspaces.model.ts rename to src/app/core/models/intacct/db/workspaces.model.ts diff --git a/src/app/core/models/si/si-configuration/advanced-settings.model.ts b/src/app/core/models/intacct/intacct-configuration/advanced-settings.model.ts similarity index 100% rename from src/app/core/models/si/si-configuration/advanced-settings.model.ts rename to src/app/core/models/intacct/intacct-configuration/advanced-settings.model.ts diff --git a/src/app/core/models/si/si-configuration/connector.model.ts b/src/app/core/models/intacct/intacct-configuration/connector.model.ts similarity index 100% rename from src/app/core/models/si/si-configuration/connector.model.ts rename to src/app/core/models/intacct/intacct-configuration/connector.model.ts diff --git a/src/app/core/models/si/si-configuration/export-settings.model.ts b/src/app/core/models/intacct/intacct-configuration/export-settings.model.ts similarity index 100% rename from src/app/core/models/si/si-configuration/export-settings.model.ts rename to src/app/core/models/intacct/intacct-configuration/export-settings.model.ts diff --git a/src/app/core/models/si/si-configuration/import-settings.model.ts b/src/app/core/models/intacct/intacct-configuration/import-settings.model.ts similarity index 100% rename from src/app/core/models/si/si-configuration/import-settings.model.ts rename to src/app/core/models/intacct/intacct-configuration/import-settings.model.ts diff --git a/src/app/core/models/intacct/intacct-configuration/intacct-onboarding.model.ts b/src/app/core/models/intacct/intacct-configuration/intacct-onboarding.model.ts new file mode 100644 index 000000000..ca622e9ff --- /dev/null +++ b/src/app/core/models/intacct/intacct-configuration/intacct-onboarding.model.ts @@ -0,0 +1,78 @@ +import { brandingFeatureConfig } from "src/app/branding/branding-config"; +import { IntacctOnboardingState } from "../../enum/enum.model"; +import { OnboardingStepper } from "../../misc/onboarding-stepper.model"; + +type IntacctOnboardingStepperMap = { + [IntacctOnboardingState.CONNECTION]: number, + [IntacctOnboardingState.LOCATION_ENTITY]: number, + [IntacctOnboardingState.EXPORT_SETTINGS]: number, + [IntacctOnboardingState.IMPORT_SETTINGS]: number, + [IntacctOnboardingState.ADVANCED_CONFIGURATION]: number, + [IntacctOnboardingState.COMPLETE]: number, +} + +export class IntacctOnboardingModel { + private onboardingSteps: OnboardingStepper[] = [ + { + active: false, + completed: false, + step: 'Connect to Sage Intacct', + icon: 'link-vertical-medium', + route: '/integrations/intacct/onboarding/connector', + styleClasses: ['step-name-connector--text'] + }, + { + active: false, + completed: false, + step: 'Export Settings', + icon: 'arrow-tail-up-medium', + route: '/integrations/intacct/onboarding/export_settings', + styleClasses: ['step-name-export--text'] + }, + { + active: false, + completed: false, + step: 'Import Settings', + icon: 'arrow-tail-down-medium', + route: '/integrations/intacct/onboarding/import_settings', + styleClasses: ['step-name-export--text'] + }, + { + active: false, + completed: false, + step: 'Advanced Settings', + icon: 'gear-medium', + route: '/integrations/intacct/onboarding/advanced_settings', + styleClasses: ['step-name-advanced--text'] + } + ]; + + private readonly onboardingStateStepMap: IntacctOnboardingStepperMap = { + [IntacctOnboardingState.CONNECTION]: 1, + [IntacctOnboardingState.LOCATION_ENTITY]: 2, + [IntacctOnboardingState.EXPORT_SETTINGS]: 3, + [IntacctOnboardingState.IMPORT_SETTINGS]: 4, + [IntacctOnboardingState.ADVANCED_CONFIGURATION]: 5, + [IntacctOnboardingState.COMPLETE]: 6 + }; + + getOnboardingSteps(currentStep: string, onboardingState: IntacctOnboardingState): OnboardingStepper[] { + this.onboardingSteps.forEach(step => { + if (step.step.toLowerCase() === currentStep.toLowerCase()) { + step.active = true; + } else { + step.active = false; + } + }); + + for (let index = this.onboardingStateStepMap[onboardingState] - 1; index > 0; index--) { + this.onboardingSteps[index - 1].completed = true; + } + + if (!brandingFeatureConfig.featureFlags.mapEmployees) { + this.onboardingSteps.splice(1, 1); + } + + return this.onboardingSteps; + } +} diff --git a/src/app/core/models/si/misc/si-export-logs.model.ts b/src/app/core/models/intacct/misc/si-export-logs.model.ts similarity index 100% rename from src/app/core/models/si/misc/si-export-logs.model.ts rename to src/app/core/models/intacct/misc/si-export-logs.model.ts diff --git a/src/app/core/models/si/misc/skip-export.model.ts b/src/app/core/models/intacct/misc/skip-export.model.ts similarity index 94% rename from src/app/core/models/si/misc/skip-export.model.ts rename to src/app/core/models/intacct/misc/skip-export.model.ts index 4c7c714df..90b68cf82 100644 --- a/src/app/core/models/si/misc/skip-export.model.ts +++ b/src/app/core/models/intacct/misc/skip-export.model.ts @@ -1,4 +1,4 @@ -import { ConditionField, JoinOption, Operator } from "../si-configuration/advanced-settings.model"; +import { ConditionField, JoinOption, Operator } from "../intacct-configuration/advanced-settings.model"; export type SkipExport = { diff --git a/src/app/core/models/misc/tracking.model.ts b/src/app/core/models/misc/tracking.model.ts index 6216abd0b..a29043d3a 100644 --- a/src/app/core/models/misc/tracking.model.ts +++ b/src/app/core/models/misc/tracking.model.ts @@ -8,9 +8,9 @@ import { QBDFieldMappingGet } from "../qbd/qbd-configuration/field-mapping.model import { Sage300AdvancedSettingGet } from "../sage300/sage300-configuration/sage300-advanced-settings.model"; import { Sage300ExportSettingGet } from "../sage300/sage300-configuration/sage300-export-setting.model"; import { Sage300ImportSettingGet } from "../sage300/sage300-configuration/sage300-import-settings.model"; -import { AdvancedSettingsGet } from "../si/si-configuration/advanced-settings.model"; -import { ExportSettingGet } from "../si/si-configuration/export-settings.model"; -import { ImportSettingGet, ImportSettings } from "../si/si-configuration/import-settings.model"; +import { AdvancedSettingsGet } from "../intacct/intacct-configuration/advanced-settings.model"; +import { ExportSettingGet } from "../intacct/intacct-configuration/export-settings.model"; +import { ImportSettingGet, ImportSettings } from "../intacct/intacct-configuration/import-settings.model"; export type UpdateEventAdditionalProperty = { phase: ProgressPhase, diff --git a/src/app/core/services/common/export-log.service.ts b/src/app/core/services/common/export-log.service.ts index 497176fb8..29d52d81d 100644 --- a/src/app/core/services/common/export-log.service.ts +++ b/src/app/core/services/common/export-log.service.ts @@ -3,7 +3,7 @@ import { ApiService } from './api.service'; import { UserService } from '../misc/user.service'; import { WorkspaceService } from './workspace.service'; import { environment } from 'src/environments/environment'; -import { SkipExportLogResponse } from '../../models/si/db/expense-group.model'; +import { SkipExportLogResponse } from '../../models/intacct/db/expense-group.model'; import { FyleReferenceType, TaskLogState } from '../../models/enum/enum.model'; import { Observable } from 'rxjs'; import { AccountingExport } from '../../models/db/accounting-export.model'; diff --git a/src/app/core/services/integration/appcues.service.ts b/src/app/core/services/integration/appcues.service.ts index 82ddb8e30..98df49f55 100644 --- a/src/app/core/services/integration/appcues.service.ts +++ b/src/app/core/services/integration/appcues.service.ts @@ -3,7 +3,7 @@ import { UserService } from '../misc/user.service'; import { AppName } from '../../models/enum/enum.model'; import { SiWorkspaceService } from '../si/si-core/si-workspace.service'; import { MinimalUser } from '../../models/db/user.model'; -import { IntacctWorkspace } from '../../models/si/db/workspaces.model'; +import { IntacctWorkspace } from '../../models/intacct/db/workspaces.model'; @Injectable({ providedIn: 'root' diff --git a/src/app/core/services/integration/tracking.service.ts b/src/app/core/services/integration/tracking.service.ts index 8e508273d..1396780c8 100644 --- a/src/app/core/services/integration/tracking.service.ts +++ b/src/app/core/services/integration/tracking.service.ts @@ -4,10 +4,10 @@ import { MappingAlphabeticalFilterAdditionalProperty, ResolveMappingErrorPropert import { QBDAdvancedSettingsPost } from '../../models/qbd/qbd-configuration/advanced-setting.model'; import { QBDExportSettingPost } from '../../models/qbd/qbd-configuration/export-setting.model'; import { QBDFieldMappingPost } from '../../models/qbd/qbd-configuration/field-mapping.model'; -import { LocationEntityPost } from '../../models/si/si-configuration/connector.model'; -import { ExportSettingPost } from '../../models/si/si-configuration/export-settings.model'; -import { ImportSettingPost } from '../../models/si/si-configuration/import-settings.model'; -import { AdvancedSettingsPost } from '../../models/si/si-configuration/advanced-settings.model'; +import { LocationEntityPost } from '../../models/intacct/intacct-configuration/connector.model'; +import { ExportSettingPost } from '../../models/intacct/intacct-configuration/export-settings.model'; +import { ImportSettingPost } from '../../models/intacct/intacct-configuration/import-settings.model'; +import { AdvancedSettingsPost } from '../../models/intacct/intacct-configuration/advanced-settings.model'; import { Sage300ExportSettingPost } from '../../models/sage300/sage300-configuration/sage300-export-setting.model'; import { Sage300ImportSettingPost } from '../../models/sage300/sage300-configuration/sage300-import-settings.model'; import { Sage300AdvancedSettingPost } from '../../models/sage300/sage300-configuration/sage300-advanced-settings.model'; diff --git a/src/app/core/services/si/export-log/export-log.service.ts b/src/app/core/services/si/export-log/export-log.service.ts index cd3b289a7..662929817 100644 --- a/src/app/core/services/si/export-log/export-log.service.ts +++ b/src/app/core/services/si/export-log/export-log.service.ts @@ -6,9 +6,9 @@ import { UserService } from '../../misc/user.service'; import { SiWorkspaceService } from '../si-core/si-workspace.service'; import { FyleReferenceType, TaskLogState } from 'src/app/core/models/enum/enum.model'; import { SelectedDateFilter } from 'src/app/core/models/qbd/misc/date-filter.model'; -import { ExpenseGroup, ExpenseGroupDescription, ExpenseGroupResponse, SkipExportLogResponse } from 'src/app/core/models/si/db/expense-group.model'; +import { ExpenseGroup, ExpenseGroupDescription, ExpenseGroupResponse, SkipExportLogResponse } from 'src/app/core/models/intacct/db/expense-group.model'; import { ExpenseGroupSetting } from 'src/app/core/models/db/expense-group-setting.model'; -import { Expense } from 'src/app/core/models/si/db/expense.model'; +import { Expense } from 'src/app/core/models/intacct/db/expense.model'; import { ApiService } from '../../common/api.service'; @Injectable({ diff --git a/src/app/core/services/si/si-configuration/si-advanced-setting.service.ts b/src/app/core/services/si/si-configuration/si-advanced-setting.service.ts index 1f3752568..0171aaf41 100644 --- a/src/app/core/services/si/si-configuration/si-advanced-setting.service.ts +++ b/src/app/core/services/si/si-configuration/si-advanced-setting.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { SiWorkspaceService } from '../si-core/si-workspace.service'; import { Observable } from 'rxjs'; -import { AdvancedSettingsGet, AdvancedSettingsPost, ConditionField, ExpenseFilterResponse, SkipExport } from 'src/app/core/models/si/si-configuration/advanced-settings.model'; +import { AdvancedSettingsGet, AdvancedSettingsPost, ConditionField, ExpenseFilterResponse, SkipExport } from 'src/app/core/models/intacct/intacct-configuration/advanced-settings.model'; import { EmailOption } from 'src/app/core/models/bamboo-hr/bamboo-hr.model'; import { StorageService } from '../../common/storage.service'; import { ApiService } from '../../common/api.service'; diff --git a/src/app/core/services/si/si-configuration/si-export-setting.service.ts b/src/app/core/services/si/si-configuration/si-export-setting.service.ts index 864430642..d73b717dc 100644 --- a/src/app/core/services/si/si-configuration/si-export-setting.service.ts +++ b/src/app/core/services/si/si-configuration/si-export-setting.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { SiWorkspaceService } from '../si-core/si-workspace.service'; import { Observable } from 'rxjs'; -import { ExportSettingGet, ExportSettingPost } from 'src/app/core/models/si/si-configuration/export-settings.model'; +import { ExportSettingGet, ExportSettingPost } from 'src/app/core/models/intacct/intacct-configuration/export-settings.model'; import { ApiService } from '../../common/api.service'; @Injectable({ diff --git a/src/app/core/services/si/si-configuration/si-import-setting.service.ts b/src/app/core/services/si/si-configuration/si-import-setting.service.ts index ca603775e..8a9ffc402 100644 --- a/src/app/core/services/si/si-configuration/si-import-setting.service.ts +++ b/src/app/core/services/si/si-configuration/si-import-setting.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { SiWorkspaceService } from '../si-core/si-workspace.service'; import { Observable } from 'rxjs'; -import { ImportSettingGet, ImportSettingPost, MappingSetting } from 'src/app/core/models/si/si-configuration/import-settings.model'; +import { ImportSettingGet, ImportSettingPost, MappingSetting } from 'src/app/core/models/intacct/intacct-configuration/import-settings.model'; import { ApiService } from '../../common/api.service'; diff --git a/src/app/core/services/si/si-core/dashboard.service.ts b/src/app/core/services/si/si-core/dashboard.service.ts index 82c7c10ea..471a1797f 100644 --- a/src/app/core/services/si/si-core/dashboard.service.ts +++ b/src/app/core/services/si/si-core/dashboard.service.ts @@ -2,11 +2,11 @@ import { Injectable } from '@angular/core'; import { firstValueFrom, from, Observable } from 'rxjs'; import { Cacheable } from 'ts-cacheable'; import { SiWorkspaceService } from './si-workspace.service'; -import { LastExport } from 'src/app/core/models/si/db/last-export.model'; +import { LastExport } from 'src/app/core/models/intacct/db/last-export.model'; import { TaskLogState, TaskLogType } from 'src/app/core/models/enum/enum.model'; -import { TaskGetParams, TaskResponse } from 'src/app/core/models/si/db/task-log.model'; -import { Error } from 'src/app/core/models/si/db/error.model'; -import { ExportableExpenseGroup } from 'src/app/core/models/si/db/expense-group.model'; +import { TaskGetParams, TaskResponse } from 'src/app/core/models/intacct/db/task-log.model'; +import { Error } from 'src/app/core/models/intacct/db/error.model'; +import { ExportableExpenseGroup } from 'src/app/core/models/intacct/db/expense-group.model'; import { ApiService } from '../../common/api.service'; @Injectable({ diff --git a/src/app/core/services/si/si-core/intacct-connector.service.ts b/src/app/core/services/si/si-core/intacct-connector.service.ts index a3708a32c..739e75db6 100644 --- a/src/app/core/services/si/si-core/intacct-connector.service.ts +++ b/src/app/core/services/si/si-core/intacct-connector.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; import { Observable, Subject } from 'rxjs'; -import { LocationEntityMapping } from 'src/app/core/models/si/db/location-entity-mapping.model'; +import { LocationEntityMapping } from 'src/app/core/models/intacct/db/location-entity-mapping.model'; import { DestinationAttribute } from 'src/app/core/models/db/destination-attribute.model'; import { SiWorkspaceService } from './si-workspace.service'; import { StorageService } from '../../common/storage.service'; import { Cacheable, CacheBuster, globalCacheBusterNotifier } from 'ts-cacheable'; -import { SageIntacctCredential } from 'src/app/core/models/si/db/sage-credentials.model'; +import { SageIntacctCredential } from 'src/app/core/models/intacct/db/sage-credentials.model'; import { ApiService } from '../../common/api.service'; diff --git a/src/app/core/services/si/si-core/si-mappings.service.ts b/src/app/core/services/si/si-core/si-mappings.service.ts index ee89cd63f..6a7377857 100644 --- a/src/app/core/services/si/si-core/si-mappings.service.ts +++ b/src/app/core/services/si/si-core/si-mappings.service.ts @@ -1,17 +1,17 @@ import { Injectable } from '@angular/core'; import { Observable, from } from 'rxjs'; import { SiWorkspaceService } from './si-workspace.service'; -import { ExpenseField } from 'src/app/core/models/si/db/expense-field.model'; +import { ExpenseField } from 'src/app/core/models/intacct/db/expense-field.model'; import { Configuration } from 'src/app/core/models/db/configuration.model'; -import { MappingSetting, MappingSettingResponse } from 'src/app/core/models/si/db/mapping-setting.model'; -import { CategoryMappingsResponse } from 'src/app/core/models/si/db/category-mapping-response.model'; -import { EmployeeMapping, EmployeeMappingPost, EmployeeMappingsResponse } from 'src/app/core/models/si/db/employee-mapping.model'; -import { MappingSource } from 'src/app/core/models/si/db/mapping-source.model'; -import { MappingIntacct, MappingPost, MappingStats } from 'src/app/core/models/si/db/mapping.model'; +import { MappingSetting, MappingSettingResponse } from 'src/app/core/models/intacct/db/mapping-setting.model'; +import { CategoryMappingsResponse } from 'src/app/core/models/intacct/db/category-mapping-response.model'; +import { EmployeeMapping, EmployeeMappingPost, EmployeeMappingsResponse } from 'src/app/core/models/intacct/db/employee-mapping.model'; +import { MappingSource } from 'src/app/core/models/intacct/db/mapping-source.model'; +import { MappingIntacct, MappingPost, MappingStats } from 'src/app/core/models/intacct/db/mapping.model'; import { MappingState } from 'src/app/core/models/enum/enum.model'; -import { CategoryMapping, CategoryMappingPost } from 'src/app/core/models/si/db/category-mapping.model'; -import { ExtendedExpenseAttributeResponse } from 'src/app/core/models/si/db/expense-attribute.model'; -import { GroupedDestinationAttribute, IntacctDestinationAttribute, PaginatedintacctDestinationAttribute } from 'src/app/core/models/si/db/destination-attribute.model'; +import { CategoryMapping, CategoryMappingPost } from 'src/app/core/models/intacct/db/category-mapping.model'; +import { ExtendedExpenseAttributeResponse } from 'src/app/core/models/intacct/db/expense-attribute.model'; +import { GroupedDestinationAttribute, IntacctDestinationAttribute, PaginatedintacctDestinationAttribute } from 'src/app/core/models/intacct/db/destination-attribute.model'; import { ApiService } from '../../common/api.service'; @Injectable({ diff --git a/src/app/core/services/si/si-core/si-workspace.service.ts b/src/app/core/services/si/si-core/si-workspace.service.ts index 52a63656d..920157193 100644 --- a/src/app/core/services/si/si-core/si-workspace.service.ts +++ b/src/app/core/services/si/si-core/si-workspace.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { IntacctOnboardingState } from 'src/app/core/models/enum/enum.model'; -import { IntacctWorkspace } from 'src/app/core/models/si/db/workspaces.model'; +import { IntacctWorkspace } from 'src/app/core/models/intacct/db/workspaces.model'; import { Cacheable } from 'ts-cacheable'; import { StorageService } from '../../common/storage.service'; -import { Configuration } from 'src/app/core/models/si/db/configuration.model'; +import { Configuration } from 'src/app/core/models/intacct/db/configuration.model'; import { HelperService } from '../../common/helper.service'; import { ApiService } from '../../common/api.service'; diff --git a/src/app/integrations/business-central/business-central-main/business-central-export-log/business-central-complete-export-log/business-central-complete-export-log.component.ts b/src/app/integrations/business-central/business-central-main/business-central-export-log/business-central-complete-export-log/business-central-complete-export-log.component.ts index e9709bcde..4fdbedc5c 100644 --- a/src/app/integrations/business-central/business-central-main/business-central-export-log/business-central-complete-export-log/business-central-complete-export-log.component.ts +++ b/src/app/integrations/business-central/business-central-main/business-central-export-log/business-central-complete-export-log/business-central-complete-export-log.component.ts @@ -4,7 +4,7 @@ import { AccountingExport, AccountingExportList, AccountingExportModel } from 's import { AccountingExportStatus, AccountingExportType, AppName, BusinessCentralExportType, PaginatorPage, TrackingApp } from 'src/app/core/models/enum/enum.model'; import { Paginator } from 'src/app/core/models/misc/paginator.model'; import { DateFilter, SelectedDateFilter } from 'src/app/core/models/qbd/misc/date-filter.model'; -import { Expense } from 'src/app/core/models/si/db/expense.model'; +import { Expense } from 'src/app/core/models/intacct/db/expense.model'; import { AccountingExportService } from 'src/app/core/services/common/accounting-export.service'; import { ExportLogService } from 'src/app/core/services/common/export-log.service'; import { PaginatorService } from 'src/app/core/services/common/paginator.service'; diff --git a/src/app/integrations/business-central/business-central-main/business-central-export-log/business-central-skipped-export-log/business-central-skipped-export-log.component.ts b/src/app/integrations/business-central/business-central-main/business-central-export-log/business-central-skipped-export-log/business-central-skipped-export-log.component.ts index 2f188a8ac..82acb7ecc 100644 --- a/src/app/integrations/business-central/business-central-main/business-central-export-log/business-central-skipped-export-log/business-central-skipped-export-log.component.ts +++ b/src/app/integrations/business-central/business-central-main/business-central-export-log/business-central-skipped-export-log/business-central-skipped-export-log.component.ts @@ -4,7 +4,7 @@ import { AccountingExportModel, SkippedAccountingExportModel } from 'src/app/cor import { PaginatorPage, TrackingApp } from 'src/app/core/models/enum/enum.model'; import { Paginator } from 'src/app/core/models/misc/paginator.model'; import { DateFilter, SelectedDateFilter } from 'src/app/core/models/qbd/misc/date-filter.model'; -import { SkipExportList, SkipExportLog, SkipExportLogResponse } from 'src/app/core/models/si/db/expense-group.model'; +import { SkipExportList, SkipExportLog, SkipExportLogResponse } from 'src/app/core/models/intacct/db/expense-group.model'; import { ExportLogService } from 'src/app/core/services/common/export-log.service'; import { PaginatorService } from 'src/app/core/services/common/paginator.service'; import { TrackingService } from 'src/app/core/services/integration/tracking.service'; diff --git a/src/app/integrations/si/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.html b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.html similarity index 71% rename from src/app/integrations/si/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.html rename to src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.html index c8cb26625..0746a434a 100644 --- a/src/app/integrations/si/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.html +++ b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.html @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/src/app/integrations/si/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.scss b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.scss similarity index 100% rename from src/app/integrations/si/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.scss rename to src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.scss diff --git a/src/app/integrations/si/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.spec.ts b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.spec.ts similarity index 100% rename from src/app/integrations/si/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.spec.ts rename to src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.spec.ts diff --git a/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.ts b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.ts new file mode 100644 index 000000000..e6a6c47ea --- /dev/null +++ b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.ts @@ -0,0 +1,29 @@ +import { Component, OnInit } from '@angular/core'; +import { IntacctOnboardingModel } from 'src/app/core/models/intacct/intacct-configuration/intacct-onboarding.model'; +import { OnboardingStepper } from 'src/app/core/models/misc/onboarding-stepper.model'; +import { WorkspaceService } from 'src/app/core/services/common/workspace.service'; + +@Component({ + selector: 'app-onboarding-intacct-connector', + templateUrl: './intacct-onboarding-connector.component.html', + styleUrls: ['./intacct-onboarding-connector.component.scss'] +}) +export class IntacctOnboardingConnectorComponent implements OnInit { + + isLoading: boolean; + + isIntacctConnected: boolean = false; + + onboardingSteps: OnboardingStepper[] = new IntacctOnboardingModel().getOnboardingSteps('Connect to Sage Intacct', this.workspaceService.getOnboardingState()); + + constructor( + private workspaceService: WorkspaceService + ) { } + + setupConnectionStatus(eventData: boolean) { + this.isIntacctConnected = eventData; + } + + ngOnInit(): void { + } +} diff --git a/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-export-setting/intacct-onboarding-export-setting.component.html b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-export-setting/intacct-onboarding-export-setting.component.html new file mode 100644 index 000000000..f6bb4cfc3 --- /dev/null +++ b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-export-setting/intacct-onboarding-export-setting.component.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/app/integrations/si/intacct-onboarding/onboarding-advanced-setting/onboarding-advanced-setting.component.scss b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-export-setting/intacct-onboarding-export-setting.component.scss similarity index 100% rename from src/app/integrations/si/intacct-onboarding/onboarding-advanced-setting/onboarding-advanced-setting.component.scss rename to src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-export-setting/intacct-onboarding-export-setting.component.scss diff --git a/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-export-setting/intacct-onboarding-export-setting.component.spec.ts b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-export-setting/intacct-onboarding-export-setting.component.spec.ts new file mode 100644 index 000000000..a9844d1d3 --- /dev/null +++ b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-export-setting/intacct-onboarding-export-setting.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { IntacctOnboardingExportSettingComponent } from './intacct-onboarding-export-setting.component'; + +describe('IntacctOnboardingExportSettingComponent', () => { + let component: IntacctOnboardingExportSettingComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ IntacctOnboardingExportSettingComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(IntacctOnboardingExportSettingComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-export-setting/intacct-onboarding-export-setting.component.ts b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-export-setting/intacct-onboarding-export-setting.component.ts new file mode 100644 index 000000000..8aa10bcda --- /dev/null +++ b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-export-setting/intacct-onboarding-export-setting.component.ts @@ -0,0 +1,23 @@ +import { Component, OnInit } from '@angular/core'; +import { IntacctOnboardingModel } from 'src/app/core/models/intacct/intacct-configuration/intacct-onboarding.model'; +import { OnboardingStepper } from 'src/app/core/models/misc/onboarding-stepper.model'; +import { QBOOnboardingModel } from 'src/app/core/models/qbo/qbo-configuration/qbo-onboarding.model'; +import { WorkspaceService } from 'src/app/core/services/common/workspace.service'; + +@Component({ + selector: 'app-intacct-onboarding-export-setting', + templateUrl: './intacct-onboarding-export-setting.component.html', + styleUrls: ['./intacct-onboarding-export-setting.component.scss'] +}) +export class IntacctOnboardingExportSettingComponent implements OnInit { + + onboardingSteps: OnboardingStepper[] = new IntacctOnboardingModel().getOnboardingSteps('Export Settings', this.workspaceService.getOnboardingState()); + + constructor( + private workspaceService: WorkspaceService + ) { } + + ngOnInit(): void { + } + +} diff --git a/src/app/integrations/si/intacct-onboarding/intacct-onboarding-landing/intacct-onboarding-landing.component.html b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-landing/intacct-onboarding-landing.component.html similarity index 100% rename from src/app/integrations/si/intacct-onboarding/intacct-onboarding-landing/intacct-onboarding-landing.component.html rename to src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-landing/intacct-onboarding-landing.component.html diff --git a/src/app/integrations/si/intacct-onboarding/intacct-onboarding-landing/intacct-onboarding-landing.component.scss b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-landing/intacct-onboarding-landing.component.scss similarity index 100% rename from src/app/integrations/si/intacct-onboarding/intacct-onboarding-landing/intacct-onboarding-landing.component.scss rename to src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-landing/intacct-onboarding-landing.component.scss diff --git a/src/app/integrations/si/intacct-onboarding/intacct-onboarding-landing/intacct-onboarding-landing.component.spec.ts b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-landing/intacct-onboarding-landing.component.spec.ts similarity index 100% rename from src/app/integrations/si/intacct-onboarding/intacct-onboarding-landing/intacct-onboarding-landing.component.spec.ts rename to src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-landing/intacct-onboarding-landing.component.spec.ts diff --git a/src/app/integrations/si/intacct-onboarding/intacct-onboarding-landing/intacct-onboarding-landing.component.ts b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-landing/intacct-onboarding-landing.component.ts similarity index 100% rename from src/app/integrations/si/intacct-onboarding/intacct-onboarding-landing/intacct-onboarding-landing.component.ts rename to src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-landing/intacct-onboarding-landing.component.ts diff --git a/src/app/integrations/si/intacct-onboarding/onboarding-routing.module.ts b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-routing.module.ts similarity index 82% rename from src/app/integrations/si/intacct-onboarding/onboarding-routing.module.ts rename to src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-routing.module.ts index 2b1840b08..5868c30fc 100644 --- a/src/app/integrations/si/intacct-onboarding/onboarding-routing.module.ts +++ b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-routing.module.ts @@ -1,11 +1,11 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { IntacctOnboardingLandingComponent } from './intacct-onboarding-landing/intacct-onboarding-landing.component'; -import { OnboardingExportSettingComponent } from './onboarding-export-setting/onboarding-export-setting.component'; +import { IntacctOnboardingExportSettingComponent } from './intacct-onboarding-export-setting/intacct-onboarding-export-setting.component'; import { OnboardingImportSettingComponent } from './onboarding-import-setting/onboarding-import-setting.component'; import { OnboardingAdvancedSettingComponent } from './onboarding-advanced-setting/onboarding-advanced-setting.component'; import { OnboardingDoneComponent } from './onboarding-done/onboarding-done.component'; -import { OnboardingComponent } from './onboarding.component'; +import { IntacctOnboardingComponent } from './intacct-onboarding.component'; import { RouterModule, Routes } from '@angular/router'; import { IntacctOnboardingConnectorComponent } from './intacct-onboarding-connector/intacct-onboarding-connector.component'; @@ -13,7 +13,7 @@ import { IntacctOnboardingConnectorComponent } from './intacct-onboarding-connec const routes: Routes = [ { path: '', - component: OnboardingComponent, + component: IntacctOnboardingComponent, children: [ { path: 'landing', @@ -25,7 +25,7 @@ const routes: Routes = [ }, { path: 'export_settings', - component: OnboardingExportSettingComponent + component: IntacctOnboardingExportSettingComponent }, { path: 'import_settings', diff --git a/src/app/integrations/si/intacct-onboarding/onboarding.component.html b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding.component.html similarity index 100% rename from src/app/integrations/si/intacct-onboarding/onboarding.component.html rename to src/app/integrations/intacct/intacct-onboarding/intacct-onboarding.component.html diff --git a/src/app/integrations/si/intacct-onboarding/onboarding-export-setting/onboarding-export-setting.component.scss b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding.component.scss similarity index 100% rename from src/app/integrations/si/intacct-onboarding/onboarding-export-setting/onboarding-export-setting.component.scss rename to src/app/integrations/intacct/intacct-onboarding/intacct-onboarding.component.scss diff --git a/src/app/integrations/si/intacct-onboarding/onboarding.component.spec.ts b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding.component.spec.ts similarity index 55% rename from src/app/integrations/si/intacct-onboarding/onboarding.component.spec.ts rename to src/app/integrations/intacct/intacct-onboarding/intacct-onboarding.component.spec.ts index d0e0ad255..fd32a6c71 100644 --- a/src/app/integrations/si/intacct-onboarding/onboarding.component.spec.ts +++ b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding.component.spec.ts @@ -1,18 +1,18 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { OnboardingComponent } from './onboarding.component'; +import { IntacctOnboardingComponent } from './intacct-onboarding.component'; describe('OnboardingComponent', () => { - let component: OnboardingComponent; - let fixture: ComponentFixture; + let component: IntacctOnboardingComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ OnboardingComponent ] + declarations: [ IntacctOnboardingComponent ] }) .compileComponents(); - fixture = TestBed.createComponent(OnboardingComponent); + fixture = TestBed.createComponent(IntacctOnboardingComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding.component.ts b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding.component.ts new file mode 100644 index 000000000..855d78d62 --- /dev/null +++ b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-intacct-onboarding', + templateUrl: './intacct-onboarding.component.html', + styleUrls: ['./intacct-onboarding.component.scss'] +}) +export class IntacctOnboardingComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/integrations/si/intacct-onboarding/onboarding.module.ts b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding.module.ts similarity index 68% rename from src/app/integrations/si/intacct-onboarding/onboarding.module.ts rename to src/app/integrations/intacct/intacct-onboarding/intacct-onboarding.module.ts index 412dd9e52..fd30a7f34 100644 --- a/src/app/integrations/si/intacct-onboarding/onboarding.module.ts +++ b/src/app/integrations/intacct/intacct-onboarding/intacct-onboarding.module.ts @@ -1,33 +1,34 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { OnboardingRoutingModule } from './onboarding-routing.module'; +import { OnboardingRoutingModule } from './intacct-onboarding-routing.module'; import { SharedModule } from 'src/app/shared/shared.module'; import { IntacctOnboardingConnectorComponent } from './intacct-onboarding-connector/intacct-onboarding-connector.component'; import { IntacctOnboardingLandingComponent } from './intacct-onboarding-landing/intacct-onboarding-landing.component'; -import { OnboardingComponent } from './onboarding.component'; +import { IntacctOnboardingComponent } from './intacct-onboarding.component'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { OnboardingDoneComponent } from './onboarding-done/onboarding-done.component'; -import { OnboardingExportSettingComponent } from './onboarding-export-setting/onboarding-export-setting.component'; +import { IntacctOnboardingExportSettingComponent } from './intacct-onboarding-export-setting/intacct-onboarding-export-setting.component'; import { OnboardingAdvancedSettingComponent } from './onboarding-advanced-setting/onboarding-advanced-setting.component'; import { OnboardingImportSettingComponent } from './onboarding-import-setting/onboarding-import-setting.component'; +import { IntacctSharedModule } from '../intacct-shared/intacct-shared.module'; @NgModule({ declarations: [ IntacctOnboardingConnectorComponent, IntacctOnboardingLandingComponent, - OnboardingComponent, - OnboardingComponent, + IntacctOnboardingComponent, OnboardingDoneComponent, OnboardingImportSettingComponent, - OnboardingExportSettingComponent, + IntacctOnboardingExportSettingComponent, OnboardingAdvancedSettingComponent ], imports: [ CommonModule, OnboardingRoutingModule, SharedModule, + IntacctSharedModule, FormsModule, ReactiveFormsModule ] }) -export class OnboardingModule { } +export class IntacctOnboardingModule { } diff --git a/src/app/integrations/si/intacct-onboarding/onboarding-advanced-setting/onboarding-advanced-setting.component.html b/src/app/integrations/intacct/intacct-onboarding/onboarding-advanced-setting/onboarding-advanced-setting.component.html similarity index 100% rename from src/app/integrations/si/intacct-onboarding/onboarding-advanced-setting/onboarding-advanced-setting.component.html rename to src/app/integrations/intacct/intacct-onboarding/onboarding-advanced-setting/onboarding-advanced-setting.component.html diff --git a/src/app/integrations/si/intacct-onboarding/onboarding-import-setting/onboarding-import-setting.component.scss b/src/app/integrations/intacct/intacct-onboarding/onboarding-advanced-setting/onboarding-advanced-setting.component.scss similarity index 100% rename from src/app/integrations/si/intacct-onboarding/onboarding-import-setting/onboarding-import-setting.component.scss rename to src/app/integrations/intacct/intacct-onboarding/onboarding-advanced-setting/onboarding-advanced-setting.component.scss diff --git a/src/app/integrations/si/intacct-onboarding/onboarding-advanced-setting/onboarding-advanced-setting.component.spec.ts b/src/app/integrations/intacct/intacct-onboarding/onboarding-advanced-setting/onboarding-advanced-setting.component.spec.ts similarity index 100% rename from src/app/integrations/si/intacct-onboarding/onboarding-advanced-setting/onboarding-advanced-setting.component.spec.ts rename to src/app/integrations/intacct/intacct-onboarding/onboarding-advanced-setting/onboarding-advanced-setting.component.spec.ts diff --git a/src/app/integrations/si/intacct-onboarding/onboarding-advanced-setting/onboarding-advanced-setting.component.ts b/src/app/integrations/intacct/intacct-onboarding/onboarding-advanced-setting/onboarding-advanced-setting.component.ts similarity index 100% rename from src/app/integrations/si/intacct-onboarding/onboarding-advanced-setting/onboarding-advanced-setting.component.ts rename to src/app/integrations/intacct/intacct-onboarding/onboarding-advanced-setting/onboarding-advanced-setting.component.ts diff --git a/src/app/integrations/si/intacct-onboarding/onboarding-done/onboarding-done.component.html b/src/app/integrations/intacct/intacct-onboarding/onboarding-done/onboarding-done.component.html similarity index 100% rename from src/app/integrations/si/intacct-onboarding/onboarding-done/onboarding-done.component.html rename to src/app/integrations/intacct/intacct-onboarding/onboarding-done/onboarding-done.component.html diff --git a/src/app/integrations/si/intacct-onboarding/onboarding-done/onboarding-done.component.scss b/src/app/integrations/intacct/intacct-onboarding/onboarding-done/onboarding-done.component.scss similarity index 100% rename from src/app/integrations/si/intacct-onboarding/onboarding-done/onboarding-done.component.scss rename to src/app/integrations/intacct/intacct-onboarding/onboarding-done/onboarding-done.component.scss diff --git a/src/app/integrations/si/intacct-onboarding/onboarding-done/onboarding-done.component.spec.ts b/src/app/integrations/intacct/intacct-onboarding/onboarding-done/onboarding-done.component.spec.ts similarity index 100% rename from src/app/integrations/si/intacct-onboarding/onboarding-done/onboarding-done.component.spec.ts rename to src/app/integrations/intacct/intacct-onboarding/onboarding-done/onboarding-done.component.spec.ts diff --git a/src/app/integrations/si/intacct-onboarding/onboarding-done/onboarding-done.component.ts b/src/app/integrations/intacct/intacct-onboarding/onboarding-done/onboarding-done.component.ts similarity index 100% rename from src/app/integrations/si/intacct-onboarding/onboarding-done/onboarding-done.component.ts rename to src/app/integrations/intacct/intacct-onboarding/onboarding-done/onboarding-done.component.ts diff --git a/src/app/integrations/si/intacct-onboarding/onboarding-import-setting/onboarding-import-setting.component.html b/src/app/integrations/intacct/intacct-onboarding/onboarding-import-setting/onboarding-import-setting.component.html similarity index 100% rename from src/app/integrations/si/intacct-onboarding/onboarding-import-setting/onboarding-import-setting.component.html rename to src/app/integrations/intacct/intacct-onboarding/onboarding-import-setting/onboarding-import-setting.component.html diff --git a/src/app/integrations/si/intacct-onboarding/onboarding.component.scss b/src/app/integrations/intacct/intacct-onboarding/onboarding-import-setting/onboarding-import-setting.component.scss similarity index 100% rename from src/app/integrations/si/intacct-onboarding/onboarding.component.scss rename to src/app/integrations/intacct/intacct-onboarding/onboarding-import-setting/onboarding-import-setting.component.scss diff --git a/src/app/integrations/si/intacct-onboarding/onboarding-import-setting/onboarding-import-setting.component.spec.ts b/src/app/integrations/intacct/intacct-onboarding/onboarding-import-setting/onboarding-import-setting.component.spec.ts similarity index 100% rename from src/app/integrations/si/intacct-onboarding/onboarding-import-setting/onboarding-import-setting.component.spec.ts rename to src/app/integrations/intacct/intacct-onboarding/onboarding-import-setting/onboarding-import-setting.component.spec.ts diff --git a/src/app/integrations/si/intacct-onboarding/onboarding-import-setting/onboarding-import-setting.component.ts b/src/app/integrations/intacct/intacct-onboarding/onboarding-import-setting/onboarding-import-setting.component.ts similarity index 100% rename from src/app/integrations/si/intacct-onboarding/onboarding-import-setting/onboarding-import-setting.component.ts rename to src/app/integrations/intacct/intacct-onboarding/onboarding-import-setting/onboarding-import-setting.component.ts diff --git a/src/app/integrations/si/si-routing.module.ts b/src/app/integrations/intacct/intacct-routing.module.ts similarity index 68% rename from src/app/integrations/si/si-routing.module.ts rename to src/app/integrations/intacct/intacct-routing.module.ts index 147d833ee..dad369ae0 100644 --- a/src/app/integrations/si/si-routing.module.ts +++ b/src/app/integrations/intacct/intacct-routing.module.ts @@ -1,15 +1,15 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SiComponent } from './si.component'; +import { IntacctComponent } from './intacct.component'; const routes: Routes = [ { path: '', - component: SiComponent, + component: IntacctComponent, children: [ { path: 'onboarding', - loadChildren: () => import('./intacct-onboarding/onboarding.module').then(m => m.OnboardingModule) + loadChildren: () => import('./intacct-onboarding/intacct-onboarding.module').then(m => m.IntacctOnboardingModule) }, { path: 'main', diff --git a/src/app/shared/components/si/configuration/configuration-export-settings/configuration-export-settings.component.html b/src/app/integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.html similarity index 100% rename from src/app/shared/components/si/configuration/configuration-export-settings/configuration-export-settings.component.html rename to src/app/integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.html diff --git a/src/app/shared/components/si/configuration/configuration-export-settings/configuration-export-settings.component.scss b/src/app/integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.scss similarity index 100% rename from src/app/shared/components/si/configuration/configuration-export-settings/configuration-export-settings.component.scss rename to src/app/integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.scss diff --git a/src/app/integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.spec.ts b/src/app/integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.spec.ts new file mode 100644 index 000000000..baf644802 --- /dev/null +++ b/src/app/integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { IntacctExportSettingsComponent } from './intacct-export-settings.component'; + +describe('IntacctExportSettingsComponent', () => { + let component: IntacctExportSettingsComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ IntacctExportSettingsComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(IntacctExportSettingsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/components/si/configuration/configuration-export-settings/configuration-export-settings.component.ts b/src/app/integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.ts similarity index 98% rename from src/app/shared/components/si/configuration/configuration-export-settings/configuration-export-settings.component.ts rename to src/app/integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.ts index 7550a9a87..f3db15a27 100644 --- a/src/app/shared/components/si/configuration/configuration-export-settings/configuration-export-settings.component.ts +++ b/src/app/integrations/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.ts @@ -1,5 +1,5 @@ -import { TitleCasePipe } from '@angular/common'; import { Component, OnInit } from '@angular/core'; +import { TitleCasePipe } from '@angular/common'; import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from '@angular/forms'; import { DomSanitizer } from '@angular/platform-browser'; import { Router } from '@angular/router'; @@ -8,8 +8,8 @@ import { brandingConfig, brandingFeatureConfig, brandingKbArticles } from 'src/a import { ExportSettingModel } from 'src/app/core/models/common/export-settings.model'; import { DefaultDestinationAttribute } from 'src/app/core/models/db/destination-attribute.model'; import { CCCExpenseState, ConfigurationCta, CorporateCreditCardExpensesObject, FyleField, ExpenseGroupedBy, ExpenseState, ExportDateType, IntacctReimbursableExpensesObject, ExpenseGroupingFieldOption, Page, ToastSeverity, IntacctOnboardingState, ProgressPhase, IntacctUpdateEvent, AppName, IntacctExportSettingDestinationOptionKey, TrackingApp } from 'src/app/core/models/enum/enum.model'; -import { ExportSettingDestinationAttributeOption, IntacctDestinationAttribute, PaginatedintacctDestinationAttribute } from 'src/app/core/models/si/db/destination-attribute.model'; -import { ExportSettingFormOption, ExportSettingGet, ExportSettingModel as IntacctExportSettingModel, ExportSettingOptionSearch } from 'src/app/core/models/si/si-configuration/export-settings.model'; +import { ExportSettingDestinationAttributeOption, IntacctDestinationAttribute, PaginatedintacctDestinationAttribute } from 'src/app/core/models/intacct/db/destination-attribute.model'; +import { ExportSettingFormOption, ExportSettingGet, ExportSettingModel as IntacctExportSettingModel, ExportSettingOptionSearch } from 'src/app/core/models/intacct/intacct-configuration/export-settings.model'; import { IntegrationsToastService } from 'src/app/core/services/common/integrations-toast.service'; import { TrackingService } from 'src/app/core/services/integration/tracking.service'; import { SiExportSettingService } from 'src/app/core/services/si/si-configuration/si-export-setting.service'; @@ -17,11 +17,11 @@ import { SiMappingsService } from 'src/app/core/services/si/si-core/si-mappings. import { SiWorkspaceService } from 'src/app/core/services/si/si-core/si-workspace.service'; @Component({ - selector: 'app-configuration-export-settings', - templateUrl: './configuration-export-settings.component.html', - styleUrls: ['./configuration-export-settings.component.scss'] + selector: 'app-intacct-export-settings', + templateUrl: './intacct-export-settings.component.html', + styleUrls: ['./intacct-export-settings.component.scss'] }) -export class ConfigurationExportSettingsComponent implements OnInit { +export class IntacctExportSettingsComponent implements OnInit { isLoading: boolean = true; diff --git a/src/app/integrations/intacct/intacct-shared/intacct-shared.module.ts b/src/app/integrations/intacct/intacct-shared/intacct-shared.module.ts new file mode 100644 index 000000000..8ce2d3744 --- /dev/null +++ b/src/app/integrations/intacct/intacct-shared/intacct-shared.module.ts @@ -0,0 +1,24 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { MultiSelectModule } from 'primeng/multiselect'; + +import { SharedModule } from 'src/app/shared/shared.module'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { IntacctExportSettingsComponent } from './intacct-export-settings/intacct-export-settings.component'; + +@NgModule({ + declarations: [ + IntacctExportSettingsComponent + ], + imports: [ + CommonModule, + SharedModule, + FormsModule, + ReactiveFormsModule, + MultiSelectModule + ], + exports: [ + IntacctExportSettingsComponent + ] +}) +export class IntacctSharedModule { } diff --git a/src/app/integrations/si/si.component.html b/src/app/integrations/intacct/intacct.component.html similarity index 100% rename from src/app/integrations/si/si.component.html rename to src/app/integrations/intacct/intacct.component.html diff --git a/src/app/integrations/si/main/configuration/configuration-advanced-setting/configuration-advanced-setting.component.scss b/src/app/integrations/intacct/intacct.component.scss similarity index 100% rename from src/app/integrations/si/main/configuration/configuration-advanced-setting/configuration-advanced-setting.component.scss rename to src/app/integrations/intacct/intacct.component.scss diff --git a/src/app/integrations/si/si.component.spec.ts b/src/app/integrations/intacct/intacct.component.spec.ts similarity index 82% rename from src/app/integrations/si/si.component.spec.ts rename to src/app/integrations/intacct/intacct.component.spec.ts index 69ba585dd..b51bb4653 100644 --- a/src/app/integrations/si/si.component.spec.ts +++ b/src/app/integrations/intacct/intacct.component.spec.ts @@ -3,13 +3,13 @@ import { HttpClientModule } from '@angular/common/http'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { of, throwError } from 'rxjs'; -import { SiComponent } from './si.component'; -import { errorResponse, workspaceResponse } from './si.fixture'; +import { IntacctComponent } from './intacct.component'; +import { errorResponse, workspaceResponse } from './intacct.fixture'; import { SiWorkspaceService } from 'src/app/core/services/si/si-core/si-workspace.service'; describe('SiComponent', () => { - let component: SiComponent; - let fixture: ComponentFixture; + let component: IntacctComponent; + let fixture: ComponentFixture; let workspace: SiWorkspaceService; beforeEach(async () => { @@ -24,14 +24,14 @@ describe('SiComponent', () => { }; await TestBed.configureTestingModule({ imports: [RouterTestingModule, HttpClientModule, HttpClientTestingModule], - declarations: [ SiComponent ], + declarations: [ IntacctComponent ], providers: [ { provide: SiWorkspaceService, useValue: service1 } ] }) .compileComponents(); - fixture = TestBed.createComponent(SiComponent); + fixture = TestBed.createComponent(IntacctComponent); component = fixture.componentInstance; workspace = TestBed.inject(SiWorkspaceService); fixture.detectChanges(); diff --git a/src/app/integrations/si/si.component.ts b/src/app/integrations/intacct/intacct.component.ts similarity index 93% rename from src/app/integrations/si/si.component.ts rename to src/app/integrations/intacct/intacct.component.ts index c09ddd7c1..e384eeaca 100644 --- a/src/app/integrations/si/si.component.ts +++ b/src/app/integrations/intacct/intacct.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { NavigationEnd, Router } from '@angular/router'; import { MinimalUser } from 'src/app/core/models/db/user.model'; import { AppName, AppUrl, IntacctOnboardingState } from 'src/app/core/models/enum/enum.model'; -import { IntacctWorkspace } from 'src/app/core/models/si/db/workspaces.model'; +import { IntacctWorkspace } from 'src/app/core/models/intacct/db/workspaces.model'; import { HelperService } from 'src/app/core/services/common/helper.service'; import { StorageService } from 'src/app/core/services/common/storage.service'; import { WindowService } from 'src/app/core/services/common/window.service'; @@ -11,11 +11,11 @@ import { UserService } from 'src/app/core/services/misc/user.service'; import { SiWorkspaceService } from 'src/app/core/services/si/si-core/si-workspace.service'; @Component({ - selector: 'app-si', - templateUrl: './si.component.html', - styleUrls: ['./si.component.scss'] + selector: 'app-intacct', + templateUrl: './intacct.component.html', + styleUrls: ['./intacct.component.scss'] }) -export class SiComponent implements OnInit { +export class IntacctComponent implements OnInit { user: MinimalUser = this.userService.getUserProfile(); diff --git a/src/app/integrations/si/si.fixture.ts b/src/app/integrations/intacct/intacct.fixture.ts similarity index 91% rename from src/app/integrations/si/si.fixture.ts rename to src/app/integrations/intacct/intacct.fixture.ts index c4f015a15..6154313cc 100644 --- a/src/app/integrations/si/si.fixture.ts +++ b/src/app/integrations/intacct/intacct.fixture.ts @@ -1,5 +1,5 @@ import { IntacctOnboardingState } from "src/app/core/models/enum/enum.model"; -import { IntacctWorkspace } from "src/app/core/models/si/db/workspaces.model"; +import { IntacctWorkspace } from "src/app/core/models/intacct/db/workspaces.model"; export const workspaceResponse: IntacctWorkspace[] = [{ "id": 1, diff --git a/src/app/integrations/si/si.module.ts b/src/app/integrations/intacct/intacct.module.ts similarity index 57% rename from src/app/integrations/si/si.module.ts rename to src/app/integrations/intacct/intacct.module.ts index a05860804..86e585f9d 100644 --- a/src/app/integrations/si/si.module.ts +++ b/src/app/integrations/intacct/intacct.module.ts @@ -1,38 +1,40 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { SiComponent } from './si.component'; +import { IntacctComponent } from './intacct.component'; import { SharedModule } from 'src/app/shared/shared.module'; import { IconSpriteModule } from 'ng-svg-icon-sprite'; import { TabMenuModule } from 'primeng/tabmenu'; import { DropdownModule } from 'primeng/dropdown'; import { TableModule } from 'primeng/table'; -import { SiRoutingModule } from './si-routing.module'; +import { SiRoutingModule } from './intacct-routing.module'; import { MainComponent } from './main/main.component'; import { ConfigurationComponent } from './main/configuration/configuration.component'; import { ConfigurationExportSettingComponent } from './main/configuration/configuration-export-setting/configuration-export-setting.component'; import { ConfigurationAdvancedSettingComponent } from './main/configuration/configuration-advanced-setting/configuration-advanced-setting.component'; import { ConfigurationImportSettingComponent } from './main/configuration/configuration-import-setting/configuration-import-setting.component'; import { DialogModule } from 'primeng/dialog'; +import { IntacctSharedModule } from './intacct-shared/intacct-shared.module'; @NgModule({ - declarations: [ - SiComponent, - MainComponent, - ConfigurationComponent, - ConfigurationExportSettingComponent, - ConfigurationAdvancedSettingComponent, - ConfigurationImportSettingComponent - ], - imports: [ - DialogModule, - TableModule, - CommonModule, - SiRoutingModule, - SharedModule, - TabMenuModule, - DropdownModule, - IconSpriteModule.forRoot({ path: 'assets/sprites/sprite.svg' }) - ] + declarations: [ + IntacctComponent, + MainComponent, + ConfigurationComponent, + ConfigurationExportSettingComponent, + ConfigurationAdvancedSettingComponent, + ConfigurationImportSettingComponent + ], + imports: [ + DialogModule, + TableModule, + CommonModule, + SiRoutingModule, + SharedModule, + TabMenuModule, + DropdownModule, + IconSpriteModule.forRoot({ path: 'assets/sprites/sprite.svg' }), + IntacctSharedModule + ] }) -export class SiModule { } +export class IntacctModule { } diff --git a/src/app/integrations/si/main/configuration/configuration-advanced-setting/configuration-advanced-setting.component.html b/src/app/integrations/intacct/main/configuration/configuration-advanced-setting/configuration-advanced-setting.component.html similarity index 100% rename from src/app/integrations/si/main/configuration/configuration-advanced-setting/configuration-advanced-setting.component.html rename to src/app/integrations/intacct/main/configuration/configuration-advanced-setting/configuration-advanced-setting.component.html diff --git a/src/app/integrations/si/main/configuration/configuration-export-setting/configuration-export-setting.component.scss b/src/app/integrations/intacct/main/configuration/configuration-advanced-setting/configuration-advanced-setting.component.scss similarity index 100% rename from src/app/integrations/si/main/configuration/configuration-export-setting/configuration-export-setting.component.scss rename to src/app/integrations/intacct/main/configuration/configuration-advanced-setting/configuration-advanced-setting.component.scss diff --git a/src/app/integrations/si/main/configuration/configuration-advanced-setting/configuration-advanced-setting.component.spec.ts b/src/app/integrations/intacct/main/configuration/configuration-advanced-setting/configuration-advanced-setting.component.spec.ts similarity index 100% rename from src/app/integrations/si/main/configuration/configuration-advanced-setting/configuration-advanced-setting.component.spec.ts rename to src/app/integrations/intacct/main/configuration/configuration-advanced-setting/configuration-advanced-setting.component.spec.ts diff --git a/src/app/integrations/si/main/configuration/configuration-advanced-setting/configuration-advanced-setting.component.ts b/src/app/integrations/intacct/main/configuration/configuration-advanced-setting/configuration-advanced-setting.component.ts similarity index 100% rename from src/app/integrations/si/main/configuration/configuration-advanced-setting/configuration-advanced-setting.component.ts rename to src/app/integrations/intacct/main/configuration/configuration-advanced-setting/configuration-advanced-setting.component.ts diff --git a/src/app/integrations/intacct/main/configuration/configuration-export-setting/configuration-export-setting.component.html b/src/app/integrations/intacct/main/configuration/configuration-export-setting/configuration-export-setting.component.html new file mode 100644 index 000000000..a74f59a90 --- /dev/null +++ b/src/app/integrations/intacct/main/configuration/configuration-export-setting/configuration-export-setting.component.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/app/integrations/si/main/configuration/configuration-import-setting/configuration-import-setting.component.scss b/src/app/integrations/intacct/main/configuration/configuration-export-setting/configuration-export-setting.component.scss similarity index 100% rename from src/app/integrations/si/main/configuration/configuration-import-setting/configuration-import-setting.component.scss rename to src/app/integrations/intacct/main/configuration/configuration-export-setting/configuration-export-setting.component.scss diff --git a/src/app/integrations/si/main/configuration/configuration-export-setting/configuration-export-setting.component.spec.ts b/src/app/integrations/intacct/main/configuration/configuration-export-setting/configuration-export-setting.component.spec.ts similarity index 100% rename from src/app/integrations/si/main/configuration/configuration-export-setting/configuration-export-setting.component.spec.ts rename to src/app/integrations/intacct/main/configuration/configuration-export-setting/configuration-export-setting.component.spec.ts diff --git a/src/app/integrations/si/main/configuration/configuration-export-setting/configuration-export-setting.component.ts b/src/app/integrations/intacct/main/configuration/configuration-export-setting/configuration-export-setting.component.ts similarity index 100% rename from src/app/integrations/si/main/configuration/configuration-export-setting/configuration-export-setting.component.ts rename to src/app/integrations/intacct/main/configuration/configuration-export-setting/configuration-export-setting.component.ts diff --git a/src/app/integrations/si/main/configuration/configuration-import-setting/configuration-import-setting.component.html b/src/app/integrations/intacct/main/configuration/configuration-import-setting/configuration-import-setting.component.html similarity index 100% rename from src/app/integrations/si/main/configuration/configuration-import-setting/configuration-import-setting.component.html rename to src/app/integrations/intacct/main/configuration/configuration-import-setting/configuration-import-setting.component.html diff --git a/src/app/integrations/si/main/main.component.scss b/src/app/integrations/intacct/main/configuration/configuration-import-setting/configuration-import-setting.component.scss similarity index 100% rename from src/app/integrations/si/main/main.component.scss rename to src/app/integrations/intacct/main/configuration/configuration-import-setting/configuration-import-setting.component.scss diff --git a/src/app/integrations/si/main/configuration/configuration-import-setting/configuration-import-setting.component.spec.ts b/src/app/integrations/intacct/main/configuration/configuration-import-setting/configuration-import-setting.component.spec.ts similarity index 100% rename from src/app/integrations/si/main/configuration/configuration-import-setting/configuration-import-setting.component.spec.ts rename to src/app/integrations/intacct/main/configuration/configuration-import-setting/configuration-import-setting.component.spec.ts diff --git a/src/app/integrations/si/main/configuration/configuration-import-setting/configuration-import-setting.component.ts b/src/app/integrations/intacct/main/configuration/configuration-import-setting/configuration-import-setting.component.ts similarity index 100% rename from src/app/integrations/si/main/configuration/configuration-import-setting/configuration-import-setting.component.ts rename to src/app/integrations/intacct/main/configuration/configuration-import-setting/configuration-import-setting.component.ts diff --git a/src/app/integrations/si/main/configuration/configuration-routing.module.ts b/src/app/integrations/intacct/main/configuration/configuration-routing.module.ts similarity index 100% rename from src/app/integrations/si/main/configuration/configuration-routing.module.ts rename to src/app/integrations/intacct/main/configuration/configuration-routing.module.ts diff --git a/src/app/integrations/si/main/configuration/configuration.component.html b/src/app/integrations/intacct/main/configuration/configuration.component.html similarity index 100% rename from src/app/integrations/si/main/configuration/configuration.component.html rename to src/app/integrations/intacct/main/configuration/configuration.component.html diff --git a/src/app/integrations/si/main/configuration/configuration.component.scss b/src/app/integrations/intacct/main/configuration/configuration.component.scss similarity index 100% rename from src/app/integrations/si/main/configuration/configuration.component.scss rename to src/app/integrations/intacct/main/configuration/configuration.component.scss diff --git a/src/app/integrations/si/main/configuration/configuration.component.spec.ts b/src/app/integrations/intacct/main/configuration/configuration.component.spec.ts similarity index 100% rename from src/app/integrations/si/main/configuration/configuration.component.spec.ts rename to src/app/integrations/intacct/main/configuration/configuration.component.spec.ts diff --git a/src/app/integrations/si/main/configuration/configuration.component.ts b/src/app/integrations/intacct/main/configuration/configuration.component.ts similarity index 100% rename from src/app/integrations/si/main/configuration/configuration.component.ts rename to src/app/integrations/intacct/main/configuration/configuration.component.ts diff --git a/src/app/integrations/si/main/configuration/configuration.module.ts b/src/app/integrations/intacct/main/configuration/configuration.module.ts similarity index 100% rename from src/app/integrations/si/main/configuration/configuration.module.ts rename to src/app/integrations/intacct/main/configuration/configuration.module.ts diff --git a/src/app/integrations/si/main/dashboard/dashboard-routing.module.ts b/src/app/integrations/intacct/main/dashboard/dashboard-routing.module.ts similarity index 100% rename from src/app/integrations/si/main/dashboard/dashboard-routing.module.ts rename to src/app/integrations/intacct/main/dashboard/dashboard-routing.module.ts diff --git a/src/app/integrations/si/main/dashboard/dashboard.component.html b/src/app/integrations/intacct/main/dashboard/dashboard.component.html similarity index 100% rename from src/app/integrations/si/main/dashboard/dashboard.component.html rename to src/app/integrations/intacct/main/dashboard/dashboard.component.html diff --git a/src/app/integrations/si/main/dashboard/dashboard.component.scss b/src/app/integrations/intacct/main/dashboard/dashboard.component.scss similarity index 100% rename from src/app/integrations/si/main/dashboard/dashboard.component.scss rename to src/app/integrations/intacct/main/dashboard/dashboard.component.scss diff --git a/src/app/integrations/si/main/dashboard/dashboard.component.spec.ts b/src/app/integrations/intacct/main/dashboard/dashboard.component.spec.ts similarity index 100% rename from src/app/integrations/si/main/dashboard/dashboard.component.spec.ts rename to src/app/integrations/intacct/main/dashboard/dashboard.component.spec.ts diff --git a/src/app/integrations/si/main/dashboard/dashboard.component.ts b/src/app/integrations/intacct/main/dashboard/dashboard.component.ts similarity index 97% rename from src/app/integrations/si/main/dashboard/dashboard.component.ts rename to src/app/integrations/intacct/main/dashboard/dashboard.component.ts index 452b9aa9e..9299eae7a 100644 --- a/src/app/integrations/si/main/dashboard/dashboard.component.ts +++ b/src/app/integrations/intacct/main/dashboard/dashboard.component.ts @@ -3,12 +3,12 @@ import { Observable, catchError, forkJoin, from, interval, map, of, switchMap, t import { brandingConfig, brandingFeatureConfig } from 'src/app/branding/branding-config'; import { AppName, ClickEvent, ExpenseState, ExportState, FyleField, FyleReferenceType, IntacctErrorType, RefinerSurveyType, TaskLogState, TaskLogType, TrackingApp } from 'src/app/core/models/enum/enum.model'; import { ResolveMappingErrorProperty } from 'src/app/core/models/misc/tracking.model'; -import { Error, GroupedErrorStat, GroupedErrors } from 'src/app/core/models/si/db/error.model'; +import { Error, GroupedErrorStat, GroupedErrors } from 'src/app/core/models/intacct/db/error.model'; import { ExpenseGroupSetting } from 'src/app/core/models/db/expense-group-setting.model'; -import { ExpenseGroup, ExpenseGroupList, ExportableExpenseGroup } from 'src/app/core/models/si/db/expense-group.model'; -import { Expense } from 'src/app/core/models/si/db/expense.model'; -import { LastExport } from 'src/app/core/models/si/db/last-export.model'; -import { Task } from 'src/app/core/models/si/db/task-log.model'; +import { ExpenseGroup, ExpenseGroupList, ExportableExpenseGroup } from 'src/app/core/models/intacct/db/expense-group.model'; +import { Expense } from 'src/app/core/models/intacct/db/expense.model'; +import { LastExport } from 'src/app/core/models/intacct/db/last-export.model'; +import { Task } from 'src/app/core/models/intacct/db/task-log.model'; import { RefinerService } from 'src/app/core/services/integration/refiner.service'; import { TrackingService } from 'src/app/core/services/integration/tracking.service'; import { UserService } from 'src/app/core/services/misc/user.service'; diff --git a/src/app/integrations/si/main/dashboard/dashboard.module.ts b/src/app/integrations/intacct/main/dashboard/dashboard.module.ts similarity index 100% rename from src/app/integrations/si/main/dashboard/dashboard.module.ts rename to src/app/integrations/intacct/main/dashboard/dashboard.module.ts diff --git a/src/app/integrations/si/main/export-log/completed-export-log/completed-export-log.component.html b/src/app/integrations/intacct/main/export-log/completed-export-log/completed-export-log.component.html similarity index 100% rename from src/app/integrations/si/main/export-log/completed-export-log/completed-export-log.component.html rename to src/app/integrations/intacct/main/export-log/completed-export-log/completed-export-log.component.html diff --git a/src/app/integrations/si/main/export-log/completed-export-log/completed-export-log.component.scss b/src/app/integrations/intacct/main/export-log/completed-export-log/completed-export-log.component.scss similarity index 100% rename from src/app/integrations/si/main/export-log/completed-export-log/completed-export-log.component.scss rename to src/app/integrations/intacct/main/export-log/completed-export-log/completed-export-log.component.scss diff --git a/src/app/integrations/si/main/export-log/completed-export-log/completed-export-log.component.spec.ts b/src/app/integrations/intacct/main/export-log/completed-export-log/completed-export-log.component.spec.ts similarity index 100% rename from src/app/integrations/si/main/export-log/completed-export-log/completed-export-log.component.spec.ts rename to src/app/integrations/intacct/main/export-log/completed-export-log/completed-export-log.component.spec.ts diff --git a/src/app/integrations/si/main/export-log/completed-export-log/completed-export-log.component.ts b/src/app/integrations/intacct/main/export-log/completed-export-log/completed-export-log.component.ts similarity index 98% rename from src/app/integrations/si/main/export-log/completed-export-log/completed-export-log.component.ts rename to src/app/integrations/intacct/main/export-log/completed-export-log/completed-export-log.component.ts index 415537600..1679d6933 100644 --- a/src/app/integrations/si/main/export-log/completed-export-log/completed-export-log.component.ts +++ b/src/app/integrations/intacct/main/export-log/completed-export-log/completed-export-log.component.ts @@ -2,8 +2,8 @@ import { Component, OnInit } from '@angular/core'; import { AbstractControl, FormBuilder, FormGroup } from '@angular/forms'; import { FyleReferenceType, PaginatorPage, TaskLogState, TrackingApp } from 'src/app/core/models/enum/enum.model'; import { DateFilter, SelectedDateFilter } from 'src/app/core/models/qbd/misc/date-filter.model'; -import { ExpenseGroup, ExpenseGroupList } from 'src/app/core/models/si/db/expense-group.model'; -import { Expense } from 'src/app/core/models/si/db/expense.model'; +import { ExpenseGroup, ExpenseGroupList } from 'src/app/core/models/intacct/db/expense-group.model'; +import { Expense } from 'src/app/core/models/intacct/db/expense.model'; import { Paginator } from 'src/app/core/models/misc/paginator.model'; import { TrackingService } from 'src/app/core/services/integration/tracking.service'; import { ExportLogService } from 'src/app/core/services/si/export-log/export-log.service'; diff --git a/src/app/integrations/si/main/export-log/export-log-routing.module.ts b/src/app/integrations/intacct/main/export-log/export-log-routing.module.ts similarity index 100% rename from src/app/integrations/si/main/export-log/export-log-routing.module.ts rename to src/app/integrations/intacct/main/export-log/export-log-routing.module.ts diff --git a/src/app/integrations/si/main/export-log/export-log.component.html b/src/app/integrations/intacct/main/export-log/export-log.component.html similarity index 100% rename from src/app/integrations/si/main/export-log/export-log.component.html rename to src/app/integrations/intacct/main/export-log/export-log.component.html diff --git a/src/app/integrations/si/main/export-log/export-log.component.scss b/src/app/integrations/intacct/main/export-log/export-log.component.scss similarity index 100% rename from src/app/integrations/si/main/export-log/export-log.component.scss rename to src/app/integrations/intacct/main/export-log/export-log.component.scss diff --git a/src/app/integrations/si/main/export-log/export-log.component.spec.ts b/src/app/integrations/intacct/main/export-log/export-log.component.spec.ts similarity index 100% rename from src/app/integrations/si/main/export-log/export-log.component.spec.ts rename to src/app/integrations/intacct/main/export-log/export-log.component.spec.ts diff --git a/src/app/integrations/si/main/export-log/export-log.component.ts b/src/app/integrations/intacct/main/export-log/export-log.component.ts similarity index 100% rename from src/app/integrations/si/main/export-log/export-log.component.ts rename to src/app/integrations/intacct/main/export-log/export-log.component.ts diff --git a/src/app/integrations/si/main/export-log/export-log.module.ts b/src/app/integrations/intacct/main/export-log/export-log.module.ts similarity index 100% rename from src/app/integrations/si/main/export-log/export-log.module.ts rename to src/app/integrations/intacct/main/export-log/export-log.module.ts diff --git a/src/app/integrations/si/main/export-log/skip-export-log/skip-export-log.component.html b/src/app/integrations/intacct/main/export-log/skip-export-log/skip-export-log.component.html similarity index 100% rename from src/app/integrations/si/main/export-log/skip-export-log/skip-export-log.component.html rename to src/app/integrations/intacct/main/export-log/skip-export-log/skip-export-log.component.html diff --git a/src/app/integrations/si/main/export-log/skip-export-log/skip-export-log.component.scss b/src/app/integrations/intacct/main/export-log/skip-export-log/skip-export-log.component.scss similarity index 100% rename from src/app/integrations/si/main/export-log/skip-export-log/skip-export-log.component.scss rename to src/app/integrations/intacct/main/export-log/skip-export-log/skip-export-log.component.scss diff --git a/src/app/integrations/si/main/export-log/skip-export-log/skip-export-log.component.spec.ts b/src/app/integrations/intacct/main/export-log/skip-export-log/skip-export-log.component.spec.ts similarity index 100% rename from src/app/integrations/si/main/export-log/skip-export-log/skip-export-log.component.spec.ts rename to src/app/integrations/intacct/main/export-log/skip-export-log/skip-export-log.component.spec.ts diff --git a/src/app/integrations/si/main/export-log/skip-export-log/skip-export-log.component.ts b/src/app/integrations/intacct/main/export-log/skip-export-log/skip-export-log.component.ts similarity index 98% rename from src/app/integrations/si/main/export-log/skip-export-log/skip-export-log.component.ts rename to src/app/integrations/intacct/main/export-log/skip-export-log/skip-export-log.component.ts index 0e070c9ea..06afc8550 100644 --- a/src/app/integrations/si/main/export-log/skip-export-log/skip-export-log.component.ts +++ b/src/app/integrations/intacct/main/export-log/skip-export-log/skip-export-log.component.ts @@ -2,8 +2,8 @@ import { Component, OnInit } from '@angular/core'; import { AbstractControl, FormBuilder, FormGroup } from '@angular/forms'; import { FyleReferenceType, PaginatorPage, TaskLogState, TrackingApp } from 'src/app/core/models/enum/enum.model'; import { DateFilter, SelectedDateFilter } from 'src/app/core/models/qbd/misc/date-filter.model'; -import { SkipExportLogResponse, SkipExportList, SkipExportLog } from 'src/app/core/models/si/db/expense-group.model'; -import { Expense } from 'src/app/core/models/si/db/expense.model'; +import { SkipExportLogResponse, SkipExportList, SkipExportLog } from 'src/app/core/models/intacct/db/expense-group.model'; +import { Expense } from 'src/app/core/models/intacct/db/expense.model'; import { Paginator } from 'src/app/core/models/misc/paginator.model'; import { TrackingService } from 'src/app/core/services/integration/tracking.service'; import { ExportLogService } from 'src/app/core/services/si/export-log/export-log.service'; diff --git a/src/app/integrations/si/main/main-routing.module.ts b/src/app/integrations/intacct/main/main-routing.module.ts similarity index 100% rename from src/app/integrations/si/main/main-routing.module.ts rename to src/app/integrations/intacct/main/main-routing.module.ts diff --git a/src/app/integrations/si/main/main.component.html b/src/app/integrations/intacct/main/main.component.html similarity index 100% rename from src/app/integrations/si/main/main.component.html rename to src/app/integrations/intacct/main/main.component.html diff --git a/src/app/integrations/si/si.component.scss b/src/app/integrations/intacct/main/main.component.scss similarity index 100% rename from src/app/integrations/si/si.component.scss rename to src/app/integrations/intacct/main/main.component.scss diff --git a/src/app/integrations/si/main/main.component.spec.ts b/src/app/integrations/intacct/main/main.component.spec.ts similarity index 100% rename from src/app/integrations/si/main/main.component.spec.ts rename to src/app/integrations/intacct/main/main.component.spec.ts diff --git a/src/app/integrations/si/main/main.component.ts b/src/app/integrations/intacct/main/main.component.ts similarity index 100% rename from src/app/integrations/si/main/main.component.ts rename to src/app/integrations/intacct/main/main.component.ts diff --git a/src/app/integrations/si/main/main.module.ts b/src/app/integrations/intacct/main/main.module.ts similarity index 100% rename from src/app/integrations/si/main/main.module.ts rename to src/app/integrations/intacct/main/main.module.ts diff --git a/src/app/integrations/si/main/mapping/category-mapping/category-mapping.component.html b/src/app/integrations/intacct/main/mapping/category-mapping/category-mapping.component.html similarity index 100% rename from src/app/integrations/si/main/mapping/category-mapping/category-mapping.component.html rename to src/app/integrations/intacct/main/mapping/category-mapping/category-mapping.component.html diff --git a/src/app/integrations/si/main/mapping/category-mapping/category-mapping.component.scss b/src/app/integrations/intacct/main/mapping/category-mapping/category-mapping.component.scss similarity index 100% rename from src/app/integrations/si/main/mapping/category-mapping/category-mapping.component.scss rename to src/app/integrations/intacct/main/mapping/category-mapping/category-mapping.component.scss diff --git a/src/app/integrations/si/main/mapping/category-mapping/category-mapping.component.spec.ts b/src/app/integrations/intacct/main/mapping/category-mapping/category-mapping.component.spec.ts similarity index 100% rename from src/app/integrations/si/main/mapping/category-mapping/category-mapping.component.spec.ts rename to src/app/integrations/intacct/main/mapping/category-mapping/category-mapping.component.spec.ts diff --git a/src/app/integrations/si/main/mapping/category-mapping/category-mapping.component.ts b/src/app/integrations/intacct/main/mapping/category-mapping/category-mapping.component.ts similarity index 96% rename from src/app/integrations/si/main/mapping/category-mapping/category-mapping.component.ts rename to src/app/integrations/intacct/main/mapping/category-mapping/category-mapping.component.ts index 4ea5dee7b..74182db59 100644 --- a/src/app/integrations/si/main/mapping/category-mapping/category-mapping.component.ts +++ b/src/app/integrations/intacct/main/mapping/category-mapping/category-mapping.component.ts @@ -4,10 +4,10 @@ import { forkJoin } from 'rxjs'; import { brandingConfig } from 'src/app/branding/branding-config'; import { DestinationAttribute } from 'src/app/core/models/db/destination-attribute.model'; import { AppName, CorporateCreditCardExpensesObject, FieldType, FyleField, IntacctReimbursableExpensesObject, MappingState, PaginatorPage, ToastSeverity } from 'src/app/core/models/enum/enum.model'; -import { CategoryMappingsResponse } from 'src/app/core/models/si/db/category-mapping-response.model'; -import { CategoryMapping, CategoryMappingPost, CategoryMappingResult } from 'src/app/core/models/si/db/category-mapping.model'; -import { IntacctDestinationAttribute } from 'src/app/core/models/si/db/destination-attribute.model'; -import { MappingStats } from 'src/app/core/models/si/db/mapping.model'; +import { CategoryMappingsResponse } from 'src/app/core/models/intacct/db/category-mapping-response.model'; +import { CategoryMapping, CategoryMappingPost, CategoryMappingResult } from 'src/app/core/models/intacct/db/category-mapping.model'; +import { IntacctDestinationAttribute } from 'src/app/core/models/intacct/db/destination-attribute.model'; +import { MappingStats } from 'src/app/core/models/intacct/db/mapping.model'; import { Paginator } from 'src/app/core/models/misc/paginator.model'; import { IntegrationsToastService } from 'src/app/core/services/common/integrations-toast.service'; import { PaginatorService } from 'src/app/core/services/si/si-core/paginator.service'; diff --git a/src/app/integrations/si/main/mapping/employee-mapping/employee-mapping.component.html b/src/app/integrations/intacct/main/mapping/employee-mapping/employee-mapping.component.html similarity index 100% rename from src/app/integrations/si/main/mapping/employee-mapping/employee-mapping.component.html rename to src/app/integrations/intacct/main/mapping/employee-mapping/employee-mapping.component.html diff --git a/src/app/integrations/si/main/mapping/employee-mapping/employee-mapping.component.scss b/src/app/integrations/intacct/main/mapping/employee-mapping/employee-mapping.component.scss similarity index 100% rename from src/app/integrations/si/main/mapping/employee-mapping/employee-mapping.component.scss rename to src/app/integrations/intacct/main/mapping/employee-mapping/employee-mapping.component.scss diff --git a/src/app/integrations/si/main/mapping/employee-mapping/employee-mapping.component.spec.ts b/src/app/integrations/intacct/main/mapping/employee-mapping/employee-mapping.component.spec.ts similarity index 100% rename from src/app/integrations/si/main/mapping/employee-mapping/employee-mapping.component.spec.ts rename to src/app/integrations/intacct/main/mapping/employee-mapping/employee-mapping.component.spec.ts diff --git a/src/app/integrations/si/main/mapping/employee-mapping/employee-mapping.component.ts b/src/app/integrations/intacct/main/mapping/employee-mapping/employee-mapping.component.ts similarity index 97% rename from src/app/integrations/si/main/mapping/employee-mapping/employee-mapping.component.ts rename to src/app/integrations/intacct/main/mapping/employee-mapping/employee-mapping.component.ts index e82d8036f..39262d439 100644 --- a/src/app/integrations/si/main/mapping/employee-mapping/employee-mapping.component.ts +++ b/src/app/integrations/intacct/main/mapping/employee-mapping/employee-mapping.component.ts @@ -4,10 +4,10 @@ import { Subject, debounce, debounceTime, forkJoin } from 'rxjs'; import { brandingConfig } from 'src/app/branding/branding-config'; import { DestinationAttribute } from 'src/app/core/models/db/destination-attribute.model'; import { AppName, AutoMapEmployeeOptions, FieldType, FyleField, MappingState, PaginatorPage, ToastSeverity } from 'src/app/core/models/enum/enum.model'; -import { IntacctDestinationAttribute } from 'src/app/core/models/si/db/destination-attribute.model'; -import { DropdownOptionSearch, EmployeeMapping, EmployeeMappingPost, EmployeeMappingResult, EmployeeMappingsResponse } from 'src/app/core/models/si/db/employee-mapping.model'; -import { MappingDestination } from 'src/app/core/models/si/db/mapping-destination.model'; -import { MappingStats } from 'src/app/core/models/si/db/mapping.model'; +import { IntacctDestinationAttribute } from 'src/app/core/models/intacct/db/destination-attribute.model'; +import { DropdownOptionSearch, EmployeeMapping, EmployeeMappingPost, EmployeeMappingResult, EmployeeMappingsResponse } from 'src/app/core/models/intacct/db/employee-mapping.model'; +import { MappingDestination } from 'src/app/core/models/intacct/db/mapping-destination.model'; +import { MappingStats } from 'src/app/core/models/intacct/db/mapping.model'; import { Paginator } from 'src/app/core/models/misc/paginator.model'; import { IntegrationsToastService } from 'src/app/core/services/common/integrations-toast.service'; import { PaginatorService } from 'src/app/core/services/si/si-core/paginator.service'; diff --git a/src/app/integrations/si/main/mapping/generic-mapping/generic-mapping.component.html b/src/app/integrations/intacct/main/mapping/generic-mapping/generic-mapping.component.html similarity index 100% rename from src/app/integrations/si/main/mapping/generic-mapping/generic-mapping.component.html rename to src/app/integrations/intacct/main/mapping/generic-mapping/generic-mapping.component.html diff --git a/src/app/integrations/si/main/mapping/generic-mapping/generic-mapping.component.scss b/src/app/integrations/intacct/main/mapping/generic-mapping/generic-mapping.component.scss similarity index 100% rename from src/app/integrations/si/main/mapping/generic-mapping/generic-mapping.component.scss rename to src/app/integrations/intacct/main/mapping/generic-mapping/generic-mapping.component.scss diff --git a/src/app/integrations/si/main/mapping/generic-mapping/generic-mapping.component.spec.ts b/src/app/integrations/intacct/main/mapping/generic-mapping/generic-mapping.component.spec.ts similarity index 100% rename from src/app/integrations/si/main/mapping/generic-mapping/generic-mapping.component.spec.ts rename to src/app/integrations/intacct/main/mapping/generic-mapping/generic-mapping.component.spec.ts diff --git a/src/app/integrations/si/main/mapping/generic-mapping/generic-mapping.component.ts b/src/app/integrations/intacct/main/mapping/generic-mapping/generic-mapping.component.ts similarity index 96% rename from src/app/integrations/si/main/mapping/generic-mapping/generic-mapping.component.ts rename to src/app/integrations/intacct/main/mapping/generic-mapping/generic-mapping.component.ts index bb4d00175..165b360bb 100644 --- a/src/app/integrations/si/main/mapping/generic-mapping/generic-mapping.component.ts +++ b/src/app/integrations/intacct/main/mapping/generic-mapping/generic-mapping.component.ts @@ -4,16 +4,16 @@ import { forkJoin } from 'rxjs'; import { AppName, MappingState, PaginatorPage, ToastSeverity } from 'src/app/core/models/enum/enum.model'; import { MappingStats } from 'src/app/core/models/qbd/db/mapping.model'; import { Configuration } from 'src/app/core/models/db/configuration.model'; -import { MinimalMappingSetting } from 'src/app/core/models/si/db/mapping-setting.model'; -import { MappingPost } from 'src/app/core/models/si/db/mapping.model'; +import { MinimalMappingSetting } from 'src/app/core/models/intacct/db/mapping-setting.model'; +import { MappingPost } from 'src/app/core/models/intacct/db/mapping.model'; import { IntegrationsToastService } from 'src/app/core/services/common/integrations-toast.service'; import { SiMappingsService } from 'src/app/core/services/si/si-core/si-mappings.service'; import { TitleCasePipe } from '@angular/common'; import { SnakeCaseToSpaceCasePipe } from 'src/app/shared/pipes/snake-case-to-space-case.pipe'; -import { ExtendedExpenseAttribute, ExtendedExpenseAttributeResponse } from 'src/app/core/models/si/db/expense-attribute.model'; +import { ExtendedExpenseAttribute, ExtendedExpenseAttributeResponse } from 'src/app/core/models/intacct/db/expense-attribute.model'; import { Paginator } from 'src/app/core/models/misc/paginator.model'; import { PaginatorService } from 'src/app/core/services/si/si-core/paginator.service'; -import { IntacctDestinationAttribute } from 'src/app/core/models/si/db/destination-attribute.model'; +import { IntacctDestinationAttribute } from 'src/app/core/models/intacct/db/destination-attribute.model'; import { brandingConfig } from 'src/app/branding/branding-config'; @Component({ diff --git a/src/app/integrations/si/main/mapping/mapping-routing.module.ts b/src/app/integrations/intacct/main/mapping/mapping-routing.module.ts similarity index 100% rename from src/app/integrations/si/main/mapping/mapping-routing.module.ts rename to src/app/integrations/intacct/main/mapping/mapping-routing.module.ts diff --git a/src/app/integrations/si/main/mapping/mapping.component.html b/src/app/integrations/intacct/main/mapping/mapping.component.html similarity index 100% rename from src/app/integrations/si/main/mapping/mapping.component.html rename to src/app/integrations/intacct/main/mapping/mapping.component.html diff --git a/src/app/integrations/si/main/mapping/mapping.component.scss b/src/app/integrations/intacct/main/mapping/mapping.component.scss similarity index 100% rename from src/app/integrations/si/main/mapping/mapping.component.scss rename to src/app/integrations/intacct/main/mapping/mapping.component.scss diff --git a/src/app/integrations/si/main/mapping/mapping.component.spec.ts b/src/app/integrations/intacct/main/mapping/mapping.component.spec.ts similarity index 100% rename from src/app/integrations/si/main/mapping/mapping.component.spec.ts rename to src/app/integrations/intacct/main/mapping/mapping.component.spec.ts diff --git a/src/app/integrations/si/main/mapping/mapping.component.ts b/src/app/integrations/intacct/main/mapping/mapping.component.ts similarity index 100% rename from src/app/integrations/si/main/mapping/mapping.component.ts rename to src/app/integrations/intacct/main/mapping/mapping.component.ts diff --git a/src/app/integrations/si/main/mapping/mapping.module.ts b/src/app/integrations/intacct/main/mapping/mapping.module.ts similarity index 100% rename from src/app/integrations/si/main/mapping/mapping.module.ts rename to src/app/integrations/intacct/main/mapping/mapping.module.ts diff --git a/src/app/integrations/integrations-routing.module.ts b/src/app/integrations/integrations-routing.module.ts index a4555297e..c9b929c8d 100644 --- a/src/app/integrations/integrations-routing.module.ts +++ b/src/app/integrations/integrations-routing.module.ts @@ -26,7 +26,7 @@ const routes: Routes = [ }, { path: 'intacct', - loadChildren: () => import('./si/si.module').then(m => m.SiModule) + loadChildren: () => import('./intacct/intacct.module').then(m => m.IntacctModule) }, { path: 'sage300', diff --git a/src/app/integrations/qbo/qbo-main/qbo-export-log/qbo-complete-export-log/qbo-complete-export-log.component.ts b/src/app/integrations/qbo/qbo-main/qbo-export-log/qbo-complete-export-log/qbo-complete-export-log.component.ts index 446ee0e99..b8396fd31 100644 --- a/src/app/integrations/qbo/qbo-main/qbo-export-log/qbo-complete-export-log/qbo-complete-export-log.component.ts +++ b/src/app/integrations/qbo/qbo-main/qbo-export-log/qbo-complete-export-log/qbo-complete-export-log.component.ts @@ -5,7 +5,7 @@ import { ExpenseGroup, ExpenseGroupResponse } from 'src/app/core/models/db/expen import { AppName, PaginatorPage, TaskLogState } from 'src/app/core/models/enum/enum.model'; import { Paginator } from 'src/app/core/models/misc/paginator.model'; import { DateFilter, SelectedDateFilter } from 'src/app/core/models/qbd/misc/date-filter.model'; -import { Expense } from 'src/app/core/models/si/db/expense.model'; +import { Expense } from 'src/app/core/models/intacct/db/expense.model'; import { ExportLogService } from 'src/app/core/services/common/export-log.service'; import { PaginatorService } from 'src/app/core/services/common/paginator.service'; import { WindowService } from 'src/app/core/services/common/window.service'; diff --git a/src/app/integrations/qbo/qbo-main/qbo-export-log/qbo-skipped-export-log/qbo-skipped-export-log.component.ts b/src/app/integrations/qbo/qbo-main/qbo-export-log/qbo-skipped-export-log/qbo-skipped-export-log.component.ts index 61f9a81a6..f48a158b3 100644 --- a/src/app/integrations/qbo/qbo-main/qbo-export-log/qbo-skipped-export-log/qbo-skipped-export-log.component.ts +++ b/src/app/integrations/qbo/qbo-main/qbo-export-log/qbo-skipped-export-log/qbo-skipped-export-log.component.ts @@ -4,7 +4,7 @@ import { AccountingExportModel, SkippedAccountingExportModel } from 'src/app/cor import { PaginatorPage } from 'src/app/core/models/enum/enum.model'; import { Paginator } from 'src/app/core/models/misc/paginator.model'; import { DateFilter, SelectedDateFilter } from 'src/app/core/models/qbd/misc/date-filter.model'; -import { SkipExportList, SkipExportLog, SkipExportLogResponse } from 'src/app/core/models/si/db/expense-group.model'; +import { SkipExportList, SkipExportLog, SkipExportLogResponse } from 'src/app/core/models/intacct/db/expense-group.model'; import { AccountingExportService } from 'src/app/core/services/common/accounting-export.service'; import { ExportLogService } from 'src/app/core/services/common/export-log.service'; import { PaginatorService } from 'src/app/core/services/common/paginator.service'; diff --git a/src/app/integrations/sage300/sage300-main/sage300-export-log/sage300-complete-export-log/sage300-complete-export-log.component.ts b/src/app/integrations/sage300/sage300-main/sage300-export-log/sage300-complete-export-log/sage300-complete-export-log.component.ts index 95c96eb3e..82e09bcae 100644 --- a/src/app/integrations/sage300/sage300-main/sage300-export-log/sage300-complete-export-log/sage300-complete-export-log.component.ts +++ b/src/app/integrations/sage300/sage300-main/sage300-export-log/sage300-complete-export-log/sage300-complete-export-log.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { AbstractControl, FormBuilder, FormGroup } from '@angular/forms'; import { AccountingExportStatus, AccountingExportType, AppName, FundSource, FyleReferenceType, PaginatorPage, TrackingApp } from 'src/app/core/models/enum/enum.model'; import { DateFilter, SelectedDateFilter } from 'src/app/core/models/qbd/misc/date-filter.model'; -import { Expense } from 'src/app/core/models/si/db/expense.model'; +import { Expense } from 'src/app/core/models/intacct/db/expense.model'; import { Paginator } from 'src/app/core/models/misc/paginator.model'; import { TrackingService } from 'src/app/core/services/integration/tracking.service'; import { PaginatorService } from 'src/app/core/services/si/si-core/paginator.service'; diff --git a/src/app/integrations/sage300/sage300-main/sage300-export-log/sage300-skipped-export-log/sage300-skipped-export-log.component.ts b/src/app/integrations/sage300/sage300-main/sage300-export-log/sage300-skipped-export-log/sage300-skipped-export-log.component.ts index 27d963f3d..ff8c8dc8d 100644 --- a/src/app/integrations/sage300/sage300-main/sage300-export-log/sage300-skipped-export-log/sage300-skipped-export-log.component.ts +++ b/src/app/integrations/sage300/sage300-main/sage300-export-log/sage300-skipped-export-log/sage300-skipped-export-log.component.ts @@ -4,7 +4,7 @@ import { AccountingExportModel, SkippedAccountingExportModel } from 'src/app/cor import { PaginatorPage, TrackingApp } from 'src/app/core/models/enum/enum.model'; import { Paginator } from 'src/app/core/models/misc/paginator.model'; import { DateFilter, SelectedDateFilter } from 'src/app/core/models/qbd/misc/date-filter.model'; -import { SkipExportList, SkipExportLog, SkipExportLogResponse } from 'src/app/core/models/si/db/expense-group.model'; +import { SkipExportList, SkipExportLog, SkipExportLogResponse } from 'src/app/core/models/intacct/db/expense-group.model'; import { AccountingExportService } from 'src/app/core/services/common/accounting-export.service'; import { ExportLogService } from 'src/app/core/services/common/export-log.service'; import { PaginatorService } from 'src/app/core/services/common/paginator.service'; diff --git a/src/app/integrations/si/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.ts b/src/app/integrations/si/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.ts deleted file mode 100644 index e2f081025..000000000 --- a/src/app/integrations/si/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-onboarding-intacct-connector', - templateUrl: './intacct-onboarding-connector.component.html', - styleUrls: ['./intacct-onboarding-connector.component.scss'] -}) -export class IntacctOnboardingConnectorComponent implements OnInit { - - isLoading: boolean; - - isIntacctConnected: boolean = false; - - constructor() { } - - setupConnectionStatus(eventData: boolean) { - this.isIntacctConnected = eventData; - } - - ngOnInit(): void { - } -} diff --git a/src/app/integrations/si/intacct-onboarding/onboarding-export-setting/onboarding-export-setting.component.html b/src/app/integrations/si/intacct-onboarding/onboarding-export-setting/onboarding-export-setting.component.html deleted file mode 100644 index 36fb544fd..000000000 --- a/src/app/integrations/si/intacct-onboarding/onboarding-export-setting/onboarding-export-setting.component.html +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/src/app/integrations/si/intacct-onboarding/onboarding-export-setting/onboarding-export-setting.component.spec.ts b/src/app/integrations/si/intacct-onboarding/onboarding-export-setting/onboarding-export-setting.component.spec.ts deleted file mode 100644 index 88cf500fd..000000000 --- a/src/app/integrations/si/intacct-onboarding/onboarding-export-setting/onboarding-export-setting.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { OnboardingExportSettingComponent } from './onboarding-export-setting.component'; - -describe('OnboardingExportSettingComponent', () => { - let component: OnboardingExportSettingComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ OnboardingExportSettingComponent ] - }) - .compileComponents(); - - fixture = TestBed.createComponent(OnboardingExportSettingComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/integrations/si/intacct-onboarding/onboarding-export-setting/onboarding-export-setting.component.ts b/src/app/integrations/si/intacct-onboarding/onboarding-export-setting/onboarding-export-setting.component.ts deleted file mode 100644 index 59ac716ac..000000000 --- a/src/app/integrations/si/intacct-onboarding/onboarding-export-setting/onboarding-export-setting.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-onboarding-export-setting', - templateUrl: './onboarding-export-setting.component.html', - styleUrls: ['./onboarding-export-setting.component.scss'] -}) -export class OnboardingExportSettingComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/integrations/si/intacct-onboarding/onboarding.component.ts b/src/app/integrations/si/intacct-onboarding/onboarding.component.ts deleted file mode 100644 index b66e1fe4c..000000000 --- a/src/app/integrations/si/intacct-onboarding/onboarding.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-onboarding', - templateUrl: './onboarding.component.html', - styleUrls: ['./onboarding.component.scss'] -}) -export class OnboardingComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/integrations/si/main/configuration/configuration-export-setting/configuration-export-setting.component.html b/src/app/integrations/si/main/configuration/configuration-export-setting/configuration-export-setting.component.html deleted file mode 100644 index b0448c858..000000000 --- a/src/app/integrations/si/main/configuration/configuration-export-setting/configuration-export-setting.component.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.ts b/src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.ts index 95b70b0d1..70fbffc6e 100644 --- a/src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.ts +++ b/src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.ts @@ -5,7 +5,7 @@ import { ImportDefaultField, ImportSettingMappingRow, ImportSettingsCustomFieldR import { FyleField, IntegrationField } from 'src/app/core/models/db/mapping.model'; import { MappingSourceField } from 'src/app/core/models/enum/enum.model'; import { Sage300DefaultFields, Sage300DependentImportFields, Sage300ImportSettingModel } from 'src/app/core/models/sage300/sage300-configuration/sage300-import-settings.model'; -import { MappingSetting } from 'src/app/core/models/si/si-configuration/import-settings.model'; +import { MappingSetting } from 'src/app/core/models/intacct/intacct-configuration/import-settings.model'; import { HelperService } from 'src/app/core/services/common/helper.service'; @Component({ diff --git a/src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.ts b/src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.ts index 48ebfc51c..b664a459c 100644 --- a/src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.ts +++ b/src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.ts @@ -1,16 +1,16 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { AbstractControl, FormGroup } from '@angular/forms'; import { QBDExportSettingFormOption } from 'src/app/core/models/qbd/qbd-configuration/export-setting.model'; -import { ExportSettingFormOption, ExportSettingOptionSearch } from 'src/app/core/models/si/si-configuration/export-settings.model'; +import { ExportSettingFormOption, ExportSettingOptionSearch } from 'src/app/core/models/intacct/intacct-configuration/export-settings.model'; import { AppName, ClickEvent, CorporateCreditCardExpensesObject, IntacctExportSettingDestinationOptionKey, IntacctReimbursableExpensesObject, TrackingApp } from 'src/app/core/models/enum/enum.model'; import { PreviewPage } from 'src/app/core/models/misc/preview-page.model'; import { TrackingService } from 'src/app/core/services/integration/tracking.service'; -import { AdvancedSettingFormOption, HourOption } from 'src/app/core/models/si/si-configuration/advanced-settings.model'; +import { AdvancedSettingFormOption, HourOption } from 'src/app/core/models/intacct/intacct-configuration/advanced-settings.model'; import { SafeHtml } from '@angular/platform-browser'; import { Router } from '@angular/router'; import { SnakeCaseToSpaceCasePipe } from 'src/app/shared/pipes/snake-case-to-space-case.pipe'; import { TitleCasePipe } from '@angular/common'; -import { IntacctDestinationAttribute } from 'src/app/core/models/si/db/destination-attribute.model'; +import { IntacctDestinationAttribute } from 'src/app/core/models/intacct/db/destination-attribute.model'; import { Sage300DestinationAttributes } from 'src/app/core/models/sage300/db/sage300-destination-attribuite.model'; import { brandingConfig } from 'src/app/branding/branding-config'; import { DefaultDestinationAttribute, DestinationAttribute } from 'src/app/core/models/db/destination-attribute.model'; diff --git a/src/app/shared/components/configuration/configuration-skip-export/configuration-skip-export.component.ts b/src/app/shared/components/configuration/configuration-skip-export/configuration-skip-export.component.ts index 5f5691428..557f7505b 100644 --- a/src/app/shared/components/configuration/configuration-skip-export/configuration-skip-export.component.ts +++ b/src/app/shared/components/configuration/configuration-skip-export/configuration-skip-export.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { AbstractControl, FormGroup } from '@angular/forms'; import { ConditionField, ExpenseFilterResponse } from 'src/app/core/models/common/advanced-settings.model'; import { JoinOption } from 'src/app/core/models/enum/enum.model'; -import { CustomOperatorOption } from 'src/app/core/models/si/si-configuration/advanced-settings.model'; +import { CustomOperatorOption } from 'src/app/core/models/intacct/intacct-configuration/advanced-settings.model'; import { HelperService } from 'src/app/core/services/common/helper.service'; @Component({ diff --git a/src/app/shared/components/configuration/email-multi-select-field/email-multi-select-field.component.ts b/src/app/shared/components/configuration/email-multi-select-field/email-multi-select-field.component.ts index 22c0de0d7..a6557f46a 100644 --- a/src/app/shared/components/configuration/email-multi-select-field/email-multi-select-field.component.ts +++ b/src/app/shared/components/configuration/email-multi-select-field/email-multi-select-field.component.ts @@ -6,7 +6,7 @@ import { AppName, ClickEvent, ToastSeverity } from 'src/app/core/models/enum/enu import { EmailOptions } from 'src/app/core/models/qbd/qbd-configuration/advanced-setting.model'; import { TrackingService } from 'src/app/core/services/integration/tracking.service'; import { IntegrationsToastService } from 'src/app/core/services/common/integrations-toast.service'; -import { EmailOption } from 'src/app/core/models/si/si-configuration/advanced-settings.model'; +import { EmailOption } from 'src/app/core/models/intacct/intacct-configuration/advanced-settings.model'; import { trackingAppMap } from 'src/app/core/models/misc/tracking.model'; import { brandingConfig } from 'src/app/branding/branding-config'; diff --git a/src/app/shared/components/dashboard/dashboard-accounting-error-dialog/dashboard-accounting-error-dialog.component.ts b/src/app/shared/components/dashboard/dashboard-accounting-error-dialog/dashboard-accounting-error-dialog.component.ts index 698d82c21..38dee2b18 100644 --- a/src/app/shared/components/dashboard/dashboard-accounting-error-dialog/dashboard-accounting-error-dialog.component.ts +++ b/src/app/shared/components/dashboard/dashboard-accounting-error-dialog/dashboard-accounting-error-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; -import { Expense, ExpenseModel } from 'src/app/core/models/si/db/expense.model'; +import { Expense, ExpenseModel } from 'src/app/core/models/intacct/db/expense.model'; @Component({ selector: 'app-dashboard-accounting-error-dialog', diff --git a/src/app/shared/components/dashboard/dashboard-error-section/dashboard-error-section.component.ts b/src/app/shared/components/dashboard/dashboard-error-section/dashboard-error-section.component.ts index fa5afce04..857a11dbc 100644 --- a/src/app/shared/components/dashboard/dashboard-error-section/dashboard-error-section.component.ts +++ b/src/app/shared/components/dashboard/dashboard-error-section/dashboard-error-section.component.ts @@ -7,7 +7,7 @@ import { Error, AccountingGroupedErrors, AccountingGroupedErrorStat, ErrorModel, import { ExtendedGenericMapping, GenericMappingResponse } from 'src/app/core/models/db/extended-generic-mapping.model'; import { AccountingDisplayName, AccountingErrorType, AccountingField, AppName, AppUrl, ExportErrorSourceType, FyleField, MappingState } from 'src/app/core/models/enum/enum.model'; import { ResolveMappingErrorProperty, trackingAppMap } from 'src/app/core/models/misc/tracking.model'; -import { Expense } from 'src/app/core/models/si/db/expense.model'; +import { Expense } from 'src/app/core/models/intacct/db/expense.model'; import { DashboardService } from 'src/app/core/services/common/dashboard.service'; import { MappingService } from 'src/app/core/services/common/mapping.service'; import { TrackingService } from 'src/app/core/services/integration/tracking.service'; diff --git a/src/app/shared/components/export-log/export-log-dialog/export-log-child-table-dialog.component.ts b/src/app/shared/components/export-log/export-log-dialog/export-log-child-table-dialog.component.ts index 1cd25bb4a..7db29173c 100644 --- a/src/app/shared/components/export-log/export-log-dialog/export-log-child-table-dialog.component.ts +++ b/src/app/shared/components/export-log/export-log-dialog/export-log-child-table-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { Expense } from 'src/app/core/models/si/db/expense.model'; +import { Expense } from 'src/app/core/models/intacct/db/expense.model'; import { WindowService } from 'src/app/core/services/common/window.service'; import { environment } from 'src/environments/environment'; diff --git a/src/app/shared/components/export-log/export-log-table/export-log-table.component.ts b/src/app/shared/components/export-log/export-log-table/export-log-table.component.ts index 5113d9359..dc8fb3efa 100644 --- a/src/app/shared/components/export-log/export-log-table/export-log-table.component.ts +++ b/src/app/shared/components/export-log/export-log-table/export-log-table.component.ts @@ -3,7 +3,7 @@ import { brandingConfig, brandingFeatureConfig } from 'src/app/branding/branding import { BrandingConfiguration } from 'src/app/core/models/branding/branding-configuration.model'; import { AccountingExportList } from 'src/app/core/models/db/accounting-export.model'; import { AppName } from 'src/app/core/models/enum/enum.model'; -import { Expense } from 'src/app/core/models/si/db/expense.model'; +import { Expense } from 'src/app/core/models/intacct/db/expense.model'; import { WindowService } from 'src/app/core/services/common/window.service'; @Component({ diff --git a/src/app/shared/components/export-log/skipped-export-log-table/skipped-export-log-table.component.ts b/src/app/shared/components/export-log/skipped-export-log-table/skipped-export-log-table.component.ts index 04f5233a3..3c8525b9b 100644 --- a/src/app/shared/components/export-log/skipped-export-log-table/skipped-export-log-table.component.ts +++ b/src/app/shared/components/export-log/skipped-export-log-table/skipped-export-log-table.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { brandingFeatureConfig } from 'src/app/branding/branding-config'; -import { SkipExportList } from 'src/app/core/models/si/db/expense-group.model'; +import { SkipExportList } from 'src/app/core/models/intacct/db/expense-group.model'; import { WindowService } from 'src/app/core/services/common/window.service'; @Component({ diff --git a/src/app/shared/components/qbd/mapping/mapping-table/mapping-table.component.ts b/src/app/shared/components/qbd/mapping/mapping-table/mapping-table.component.ts index 6c8cc36c3..b6782b499 100644 --- a/src/app/shared/components/qbd/mapping/mapping-table/mapping-table.component.ts +++ b/src/app/shared/components/qbd/mapping/mapping-table/mapping-table.component.ts @@ -2,8 +2,8 @@ import { Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; import { FormGroup } from '@angular/forms'; import { FieldType, OperatingSystem } from 'src/app/core/models/enum/enum.model'; import { Mapping, MappingModel, MappingPost } from 'src/app/core/models/qbd/db/mapping.model'; -import { EmployeeMapping } from 'src/app/core/models/si/db/employee-mapping.model'; -import { MappingIntacct, MappingResponse, MappingStats } from 'src/app/core/models/si/db/mapping.model'; +import { EmployeeMapping } from 'src/app/core/models/intacct/db/employee-mapping.model'; +import { MappingIntacct, MappingResponse, MappingStats } from 'src/app/core/models/intacct/db/mapping.model'; @Component({ selector: 'app-mapping-table', diff --git a/src/app/shared/components/si/configuration/configuration-advanced-settings/configuration-advanced-settings.component.ts b/src/app/shared/components/si/configuration/configuration-advanced-settings/configuration-advanced-settings.component.ts index 0ad5aa2c2..9710f0055 100644 --- a/src/app/shared/components/si/configuration/configuration-advanced-settings/configuration-advanced-settings.component.ts +++ b/src/app/shared/components/si/configuration/configuration-advanced-settings/configuration-advanced-settings.component.ts @@ -4,7 +4,7 @@ import { Router } from '@angular/router'; import { forkJoin } from 'rxjs'; import { AppName, ConfigurationCta, FyleField, IntacctOnboardingState, IntacctReimbursableExpensesObject, IntacctUpdateEvent, Page, PaymentSyncDirection, ProgressPhase, ToastSeverity, TrackingApp } from 'src/app/core/models/enum/enum.model'; import { EmailOptions } from 'src/app/core/models/qbd/qbd-configuration/advanced-setting.model'; -import { AdvancedSetting, AdvancedSettingFormOption, AdvancedSettingsGet, AdvancedSettingsPost, HourOption } from 'src/app/core/models/si/si-configuration/advanced-settings.model'; +import { AdvancedSetting, AdvancedSettingFormOption, AdvancedSettingsGet, AdvancedSettingsPost, HourOption } from 'src/app/core/models/intacct/intacct-configuration/advanced-settings.model'; import { IntegrationsToastService } from 'src/app/core/services/common/integrations-toast.service'; import { TrackingService } from 'src/app/core/services/integration/tracking.service'; import { SiAdvancedSettingService } from 'src/app/core/services/si/si-configuration/si-advanced-setting.service'; @@ -12,8 +12,8 @@ import { SiMappingsService } from 'src/app/core/services/si/si-core/si-mappings. import { SiWorkspaceService } from 'src/app/core/services/si/si-core/si-workspace.service'; import { SkipExportComponent } from '../../helper/skip-export/skip-export.component'; import { TitleCasePipe } from '@angular/common'; -import { IntacctDestinationAttribute } from 'src/app/core/models/si/db/destination-attribute.model'; -import { Configuration } from 'src/app/core/models/si/si-configuration/advanced-settings.model'; +import { IntacctDestinationAttribute } from 'src/app/core/models/intacct/db/destination-attribute.model'; +import { Configuration } from 'src/app/core/models/intacct/intacct-configuration/advanced-settings.model'; import { brandingConfig, brandingKbArticles } from 'src/app/branding/branding-config'; import { environment } from 'src/environments/environment'; import { AdvancedSettingsModel } from 'src/app/core/models/common/advanced-settings.model'; diff --git a/src/app/shared/components/si/configuration/configuration-export-settings/configuration-export-settings.component.spec.ts b/src/app/shared/components/si/configuration/configuration-export-settings/configuration-export-settings.component.spec.ts deleted file mode 100644 index 33311c502..000000000 --- a/src/app/shared/components/si/configuration/configuration-export-settings/configuration-export-settings.component.spec.ts +++ /dev/null @@ -1,55 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ConfigurationExportSettingsComponent } from './configuration-export-settings.component'; -import { FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { HttpClientModule } from '@angular/common/http'; -import { RouterTestingModule } from '@angular/router/testing'; - -import { SharedModule } from 'src/app/shared/shared.module'; -import { SiWorkspaceService } from 'src/app/core/services/si/si-core/si-workspace.service'; -import { SiExportSettingService } from 'src/app/core/services/si/si-configuration/si-export-setting.service'; -import { Router } from '@angular/router'; -import { IntacctOnboardingState } from 'src/app/core/models/enum/enum.model'; -import { IntegrationsToastService } from 'src/app/core/services/common/integrations-toast.service'; - -describe('ConfigurationExportSettingsComponent', () => { - let component: ConfigurationExportSettingsComponent; - let fixture: ComponentFixture; - let service1: any; - let service2: any; - let service3: any; - let formbuilder: FormBuilder; - let siWorkspaceService: SiWorkspaceService; - let siExportSettingService: SiExportSettingService; - const routerSpy = { navigate: jasmine.createSpy('navigate'), url: '/path' }; - let router: Router; - - beforeEach(async () => { - service1 = { - getOnboardingState: () => IntacctOnboardingState.EXPORT_SETTINGS, - setOnboardingState: () => undefined - }; - - service2 = { - displayToastMessage: () => undefined - }; - await TestBed.configureTestingModule({ - imports: [FormsModule, ReactiveFormsModule, HttpClientModule, RouterTestingModule, SharedModule], - declarations: [ ConfigurationExportSettingsComponent ], - providers: [ - FormBuilder, - { provide: Router, useValue: routerSpy }, - { provide: IntegrationsToastService, useValue: service3 } - ] - }) - .compileComponents(); - - fixture = TestBed.createComponent(ConfigurationExportSettingsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/components/si/configuration/configuration-import-settings/configuration-import-settings.component.ts b/src/app/shared/components/si/configuration/configuration-import-settings/configuration-import-settings.component.ts index ac84bab4f..2401e76b0 100644 --- a/src/app/shared/components/si/configuration/configuration-import-settings/configuration-import-settings.component.ts +++ b/src/app/shared/components/si/configuration/configuration-import-settings/configuration-import-settings.component.ts @@ -5,10 +5,10 @@ import { RxwebValidators } from '@rxweb/reactive-form-validators'; import { forkJoin } from 'rxjs'; import { brandingConfig, brandingKbArticles } from 'src/app/branding/branding-config'; import { IntacctCategoryDestination, ConfigurationCta, IntacctOnboardingState, IntacctUpdateEvent, Page, ProgressPhase, ToastSeverity, MappingSourceField, AppName, TrackingApp } from 'src/app/core/models/enum/enum.model'; -import { IntacctDestinationAttribute } from 'src/app/core/models/si/db/destination-attribute.model'; -import { ExpenseField } from 'src/app/core/models/si/db/expense-field.model'; -import { LocationEntityMapping } from 'src/app/core/models/si/db/location-entity-mapping.model'; -import { DependentFieldSetting, ImportSettingGet, ImportSettingPost, ImportSettings, MappingSetting } from 'src/app/core/models/si/si-configuration/import-settings.model'; +import { IntacctDestinationAttribute } from 'src/app/core/models/intacct/db/destination-attribute.model'; +import { ExpenseField } from 'src/app/core/models/intacct/db/expense-field.model'; +import { LocationEntityMapping } from 'src/app/core/models/intacct/db/location-entity-mapping.model'; +import { DependentFieldSetting, ImportSettingGet, ImportSettingPost, ImportSettings, MappingSetting } from 'src/app/core/models/intacct/intacct-configuration/import-settings.model'; import { IntegrationsToastService } from 'src/app/core/services/common/integrations-toast.service'; import { StorageService } from 'src/app/core/services/common/storage.service'; import { TrackingService } from 'src/app/core/services/integration/tracking.service'; diff --git a/src/app/shared/components/si/core/intacct-connector/intacct-connector.component.spec.ts b/src/app/shared/components/si/core/intacct-connector/intacct-connector.component.spec.ts index f2069d46f..db8f08f77 100644 --- a/src/app/shared/components/si/core/intacct-connector/intacct-connector.component.spec.ts +++ b/src/app/shared/components/si/core/intacct-connector/intacct-connector.component.spec.ts @@ -6,10 +6,10 @@ import { SiMappingsService } from 'src/app/core/services/si/si-core/si-mappings. import { IntegrationsToastService } from 'src/app/core/services/common/integrations-toast.service'; import { MessageService } from 'primeng/api'; import { of, throwError } from 'rxjs'; -import { SageIntacctCredential } from 'src/app/core/models/si/db/sage-credentials.model'; -import { SiComponent } from 'src/app/integrations/si/si.component'; +import { SageIntacctCredential } from 'src/app/core/models/intacct/db/sage-credentials.model'; +import { SiComponent } from 'src/app/integrations/intacct/intacct.component'; import { HttpClientModule } from '@angular/common/http'; -import { IntacctOnboardingConnectorComponent } from 'src/app/integrations/si/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component'; +import { IntacctOnboardingConnectorComponent } from 'src/app/integrations/intacct/intacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component'; describe('IntacctConnectorComponent', () => { let component: IntacctConnectorComponent; diff --git a/src/app/shared/components/si/core/intacct-location-entity/intacct-location-entity.component.ts b/src/app/shared/components/si/core/intacct-location-entity/intacct-location-entity.component.ts index a60b9b948..4af4be681 100644 --- a/src/app/shared/components/si/core/intacct-location-entity/intacct-location-entity.component.ts +++ b/src/app/shared/components/si/core/intacct-location-entity/intacct-location-entity.component.ts @@ -2,16 +2,16 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Router } from '@angular/router'; import { ConfigurationCta, IntacctField, IntacctOnboardingState, ToastSeverity, TrackingApp } from 'src/app/core/models/enum/enum.model'; -import { LocationEntityMapping } from 'src/app/core/models/si/db/location-entity-mapping.model'; +import { LocationEntityMapping } from 'src/app/core/models/intacct/db/location-entity-mapping.model'; import { UserService } from 'src/app/core/services/misc/user.service'; import { IntacctConnectorService } from 'src/app/core/services/si/si-core/intacct-connector.service'; import { StorageService } from 'src/app/core/services/common/storage.service'; import { SiWorkspaceService } from 'src/app/core/services/si/si-core/si-workspace.service'; import { TrackingService } from 'src/app/core/services/integration/tracking.service'; import { IntegrationsToastService } from 'src/app/core/services/common/integrations-toast.service'; -import { LocationEntityPost } from 'src/app/core/models/si/si-configuration/connector.model'; +import { LocationEntityPost } from 'src/app/core/models/intacct/intacct-configuration/connector.model'; import { SiMappingsService } from 'src/app/core/services/si/si-core/si-mappings.service'; -import { IntacctDestinationAttribute } from 'src/app/core/models/si/db/destination-attribute.model'; +import { IntacctDestinationAttribute } from 'src/app/core/models/intacct/db/destination-attribute.model'; import { brandingConfig, brandingKbArticles } from 'src/app/branding/branding-config'; @Component({ diff --git a/src/app/shared/components/si/helper/dashboard-intacct-errors/dashboard-intacct-errors.component.ts b/src/app/shared/components/si/helper/dashboard-intacct-errors/dashboard-intacct-errors.component.ts index 2aa158b99..6450f1a4a 100644 --- a/src/app/shared/components/si/helper/dashboard-intacct-errors/dashboard-intacct-errors.component.ts +++ b/src/app/shared/components/si/helper/dashboard-intacct-errors/dashboard-intacct-errors.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; -import { ExpenseGroup } from 'src/app/core/models/si/db/expense-group.model'; -import { Expense } from 'src/app/core/models/si/db/expense.model'; +import { ExpenseGroup } from 'src/app/core/models/intacct/db/expense-group.model'; +import { Expense } from 'src/app/core/models/intacct/db/expense.model'; import { environment } from 'src/environments/environment'; @Component({ diff --git a/src/app/shared/components/si/helper/dashboard-mapping-resolve/dashboard-mapping-resolve.component.ts b/src/app/shared/components/si/helper/dashboard-mapping-resolve/dashboard-mapping-resolve.component.ts index f32be70fe..27d9dd603 100644 --- a/src/app/shared/components/si/helper/dashboard-mapping-resolve/dashboard-mapping-resolve.component.ts +++ b/src/app/shared/components/si/helper/dashboard-mapping-resolve/dashboard-mapping-resolve.component.ts @@ -1,10 +1,10 @@ import { Component, Input, OnInit } from '@angular/core'; import { FyleField, IntacctCategoryDestination, IntacctErrorType, SageIntacctField, ToastSeverity } from 'src/app/core/models/enum/enum.model'; -import { CategoryMappingPost } from 'src/app/core/models/si/db/category-mapping.model'; -import { IntacctDestinationAttribute } from 'src/app/core/models/si/db/destination-attribute.model'; -import { EmployeeMappingPost } from 'src/app/core/models/si/db/employee-mapping.model'; -import { Error } from 'src/app/core/models/si/db/error.model'; -import { ExpenseAttribute } from 'src/app/core/models/si/db/expense-attribute.model'; +import { CategoryMappingPost } from 'src/app/core/models/intacct/db/category-mapping.model'; +import { IntacctDestinationAttribute } from 'src/app/core/models/intacct/db/destination-attribute.model'; +import { EmployeeMappingPost } from 'src/app/core/models/intacct/db/employee-mapping.model'; +import { Error } from 'src/app/core/models/intacct/db/error.model'; +import { ExpenseAttribute } from 'src/app/core/models/intacct/db/expense-attribute.model'; import { IntegrationsToastService } from 'src/app/core/services/common/integrations-toast.service'; import { SiMappingsService } from 'src/app/core/services/si/si-core/si-mappings.service'; import { SiWorkspaceService } from 'src/app/core/services/si/si-core/si-workspace.service'; diff --git a/src/app/shared/components/si/helper/skip-export/skip-export.component.ts b/src/app/shared/components/si/helper/skip-export/skip-export.component.ts index 3d507488c..08f5db744 100644 --- a/src/app/shared/components/si/helper/skip-export/skip-export.component.ts +++ b/src/app/shared/components/si/helper/skip-export/skip-export.component.ts @@ -1,8 +1,8 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms'; import { forkJoin } from 'rxjs'; -import { constructPayload1, constructPayload2 } from 'src/app/core/models/si/misc/skip-export.model'; -import { ConditionField, CustomOperatorOption, ExpenseFilterResponse, JoinOptions, SkipExport } from 'src/app/core/models/si/si-configuration/advanced-settings.model'; +import { constructPayload1, constructPayload2 } from 'src/app/core/models/intacct/misc/skip-export.model'; +import { ConditionField, CustomOperatorOption, ExpenseFilterResponse, JoinOptions, SkipExport } from 'src/app/core/models/intacct/intacct-configuration/advanced-settings.model'; import { SiAdvancedSettingService } from 'src/app/core/services/si/si-configuration/si-advanced-setting.service'; @Component({ diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index cf97325fa..9f0b1f159 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -46,7 +46,7 @@ import { MappingTableComponent } from './components/qbd/mapping/mapping-table/ma import { MappingFilterComponent } from './components/helper/mapping/mapping-filter/mapping-filter.component'; import { MappingHeaderSectionComponent } from './components/qbd/mapping/mapping-header-section/mapping-header-section.component'; import { TableModule } from 'primeng/table'; -import { ConfigurationExportSettingsComponent } from './components/si/configuration/configuration-export-settings/configuration-export-settings.component'; + import { IntacctStepperComponent } from './components/si/helper/intacct-stepper/intacct-stepper.component'; import { IntacctConnectorComponent } from './components/si/core/intacct-connector/intacct-connector.component'; import { IntacctLocationEntityComponent } from './components/si/core/intacct-location-entity/intacct-location-entity.component'; @@ -125,7 +125,6 @@ import { SvgIconComponent } from './components/core/svg-icon/svg-icon.component' MappingTableComponent, MappingFilterComponent, MappingHeaderSectionComponent, - ConfigurationExportSettingsComponent, ConfigurationImportSettingsComponent, ConfigurationAdvancedSettingsComponent, SkipExportComponent, @@ -224,7 +223,6 @@ import { SvgIconComponent } from './components/core/svg-icon/svg-icon.component' MappingTableComponent, MappingFilterComponent, MappingHeaderSectionComponent, - ConfigurationExportSettingsComponent, ConfigurationImportSettingsComponent, ConfigurationAdvancedSettingsComponent, DashboardMappingResolveComponent,