Merge branch 'release/1.5' into develop

This commit is contained in:
Lorenz Hilpert
2021-12-10 10:50:36 +01:00

View File

@@ -181,7 +181,10 @@ export class PurchasingOptionsModalComponent {
this.purchasingOptionsModalStore.setOption(this.modalRef.data.option);
this.purchasingOptionsModalStore.setAvailableOptions(this.modalRef.data.availableOptions);
if (this.modalRef.data.availableOptions?.some((option) => option === 'pick-up' || option === 'take-away')) {
if (
this.modalRef.data.availableOptions?.some((option) => option === 'pick-up' || option === 'take-away') ||
['take-away', 'pick-up'].includes(this.modalRef.data.option)
) {
this.purchasingOptionsModalStore.loadBranches(this.modalRef?.data?.branchId);
}
}