From c9996976455b82ccb550b657b2229d6a8df47517 Mon Sep 17 00:00:00 2001 From: Lorenz Hilpert Date: Mon, 25 Jan 2021 13:39:42 +0100 Subject: [PATCH] #1323 Dialog um Hindernismeldung erweitern Co-authored-by: n.righi@paragon-data.de --- apps/domain/cart/src/lib/cart.service.ts | 2 +- .../customer-details.component.ts | 6 +-- .../product-checkout.component.html | 9 ++-- .../product-checkout.component.scss | 13 +++-- .../product-checkout.component.ts | 44 +++++++++++++--- .../src/app/refact-imp/cart.refact-imp.ts | 50 ++++++++++++------- .../src/app/refact-imp/checkout.refact-imp.ts | 19 +++++-- .../ui/modal/src/lib/debug-modal.component.ts | 2 +- tailwind.config.js | 1 + 9 files changed, 108 insertions(+), 38 deletions(-) diff --git a/apps/domain/cart/src/lib/cart.service.ts b/apps/domain/cart/src/lib/cart.service.ts index b074ed31a..9443de450 100644 --- a/apps/domain/cart/src/lib/cart.service.ts +++ b/apps/domain/cart/src/lib/cart.service.ts @@ -13,7 +13,7 @@ export class CartService { throw new Error('Not Implemented'); } - getCardId(processId: number): Observable { + getCartId(processId: number): Observable { throw new Error('Not Implemented'); } diff --git a/apps/page/customer/src/lib/customer-details/customer-details.component.ts b/apps/page/customer/src/lib/customer-details/customer-details.component.ts index dd5551945..06f23f6c7 100644 --- a/apps/page/customer/src/lib/customer-details/customer-details.component.ts +++ b/apps/page/customer/src/lib/customer-details/customer-details.component.ts @@ -133,9 +133,9 @@ export class CustomerDetailsComponent implements OnInit { this.process.updateName(this.application.activatedProcessId, customer.lastName); // Set Customer For Process - const customerAdded: any = await this.checkoutService.setCustomer(this.application.activatedProcessId, customer); - if (!customerAdded.ok) { - this.modal.open({ content: UiDebugModalComponent, data: customerAdded }); + const canAdd = await this.checkoutService.setCustomer(this.application.activatedProcessId, customer); + + if (!canAdd) { return; } diff --git a/apps/sales/src/app/modules/product/components/product-checkout/product-checkout.component.html b/apps/sales/src/app/modules/product/components/product-checkout/product-checkout.component.html index 712e1d464..439089469 100644 --- a/apps/sales/src/app/modules/product/components/product-checkout/product-checkout.component.html +++ b/apps/sales/src/app/modules/product/components/product-checkout/product-checkout.component.html @@ -98,7 +98,8 @@
-

Artikel wurde dem Warenkorb hinzugefügt

+

Artikel wurde dem Warenkorb hinzugefügt

+

Artikel kann dem Warenkorb nicht hinzugefügt werden

@@ -123,8 +124,10 @@
{{ book.product.contributors }} - {{ book.product.name }} - - + Leider können wir den Service mit den bereits ausgewählten Services im Warenkorb nicht kombinieren. + {{ book.product.formatDetail }} diff --git a/apps/sales/src/app/modules/product/components/product-checkout/product-checkout.component.scss b/apps/sales/src/app/modules/product/components/product-checkout/product-checkout.component.scss index 54b580594..ce0ae0bb2 100644 --- a/apps/sales/src/app/modules/product/components/product-checkout/product-checkout.component.scss +++ b/apps/sales/src/app/modules/product/components/product-checkout/product-checkout.component.scss @@ -172,7 +172,7 @@ // SECOND STEP DESIGN .modal-step-2 { - height: 420px; + height: auto; justify-content: flex-start; .header { @@ -244,7 +244,15 @@ text-overflow: ellipsis; overflow: hidden; white-space: nowrap; - margin-bottom: 25px; + } + + .book-format { + margin-top: 25px; + } + + .can-add-hint { + @apply text-dark-goldenrod text-card-sub; + margin-top: 8px; } .order-book-icon { @@ -327,7 +335,6 @@ align-items: center; width: 93%; margin-top: 25px; - margin-bottom: 20px; } .img-truck-b2b { diff --git a/apps/sales/src/app/modules/product/components/product-checkout/product-checkout.component.ts b/apps/sales/src/app/modules/product/components/product-checkout/product-checkout.component.ts index b6197bf95..25574b27d 100644 --- a/apps/sales/src/app/modules/product/components/product-checkout/product-checkout.component.ts +++ b/apps/sales/src/app/modules/product/components/product-checkout/product-checkout.component.ts @@ -88,6 +88,8 @@ export class ProductCheckoutComponent implements OnInit, OnDestroy { confirmationBtnText = 'Fortfahren'; + canAddItem: boolean = true; + // Trigger other functionality if needed @Output() closed: EventEmitter = new EventEmitter(); @@ -513,13 +515,13 @@ export class ProductCheckoutComponent implements OnInit, OnDestroy { map((response) => { if (response && response.av) { const preferredSupplier = response.av.find((av) => av && av.preferred === 1); + if (preferredSupplier) { this.currentAvailability = preferredSupplier; + this.checkCanAdd(); this._pikUpPrice = preferredSupplier.price.value.value; } - this.shoppingCartService.canAddItem(undefined, this.currentAvailability); - const eligibleAvailabilities = response.av .filter((availability) => allowedAvailabilityStatusCodes(availability.status) && availability.qty) .map((availability) => availability.qty); @@ -546,6 +548,7 @@ export class ProductCheckoutComponent implements OnInit, OnDestroy { let preferredQty = 0; if (preferedAv) { this.currentAvailability = preferedAv; + this.checkCanAdd(); this._deliveryPrice = preferedAv.price.value.value; if (allowedAvailabilityStatusCodes(preferedAv.status)) { preferredQty = preferedAv.qty; @@ -564,14 +567,43 @@ export class ProductCheckoutComponent implements OnInit, OnDestroy { return shippingAvailability; } else if (this.deliveryType === DeliveryOption.DELIVERY_B2B) { - // TODO: Logik für Verfügbarkeit prüfen + const shippingB2bAvailability = await this.productAvailabilityService + .getShippingB2BAvailability(this.book, this.book.product.ean, +this.selectedBranch.branchNumber, numberOfItems) + .pipe( + map((response) => { + if (response && response.av) { + const preferedAv = response.av.find((t) => t && t.preferred === 1); + let preferredQty = 0; + if (preferedAv) { + this.currentAvailability = preferedAv; + this.checkCanAdd(); + this._deliveryPrice = preferedAv.price.value.value; + if (allowedAvailabilityStatusCodes(preferedAv.status)) { + preferredQty = preferedAv.qty; + } + this.detectChanges(); + } + if (preferredQty) { + return preferredQty; + } + return 0; + } + return 0; + }) + ) + .toPromise(); + + return shippingB2bAvailability; } - this.shoppingCartService - .canAddItem(undefined, this.currentAvailability) - .then((result) => this.uiModal.open({ content: UiDebugModalComponent, data: { canAddItem: result } })); + return of(numberOfItems).toPromise(); } + async checkCanAdd() { + // TODO: Hindernissmeldung + this.canAddItem = await this.shoppingCartService.canAddItem(undefined, this.currentAvailability); + } + updateCart() { this.store.dispatch( new SetCartEntry( diff --git a/apps/sales/src/app/refact-imp/cart.refact-imp.ts b/apps/sales/src/app/refact-imp/cart.refact-imp.ts index 654cf3278..6785afc7f 100644 --- a/apps/sales/src/app/refact-imp/cart.refact-imp.ts +++ b/apps/sales/src/app/refact-imp/cart.refact-imp.ts @@ -9,9 +9,19 @@ import { OLAAvailabilityDTO, StoreCheckoutService } from '@swagger/checkout'; import { CustomerSelectors } from '../core/store/selectors/customer.selectors'; import { StringDictionary } from '@cmf/core'; import { ApplicationService } from '@core/application'; +import { CrmCustomerService } from '@domain/crm'; +import { CustomerDTO } from '@swagger/crm'; +import { UiDebugModalComponent, UiModalService } from '@ui/modal'; + @Injectable() export class CartRefactImp implements CartService { - constructor(private store: Store, private checkoutService: StoreCheckoutService, private applicationService: ApplicationService) {} + constructor( + private store: Store, + private checkoutService: StoreCheckoutService, + private applicationService: ApplicationService, + private customerService: CrmCustomerService, + private uiModal: UiModalService + ) {} getItems(processId: number): Observable { return this.store.select(SharedSelectors.getCart).pipe( @@ -41,12 +51,12 @@ export class CartRefactImp implements CartService { ); } - getCardId(processId: number): Observable { + getCartId(processId: number): Observable { return this.store.select(ProcessSelectors.getCurrentProcess).pipe(map((process) => process.cartId)); } getRequiredCustomerTypes(processId: number): Observable { - // return this.getCardId(processId).pipe( + // return this.getCartId(processId).pipe( // switchMap((cartId) => { // return this.checkoutService // .StoreCheckoutCanAddBuyer({ shoppingCartId: cartId, payload: { customerFeatures: {} } }) @@ -94,37 +104,43 @@ export class CartRefactImp implements CartService { } async canAddItem(processId: number, availability: OLAAvailabilityDTO): Promise { - const customer$ = await this.store.select(CustomerSelectors.getActiveUser).pipe(first()).toPromise(); - const features$ = await this.store.select(CustomerSelectors.getCustomerFeatures).pipe(first()).toPromise(); + const getCustomerIdByProcessIdFn = await this.store.select(CustomerSelectors.getActiveUser).pipe(first()).toPromise(); - console.log({ processId }, { activatedProcessId: this.applicationService.activatedProcessId }); + let customerId: number; + try { + customerId = getCustomerIdByProcessIdFn(processId || this.applicationService.activatedProcessId)?.id; + } catch (error) {} - const customerId = customer$(processId || this.applicationService.activatedProcessId)?.id; - - console.log({ customerId }); + let customer: CustomerDTO; + if (customerId) { + customer = await this.customerService + .getCustomer(customerId) + .pipe(map((res) => res.result)) + .toPromise(); + } const customerFeatures: StringDictionary = {}; if (customerId) { - const features = features$(customerId); - - console.log({ features }); - - for (const feature of features) { + for (const feature of customer.features) { customerFeatures[feature.key] = feature.key; } } - this.getCardId(processId || this.applicationService.activatedProcessId) + return this.getCartId(processId || this.applicationService.activatedProcessId) .pipe( first(), switchMap((cartId) => { return this.checkoutService .StoreCheckoutCanAddItem({ shoppingCartId: cartId, payload: { customerFeatures, availabilities: [availability] } }) - .pipe(tap((res) => console.log(res))); + .pipe( + map((res) => { + this.uiModal.open({ content: UiDebugModalComponent, data: res }); + return res.result.ok; + }) + ); }) ) .toPromise(); - return false; } } diff --git a/apps/sales/src/app/refact-imp/checkout.refact-imp.ts b/apps/sales/src/app/refact-imp/checkout.refact-imp.ts index da57be110..33e02af23 100644 --- a/apps/sales/src/app/refact-imp/checkout.refact-imp.ts +++ b/apps/sales/src/app/refact-imp/checkout.refact-imp.ts @@ -5,9 +5,10 @@ import { CheckoutService } from '@domain/checkout'; import { Store } from '@ngxs/store'; import { PayerDTO, PayerType, ShippingAddressDTO, StoreCheckoutService } from '@swagger/checkout'; import { CustomerDTO, PayerDTO as CrmPayerDTO, ShippingAddressDTO as CrmShippingAddressDTO } from '@swagger/crm'; +import { UiDebugModalComponent, UiModalService } from '@ui/modal'; import { Observable } from 'rxjs'; -import { first, mergeMap } from 'rxjs/operators'; +import { first, map, mergeMap } from 'rxjs/operators'; import { RefactSetCustomer, RefactSetCustomerBillingAddress, @@ -18,11 +19,16 @@ import { CustomerSelectors } from '../core/store/selectors/customer.selectors'; @Injectable() export class CheckoutRefactImp implements CheckoutService { - constructor(private store: Store, private checkoutService: StoreCheckoutService, private cartService: CartService) {} + constructor( + private store: Store, + private checkoutService: StoreCheckoutService, + private cartService: CartService, + private uiModal: UiModalService + ) {} async setCustomer(processId: number, customer: CustomerDTO): Promise { const response = await this.cartService - .getCardId(processId) + .getCartId(processId) .pipe( first(), mergeMap((shoppingCartId) => { @@ -39,7 +45,12 @@ export class CheckoutRefactImp implements CheckoutService { this.store.dispatch(new SetActiveCustomer(customer.id)); this.store.dispatch(new RefactSetCustomer(customer)); } - return response.result as any; + + if (!response.result.ok) { + this.uiModal.open({ content: UiDebugModalComponent, data: response }); + } + + return response.result.ok; } getCustomer(processId: number): Observable { diff --git a/apps/ui/modal/src/lib/debug-modal.component.ts b/apps/ui/modal/src/lib/debug-modal.component.ts index 78b946420..2b9601178 100644 --- a/apps/ui/modal/src/lib/debug-modal.component.ts +++ b/apps/ui/modal/src/lib/debug-modal.component.ts @@ -3,7 +3,7 @@ import { UiModalRef } from './defs'; @Component({ selector: 'ui-debug-modal', - template: `{{ modalRef.data | json }}`, + template: `
 {{ modalRef.data | json }}
`, }) export class UiDebugModalComponent implements OnInit { constructor(public modalRef: UiModalRef) {} diff --git a/tailwind.config.js b/tailwind.config.js index d8bab4ce8..43d8afbc9 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -78,6 +78,7 @@ module.exports = { 'active-branch': '#596470', 'inactive-branch': '#9ca5b0', 'disabled-branch': '#c6cbd2', + 'dark-goldenrod': '#be8100', }, boxShadow: { input: '0 6px 24px 0 rgba(214, 215, 217, 0.8)',