diff --git a/apps/sales/src/app/components/menu/menu.component.html b/apps/sales/src/app/components/menu/menu.component.html index fbd9ff951..7cbc0f95c 100644 --- a/apps/sales/src/app/components/menu/menu.component.html +++ b/apps/sales/src/app/components/menu/menu.component.html @@ -122,7 +122,7 @@
- +
Tätigkeitskalender
diff --git a/apps/sales/src/app/modules/barcode-search/barcode-search.module.ts b/apps/sales/src/app/modules/barcode-search/barcode-search.module.ts index 356f1939d..10b40b8be 100644 --- a/apps/sales/src/app/modules/barcode-search/barcode-search.module.ts +++ b/apps/sales/src/app/modules/barcode-search/barcode-search.module.ts @@ -12,6 +12,8 @@ import { CustomerCardBarcodeSearchComponent } from './pages/customer-card-barcod import { BarcodeScannerComponent } from './components/barcode-scanner/barcode-scanner.component'; import { CustomerCardManualEntryComponent } from './components/customer-card-manual-entry/customer-card-manual-entry.component'; import { CustomerCardSearchEmptyModalComponent } from './components/customer-card-search-empty-modal/customer-card-search-empty-modal.component'; +import { CustomerCardSearchErrorModalComponent } from './components/customer-card-search-error-modal/customer-card-search-error-modal.component'; + @NgModule({ imports: [ @@ -40,7 +42,8 @@ import { CustomerCardSearchEmptyModalComponent } from './components/customer-car BarcodeScannerComponent, CustomerCardBarcodeSearchComponent, CustomerCardManualEntryComponent, - CustomerCardSearchEmptyModalComponent + CustomerCardSearchEmptyModalComponent, + CustomerCardSearchErrorModalComponent ] }) export class BarcodeSearchModule {} diff --git a/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.html b/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.html new file mode 100644 index 000000000..675c2c212 --- /dev/null +++ b/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.html @@ -0,0 +1,15 @@ + + + +
+
{{title}}
+ +
{{message}}
+ +
+ Zur Kundensuche + +
+
+ diff --git a/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.scss b/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.scss new file mode 100644 index 000000000..f7026d65a --- /dev/null +++ b/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.scss @@ -0,0 +1,26 @@ +lib-icon { + position: absolute; + top: 20px; + right: 20px; +} + +.modal-wrapper { + width: 50%; + min-width: 300px; + margin: 0 auto; + text-align: center; + + .header { + font-size: 22px; + font-weight: bold; + margin: 35px 0 15px 0; + } + + .content { + margin: 15px 0; + } + + .actions { + margin: 35px 0; + } +} diff --git a/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.spec.ts b/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.spec.ts new file mode 100644 index 000000000..700a820df --- /dev/null +++ b/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CustomerCardSearchErrorModalComponent } from './customer-card-search-error-modal.component'; + +describe('CustomerCardSearchErrorModalComponent', () => { + let component: CustomerCardSearchErrorModalComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CustomerCardSearchErrorModalComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CustomerCardSearchErrorModalComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.ts b/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.ts new file mode 100644 index 000000000..11f1ee605 --- /dev/null +++ b/apps/sales/src/app/modules/barcode-search/components/customer-card-search-error-modal/customer-card-search-error-modal.component.ts @@ -0,0 +1,29 @@ +import { Component, OnInit } from '@angular/core'; +import { ModalService } from '@libs/ui'; + +@Component({ + selector: 'app-customer-card-search-error-modal', + templateUrl: './customer-card-search-error-modal.component.html', + styleUrls: ['./customer-card-search-error-modal.component.scss'] +}) +export class CustomerCardSearchErrorModalComponent implements OnInit { + id = 'customer-card-search-error-modal'; + title: string; + message: string; + + constructor( + private modalService: ModalService + ) {} + + ngOnInit() {} + + openDialog(title, message) { + this.title = title; + this.message = message; + this.modalService.open(this.id); + } + + closeDialog() { + this.modalService.close(this.id); + } +} diff --git a/apps/sales/src/app/modules/barcode-search/pages/customer-card-barcode-search/customer-card-barcode-search.component.html b/apps/sales/src/app/modules/barcode-search/pages/customer-card-barcode-search/customer-card-barcode-search.component.html index 318fc9c89..5fdfcda39 100644 --- a/apps/sales/src/app/modules/barcode-search/pages/customer-card-barcode-search/customer-card-barcode-search.component.html +++ b/apps/sales/src/app/modules/barcode-search/pages/customer-card-barcode-search/customer-card-barcode-search.component.html @@ -6,4 +6,5 @@ + diff --git a/apps/sales/src/app/modules/barcode-search/pages/customer-card-barcode-search/customer-card-barcode-search.component.ts b/apps/sales/src/app/modules/barcode-search/pages/customer-card-barcode-search/customer-card-barcode-search.component.ts index aaf74985d..aba2b3493 100644 --- a/apps/sales/src/app/modules/barcode-search/pages/customer-card-barcode-search/customer-card-barcode-search.component.ts +++ b/apps/sales/src/app/modules/barcode-search/pages/customer-card-barcode-search/customer-card-barcode-search.component.ts @@ -16,6 +16,9 @@ import { CustomerCardManualEntryComponent } from '../../components/customer-card import { CustomerCardSearchEmptyModalComponent } from '../../components/customer-card-search-empty-modal/customer-card-search-empty-modal.component'; +import { + CustomerCardSearchErrorModalComponent +} from '../../components/customer-card-search-error-modal/customer-card-search-error-modal.component'; @Component({ selector: 'app-customer-card-barcode-search', @@ -26,6 +29,7 @@ export class CustomerCardBarcodeSearchComponent implements OnInit, OnDestroy, Af @ViewChild('scanner') scanner: CustomerCardScannerScanditComponent; @ViewChild('manualentry') manualentry: CustomerCardManualEntryComponent; @ViewChild('searchCardEmptyModal') searchCardEmptyModal: CustomerCardSearchEmptyModalComponent; + @ViewChild('searchCardErrorModal') searchCardErrorModal: CustomerCardSearchErrorModalComponent; @Select(ProcessSelectors.getProcesses) processes$: Observable; processes: Process[] = []; destroy$ = new Subject(); @@ -96,6 +100,8 @@ export class CustomerCardBarcodeSearchComponent implements OnInit, OnDestroy, Af this.scanner.scanToggle(); this.searchCardEmptyModal.openDialog(); } + }, e => { + this.searchCardErrorModal.openDialog(`${e.status} ${e.statusText}`, e.message); }); } diff --git a/apps/sales/src/app/modules/cart/components/change-order-type/change-order-type.component.ts b/apps/sales/src/app/modules/cart/components/change-order-type/change-order-type.component.ts index 3bb866a3c..d3066f64d 100644 --- a/apps/sales/src/app/modules/cart/components/change-order-type/change-order-type.component.ts +++ b/apps/sales/src/app/modules/cart/components/change-order-type/change-order-type.component.ts @@ -105,7 +105,7 @@ export class ChangeOrderTypeComponent implements OnInit, OnDestroy { } get shippingAvailable() { - if (this.availability.filter(t => t.type === CheckoutType.delivery && t.status === 1024).length > 0) { + if (this.availability.filter(t => t.type === CheckoutType.delivery && allowedAvailabilityStatusCodes(t.status)).length > 0) { return of(true); } return of(false); diff --git a/apps/sales/src/app/modules/customer/components/create-customer-card/create-customer-card.component.html b/apps/sales/src/app/modules/customer/components/create-customer-card/create-customer-card.component.html index 470949804..61e630dc6 100644 --- a/apps/sales/src/app/modules/customer/components/create-customer-card/create-customer-card.component.html +++ b/apps/sales/src/app/modules/customer/components/create-customer-card/create-customer-card.component.html @@ -253,7 +253,7 @@ [error]="submitted && f.country.errors" [errorMessage]="f.city.errors && f.city.errors.backendValidation ? f.city.errors.backendValidationMsg : 'Land wird benötigt'" [value]="f.country.value" - [maxheight]="'255px'" + [maxheight]="'360px'" [scroll]="true" #landDD > diff --git a/apps/sales/src/app/modules/customer/pages/customer-order-detail/customer-order-detail.component.html b/apps/sales/src/app/modules/customer/pages/customer-order-detail/customer-order-detail.component.html index e1cd09d95..fb8149838 100644 --- a/apps/sales/src/app/modules/customer/pages/customer-order-detail/customer-order-detail.component.html +++ b/apps/sales/src/app/modules/customer/pages/customer-order-detail/customer-order-detail.component.html @@ -50,6 +50,7 @@ [isOnlyOne]="onlyOneItemAvailable" [disableEdit]="onlineCustomer || guestCustomer" [paymentDataDTO]="paymentDataDTO" + [estimatedDateLabel]="isDownload ? 'Verfügbar ab' : 'Versand'" > diff --git a/apps/sales/src/app/modules/customer/pages/customer-search-result/customer-search-result.component.html b/apps/sales/src/app/modules/customer/pages/customer-search-result/customer-search-result.component.html index 6166e392d..fab40f2fb 100644 --- a/apps/sales/src/app/modules/customer/pages/customer-search-result/customer-search-result.component.html +++ b/apps/sales/src/app/modules/customer/pages/customer-search-result/customer-search-result.component.html @@ -39,7 +39,7 @@ Neue Kundendaten erfassen - +