@colijnit/transaction 253.1.9 → 253.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 +54 -12
- 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/core/base/transaction-payment-base.component.js +1 -1
- package/esm2015/lib/component/transaction-header/transaction-header-payment/transaction-header-payment.component.js +1 -1
- package/esm2015/lib/component/transaction-search/transaction-filter-content/purchase-order-filter-content/transaction-purchase-order-filter-content-logistics/transaction-purchase-order-filter-content-logistics.component.js +13 -15
- 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 +50 -21
- package/fesm2015/colijnit-transaction.js.map +1 -1
- package/lib/component/transaction-search/transaction-filter-content/purchase-order-filter-content/transaction-purchase-order-filter-content-logistics/transaction-purchase-order-filter-content-logistics.component.d.ts +6 -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 = "253.1.
|
|
7
|
-
this.publishDate = "
|
|
6
|
+
this.symVer = "253.1.11";
|
|
7
|
+
this.publishDate = "13-8-2024 17:30:09";
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsVUFBVSxDQUFDO1FBQ3BCLGdCQUFXLEdBQUcsb0JBQW9CLENBQUM7SUFDNUMsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMjUzLjEuMTFcIjtcbiAgcHVibGljIHB1Ymxpc2hEYXRlID0gXCIxMy04LTIwMjQgMTc6MzA6MDlcIjtcbn0iXX0=
|
|
@@ -254,8 +254,8 @@ class Version {
|
|
|
254
254
|
constructor() {
|
|
255
255
|
this.name = "@colijnit/transaction";
|
|
256
256
|
this.description = "Colijn IT transaction package";
|
|
257
|
-
this.symVer = "253.1.
|
|
258
|
-
this.publishDate = "
|
|
257
|
+
this.symVer = "253.1.11";
|
|
258
|
+
this.publishDate = "13-8-2024 17:30:09";
|
|
259
259
|
}
|
|
260
260
|
}
|
|
261
261
|
|
|
@@ -1917,6 +1917,23 @@ class ArticleConnectorService {
|
|
|
1917
1917
|
});
|
|
1918
1918
|
});
|
|
1919
1919
|
}
|
|
1920
|
+
getArticleListWithBarcodeArticleNrEanCode(search) {
|
|
1921
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
1922
|
+
return new Promise((resolve, reject) => {
|
|
1923
|
+
return this.connector.getArticleListWithBarcodeArticleNrEanCode(search).then((response) => {
|
|
1924
|
+
if (response && response.validationResult && response.validationResult.success) {
|
|
1925
|
+
// return this._boFactory.makeWithRawBackendData(ArticleExtended, response.resultObject) as ArticleLight;
|
|
1926
|
+
const collection = this._boFactory.makeBOArrayFromRawBackendDataArray(ArticleLight, response.resultObject);
|
|
1927
|
+
resolve(collection);
|
|
1928
|
+
}
|
|
1929
|
+
else {
|
|
1930
|
+
this._handleExceptionFromResponse(response);
|
|
1931
|
+
reject(null);
|
|
1932
|
+
}
|
|
1933
|
+
});
|
|
1934
|
+
});
|
|
1935
|
+
});
|
|
1936
|
+
}
|
|
1920
1937
|
getMainArticles() {
|
|
1921
1938
|
return __awaiter(this, void 0, void 0, function* () {
|
|
1922
1939
|
return new Promise((resolve, reject) => {
|
|
@@ -10348,6 +10365,9 @@ class TransactionService extends PendingReasonService {
|
|
|
10348
10365
|
getArticles(request) {
|
|
10349
10366
|
return this.articleConnector.searchArticles(request);
|
|
10350
10367
|
}
|
|
10368
|
+
getArticleListWithBarcodeArticleNrEanCode(search) {
|
|
10369
|
+
return this.articleConnector.getArticleListWithBarcodeArticleNrEanCode(search);
|
|
10370
|
+
}
|
|
10351
10371
|
getMainArticles() {
|
|
10352
10372
|
return this.articleConnector.getMainArticles();
|
|
10353
10373
|
}
|
|
@@ -42208,6 +42228,7 @@ class TransactionPurchaseOrderFilterContentLogisticsComponent extends Transactio
|
|
|
42208
42228
|
this.deliveryMethodFields = { text: "description", value: "code" };
|
|
42209
42229
|
this.warehouseFields = { text: "description", value: "warehouseNo" };
|
|
42210
42230
|
this.sourceWarehouseFields = { text: "description", value: "warehouseNo" };
|
|
42231
|
+
this.partDeliveryFields = { text: "description", value: "code" };
|
|
42211
42232
|
}
|
|
42212
42233
|
showClass() {
|
|
42213
42234
|
return true;
|
|
@@ -42219,6 +42240,7 @@ class TransactionPurchaseOrderFilterContentLogisticsComponent extends Transactio
|
|
|
42219
42240
|
this._setDeliveryMethods();
|
|
42220
42241
|
this._setWarehouses();
|
|
42221
42242
|
this._setSourceWarehouses();
|
|
42243
|
+
this._setPartDelivery();
|
|
42222
42244
|
}
|
|
42223
42245
|
//Delivery Methods
|
|
42224
42246
|
_setDeliveryMethods() {
|
|
@@ -42238,6 +42260,11 @@ class TransactionPurchaseOrderFilterContentLogisticsComponent extends Transactio
|
|
|
42238
42260
|
this.sourceWarehouses = new FilterViewmodel(warehouses, this.sourceWarehouseFields).filterItems;
|
|
42239
42261
|
});
|
|
42240
42262
|
}
|
|
42263
|
+
_setPartDelivery() {
|
|
42264
|
+
this.transactionService.getYesNo("NL").then((partDelivery) => {
|
|
42265
|
+
this.partDelivery = new FilterViewmodel(partDelivery, this.partDeliveryFields).filterItems;
|
|
42266
|
+
});
|
|
42267
|
+
}
|
|
42241
42268
|
}
|
|
42242
42269
|
TransactionPurchaseOrderFilterContentLogisticsComponent.decorators = [
|
|
42243
42270
|
{ type: Component, args: [{
|
|
@@ -42271,15 +42298,6 @@ TransactionPurchaseOrderFilterContentLogisticsComponent.decorators = [
|
|
|
42271
42298
|
</co-transaction-filter-item>
|
|
42272
42299
|
</div>
|
|
42273
42300
|
|
|
42274
|
-
<!--Geleverd-->
|
|
42275
|
-
<div class="filter-item-wrapper">
|
|
42276
|
-
<co-transaction-filter-historic-state [label]="'DELIVERED'"
|
|
42277
|
-
[(model)]="searchService.searchRequest.quantityDelivered"
|
|
42278
|
-
[mode]="modes.SelectListWithStringCollectionOutput">
|
|
42279
|
-
>
|
|
42280
|
-
</co-transaction-filter-historic-state>
|
|
42281
|
-
</div>
|
|
42282
|
-
|
|
42283
42301
|
<!--Gefactureerd-->
|
|
42284
42302
|
<div class="filter-item-wrapper">
|
|
42285
42303
|
<co-transaction-filter-historic-state [label]="'INVOICED'"
|
|
@@ -42344,11 +42362,11 @@ TransactionPurchaseOrderFilterContentLogisticsComponent.decorators = [
|
|
|
42344
42362
|
|
|
42345
42363
|
<!--Deellevering-->
|
|
42346
42364
|
<div class="filter-item-wrapper">
|
|
42347
|
-
<co-transaction-filter-
|
|
42348
|
-
|
|
42349
|
-
|
|
42350
|
-
|
|
42351
|
-
</co-transaction-filter-
|
|
42365
|
+
<co-transaction-filter-item [placeholder]="'PART_DELIVERY'"
|
|
42366
|
+
[collection]="partDelivery"
|
|
42367
|
+
[(model)]="searchService.searchRequest.partialDelivery"
|
|
42368
|
+
[mode]="modes.Filterlist">
|
|
42369
|
+
</co-transaction-filter-item>
|
|
42352
42370
|
</div>
|
|
42353
42371
|
|
|
42354
42372
|
<!--Magazijn-->
|
|
@@ -46794,13 +46812,24 @@ class AddProductComponent {
|
|
|
46794
46812
|
this.searchText = undefined;
|
|
46795
46813
|
this._changeDetector.detectChanges();
|
|
46796
46814
|
// first check if there's a single article found
|
|
46797
|
-
|
|
46798
|
-
if
|
|
46799
|
-
|
|
46815
|
+
// This is a two check step:
|
|
46816
|
+
// Check if there is an exact match on barcode, ean or articlenumber
|
|
46817
|
+
// if not: check with search like
|
|
46818
|
+
// else open catalogus
|
|
46819
|
+
const fullMatchSearch = yield this.transactionService.getArticleListWithBarcodeArticleNrEanCode(text);
|
|
46820
|
+
if (fullMatchSearch && fullMatchSearch.length === 1) {
|
|
46821
|
+
const article = yield this.transactionService.getArticleExtended(fullMatchSearch[0].articleNr);
|
|
46800
46822
|
yield this.handleAddArticle(article);
|
|
46801
46823
|
}
|
|
46802
|
-
else {
|
|
46803
|
-
this.
|
|
46824
|
+
else {
|
|
46825
|
+
const foundArticles = yield this.transactionService.getArticles(this.catalogParameters);
|
|
46826
|
+
if (foundArticles && foundArticles.length === 1) {
|
|
46827
|
+
const article = yield this.transactionService.getArticleExtended(foundArticles[0].articleNumber);
|
|
46828
|
+
yield this.handleAddArticle(article);
|
|
46829
|
+
}
|
|
46830
|
+
else {
|
|
46831
|
+
this.showCatalogDialog();
|
|
46832
|
+
}
|
|
46804
46833
|
}
|
|
46805
46834
|
});
|
|
46806
46835
|
}
|