@colijnit/transaction 12.1.30 → 12.1.31
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 +58 -41
- package/bundles/colijnit-transaction.umd.js.map +1 -1
- package/colijnit-transaction.metadata.json +1 -1
- package/esm2015/lib/assets/dictionary/text.properties.js +6 -4
- package/esm2015/lib/component/core/base/dialog-transaction-line-base.component.js +1 -1
- package/esm2015/lib/component/core/base/transaction-line-base.component.js +1 -1
- package/esm2015/lib/component/transaction-header-fields/transaction-header-administrative-relation.component.js +1 -1
- package/esm2015/lib/component/transaction-header-fields/transaction-header-marketing.component.js +1 -1
- package/esm2015/lib/component/transaction-line-fields/transaction-line-commission-code.component.js +8 -3
- package/esm2015/lib/component/transaction-line-fields/transaction-line-delivery-method.component.js +9 -4
- package/esm2015/lib/component/transaction-line-fields/transaction-line-warehouse.component.js +12 -7
- package/esm2015/lib/service/dialog.service.js +1 -1
- package/esm2015/lib/service/transaction-connector.service.js +11 -11
- package/esm2015/lib/service/transaction.service.js +1 -1
- package/fesm2015/colijnit-transaction.js +41 -24
- package/fesm2015/colijnit-transaction.js.map +1 -1
- package/lib/component/core/base/transaction-line-base.component.d.ts +2 -0
- package/lib/component/transaction-line-fields/transaction-line-warehouse.component.d.ts +1 -1
- package/package.json +1 -1
|
@@ -685,9 +685,10 @@
|
|
|
685
685
|
"SAME_AS_DELIVERY": "Hetzelfde als bezorgadres",
|
|
686
686
|
"SAVE": "Opslaan",
|
|
687
687
|
"SEARCH": "Zoeken",
|
|
688
|
-
"SEARCH_NUMBER_CUSTOMER_OR_DATE": "Zoeken op nummer, klant of datum",
|
|
689
|
-
"SEARCH_IN_COLLECTION": "Zoek binnen collectie...",
|
|
690
688
|
"SEARCH_ADD_ARTICLE": "Zoeken en toevoegen artikel",
|
|
689
|
+
"SEARCH_DELIVERY_METHOD": "Zoek levermethode",
|
|
690
|
+
"SEARCH_IN_COLLECTION": "Zoek binnen collectie...",
|
|
691
|
+
"SEARCH_NUMBER_CUSTOMER_OR_DATE": "Zoeken op nummer, klant of datum",
|
|
691
692
|
"SEARCH_WAREHOUSE": "Zoek magazijn",
|
|
692
693
|
"SELECT": "Selecteren",
|
|
693
694
|
"SELECT_A": "Selecteer een",
|
|
@@ -996,9 +997,10 @@
|
|
|
996
997
|
"SAME_AS_DELIVERY": "Same as delivery address",
|
|
997
998
|
"SAVE": "Save",
|
|
998
999
|
"SEARCH": "Search",
|
|
999
|
-
"SEARCH_NUMBER_CUSTOMER_OR_DATE": "Search for number, customer or date",
|
|
1000
1000
|
"SEARCH_ADD_ARTICLE": "Search and add article",
|
|
1001
|
+
"SEARCH_DELIVERY_METHOD": "Search deliverymethod",
|
|
1001
1002
|
"SEARCH_IN_COLLECTION": "Search in collection...",
|
|
1003
|
+
"SEARCH_NUMBER_CUSTOMER_OR_DATE": "Search for number, customer or date",
|
|
1002
1004
|
"SEARCH_WAREHOUSE": "Search warehouse",
|
|
1003
1005
|
"SELECT": "Select",
|
|
1004
1006
|
"SELECT_A": "Select a",
|
|
@@ -2429,15 +2431,15 @@
|
|
|
2429
2431
|
var _this = this;
|
|
2430
2432
|
return __generator(this, function (_a) {
|
|
2431
2433
|
return [2 /*return*/, new Promise(function (resolve, reject) {
|
|
2432
|
-
|
|
2433
|
-
if (collection) {
|
|
2434
|
-
|
|
2435
|
-
}
|
|
2434
|
+
// const collection = this._collectionService.getCollection(DeliveryMethod.name);
|
|
2435
|
+
// if (collection) {
|
|
2436
|
+
// return resolve(collection);
|
|
2437
|
+
// }
|
|
2436
2438
|
return _this.connector.getDeliveryMethods().then(function (result) {
|
|
2437
2439
|
if (result.validationResult && result.validationResult.success) {
|
|
2438
|
-
var
|
|
2439
|
-
|
|
2440
|
-
resolve(
|
|
2440
|
+
var collection = _this._boFactory.makeBOArrayFromRawBackendDataArray(deliveryMethod_bo.DeliveryMethod, result.resultObjects);
|
|
2441
|
+
// this._collectionService.cacheCollection(DeliveryMethod.name, collection);
|
|
2442
|
+
resolve(collection);
|
|
2441
2443
|
}
|
|
2442
2444
|
else {
|
|
2443
2445
|
reject(result.validationMessagesAsString);
|
|
@@ -2458,9 +2460,9 @@
|
|
|
2458
2460
|
}
|
|
2459
2461
|
return _this.connector.getDeliveryOptions().then(function (result) {
|
|
2460
2462
|
if (result.validationResult && result.validationResult.success) {
|
|
2461
|
-
var
|
|
2462
|
-
_this._collectionService.cacheCollection(deliveryOption_bo.DeliveryOption.name,
|
|
2463
|
-
resolve(
|
|
2463
|
+
var collection_6 = _this._boFactory.makeBOArrayFromRawBackendDataArray(deliveryMethod_bo.DeliveryMethod, result.resultObjects);
|
|
2464
|
+
_this._collectionService.cacheCollection(deliveryOption_bo.DeliveryOption.name, collection_6);
|
|
2465
|
+
resolve(collection_6);
|
|
2464
2466
|
}
|
|
2465
2467
|
else {
|
|
2466
2468
|
reject(result.validationMessagesAsString);
|
|
@@ -2839,9 +2841,9 @@
|
|
|
2839
2841
|
}
|
|
2840
2842
|
return _this.connector.getTags(category).then(function (result) {
|
|
2841
2843
|
if (result.validationResult && result.validationResult.success) {
|
|
2842
|
-
var
|
|
2843
|
-
_this._collectionService.cacheCollection(tag.Tag.name,
|
|
2844
|
-
resolve(
|
|
2844
|
+
var collection_7 = _this._boFactory.makeBOArrayFromRawBackendDataArray(tag.Tag, result.resultObjects);
|
|
2845
|
+
_this._collectionService.cacheCollection(tag.Tag.name, collection_7, [category]);
|
|
2846
|
+
resolve(collection_7);
|
|
2845
2847
|
}
|
|
2846
2848
|
else {
|
|
2847
2849
|
reject(result.validationMessagesAsString);
|
|
@@ -2862,9 +2864,9 @@
|
|
|
2862
2864
|
}
|
|
2863
2865
|
return _this.connector.getOnHoldCodes().then(function (result) {
|
|
2864
2866
|
if (result.validationResult && result.validationResult.success) {
|
|
2865
|
-
var
|
|
2866
|
-
_this._collectionService.cacheCollection(onHoldCode_bo.OnHoldCode.name,
|
|
2867
|
-
resolve(
|
|
2867
|
+
var collection_8 = _this._boFactory.makeBOArrayFromRawBackendDataArray(onHoldCode_bo.OnHoldCode, result.resultObjects);
|
|
2868
|
+
_this._collectionService.cacheCollection(onHoldCode_bo.OnHoldCode.name, collection_8);
|
|
2869
|
+
resolve(collection_8);
|
|
2868
2870
|
}
|
|
2869
2871
|
else {
|
|
2870
2872
|
reject(result.validationMessagesAsString);
|
|
@@ -2879,15 +2881,15 @@
|
|
|
2879
2881
|
var _this = this;
|
|
2880
2882
|
return __generator(this, function (_a) {
|
|
2881
2883
|
return [2 /*return*/, new Promise(function (resolve, reject) {
|
|
2882
|
-
|
|
2883
|
-
if (collection) {
|
|
2884
|
-
|
|
2885
|
-
}
|
|
2884
|
+
// const collection = this._collectionService.getCollection(Warehouse.name);
|
|
2885
|
+
// if (collection) {
|
|
2886
|
+
// return resolve(collection);
|
|
2887
|
+
// }
|
|
2886
2888
|
return _this.connector.getWarehouses(branchNr).then(function (result) {
|
|
2887
2889
|
if (result.validationResult && result.validationResult.success) {
|
|
2888
|
-
var
|
|
2889
|
-
|
|
2890
|
-
resolve(
|
|
2890
|
+
var collection = _this._boFactory.makeBOArrayFromRawBackendDataArray(warehouse_bo.Warehouse, result.resultObjects);
|
|
2891
|
+
// this._collectionService.cacheCollection(Warehouse.name, collection);
|
|
2892
|
+
resolve(collection);
|
|
2891
2893
|
}
|
|
2892
2894
|
else {
|
|
2893
2895
|
reject(result.validationMessagesAsString);
|
|
@@ -2918,7 +2920,7 @@
|
|
|
2918
2920
|
var _this = this;
|
|
2919
2921
|
return __generator(this, function (_a) {
|
|
2920
2922
|
return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
|
|
2921
|
-
var collection, result,
|
|
2923
|
+
var collection, result, collection_9;
|
|
2922
2924
|
return __generator(this, function (_a) {
|
|
2923
2925
|
switch (_a.label) {
|
|
2924
2926
|
case 0:
|
|
@@ -2930,9 +2932,9 @@
|
|
|
2930
2932
|
case 1:
|
|
2931
2933
|
result = _a.sent();
|
|
2932
2934
|
if (result.validationResult && result.validationResult.success) {
|
|
2933
|
-
|
|
2934
|
-
this._collectionService.cacheCollection(paymentMethod_bo.PaymentMethod.name,
|
|
2935
|
-
resolve(
|
|
2935
|
+
collection_9 = this._boFactory.makeBOArrayFromRawBackendDataArray(paymentMethod_bo.PaymentMethod, result.resultObjects);
|
|
2936
|
+
this._collectionService.cacheCollection(paymentMethod_bo.PaymentMethod.name, collection_9);
|
|
2937
|
+
resolve(collection_9);
|
|
2936
2938
|
}
|
|
2937
2939
|
else {
|
|
2938
2940
|
reject(result.validationMessagesAsString);
|
|
@@ -13160,9 +13162,14 @@
|
|
|
13160
13162
|
this._transactionService.getDeliveryMethods().then(function (methods) {
|
|
13161
13163
|
_this.data = methods.slice();
|
|
13162
13164
|
_this.data.forEach(function (d, index) {
|
|
13163
|
-
_this.viewModels.push({
|
|
13164
|
-
|
|
13165
|
+
_this.viewModels.push({
|
|
13166
|
+
value: d.code,
|
|
13167
|
+
text: d.description,
|
|
13168
|
+
label: ((d.code !== null && d.code !== undefined) ? d.code + ' ' : '') + ((d.description !== null && d.description !== undefined) ? d.description : ''),
|
|
13169
|
+
checked: _this.useTransactionLine ? _this.transactionLine.deliveryMethodCode === d.code : index === 0
|
|
13170
|
+
});
|
|
13165
13171
|
});
|
|
13172
|
+
_super.prototype.ngOnInit.call(_this);
|
|
13166
13173
|
});
|
|
13167
13174
|
};
|
|
13168
13175
|
TransactionLineDeliveryMethodComponent.prototype.commitDeliveryMethod = function (method) {
|
|
@@ -13209,7 +13216,7 @@
|
|
|
13209
13216
|
TransactionLineDeliveryMethodComponent.decorators = [
|
|
13210
13217
|
{ type: i0.Component, args: [{
|
|
13211
13218
|
selector: "co-transaction-line-delivery-method",
|
|
13212
|
-
template: "\n <div class=\"co-transaction-default-flex-row\" *ngFor=\"let row of viewModelsFiltered\">\n <co-input-checkbox\n [model]=\"row.checked\"\n [label]=\"row.
|
|
13219
|
+
template: "\n <div class=\"co-transaction-default-flex-row\" *ngFor=\"let row of viewModelsFiltered\">\n <co-input-checkbox\n [model]=\"row.checked\"\n [label]=\"row.label\"\n (click)=\"handleChecked($event, row)\"\n ></co-input-checkbox>\n </div>\n<!--\n\n <co-input-combo-box\n [collection]=\"data\"\n [placeholder]=\"'DELIVERY_METHOD' | localize\"\n [fields]=\"fields\"\n [readonly]=\"readonly\"\n (modelChange)=\"commitDeliveryMethod($event)\"\n ></co-input-combo-box>\n-->\n ",
|
|
13213
13220
|
encapsulation: i0.ViewEncapsulation.None
|
|
13214
13221
|
},] }
|
|
13215
13222
|
];
|
|
@@ -13392,7 +13399,12 @@
|
|
|
13392
13399
|
this._transactionService.getCommissionCodes("NL").then(function (codes) {
|
|
13393
13400
|
_this.data = codes.slice();
|
|
13394
13401
|
_this.data.forEach(function (d, index) {
|
|
13395
|
-
_this.viewModels.push({
|
|
13402
|
+
_this.viewModels.push({
|
|
13403
|
+
value: d.code,
|
|
13404
|
+
text: d.description,
|
|
13405
|
+
label: ((d.code !== null && d.code !== undefined) ? d.code + ' ' : '') + ((d.description !== null && d.description !== undefined) ? d.description : ''),
|
|
13406
|
+
checked: _this.useTransactionLine ? _this.transactionLine.commissionCode === d.code : index === 0
|
|
13407
|
+
});
|
|
13396
13408
|
});
|
|
13397
13409
|
});
|
|
13398
13410
|
};
|
|
@@ -13440,7 +13452,7 @@
|
|
|
13440
13452
|
TransactionLineCommissionCodeComponent.decorators = [
|
|
13441
13453
|
{ type: i0.Component, args: [{
|
|
13442
13454
|
selector: "co-transaction-line-commission-code",
|
|
13443
|
-
template: "\n <div class=\"co-transaction-default-flex-row\" *ngFor=\"let row of viewModels\">\n <co-input-checkbox\n [model]=\"row.checked\"\n [label]=\"row.
|
|
13455
|
+
template: "\n <div class=\"co-transaction-default-flex-row\" *ngFor=\"let row of viewModels\">\n <co-input-checkbox\n [model]=\"row.checked\"\n [label]=\"row.label\"\n (click)=\"handleChecked($event, row)\"\n ></co-input-checkbox>\n </div>\n ",
|
|
13444
13456
|
encapsulation: i0.ViewEncapsulation.None
|
|
13445
13457
|
},] }
|
|
13446
13458
|
];
|
|
@@ -13475,18 +13487,23 @@
|
|
|
13475
13487
|
function TransactionLineWarehouseComponent(_transactionService) {
|
|
13476
13488
|
var _this = _super.call(this) || this;
|
|
13477
13489
|
_this._transactionService = _transactionService;
|
|
13478
|
-
_this.
|
|
13490
|
+
_this.collection = [];
|
|
13479
13491
|
return _this;
|
|
13480
13492
|
}
|
|
13481
13493
|
TransactionLineWarehouseComponent.prototype.ngOnInit = function () {
|
|
13482
13494
|
var _this = this;
|
|
13483
13495
|
this.viewModels.length = 0;
|
|
13484
13496
|
this._transactionService.getWarehouses(this.branch).then(function (warehouses) {
|
|
13485
|
-
_this.
|
|
13486
|
-
_this.
|
|
13487
|
-
_this.viewModels.push({
|
|
13488
|
-
|
|
13497
|
+
_this.collection = warehouses.slice();
|
|
13498
|
+
_this.collection.forEach(function (d, index) {
|
|
13499
|
+
_this.viewModels.push({
|
|
13500
|
+
value: d.warehouseNo,
|
|
13501
|
+
text: d.description,
|
|
13502
|
+
label: ((d.warehouseNo !== null && d.warehouseNo !== undefined) ? d.warehouseNo + ' ' : '') + ((d.description !== null && d.description !== undefined) ? d.description : ''),
|
|
13503
|
+
checked: _this.useTransactionLine ? _this.transactionLine.warehouseNumber === d.warehouseNo : index === 0
|
|
13504
|
+
});
|
|
13489
13505
|
});
|
|
13506
|
+
_super.prototype.ngOnInit.call(_this);
|
|
13490
13507
|
});
|
|
13491
13508
|
};
|
|
13492
13509
|
TransactionLineWarehouseComponent.prototype.commitWarehouse = function (warehouse) {
|
|
@@ -13530,7 +13547,7 @@
|
|
|
13530
13547
|
TransactionLineWarehouseComponent.decorators = [
|
|
13531
13548
|
{ type: i0.Component, args: [{
|
|
13532
13549
|
selector: "co-transaction-line-warehouse",
|
|
13533
|
-
template: "\n <div class=\"co-transaction-default-flex-row\" *ngFor=\"let row of viewModelsFiltered\">\n <co-input-checkbox\n [model]=\"row.checked\"\n [label]=\"row.
|
|
13550
|
+
template: "\n <div class=\"co-transaction-default-flex-row\" *ngFor=\"let row of viewModelsFiltered\">\n <co-input-checkbox\n [model]=\"row.checked\"\n [label]=\"row.label\"\n (click)=\"handleChecked($event, row)\"></co-input-checkbox>\n </div>\n ",
|
|
13534
13551
|
encapsulation: i0.ViewEncapsulation.None
|
|
13535
13552
|
},] }
|
|
13536
13553
|
];
|