sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-28 22:42:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag '835-gastkundenanlage-not-possible' into develop

Browse Source 
ISA-1.0.883

# Conflicts:
#	apps/sales/src/app/modules/customer/components/create-customer-card/create-customer-card.component.ts
This commit is contained in:
Michael Auer
2020-07-17 12:36:41 +02:00
parent 1e7ffce711 a9982202d7
commit 2e3bcf3cf4
2 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
apps/sales/src/app/modules/customer/components/create-customer-card/create-customer-card.component.ts
View File

@@ -133,7 +133,7 @@ export class CreateCustomerCardComponent implements OnInit, OnDestroy {
cartHasItemsForDownload = false;
guestChecked = false;
onlineChecked = false;
guestDisabled = true;
guestDisabled = false;
customerCardChecked = false;
deliveryAndGuestOrOnline = false;
pickUpOrTakeNowAndOnline = false;
@@ -261,32 +261,48 @@ export class CreateCustomerCardComponent implements OnInit, OnDestroy {
this.cartHasItemsForTakeNow = cartHasItemsFor(DeliveryOption.TAKE_NOW);
this.cartHasItemsForDownload = cartHasItemsFor(DeliveryOption.DOWNLOAD);
(this.cartHasItemsForDownload || this.cartHasItemsForDelivery).ifTrue(
() => {
this.onlineChecked = true;
this.guestChecked = false;
this.flagsSetByConditions = true;
this.cartHasItemsForDownload.ifTrue(() => {
this.onlineChecked = true;
this.guestDisabled = true;
this.guestChecked = false;
this.flagsSetByConditions = true;
if (this.cartHasItemsForDownload) {
this.headerText =
// tslint:disable-next-line: max-line-length
'Um Ihnen das ebook bereitstellen zu können, brauchen Sie ein Onlinekonto bei Hugendubel. Wir richten es Ihnen gerne sofort ein.';
}
}
);
this.headerText =
'Um Ihnen das ebook bereitstellen zu können, brauchen Sie ein Onlinekonto bei Hugendubel. Wir richten es Ihnen gerne sofort ein.';
(
this.cartHasItemsForDelivery &&
!this.cartHasItemsForDownload &&
!this.onlineChecked
).ifTrue(this.guestCheckboxInitialization);
return;
});
// Ruecklage
if (this.cartHasItemsForTakeNow) {
this.disableGuestCheckbox();
}
// Abholung
if (this.cartHasItemsForPickUp) {
this.disableGuestCheckbox();
}
// Versand
if (this.cartHasItemsForDelivery) {
this.guestCheckboxInitialization();
}
this.detectChanges();
};
disableGuestCheckbox = () => {
this.guestDisabled = true;
this.flagsSetByConditions = true;
};
guestCheckboxInitialization = () => {
this.guestChecked = true;
this.onlineChecked = false;
this.guestDisabled = false;
this.flagsSetByConditions = true;
if (!this.guestChecked && !this.onlineChecked) {
this.guestChecked = true;
}
};
initializationSubscriptionHandler = (process: Process) => {

4
azure-pipelines.yml
View File

@@ -23,7 +23,7 @@ jobs:
demands:
- Agent.OS -equals Linux
- docker
condition: and(ne(variables['Build.SourceBranch'], 'refs/heads/develop'), ne(variables['Build.SourceBranch'], 'refs/heads/integration'), ne(variables['Build.SourceBranch'], 'refs/heads/master'))
condition: and(ne(variables['Build.SourceBranch'], 'refs/heads/develop'), ne(variables['Build.SourceBranch'], 'refs/heads/integration'), ne(variables['Build.SourceBranch'], 'refs/heads/master'), not(startsWith(variables['Build.SourceBranch'], 'refs/heads/hotfix/')))
steps:
- task: npmAuthenticate@0
displayName: 'npm auth'
@@ -89,7 +89,7 @@ jobs:
demands:
- Agent.OS -equals Linux
- docker
condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/integration'), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/integration'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), startsWith(variables['Build.SourceBranch'], 'refs/heads/hotfix/'))
steps:
- task: npmAuthenticate@0
displayName: 'npm auth'