mirror of
https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend
synced 2025-12-31 09:37:15 +01:00
Merge branch 'development' of https://bitbucket.org/umwerk/instore-ma-app into development
This commit is contained in:
Eraldo Hasanaj
@@ -9,6 +9,6 @@
|
||||
</div>
|
||||
<div *ngIf="showMore" (click)="toggleMore()" class="less-filters-container">
|
||||
<img class="less-icon" src="../../../assets/images/Less_Arrow.svg">
|
||||
<span class="less-filters">Weigner Filter</span>
|
||||
<span class="less-filters">Weniger Filter</span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -27,8 +27,8 @@
|
||||
</div>
|
||||
<div class="recent-search-content">
|
||||
<div *ngFor="let article of recentArticles" class="recent-article">
|
||||
<div class="recent-article-container align-left">
|
||||
<div (click)="showRecentSearchResults(article)">
|
||||
<div class="recent-article-container align-left" (click)="showRecentSearchResults(article)">
|
||||
<div>
|
||||
<img
|
||||
class="lupe-icon"
|
||||
src="../../../assets/images/Lupe_Icon.svg"
|
||||
|
||||
@@ -85,7 +85,6 @@
|
||||
.input {
|
||||
width: 75%;
|
||||
padding: 15px 0;
|
||||
caret-color: $hima-button-color;
|
||||
border: none;
|
||||
font-size: 16px;
|
||||
color: #000000;
|
||||
|
||||
@@ -87,7 +87,6 @@
|
||||
}
|
||||
|
||||
input {
|
||||
caret-color: $hima-button-color;
|
||||
border: none;
|
||||
|
||||
&:focus {
|
||||
|
||||
@@ -227,7 +227,6 @@
|
||||
.input {
|
||||
width: 100%;
|
||||
padding: 15px 10px;
|
||||
caret-color: $hima-button-color;
|
||||
border: none;
|
||||
font-size: 18px;
|
||||
font-weight: bold;
|
||||
|
||||
@@ -1,248 +1,148 @@
|
||||
<div class="customer-edit-container" *ngIf="user">
|
||||
<div class="customer-section">
|
||||
<div><span class="customer-section-header">Bestellungen</span></div>
|
||||
</div>
|
||||
<div class="customer-section-edit">
|
||||
<div class="customer-section-edit-title">
|
||||
<span>Kundendetails</span>
|
||||
<div class="customer-section">
|
||||
<div><span class="customer-section-header">Bestellungen</span></div>
|
||||
</div>
|
||||
<div class="align-center customer-section-edit-description">
|
||||
<span>Sind Ihre Kundendaten korrekt?</span>
|
||||
</div>
|
||||
<div class="edit-wrapper">
|
||||
<form [formGroup]="userForm">
|
||||
<div class="line"></div>
|
||||
<div class="form-group">
|
||||
<label class="placeholder form-control-placeholder" for="name"
|
||||
>Name</label
|
||||
>
|
||||
<input
|
||||
type="text"
|
||||
id="name"
|
||||
class="input form-control"
|
||||
formControlName="name"
|
||||
[ngClass]="{ 'error-visible': f.name.errors }"
|
||||
required
|
||||
#nameInput
|
||||
/>
|
||||
|
||||
<ng-container *ngIf="f.name.disabled">
|
||||
<a class="inline-btn" (click)="enableInput('name', nameInput)"
|
||||
>Ändern</a
|
||||
>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="!f.name.disabled">
|
||||
<a class="inline-btn" (click)="enableInput('name', nameInput)"
|
||||
>Speichren</a
|
||||
>
|
||||
<img
|
||||
(click)="clear('name')"
|
||||
class="clear-icon"
|
||||
src="../../../assets/images/close.svg"
|
||||
alt="close"
|
||||
*ngIf="!f.name.errors"
|
||||
/>
|
||||
</ng-container>
|
||||
|
||||
<div *ngIf="f.name.errors" class="invalid-feedback">
|
||||
<div>Name wird benötigt</div>
|
||||
<div class="customer-section-edit">
|
||||
<div class="customer-section-edit-title">
|
||||
<span>Kundendetails</span>
|
||||
</div>
|
||||
<div class="align-center customer-section-edit-description">
|
||||
<span>Sind Ihre Kundendaten korrekt?</span>
|
||||
</div>
|
||||
<div class="edit-wrapper">
|
||||
<form [formGroup]="userForm">
|
||||
<div class="line"></div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="input-container">
|
||||
<label class="placeholder form-control-placeholder" for="name">Name</label>
|
||||
<input type="text" id="name" class="input form-control" formControlName="name" [ngClass]="{ 'error-visible': f.name.errors }" required #nameInput>
|
||||
</div>
|
||||
|
||||
<div class="line-actions">
|
||||
<ng-container *ngIf="f.name.disabled">
|
||||
<a class="inline-btn" (click)="enableInput('name', nameInput)">Ändern</a>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="!f.name.disabled">
|
||||
<img (click)="clear('name')" class="clear-icon" src="../../../assets/images/close.svg" alt="close" *ngIf="!f.name.errors">
|
||||
<a class="inline-btn save-btn" (click)="enableInput('name', nameInput)">Speichern</a>
|
||||
</ng-container>
|
||||
|
||||
<div *ngIf="f.name.errors" class="invalid-feedback">
|
||||
<div>Name wird benötigt</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="line"></div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="placeholder form-control-placeholder" for="email"
|
||||
>E-Mail</label
|
||||
>
|
||||
<input
|
||||
type="text"
|
||||
id="email"
|
||||
class="input form-control"
|
||||
formControlName="email"
|
||||
[ngClass]="{ 'error-visible': f.email.errors }"
|
||||
required
|
||||
#emailInput
|
||||
/>
|
||||
|
||||
<ng-container *ngIf="f.email.disabled">
|
||||
<a class="inline-btn" (click)="enableInput('email', emailInput)"
|
||||
>Ändern</a
|
||||
>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="!f.email.disabled">
|
||||
<a class="inline-btn" (click)="enableInput('email', emailInput)"
|
||||
>Speichren</a
|
||||
>
|
||||
<img
|
||||
(click)="clear('email')"
|
||||
class="clear-icon"
|
||||
src="../../../assets/images/close.svg"
|
||||
alt="close"
|
||||
*ngIf="!f.email.errors"
|
||||
/>
|
||||
</ng-container>
|
||||
|
||||
<div *ngIf="f.email.errors" class="invalid-feedback">
|
||||
<div>E-Mail wird benötigt</div>
|
||||
|
||||
<div class="line"></div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="input-container">
|
||||
<label class="placeholder form-control-placeholder" for="email">E-Mail</label>
|
||||
<input type="text" id="email" class="input form-control" formControlName="email" [ngClass]="{ 'error-visible': f.email.errors }" required #emailInput>
|
||||
</div>
|
||||
<div class="line-actions">
|
||||
<ng-container *ngIf="f.email.disabled">
|
||||
<a class="inline-btn" (click)="enableInput('email', emailInput)">Ändern</a>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="!f.email.disabled">
|
||||
<img (click)="clear('email')" class="clear-icon" src="../../../assets/images/close.svg" alt="close" *ngIf="!f.email.errors">
|
||||
<a class="inline-btn save-btn" (click)="enableInput('email', emailInput)">Speichern</a>
|
||||
</ng-container>
|
||||
|
||||
<div *ngIf="f.email.errors" class="invalid-feedback">
|
||||
<div>E-Mail wird benötigt</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="line"></div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="placeholder form-control-placeholder" for="phone_number"
|
||||
>Telefonnummer</label
|
||||
>
|
||||
<input
|
||||
type="text"
|
||||
id="phone_number"
|
||||
class="input form-control"
|
||||
formControlName="phone_number"
|
||||
[ngClass]="{ 'error-visible': f.phone_number.errors }"
|
||||
required
|
||||
#phonelInput
|
||||
/>
|
||||
|
||||
<ng-container *ngIf="f.phone_number.disabled">
|
||||
<a
|
||||
class="inline-btn"
|
||||
(click)="enableInput('phone_number', phonelInput)"
|
||||
>Ändern</a
|
||||
>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="!f.phone_number.disabled">
|
||||
<a
|
||||
class="inline-btn"
|
||||
(click)="enableInput('phone_number', phonelInput)"
|
||||
>Speichren</a
|
||||
>
|
||||
<img
|
||||
(click)="clear('phone_number')"
|
||||
class="clear-icon"
|
||||
src="../../../assets/images/close.svg"
|
||||
alt="close"
|
||||
*ngIf="!f.phone_number.errors"
|
||||
/>
|
||||
</ng-container>
|
||||
|
||||
<div *ngIf="f.phone_number.errors" class="invalid-feedback">
|
||||
<div>Telefonnummer wird benötigt</div>
|
||||
|
||||
<div class="line"></div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="input-container">
|
||||
<label class="placeholder form-control-placeholder" for="phone_number">Telefonnummer</label>
|
||||
<input type="text" id="phone_number" class="input form-control" formControlName="phone_number" [ngClass]="{ 'error-visible': f.phone_number.errors }" required #phoneInput>
|
||||
</div>
|
||||
<div class="line-actions">
|
||||
<ng-container *ngIf="f.phone_number.disabled">
|
||||
<a class="inline-btn" (click)="enableInput('phone_number', phoneInput)">Ändern</a>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="!f.phone_number.disabled">
|
||||
<img (click)="clear('phone_number')" class="clear-icon" src="../../../assets/images/close.svg" alt="close" *ngIf="!f.phone_number.errors">
|
||||
<a class="inline-btn save-btn" (click)="enableInput('phone_number', phoneInput)">Speichern</a>
|
||||
</ng-container>
|
||||
|
||||
<div *ngIf="f.phone_number.errors" class="invalid-feedback">
|
||||
<div>Telefonnummer wird benötigt</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="line"></div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="placeholder form-control-placeholder" for="pay"
|
||||
>Zahlungsart</label
|
||||
>
|
||||
<input
|
||||
type="text"
|
||||
id="pay"
|
||||
class="input form-control"
|
||||
formControlName="pay"
|
||||
[ngClass]="{ 'error-visible': f.pay.errors }"
|
||||
required
|
||||
#payInput
|
||||
/>
|
||||
|
||||
<ng-container *ngIf="f.pay.disabled">
|
||||
<a class="inline-btn" (click)="enableInput('pay', payInput)"
|
||||
>Ändern</a
|
||||
>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="!f.pay.disabled">
|
||||
<a class="inline-btn" (click)="enableInput('pay', payInput)"
|
||||
>Speichren</a
|
||||
>
|
||||
<img
|
||||
(click)="clear('pay')"
|
||||
class="clear-icon"
|
||||
src="../../../assets/images/close.svg"
|
||||
alt="close"
|
||||
*ngIf="!f.pay.errors"
|
||||
/>
|
||||
</ng-container>
|
||||
|
||||
<div *ngIf="f.pay.errors" class="invalid-feedback">
|
||||
<div>Zahlungsart wird benötigt</div>
|
||||
|
||||
<div class="line"></div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="input-container">
|
||||
<label class="placeholder form-control-placeholder" for="pay">Zahlungsart</label>
|
||||
<input type="text" id="pay" class="input form-control" formControlName="pay" [ngClass]="{ 'error-visible': f.pay.errors }" required #payInput>
|
||||
</div>
|
||||
<div class="line-actions">
|
||||
<ng-container *ngIf="f.pay.disabled">
|
||||
<a class="inline-btn" (click)="enableInput('pay', payInput)">Ändern</a>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="!f.pay.disabled">
|
||||
<img (click)="clear('pay')" class="clear-icon" src="../../../assets/images/close.svg" alt="close" *ngIf="!f.pay.errors">
|
||||
<a class="inline-btn save-btn" (click)="enableInput('pay', payInput)">Speichern</a>
|
||||
</ng-container>
|
||||
|
||||
<div *ngIf="f.pay.errors" class="invalid-feedback">
|
||||
<div>Zahlungsart wird benötigt</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="line"></div>
|
||||
|
||||
<div class="form-group">
|
||||
<label
|
||||
class="placeholder form-control-placeholder"
|
||||
for="invoice_addrees"
|
||||
>Rechnungsadresse</label
|
||||
>
|
||||
<input
|
||||
type="text"
|
||||
id="invoice_addrees"
|
||||
class="input form-control"
|
||||
formControlName="invoice_addrees"
|
||||
[ngClass]="{ 'error-visible': f.invoice_addrees.errors }"
|
||||
required
|
||||
#invoicelInput
|
||||
/>
|
||||
|
||||
<a class="inline-btn" [routerLink]="['billing']">Ändern</a>
|
||||
</div>
|
||||
|
||||
<div class="line"></div>
|
||||
|
||||
<div class="form-group">
|
||||
<label
|
||||
class="placeholder form-control-placeholder"
|
||||
for="delivery_address"
|
||||
>Lieferadresse</label
|
||||
>
|
||||
<input
|
||||
type="text"
|
||||
id="delivery_address"
|
||||
class="input form-control"
|
||||
formControlName="delivery_address"
|
||||
[ngClass]="{ 'error-visible': f.delivery_address.errors }"
|
||||
required
|
||||
#deliveryInput
|
||||
/>
|
||||
|
||||
<ng-container *ngIf="f.delivery_address.disabled">
|
||||
<a
|
||||
class="inline-btn"
|
||||
(click)="enableInput('delivery_address', deliveryInput)"
|
||||
>Ändern</a
|
||||
>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="!f.delivery_address.disabled">
|
||||
<a
|
||||
class="inline-btn"
|
||||
(click)="enableInput('delivery_address', deliveryInput)"
|
||||
>Speichren</a
|
||||
>
|
||||
<img
|
||||
(click)="clear('delivery_address')"
|
||||
class="clear-icon"
|
||||
src="../../../assets/images/close.svg"
|
||||
alt="close"
|
||||
*ngIf="!f.delivery_address.errors"
|
||||
/>
|
||||
</ng-container>
|
||||
|
||||
<div *ngIf="f.delivery_address.errors" class="invalid-feedback">
|
||||
<div>Lieferadresse wird benötigt</div>
|
||||
|
||||
<div class="line"></div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="input-container">
|
||||
<label class="placeholder form-control-placeholder" for="invoice_addrees">Rechnungsadresse</label>
|
||||
<input type="text" id="invoice_addrees" class="input form-control" formControlName="invoice_addrees" [ngClass]="{ 'error-visible': f.invoice_addrees.errors }" required #invoiceInput>
|
||||
</div>
|
||||
<div class="line-actions">
|
||||
<a class="inline-btn" [routerLink]="['billing']">Ändern</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="line"></div>
|
||||
|
||||
<div class="btn-container">
|
||||
<a class="btn back" (click)="back()">Zurück </a>
|
||||
<a class="btn active" (click)="approve()">Vorgang zuweisen</a>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<div class="line"></div>
|
||||
|
||||
<div class="form-group">
|
||||
<div class="input-container">
|
||||
<label class="placeholder form-control-placeholder" for="delivery_address">Lieferadresse</label>
|
||||
<input type="text" id="delivery_address" class="input form-control" formControlName="delivery_address" [ngClass]="{ 'error-visible': f.delivery_address.errors }" required #deliveryInput>
|
||||
</div>
|
||||
<div class="line-actions">
|
||||
<ng-container *ngIf="f.delivery_address.disabled">
|
||||
<a class="inline-btn" (click)="enableInput('delivery_address', deliveryInput)">Ändern</a>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="!f.delivery_address.disabled">
|
||||
<img (click)="clear('delivery_address')" class="clear-icon" src="../../../assets/images/close.svg" alt="close" *ngIf="!f.delivery_address.errors">
|
||||
<a class="inline-btn save-btn" (click)="enableInput('delivery_address', deliveryInput)">Speichern</a>
|
||||
</ng-container>
|
||||
|
||||
<div *ngIf="f.delivery_address.errors" class="invalid-feedback">
|
||||
<div>Lieferadresse wird benötigt</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="line"></div>
|
||||
|
||||
<div class="btn-container">
|
||||
<a class="btn back" (click)="back()">Zurück </a>
|
||||
<a class="btn active" (click)="approve()">Vorgang zuweisen</a>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -82,11 +82,9 @@
|
||||
position: absolute;
|
||||
width: 240px;
|
||||
text-align: right;
|
||||
right: 120px;
|
||||
bottom: 14px;
|
||||
right: 125px;
|
||||
animation: shake 0.3s cubic-bezier(0.7, 0.07, 0.19, 0.97) both;
|
||||
transform: translate3d(0, 0, 0);
|
||||
position: absolute;
|
||||
font-size: 14px;
|
||||
font-weight: bold;
|
||||
color: $hima-error-msg-color;
|
||||
@@ -108,7 +106,7 @@
|
||||
|
||||
.form-group-location {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
.form-group-split {
|
||||
@@ -128,7 +126,7 @@
|
||||
width: 100%;
|
||||
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
@@ -141,19 +139,29 @@
|
||||
}
|
||||
|
||||
.input {
|
||||
width: 75%;
|
||||
padding: 15px 0;
|
||||
caret-color: $hima-button-color;
|
||||
border: none;
|
||||
font-size: 16px;
|
||||
color: #000000;
|
||||
text-align: left;
|
||||
line-height: 21px;
|
||||
padding-left: 3%;
|
||||
padding-right: 7%;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.input-container {
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
align-items: center;
|
||||
width: 75%;
|
||||
}
|
||||
|
||||
.line-actions {
|
||||
display:flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
input:focus {
|
||||
@@ -171,8 +179,9 @@
|
||||
color: #000000;
|
||||
text-align: left;
|
||||
line-height: 21px;
|
||||
padding-left: 15px;
|
||||
padding-left: 20px;
|
||||
white-space: nowrap;
|
||||
padding-right: 15px;
|
||||
}
|
||||
|
||||
.inline-btn {
|
||||
@@ -189,6 +198,12 @@
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.clear-icon {
|
||||
height: 23px;
|
||||
width: 23px;
|
||||
padding-right: 10px;
|
||||
}
|
||||
|
||||
.btn-container {
|
||||
text-align: center;
|
||||
margin-top: 4rem;
|
||||
@@ -221,12 +236,6 @@
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
.clear-icon {
|
||||
width: 20px;
|
||||
right: 145px;
|
||||
position: relative;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes shake {
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
color: black;
|
||||
font-weight: bold;
|
||||
font-size: 21px;
|
||||
caret-color: $hima-button-color;
|
||||
}
|
||||
|
||||
.search-icon {
|
||||
|
||||
Reference in New Issue
Block a user