diff --git a/src/app/main/component/user/components/habit/add-edit-custom-habit/add-edit-custom-habit.component.ts b/src/app/main/component/user/components/habit/add-edit-custom-habit/add-edit-custom-habit.component.ts index eac121e26e..d5da347703 100644 --- a/src/app/main/component/user/components/habit/add-edit-custom-habit/add-edit-custom-habit.component.ts +++ b/src/app/main/component/user/components/habit/add-edit-custom-habit/add-edit-custom-habit.component.ts @@ -160,6 +160,7 @@ export class AddEditCustomHabitComponent extends FormBaseComponent implements On text: item.text }; }); + console.log(this.newList, 'new list'); this.getControl('shopList').setValue(this.newList); } diff --git a/src/app/main/component/user/components/habit/add-new-habit/add-new-habit.component.ts b/src/app/main/component/user/components/habit/add-new-habit/add-new-habit.component.ts index 8c5bc6f6df..8128fdcb8a 100644 --- a/src/app/main/component/user/components/habit/add-new-habit/add-new-habit.component.ts +++ b/src/app/main/component/user/components/habit/add-new-habit/add-new-habit.component.ts @@ -292,7 +292,10 @@ export class AddNewHabitComponent implements OnInit { .assignCustomHabit(this.habitId, this.friendsIdsList, habitAssignProperties) .pipe(take(1)) .subscribe(() => { - this.customShopList.length > 0 ? this.addCustomHabitItems() : this.afterHabitWasChanged('habitAdded'); + if (this.customShopList.length) { + this.addCustomHabitItems(); + } + this.afterHabitWasChanged('habitAdded'); }); } diff --git a/src/app/shared/ubs-footer/ubs-footer.component.html b/src/app/shared/ubs-footer/ubs-footer.component.html index f7bfb99b1c..8801331263 100644 --- a/src/app/shared/ubs-footer/ubs-footer.component.html +++ b/src/app/shared/ubs-footer/ubs-footer.component.html @@ -8,7 +8,7 @@
diff --git a/src/app/ubs/ubs-admin/components/ubs-admin-tariffs/ubs-admin-tariffs-pricing-page/ubs-admin-tariffs-pricing-page.component.ts b/src/app/ubs/ubs-admin/components/ubs-admin-tariffs/ubs-admin-tariffs-pricing-page/ubs-admin-tariffs-pricing-page.component.ts index 8642073f78..2f8d48c5fb 100644 --- a/src/app/ubs/ubs-admin/components/ubs-admin-tariffs/ubs-admin-tariffs-pricing-page/ubs-admin-tariffs-pricing-page.component.ts +++ b/src/app/ubs/ubs-admin/components/ubs-admin-tariffs/ubs-admin-tariffs-pricing-page/ubs-admin-tariffs-pricing-page.component.ts @@ -39,6 +39,7 @@ export class UbsAdminTariffsPricingPageComponent implements OnInit, OnDestroy { areAllCheckBoxEmpty: boolean; limitStatus: limitStatus = null; description; + servicePrice; couriers; limitsForm: FormGroup; currentLocation; @@ -365,6 +366,7 @@ export class UbsAdminTariffsPricingPageComponent implements OnInit, OnDestroy { .pipe(takeUntil(this.destroy)) .subscribe((res: Service) => { this.service = res; + this.servicePrice = this.service?.price * 100; this.isLoadBar1 = false; }); }