@colijnit/transaction 255.1.9 → 255.1.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/colijnit-transaction.umd.js +60 -13
- package/bundles/colijnit-transaction.umd.js.map +1 -1
- package/colijnit-transaction.metadata.json +1 -1
- package/esm2015/lib/component/add-product/add-product.component.js +17 -6
- package/esm2015/lib/component/dialog/transaction-search/dialog-transaction-search.component.js +7 -1
- package/esm2015/lib/component/transaction-header/transaction-header-popup/transaction-header-popup-create-service.component.js +2 -7
- package/esm2015/lib/service/article-connector.service.js +18 -1
- package/esm2015/lib/service/transaction.service.js +4 -1
- package/esm2015/lib/transaction-version.js +3 -3
- package/fesm2015/colijnit-transaction.js +45 -13
- package/fesm2015/colijnit-transaction.js.map +1 -1
- package/lib/component/dialog/transaction-search/dialog-transaction-search.component.d.ts +1 -0
- package/lib/service/article-connector.service.d.ts +1 -0
- package/lib/service/transaction.service.d.ts +1 -0
- package/package.json +1 -1
|
@@ -3,8 +3,8 @@ export class Version {
|
|
|
3
3
|
constructor() {
|
|
4
4
|
this.name = "@colijnit/transaction";
|
|
5
5
|
this.description = "Colijn IT transaction package";
|
|
6
|
-
this.symVer = "255.1.
|
|
7
|
-
this.publishDate = "
|
|
6
|
+
this.symVer = "255.1.11";
|
|
7
|
+
this.publishDate = "13-8-2024 16:45:48";
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsVUFBVSxDQUFDO1FBQ3BCLGdCQUFXLEdBQUcsb0JBQW9CLENBQUM7SUFDNUMsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMjU1LjEuMTFcIjtcbiAgcHVibGljIHB1Ymxpc2hEYXRlID0gXCIxMy04LTIwMjQgMTY6NDU6NDhcIjtcbn0iXX0=
|
|
@@ -262,8 +262,8 @@ class Version {
|
|
|
262
262
|
constructor() {
|
|
263
263
|
this.name = "@colijnit/transaction";
|
|
264
264
|
this.description = "Colijn IT transaction package";
|
|
265
|
-
this.symVer = "255.1.
|
|
266
|
-
this.publishDate = "
|
|
265
|
+
this.symVer = "255.1.11";
|
|
266
|
+
this.publishDate = "13-8-2024 16:45:48";
|
|
267
267
|
}
|
|
268
268
|
}
|
|
269
269
|
|
|
@@ -1940,6 +1940,23 @@ class ArticleConnectorService {
|
|
|
1940
1940
|
});
|
|
1941
1941
|
});
|
|
1942
1942
|
}
|
|
1943
|
+
getArticleListWithBarcodeArticleNrEanCode(search) {
|
|
1944
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
1945
|
+
return new Promise((resolve, reject) => {
|
|
1946
|
+
return this.connector.getArticleListWithBarcodeArticleNrEanCode(search).then((response) => {
|
|
1947
|
+
if (response && response.validationResult && response.validationResult.success) {
|
|
1948
|
+
// return this._boFactory.makeWithRawBackendData(ArticleExtended, response.resultObject) as ArticleLight;
|
|
1949
|
+
const collection = this._boFactory.makeBOArrayFromRawBackendDataArray(ArticleLight, response.resultObject);
|
|
1950
|
+
resolve(collection);
|
|
1951
|
+
}
|
|
1952
|
+
else {
|
|
1953
|
+
this._handleExceptionFromResponse(response);
|
|
1954
|
+
reject(null);
|
|
1955
|
+
}
|
|
1956
|
+
});
|
|
1957
|
+
});
|
|
1958
|
+
});
|
|
1959
|
+
}
|
|
1943
1960
|
getMainArticles() {
|
|
1944
1961
|
return __awaiter(this, void 0, void 0, function* () {
|
|
1945
1962
|
return new Promise((resolve, reject) => {
|
|
@@ -10624,6 +10641,9 @@ class TransactionService extends PendingReasonService {
|
|
|
10624
10641
|
getArticles(request) {
|
|
10625
10642
|
return this.articleConnector.searchArticles(request);
|
|
10626
10643
|
}
|
|
10644
|
+
getArticleListWithBarcodeArticleNrEanCode(search) {
|
|
10645
|
+
return this.articleConnector.getArticleListWithBarcodeArticleNrEanCode(search);
|
|
10646
|
+
}
|
|
10627
10647
|
getMainArticles() {
|
|
10628
10648
|
return this.articleConnector.getMainArticles();
|
|
10629
10649
|
}
|
|
@@ -35652,7 +35672,7 @@ TransactionHeaderPopupCreateServiceComponent.decorators = [
|
|
|
35652
35672
|
-->
|
|
35653
35673
|
<div class="service-data-header">
|
|
35654
35674
|
<span class="data-description" [textContent]="existingTransactionTitleText"></span>
|
|
35655
|
-
<span class="toggle-change" [textContent]="'CHANGE' | localize" (click)="
|
|
35675
|
+
<span class="toggle-change" [textContent]="'CHANGE' | localize" (click)="createOrderWithTransactionLineClicked(); forceReadonly = false"></span>
|
|
35656
35676
|
</div>
|
|
35657
35677
|
<div *ngIf="existingTransactionLine" class="create-via-transaction-result-display">
|
|
35658
35678
|
<co-image-display [model]="existingTransactionLine?.articleImageData"></co-image-display>
|
|
@@ -35663,14 +35683,9 @@ TransactionHeaderPopupCreateServiceComponent.decorators = [
|
|
|
35663
35683
|
<div *ngIf="chosenTransactionLine" class="create-via-transaction-result-display">
|
|
35664
35684
|
<co-image-display [model]="transactionImage"></co-image-display>
|
|
35665
35685
|
<span [textContent]="chosenTransactionLine?.goodDescription"></span>
|
|
35666
|
-
<!--<span [textContent]="existingTransactionLine?.articleBoundConcatenatedText"></span>-->
|
|
35667
|
-
<!--<span [textContent]="existingTransactionLine?.price | currency: 'EUR'"></span>-->
|
|
35668
35686
|
</div>
|
|
35669
35687
|
</div>
|
|
35670
35688
|
<div *ngIf="createViaProduct" class="create-via-product">
|
|
35671
|
-
<!--
|
|
35672
|
-
<co-input-search [useLeftIcon]="false" [useRightIcon]="true" [label]="'ARTICLE' | localize" (rightIconClick)="searchArticleClicked_handler()" [(model)]="articleSearchText"></co-input-search>
|
|
35673
|
-
-->
|
|
35674
35689
|
<div class="create-via-product-result-display">
|
|
35675
35690
|
<co-image-display [model]="chosenArticle?.imageData"></co-image-display>
|
|
35676
35691
|
<span [textContent]="chosenArticle?.description"></span>
|
|
@@ -36363,6 +36378,7 @@ class DialogTransactionSearchComponent {
|
|
|
36363
36378
|
}
|
|
36364
36379
|
ngOnInit() {
|
|
36365
36380
|
return __awaiter(this, void 0, void 0, function* () {
|
|
36381
|
+
yield this.searchTransactions();
|
|
36366
36382
|
});
|
|
36367
36383
|
}
|
|
36368
36384
|
ngOnDestroy() {
|
|
@@ -36373,6 +36389,11 @@ class DialogTransactionSearchComponent {
|
|
|
36373
36389
|
transLineClicked(line) {
|
|
36374
36390
|
this.lineClicked.emit(line);
|
|
36375
36391
|
}
|
|
36392
|
+
searchTransactions() {
|
|
36393
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
36394
|
+
this.transactionSearchService.searchTransactions();
|
|
36395
|
+
});
|
|
36396
|
+
}
|
|
36376
36397
|
}
|
|
36377
36398
|
DialogTransactionSearchComponent.decorators = [
|
|
36378
36399
|
{ type: Component, args: [{
|
|
@@ -48618,13 +48639,24 @@ class AddProductComponent {
|
|
|
48618
48639
|
this.searchText = undefined;
|
|
48619
48640
|
this._changeDetector.detectChanges();
|
|
48620
48641
|
// first check if there's a single article found
|
|
48621
|
-
|
|
48622
|
-
if
|
|
48623
|
-
|
|
48642
|
+
// This is a two check step:
|
|
48643
|
+
// Check if there is an exact match on barcode, ean or articlenumber
|
|
48644
|
+
// if not: check with search like
|
|
48645
|
+
// else open catalogus
|
|
48646
|
+
const fullMatchSearch = yield this.transactionService.getArticleListWithBarcodeArticleNrEanCode(text);
|
|
48647
|
+
if (fullMatchSearch && fullMatchSearch.length === 1) {
|
|
48648
|
+
const article = yield this.transactionService.getArticleExtended(fullMatchSearch[0].articleNr);
|
|
48624
48649
|
yield this.handleAddArticle(article);
|
|
48625
48650
|
}
|
|
48626
|
-
else {
|
|
48627
|
-
this.
|
|
48651
|
+
else {
|
|
48652
|
+
const foundArticles = yield this.transactionService.getArticles(this.catalogParameters);
|
|
48653
|
+
if (foundArticles && foundArticles.length === 1) {
|
|
48654
|
+
const article = yield this.transactionService.getArticleExtended(foundArticles[0].articleNumber);
|
|
48655
|
+
yield this.handleAddArticle(article);
|
|
48656
|
+
}
|
|
48657
|
+
else {
|
|
48658
|
+
this.showCatalogDialog();
|
|
48659
|
+
}
|
|
48628
48660
|
}
|
|
48629
48661
|
});
|
|
48630
48662
|
}
|