Merged PR 372: #1085 Set Partial Quantity On UI Change to Checkmark or SelectAll

This commit is contained in:
Sebastian Neumair
2020-10-19 13:36:54 +00:00
2 changed files with 28 additions and 4 deletions

View File

@@ -34,6 +34,7 @@ import {
ShelfShippingNoteService,
} from '../../services';
import { ShelfOrderDetailsShelfTagsComponent } from './shelf-tags/shelftags.component';
import { isNullOrUndefined } from 'util';
@Component({
selector: 'app-shelf-order-details',
@@ -135,15 +136,14 @@ export class ShelfOrderDetailsComponent {
selectOrderItem(orderItem: OrderItemListItemDTO, value: boolean) {
if (!value) {
this.selectedForPartialPickup.delete(orderItem.orderItemId);
this.clearItemFromPartialPickup(orderItem);
} else {
this.selectedForPartialPickup.set(orderItem.orderItemId, orderItem);
this.setItemForPartialPickUp(orderItem);
}
}
setOrderItemQuanity(orderItem: OrderItemListItemDTO, quantity: number) {
this.quantityForPartialPickup.set(orderItem.orderItemId, quantity);
this.selectOrderItem(orderItem, true);
this.setItemForPartialPickUp(orderItem, quantity);
}
saveComment(item: OrderItemListItemDTO, comment: string) {
@@ -484,4 +484,20 @@ export class ShelfOrderDetailsComponent {
shareReplay(1)
);
}
private clearItemFromPartialPickup(orderItem: OrderItemListItemDTO) {
this.selectedForPartialPickup.delete(orderItem.orderItemId);
this.quantityForPartialPickup.delete(orderItem.orderItemId);
}
private setItemForPartialPickUp(
orderItem: OrderItemListItemDTO,
quantity?: number
) {
this.selectedForPartialPickup.set(orderItem.orderItemId, orderItem);
this.quantityForPartialPickup.set(
orderItem.orderItemId,
isNullOrUndefined(quantity) ? orderItem.overallQuantity : quantity
);
}
}

View File

@@ -51,6 +51,14 @@ export class ShelfAbholfachEtikettService {
print(printer);
} catch (error) {
console.log('Printing Abholfachetikett Failed');
data.printerComponent.openDialog();
setTimeout(
() =>
data.printerComponent.setError(
error.message || 'Drucken des Abholfachetiketts fehlgeschlagen'
),
1500
);
} finally {
if (data.statusObs$ && data.statusObs$.next) {
data.statusObs$.next(false);