@hitsoft/e-donusum 1.0.14 → 1.0.15

package/fesm2020/hitsoft-e-donusum.mjs

@@ -6703,6 +6703,7 @@ class HitParamsIntegratorComponent {
         });
     }
     async submitForm() {
+        debugger;
         if (this.formParamsIntegrator.invalid) {
             window.scroll({
                 top: 0,
@@ -6737,7 +6738,7 @@ class HitParamsIntegratorComponent {
         }), tap$1(() => { }))
             .subscribe(async () => {
             // this.toasterService.success('eDonusum::TransactionSuccessful');
-            await this.getParamsIntegrator(false, this.paramsIntegratorDtoWithNavigationPropertiesDto.branch
+            await this.getParamsIntegrator(false, this.paramsIntegratorDtoWithNavigationPropertiesDto?.branch
                 ? this.paramsIntegratorDtoWithNavigationPropertiesDto.branch.id
                 : '00000000-0000-0000-0000-000000000000');
             this.valid.emit(true);
@@ -6747,7 +6748,9 @@ class HitParamsIntegratorComponent {
         });
     }
     async getParamsIntegrator(buildForm = false, branchId) {
+        debugger;
         this.hitParamsIntegratorsService.getParamsIntegrator(branchId).subscribe(data => {
+            debugger;
             this.paramsIntegratorDtoWithNavigationPropertiesDto = data;
             if (buildForm)
                 this.buildForm();
@@ -6772,11 +6775,19 @@ class HitParamsIntegratorComponent {
     //   });
     // }
     async connectionTest() {
-        if (this.formParamsIntegrator.controls.branchId.value == '')
+        if (this.formParamsIntegrator.controls.branchId?.value == '')
             this.formParamsIntegrator.controls.branchId.setValue('00000000-0000-0000-0000-000000000000');
         let request = this.formParamsIntegrator.value;
         return await this.hitEntegratorsService.connectionTest(request).then(data => {
-            return data;
+            this.submitButtonDisabled = false;
+            if (data) {
+                this.toasterService.success('eDonusum::ConnectionSuccessful');
+                return true;
+            }
+            else {
+                this.toasterService.error(data.message);
+                return false;
+            }
         });
     }
 }
@@ -6940,9 +6951,11 @@ class HitParamsGeneralPart1Component {
                 .pipe(finalize$1(() => {
                 this.submitButtonDisabled = false;
             }), tap$1(() => { }))
-                .subscribe(async () => {
+                .subscribe(async (data) => {
                 // this.toasterService.success('eDonusum::TransactionSuccessful');
+                await this.getGeneralParams();
                 this.valid.emit(true);
+                this.paramsGeneralDtoPart1.emit(data);
             }, err => {
                 this.toasterService.error('eDonusum::TransactionUnsuccessful');
                 this.valid.emit(false);
@@ -7046,25 +7059,32 @@ class HitParamsGeneralPart2Component {
         });
     }
     submitForm() {
-        if (this.generalformParamsGeneralPart2.invalid)
-            return;
-        this.submitButtonDisabled = true;
-        // this.toasterService.info('eDonusum::TransactionStarted');
-        this.paramsGeneralDtoPart1.integrator =
-            this.generalformParamsGeneralPart2.controls.integrator.value;
-        const request = this.service.update(this.paramsGeneralDto.id, {
-            ...this.paramsGeneralDtoPart1,
-        });
-        request
-            .pipe(finalize$1(() => {
-            this.submitButtonDisabled = false;
-        }), tap$1(() => { }))
-            .subscribe(() => {
-            // this.toasterService.success('eDonusum::TransactionSuccessful');
-            this.valid.emit(true);
-        }, err => {
-            this.toasterService.error('eDonusum::TransactionUnsuccessful');
-            this.valid.emit(false);
+        debugger;
+        this.hitParamsGeneralsService.getParamsGeneral().subscribe(data => {
+            this.paramsGeneralDto = data;
+            if (this.generalformParamsGeneralPart2.invalid)
+                return;
+            this.submitButtonDisabled = true;
+            // this.toasterService.info('eDonusum::TransactionStarted');
+            this.paramsGeneralDtoPart1.integrator =
+                this.generalformParamsGeneralPart2.controls.integrator.value;
+            const request = this.service.update(this.paramsGeneralDto?.id, {
+                ...this.paramsGeneralDtoPart1,
+            });
+            request
+                .pipe(finalize$1(() => {
+                this.submitButtonDisabled = false;
+            }), tap$1(() => { }))
+                .subscribe(() => {
+                // this.toasterService.success('eDonusum::TransactionSuccessful');
+                this.hitParamsGeneralsService.getParamsGeneral().subscribe(data => {
+                    this.paramsGeneralDto = data;
+                });
+                this.valid.emit(true);
+            }, err => {
+                this.toasterService.error('eDonusum::TransactionUnsuccessful');
+                this.valid.emit(false);
+            });
         });
     }
 }