Merged PR 962: #2374 Reorder Modal Fix Disable Order Button if Store And TakeAway Availabili...

#2374 Reorder Modal Fix Disable Order Button if Store And TakeAway Availabilites don't exist
This commit is contained in:
Nino Righi
2021-11-15 08:25:55 +00:00
committed by Andreas Schickinger
parent bc1fc27a5d
commit a4a4fc344a
2 changed files with 8 additions and 4 deletions

View File

@@ -77,7 +77,11 @@
Nicht lieferbar
</ui-spinner>
</button>
<button class="cta-reorder cta-action-primary" [disabled]="ctaDisabled$ | async" (click)="reorder()">
<button
class="cta-reorder cta-action-primary"
[disabled]="(ctaDisabled$ | async) || ((storeAvailabilityError$ | async) && (takeAwayAvailabilityError$ | async))"
(click)="reorder()"
>
<ui-spinner [show]="ctaDisabled$ | async">
Bestellen
</ui-spinner>

View File

@@ -4,7 +4,7 @@ import { ComponentStore } from '@ngrx/component-store';
import { AvailabilityDTO2, OrderItemListItemDTO } from '@swagger/oms';
import { UiModalRef } from '@ui/modal';
import { combineLatest } from 'rxjs';
import { catchError, map, switchMap, tap } from 'rxjs/operators';
import { catchError, map, shareReplay, switchMap, tap } from 'rxjs/operators';
import { ReorderResult } from './reorder.result';
interface GoodsInListReorderModalState {
@@ -47,8 +47,8 @@ export class ReorderModalComponent extends ComponentStore<GoodsInListReorderModa
}
readonly ctaDisabled$ = this.select((s) => s.ctaDisabled);
readonly storeAvailabilityError$ = this.select((s) => s.storeAvailabilityError);
readonly takeAwayAvailabilityError$ = this.select((s) => s.takeAwayAvailabilityError);
readonly storeAvailabilityError$ = this.select((s) => s.storeAvailabilityError).pipe(shareReplay());
readonly takeAwayAvailabilityError$ = this.select((s) => s.takeAwayAvailabilityError).pipe(shareReplay());
readonly currentBranch$ = this.domainAvailabilityService.getCurrentBranch();