sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-31 09:37:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/3.0' into develop

Browse Source
This commit is contained in:
Lorenz Hilpert
2023-07-27 17:51:51 +02:00
parent f4579ef8dc 75528d37d3
commit 1e504d9e0c
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/shared/modals/purchase-options-modal/src/lib/purchase-options-list-item/purchase-options-list-item.component.ts
View File

@@ -270,16 +270,25 @@ export class PurchaseOptionsListItemComponent implements OnInit, OnDestroy, OnCh
}
initPriceSubscription() {
const sub = this.price$.subscribe((price) => {
const sub = combineLatest([this.canEditPrice$, this.price$]).subscribe(([canEditPrice, price]) => {
if (!canEditPrice) {
return;
}
const priceStr = this.stringifyPrice(price?.value?.value);
if (priceStr === '') return;
if (this.parsePrice(this.priceFormControl.value) !== price?.value?.value) {
debugger;
this.priceFormControl.setValue(priceStr);
}
});
const valueChangesSub = this.priceFormControl.valueChanges.subscribe((value) => {
const valueChangesSub = combineLatest([this.canEditPrice$, this.priceFormControl.valueChanges]).subscribe(([canEditPrice, value]) => {
if (!canEditPrice) {
return;
}
const price = this._store.getPrice(this.item.id);
const parsedPrice = this.parsePrice(value);

8
apps/shared/modals/purchase-options-modal/src/lib/store/purchase-options.selectors.ts
View File

@@ -211,10 +211,12 @@ export function getPriceForPurchaseOption(
purchaseOption: PurchaseOption
): (state: PurchaseOptionsState) => PriceDTO & { fromCatalogue?: boolean } {
return (state) => {
const price = getPrices(state)[itemId];
if (getCanEditPrice(itemId)(state)) {
const price = getPrices(state)[itemId];
if (price) {
return price;
if (price) {
return price;
}
}
const item = getItems(state).find((item) => item.id === itemId);