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

Merged in bugfix/sprint-16-alex (pull request #1246)

Browse Source 
Bugfix/sprint 16 alex
This commit is contained in:
Aleksandras Mikuta
2020-03-31 09:17:48 +00:00
committed by Eraldo Hasanaj
parent 907c2b3d04 d9c531a065
commit bf44536ff3
9 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/sales/src/app/modules/customer/components/customer-order-item-row/customer-order-item-row.component.ts
View File

@@ -56,7 +56,7 @@ export class CustomerOrderItemRowComponent implements OnInit {
this.store.dispatch(new SetEditOrder(this.order));
let breadcrumbName = '';
if (this.order.buyer) {
breadcrumbName = this.order.buyer.firstName + ' ' + this.order.buyer.lastName + ' Barbeiten';
breadcrumbName = this.order.buyer.firstName + ' ' + this.order.buyer.lastName + ' Bearbeiten';
}
const subItem = this.order.items.find(t => t.id === id).data.subsetItems[0].data;

2
apps/sales/src/app/modules/goods-in/pages/goods-in-order-details/goods-in-order-details.component.ts
View File

@@ -385,7 +385,7 @@ export class GoodsInOrderDetailsComponent implements OnInit, OnDestroy, AfterVie
this.store.dispatch(new SetEditOrder(this.order));
let breadcrumbName = '';
if (this.order.buyer) {
breadcrumbName = this.order.buyer.firstName + ' ' + this.order.buyer.lastName + ' Barbeiten';
breadcrumbName = this.order.buyer.firstName + ' ' + this.order.buyer.lastName + ' Bearbeiten';
}
// tslint:disable-next-line: max-line-length
const path = `/shelf/edit/${this.order.id}/${this.order.id}/${this.processingStatus}/o/goodsin/${this.order.buyer.source}/${this.order.items[0].id}`;

10
apps/sales/src/app/modules/product/components/product-checkout/product-checkout.component.html
View File

@@ -7,7 +7,7 @@
<div class="body">
<div class="option" *ngIf="takeNowAvailable | async">
<div class="option__top-container">
<lib-icon class="img img-now" height="37px" name="Take_now" alt="take now"></lib-icon>
<lib-icon class="img img-now" name="Take_now" alt="take now" width="47px" height="37px"></lib-icon>
<h2 class="title-take-now">Rücklage</h2>
<span class="description description-take-now">Möchten Sie den Artikel zurücklegen lassen?</span>
</div>
@@ -20,7 +20,7 @@
</div>
<div class="option" *ngIf="(storeAvailable | async) || searchingNewBranch">
<div class="option__top-container">
<lib-icon class="img" name="Package_Icon" alt="package"></lib-icon>
<lib-icon class="img" name="Package_Icon" alt="package" width="47px" height="37px"></lib-icon>
<h2>Abholung</h2>
<span class="description description-take-away">Möchten Sie den Artikel in einer unserer Filialen abholen?</span>
<div class="option__content-container">
@@ -47,7 +47,7 @@
</div>
<div class="option" *ngIf="shippingAvailable | async">
<div class="option__top-container">
<lib-icon class="img img-truck" name="truck_Icon" alt="truck"></lib-icon>
<lib-icon class="img img-truck" name="truck_Icon" alt="truck" width="47px" height="37px"></lib-icon>
<h2>Versand</h2>
<span class="description description-delivery">Möchten Sie den Artikel nach Hause geliefert bekommen?</span>
<div class="delivery">
@@ -76,8 +76,8 @@
<lib-icon
(click)="closeModal()"
class="close-icon img"
width="19px"
height="19px"
width="23px"
height="23px"
name="{{ stepTwoImgType }}"
alt="truck"
></lib-icon>

5
apps/sales/src/app/modules/product/components/product-checkout/product-checkout.component.scss
View File

@@ -100,6 +100,7 @@
text-align: left;
position: relative;
top: -2px;
padding: 5px 0;
padding-left: 6px;
&-date {
@@ -168,11 +169,11 @@
justify-content: flex-start;
align-items: center;
width: 100%;
margin-bottom: 8px;
margin-bottom: 13px;
.img {
margin-right: 13px;
margin-top: 8px;
margin-top: 5px;
margin-left: 25px;
}
}

1
apps/sales/src/app/modules/product/pages/product-details/product-details.component.html
View File

@@ -1,6 +1,7 @@
<div
id="product-detail-container"
class="product-detail-container"
#productDetailContainer
*ngIf="product"
[@shrinkMainCard]="expanded"
(scroll)="scrollHandler($event)"

7
apps/sales/src/app/modules/product/pages/product-details/product-details.component.ts
View File

@@ -43,6 +43,7 @@ import { allowedAvailabilityStatusCodes } from 'apps/sales/src/app/core/utils/pr
animations: [shrinkTitleAnimation, shrinkSecondaryAnimation, shrinkMainCard]
})
export class ProductDetailsComponent implements OnInit, OnDestroy {
@ViewChild('productDetailContainer', { read: ElementRef }) private productDetailContainer: ElementRef<any>;
@ViewChild('checkout') checkoutDialog: ProductCheckoutComponent;
@ViewChild('photoGallery') photoGallery: PhotoGalleryComponent;
@ViewChild('productReview') productReview: ProductReviewComponent;
@@ -306,6 +307,9 @@ export class ProductDetailsComponent implements OnInit, OnDestroy {
takeUntil(this.destroy$)
)
.subscribe((item: ItemDTO) => {
if (this.productDetailContainer) {
this.productDetailContainer.nativeElement.scrollTop = 0;
}
if (item) {
this.availability = [];
this.addSelectedItemToProcessIfMissingOrChanged(item);
@@ -351,6 +355,9 @@ export class ProductDetailsComponent implements OnInit, OnDestroy {
filter(item => !isNullOrUndefined(item))
)
.subscribe((item: ItemDTO) => {
if (this.productDetailContainer) {
this.productDetailContainer.nativeElement.scrollTop = 0;
}
this.item = item;
this.product = this.productDetailMapper(item);
this.product.fullDescription =

9
apps/sales/src/app/modules/remission/components/remission-add-product-to-shipping-document-partially-dialog/remission-add-product-to-shipping-document-partially-dialog.component.scss
View File

@@ -1,3 +1,12 @@
::ng-deep {
#remission-add-product-to-shipping-document-partially-modal {
.dropdown-options {
right: 50%;
transform: translateX(50%);
}
}
}
.modal-wrapper {
font-family: 'Open Sans';
line-height: 21px;

2
apps/sales/src/app/modules/remission/components/remission-shipping-document/remission-shipping-document.component.scss
View File

@@ -64,7 +64,7 @@
justify-content: center;
span {
margin-top: 35px;
margin: 35px 0 30px;
font-family: 'Open Sans';
font-size: 16px;
color: #89949e;

2
apps/sales/src/app/modules/shelf/pages/shelf-order-details/shelf-order-details.component.ts
View File

@@ -698,7 +698,7 @@ export class ShelfOrderDetailsComponent implements OnInit, OnDestroy, AfterConte
this.store.dispatch(new SetEditOrder(this.orderDTO));
let breadcrumbName = '';
if (this.orderDTO.buyer) {
breadcrumbName = this.orderDTO.buyer.firstName + ' ' + this.orderDTO.buyer.lastName + ' Barbeiten';
breadcrumbName = this.orderDTO.buyer.firstName + ' ' + this.orderDTO.buyer.lastName + ' Bearbeiten';
}
const path = `/shelf/edit/${this.order.compartmentCode ? this.order.compartmentCode : this.order.orderId}/${this.order.orderId}/${
this.status