sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-31 09:37:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merged PR 274: Mit der letzten Integration ersetzt

Browse Source 
Mit der letzten Integration ersetzt
This commit is contained in:
Lorenz Hilpert
2020-09-08 15:33:34 +00:00
committed by Sebastian Neumair
parent 84777be5cf 9c175efa5f
commit f3c8e9024f
4 changed files with 5 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/sales/src/app/modules/barcode-search/pages/article-barcode-search/barcode-search.component.html
View File

@@ -4,7 +4,5 @@
Halten Sie den Artikel an den externen Barcodescanner oder nutzen Sie die Scanfunktion des iPads.
</caption>
<button class="btn-active medium" type="button" (click)="openScanner()">
Artikel scannen
</button>
<lib-barcode-scanner #scanner (scan)="triggerSearch($event)"></lib-barcode-scanner>
</div>

12
apps/sales/src/app/modules/barcode-search/pages/article-barcode-search/barcode-search.component.scss
View File

@@ -38,15 +38,3 @@ lib-barcode-scanner-scandit {
.btn {
margin-top: 15px;
}
button {
background-color: #f70400;
border: none;
border-radius: 25px;
color: #fff;
text-align: center;
padding: 12px 25px;
font-family: 'Open Sans';
font-size: 18px;
font-weight: bold;
}

19
apps/sales/src/app/modules/barcode-search/pages/article-barcode-search/barcode-search.component.ts
View File

@@ -14,7 +14,6 @@ import { AddBreadcrumb } from '../../../../core/store/actions/breadcrumb.actions
import { takeUntil } from 'rxjs/operators';
import { ProcessSelectors } from '../../../../core/store/selectors/process.selectors';
import { ItemDTO } from '@swagger/cat';
import { NativeContainerService } from 'native-container';
@Component({
selector: 'app-barcode-search',
@@ -28,12 +27,7 @@ export class BarcodeSearchComponent implements OnInit, OnDestroy {
scanningVisible = false;
destroy$ = new Subject();
constructor(
private store: Store,
private router: Router,
protected productService: ProductService,
private nativeContainer: NativeContainerService
) {}
constructor(private store: Store, private router: Router, protected productService: ProductService) {}
ngOnInit() {
this.processes$.pipe(takeUntil(this.destroy$)).subscribe((p: Process[]) => (this.processes = p));
@@ -86,15 +80,8 @@ export class BarcodeSearchComponent implements OnInit, OnDestroy {
);
}
openScanner() {
if (this.nativeContainer.isUiWebview()) {
this.nativeContainer
.openScanner('scanBook')
.pipe(takeUntil(this.destroy$))
.subscribe((message) => {
this.triggerSearch(message.data);
});
}
toggleScan() {
this.scanningVisible = !this.scanningVisible;
}
ngOnDestroy() {

2
apps/sales/src/app/modules/product/pages/product-search/product-search.component.html
View File

@@ -15,4 +15,4 @@
<div *ngSwitchCase="'search'" [@fadeIn]="active">
<app-text-search></app-text-search>
</div>
</div>
</div>