sage 300 fixes (#554)

sage 300 fixes
fylein · Mar 6, 2024 · 0ede24e · 0ede24e
1 parent 2b3dedb
commit 0ede24e
Show file tree

Hide file tree

Showing 13 changed files with 343 additions and 270 deletions.
diff --git a/src/app/core/models/sage300/sage300-configuration/sage300-import-settings.model.ts b/src/app/core/models/sage300/sage300-configuration/sage300-import-settings.model.ts
@@ -59,6 +59,7 @@ export class Sage300ImportSettingModel extends ImportSettingsModel {
             isDependentImportEnabled: new FormControl(importSettings?.dependent_field_settings?.is_import_enabled ? importSettings.dependent_field_settings.is_import_enabled : false),
             costCodes: new FormControl(importSettings?.dependent_field_settings?.cost_code_field_name ? this.generateDependentFieldValue(importSettings.dependent_field_settings.cost_code_field_name, importSettings.dependent_field_settings.cost_code_placeholder) : null),
             costCategory: new FormControl(importSettings?.dependent_field_settings?.cost_category_field_name ? this.generateDependentFieldValue(importSettings.dependent_field_settings.cost_category_field_name, importSettings.dependent_field_settings.cost_category_placeholder) : null),
+            addCommitmentDetails: new FormControl(importSettings?.import_settings?.add_commitment_details ?? false),
             dependentFieldImportToggle: new FormControl(true)
         });
     }
@@ -71,7 +72,7 @@ export class Sage300ImportSettingModel extends ImportSettingsModel {
             import_settings: {
                 import_categories: importSettingsForm.get('importCategories')?.value,
                 import_vendors_as_merchants: importSettingsForm.get('importVendorAsMerchant')?.value,
-                add_commitment_details: false
+                add_commitment_details: importSettingsForm.get('addCommitmentDetails')?.value
             },
             mapping_settings: mappingSettings,
             dependent_field_settings: importSettingsForm.get('isDependentImportEnabled')?.value ? {

diff --git a/...l-shared/business-central-export-settings/business-central-export-settings.component.scss b/...l-shared/business-central-export-settings/business-central-export-settings.component.scss
@@ -1,3 +0,0 @@
-:host ::ng-deep .remove-padding app-configuration-select-field div {
-    @apply tw-pt-0 #{!important};
-}

diff --git a/...ge300-onboarding/sage300-onboarding-connector/sage300-onboarding-connector.component.html b/...ge300-onboarding/sage300-onboarding-connector/sage300-onboarding-connector.component.html
@@ -10,20 +10,20 @@
             <div>
                 <app-configuration-step-header 
                 [headerText]="'Connect to your Sage 300 CRE account'"
-                [contentText]="'Connect to your Sage 300 CRE account to establish a connection between ' + brandingConfig.brandName + ' and Sage 300 CRE. HH2 Identifier is required to connect Sage 300 CRE to '+ brandingConfig.brandName"
+                [contentText]="'To connect your Sage 300 CRE database to your ' + brandingConfig.brandName + ' account, you need to set up the HH2 sync. Click here for details or contact your ' + brandingConfig.brandName + ' Implementation Specialist for help with the setup.'"
                 [redirectLink]="redirectLink"></app-configuration-step-header>
             </div>
             <div class="tw-p-24-px tw-px-24-px tw-pb-24-px">
                 <div class="tw-flex tw-justify-center tw-items-center">
                     <form [formGroup]="connectSage300Form">
                         <div class="tw-mb-16-px">
-                            <app-configuration-text-field [customErrorMessage]="'Please enter a valid HH2 Identifier.'" [form]="connectSage300Form" [formControllerName]="'companyID'" [isFieldMandatory]="true" [label]="'HH2 Identifier'" [placeholder]="'Enter HH2 Identifier'"></app-configuration-text-field>
+                            <app-configuration-text-field [customErrorMessage]="'Please enter a valid Identifier.'" [form]="connectSage300Form" [formControllerName]="'companyID'" [isFieldMandatory]="true" [label]="'Identifier'" [placeholder]="'Enter Identifier'"></app-configuration-text-field>
                         </div>
                         <div class="tw-mb-16-px">
-                            <app-configuration-text-field [customErrorMessage]="'Please enter valid HH2 User ID.'" [form]="connectSage300Form" [formControllerName]="'userID'" [isFieldMandatory]="true" [label]="'HH2 User ID'" [placeholder]="'Enter HH2 User ID'"></app-configuration-text-field>
+                            <app-configuration-text-field [customErrorMessage]="'Please enter valid User ID.'" [form]="connectSage300Form" [formControllerName]="'userID'" [isFieldMandatory]="true" [label]="'User ID'" [placeholder]="'Enter User ID'"></app-configuration-text-field>
                         </div>
                         <div>
-                            <app-configuration-text-field [customErrorMessage]="'Incorrect Password. Please enter correct password'" [form]="connectSage300Form" [formControllerName]="'userPassword'" [isFieldMandatory]="true" [label]="'HH2 User Password'" [placeholder]="'Enter HH2 User Password'" [type]="'password'"></app-configuration-text-field>
+                            <app-configuration-text-field [customErrorMessage]="'Incorrect Password. Please enter correct password'" [form]="connectSage300Form" [formControllerName]="'userPassword'" [isFieldMandatory]="true" [label]="'User Password'" [placeholder]="'Enter User Password'" [type]="'password'"></app-configuration-text-field>
                         </div>
                     </form>
                 </div>

diff --git a/...0/sage300-onboarding/sage300-onboarding-landing/sage300-onboarding-landing.component.html b/...0/sage300-onboarding/sage300-onboarding-landing/sage300-onboarding-landing.component.html
@@ -3,6 +3,6 @@
         <app-landing-page-header [iconPath]="'assets/logos/sage300-logo.svg'" [appName]="'Sage 300 CRE'" [appDescription]="'Import data from Sage 300 CRE to ' + brandingConfig.brandName + ' and Export expenses from ' + brandingConfig.brandName + ' to Sage 300 CRE. '" [isLoading]="false" [isIntegrationSetupInProgress]="false" [isIntegrationConnected]="false" [redirectLink]="redirectLink" [buttonText]="'Connect'" [postConnectionRoute]="'sage300/onboarding/connector'"></app-landing-page-header>
     </div>
     <div>
-        <app-landing-page-body [headlineText]="'Guide to setup your Integrations'" [headerText]="'A quick guide to help you set up the integration quick and easy.'" [embedVideo]="embedVideoLink" [svgPath]="'assets/flow-charts/sage300-flow-chart.svg'" [appName]="appName"></app-landing-page-body>
+        <app-landing-page-body [headlineText]="'Guide to setup your Integrations'" [headerText]="'A set up through to help you set up the integration quick and easy.'" [embedVideo]="embedVideoLink" [svgPath]="'assets/flow-charts/sage300-flow-chart.svg'" [appName]="appName"></app-landing-page-body>
     </div>
 </div>
diff --git a/...ons/sage300/sage300-shared/sage300-import-settings/sage300-import-settings.component.html b/...ons/sage300/sage300-shared/sage300-import-settings/sage300-import-settings.component.html
@@ -41,6 +41,7 @@ <h4 class="tw-text-16-px tw-text-normal-text-color tw-mb-8-px">
                         [accountingFieldOptions]="sage300Fields" 
                         [fyleFieldOptions]="fyleFields" 
                         [dependentImportFields]="dependentImportFields" 
+                        [redirectLink]="supportArticleLink"
                         [dependentDestinationValue] = "'JOB'"
                         (showWarningForDependentFields)="showWarningForDependentFields()">
                     </app-configuration-import-field>