@colijnit/transaction 12.1.76 → 12.1.77
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 +14 -18
- package/bundles/colijnit-transaction.umd.js.map +1 -1
- package/colijnit-transaction.metadata.json +1 -1
- package/esm2015/lib/component/checkout/checkout-overview-relation-edit/checkout-overview-relation-edit.component.js +4 -5
- package/esm2015/lib/component/transaction-search/transaction-search-tile/transaction-search-purchase-order-tile/transaction-search-purchase-order-tile.component.js +2 -2
- package/esm2015/lib/component/transaction-search/transaction-search-tile/transaction-search-sales-order-tile/transaction-search-sales-order-tile.component.js +2 -2
- package/esm2015/lib/service/transaction-connector-adapter.service.js +3 -3
- package/esm2015/lib/service/transaction-connector.service.js +3 -3
- package/esm2015/lib/service/transaction.service.js +6 -10
- package/fesm2015/colijnit-transaction.js +14 -18
- package/fesm2015/colijnit-transaction.js.map +1 -1
- package/lib/service/transaction-connector-adapter.service.d.ts +1 -1
- package/lib/service/transaction-connector.service.d.ts +1 -1
- package/lib/service/transaction.service.d.ts +1 -1
- package/package.json +2 -2
|
@@ -3338,12 +3338,12 @@
|
|
|
3338
3338
|
});
|
|
3339
3339
|
});
|
|
3340
3340
|
};
|
|
3341
|
-
TransactionConnectorAdapterService.prototype.addTransactionLine = function (uuid, articleLine, articleNo, amount, isReturn, aboveLineNr, belowLineNr) {
|
|
3341
|
+
TransactionConnectorAdapterService.prototype.addTransactionLine = function (uuid, articleLine, articleNo, amount, warehouseNo, commissionCode, isReturn, aboveLineNr, belowLineNr) {
|
|
3342
3342
|
return __awaiter(this, void 0, void 0, function () {
|
|
3343
3343
|
var _this = this;
|
|
3344
3344
|
return __generator(this, function (_a) {
|
|
3345
3345
|
return [2 /*return*/, new Promise(function (resolve, reject) {
|
|
3346
|
-
return _this.connector.addTransactionLine(uuid, articleLine, articleNo, amount, isReturn, aboveLineNr, belowLineNr).then(function (result) {
|
|
3346
|
+
return _this.connector.addTransactionLine(uuid, articleLine, articleNo, amount, warehouseNo, commissionCode, isReturn, aboveLineNr, belowLineNr).then(function (result) {
|
|
3347
3347
|
if (result.validationResult && result.validationResult.success) {
|
|
3348
3348
|
resolve(_this._boFactory.makeWithRawBackendData(transactionInfoResponse_bo.TransactionInfoResponse, result.resultObject));
|
|
3349
3349
|
}
|
|
@@ -5388,10 +5388,10 @@
|
|
|
5388
5388
|
});
|
|
5389
5389
|
});
|
|
5390
5390
|
};
|
|
5391
|
-
TransactionConnectorService.prototype.addTransactionLine = function (uuid, articleLine, articleNo, amount, isReturn, aboveLineNr, belowLineNr) {
|
|
5391
|
+
TransactionConnectorService.prototype.addTransactionLine = function (uuid, articleLine, articleNo, amount, warehouseNo, commissionCode, isReturn, aboveLineNr, belowLineNr) {
|
|
5392
5392
|
return __awaiter(this, void 0, void 0, function () {
|
|
5393
5393
|
return __generator(this, function (_a) {
|
|
5394
|
-
return [2 /*return*/, this._adapterService.addTransactionLine(uuid, articleLine, articleNo, amount, isReturn, aboveLineNr, belowLineNr)];
|
|
5394
|
+
return [2 /*return*/, this._adapterService.addTransactionLine(uuid, articleLine, articleNo, amount, warehouseNo, commissionCode, isReturn, aboveLineNr, belowLineNr)];
|
|
5395
5395
|
});
|
|
5396
5396
|
});
|
|
5397
5397
|
};
|
|
@@ -7717,8 +7717,6 @@
|
|
|
7717
7717
|
var _this = this;
|
|
7718
7718
|
return __generator(this, function (_a) {
|
|
7719
7719
|
return [2 /*return*/, new Promise(function (resolve) {
|
|
7720
|
-
// todo fix this
|
|
7721
|
-
request.branchNr = "1";
|
|
7722
7720
|
_this.connector.createSalesOrder(request).then(function (response) {
|
|
7723
7721
|
_this.rememberCurrentTransaction(response);
|
|
7724
7722
|
resolve(true);
|
|
@@ -7745,8 +7743,6 @@
|
|
|
7745
7743
|
var _this = this;
|
|
7746
7744
|
return __generator(this, function (_a) {
|
|
7747
7745
|
return [2 /*return*/, new Promise(function (resolve) {
|
|
7748
|
-
// todo fix this
|
|
7749
|
-
request.branchNr = "1";
|
|
7750
7746
|
_this.connector.createPurchaseOrder(request).then(function (response) {
|
|
7751
7747
|
_this.rememberCurrentTransaction(response);
|
|
7752
7748
|
resolve(true);
|
|
@@ -7760,8 +7756,6 @@
|
|
|
7760
7756
|
var _this = this;
|
|
7761
7757
|
return __generator(this, function (_a) {
|
|
7762
7758
|
return [2 /*return*/, new Promise(function (resolve) {
|
|
7763
|
-
// todo fix this
|
|
7764
|
-
request.branchNr = "1";
|
|
7765
7759
|
_this.connector.createServiceOrder(request).then(function (response) {
|
|
7766
7760
|
_this.rememberCurrentTransaction(response);
|
|
7767
7761
|
resolve(true);
|
|
@@ -7914,7 +7908,7 @@
|
|
|
7914
7908
|
case 0: return [4 /*yield*/, this._checkAndCreateTransaction()];
|
|
7915
7909
|
case 1:
|
|
7916
7910
|
_a.sent();
|
|
7917
|
-
return [4 /*yield*/, this.connector.addTransactionLine(this.currentTransaction.transactionInfo.uuid, transactionLineType_enum.TransactionLineType.ArticleLine, articleNo, null, isReturn, aboveLineNr, belowLineNr)];
|
|
7911
|
+
return [4 /*yield*/, this.connector.addTransactionLine(this.currentTransaction.transactionInfo.uuid, transactionLineType_enum.TransactionLineType.ArticleLine, articleNo, null, null, null, isReturn, aboveLineNr, belowLineNr)];
|
|
7918
7912
|
case 2:
|
|
7919
7913
|
response = _a.sent();
|
|
7920
7914
|
return [2 /*return*/, this.handleLineOperationStatuses(response)];
|
|
@@ -7938,7 +7932,7 @@
|
|
|
7938
7932
|
// });
|
|
7939
7933
|
// });
|
|
7940
7934
|
// }
|
|
7941
|
-
TransactionService.prototype.addTransactionLine = function (lineType, articleNo, amount, isReturn, aboveLineNr, belowLineNr, remember) {
|
|
7935
|
+
TransactionService.prototype.addTransactionLine = function (lineType, articleNo, amount, warehouseNo, commissionCode, isReturn, aboveLineNr, belowLineNr, remember) {
|
|
7942
7936
|
if (remember === void 0) { remember = true; }
|
|
7943
7937
|
return __awaiter(this, void 0, void 0, function () {
|
|
7944
7938
|
var _this = this;
|
|
@@ -7948,7 +7942,7 @@
|
|
|
7948
7942
|
case 1:
|
|
7949
7943
|
_a.sent();
|
|
7950
7944
|
return [2 /*return*/, new Promise(function (resolve, reject) {
|
|
7951
|
-
_this.connector.addTransactionLine(_this.currentTransaction.transactionInfo.uuid, lineType, articleNo, amount, isReturn, aboveLineNr, belowLineNr)
|
|
7945
|
+
_this.connector.addTransactionLine(_this.currentTransaction.transactionInfo.uuid, lineType, articleNo, amount, warehouseNo, commissionCode, isReturn, aboveLineNr, belowLineNr)
|
|
7952
7946
|
.then(function (response) { return __awaiter(_this, void 0, void 0, function () {
|
|
7953
7947
|
return __generator(this, function (_a) {
|
|
7954
7948
|
this.rememberCurrentTransaction(response);
|
|
@@ -8467,6 +8461,8 @@
|
|
|
8467
8461
|
createMethod = this._createTransactionMethods.get(this.transactionKind);
|
|
8468
8462
|
if (createMethod) {
|
|
8469
8463
|
request = new createTransactionRequest.CreateTransactionRequest();
|
|
8464
|
+
// todo fix this
|
|
8465
|
+
request.branchNr = "1";
|
|
8470
8466
|
return [2 /*return*/, createMethod.call(this, request)];
|
|
8471
8467
|
}
|
|
8472
8468
|
else {
|
|
@@ -8700,12 +8696,12 @@
|
|
|
8700
8696
|
set: function (value) {
|
|
8701
8697
|
this._relation = value;
|
|
8702
8698
|
if (this._relation) {
|
|
8703
|
-
if (this._relation instanceof supplierFullObject_bo.SupplierFullObject) {
|
|
8704
|
-
this._relation.type = relationNameKind_enum.RelationNameKind.Company;
|
|
8705
|
-
}
|
|
8706
8699
|
if (this._relation instanceof customerFullObject_bo.CustomerFullObject) {
|
|
8707
8700
|
this.customerGroup = this._relation.customerGroup;
|
|
8708
8701
|
}
|
|
8702
|
+
else {
|
|
8703
|
+
this._relation.type = relationNameKind_enum.RelationNameKind.Company;
|
|
8704
|
+
}
|
|
8709
8705
|
this.address = this._relation.getFirstAddressOrCreateNew();
|
|
8710
8706
|
var firstActiveAddress = this._relation.activeAddresses.length > 0 ? this._relation.activeAddresses[0] : undefined;
|
|
8711
8707
|
this.deliveryAddressNawNr = firstActiveAddress ? firstActiveAddress.nawNr : 0;
|
|
@@ -11774,7 +11770,7 @@
|
|
|
11774
11770
|
TransactionSearchPurchaseOrderTileComponent.decorators = [
|
|
11775
11771
|
{ type: i0.Component, args: [{
|
|
11776
11772
|
selector: "co-transaction-search-purchase-order-tile",
|
|
11777
|
-
template: "\n <div class=\"transaction-tile-wrapper\" (click)=\"onTransactionClick(transaction)\">\n <div class=\"tile\">\n <div class=\"tile-header\">\n <div class=\"tile-upper-left\">\n <div class=\"transaction-tile-avatar\">\n <co-avatar [image]=\"transaction.execImage\" [relationId]=\"transaction.handledBy\"></co-avatar>\n </div>\n </div>\n <div class=\"tile-upper-middle\">\n <div class=\"header\"><span [textContent]=\"transaction.transNr\"></span></div>\n <div class=\"text\"><span [textContent]=\"transaction.brancheName\"></span></div>\n </div>\n <div class=\"tile-upper-right\">\n <div class=\"status-bar-wrapper\">\n <co-transaction-statusbar [transaction]=\"transaction\" [transactionKind]=\"transaction.transactionKind\"></co-transaction-statusbar>\n </div>\n <div class=\"header total-price-vat\"><span [textContent]=\"transaction.totalPriceWithVat | currency:'EUR'\"></span></div>\n </div>\n </div>\n <div class=\"tile-body\">\n <div class=\"tile-middle-left\"></div>\n <div class=\"tile-middle-middle\">\n <div class=\"text\"><span [textContent]=\"transaction.relationName\"></span></div>\n <div class=\"text\"><span [textContent]=\"transaction.getAdres()\"></span></div>\n </div>\n <div class=\"tile-middle-right\"></div>\n </div>\n <div class=\"tile-footer\">\n <div class=\"tile-bottom-left order-info-section\">\n <div class=\"label\"><span [textContent]=\"'ORDER_DATE' | localize\"></span></div>\n <div class=\"value\">\n <span [textContent]=\"transaction.getTransDate() | date:'dd MMM yyyy'\"></span></div>\n </div>\n <div class=\"tile-bottom-middle order-info-section\">\n <div class=\"label\"><span [textContent]=\"'DELIVERY_DATE' | localize\"></span></div>\n <div class=\"value\">\n <span [textContent]=\"transaction.getDeliveryDate() | date:'dd MMM yyyy'\"></span>\n <div *ngIf=\"transaction.getDeliveryDate()\">\n <co-icon *ngIf=\"transaction.deliveryDateDefinitive; else indefinite\"\n [iconData]=\"this.iconCacheService.getIcon(this.icons.Lock)\" class=\"lock-icon\"></co-icon>\n <ng-template #indefinite>\n <co-icon [iconData]=\"this.iconCacheService.getIcon(this.icons.Unlock)\" class=\"unlock-icon\"></co-icon>\n </ng-template>\n </div>\n </div>\n </div>\n <div class=\"tile-bottom-right order-info-section\">\n <div class=\"label\"><span [textContent]=\"'ORDER_RULE' | localize\"></span></div>\n <div class=\"value\">\n <span [textContent]=\"'68/00'\"></span></div>\n </div>\n </div>\n </div>\n </div>\n ",
|
|
11773
|
+
template: "\n <div class=\"transaction-tile-wrapper\" (click)=\"onTransactionClick(transaction)\">\n <div class=\"tile\">\n <div class=\"tile-header\">\n <div class=\"tile-upper-left\">\n <div class=\"transaction-tile-avatar\">\n <co-avatar [image]=\"transaction.execImage\" [relationId]=\"transaction.handledBy\"></co-avatar>\n </div>\n </div>\n <div class=\"tile-upper-middle\">\n <div class=\"header\"><span [textContent]=\"transaction.transNr\"></span></div>\n <div class=\"text\"><span [textContent]=\"transaction.brancheName\"></span></div>\n </div>\n <div class=\"tile-upper-right\">\n <div class=\"status-bar-wrapper\" (click)=\"$event.stopPropagation()\">\n <co-transaction-statusbar [transaction]=\"transaction\" [transactionKind]=\"transaction.transactionKind\"></co-transaction-statusbar>\n </div>\n <div class=\"header total-price-vat\"><span [textContent]=\"transaction.totalPriceWithVat | currency:'EUR'\"></span></div>\n </div>\n </div>\n <div class=\"tile-body\">\n <div class=\"tile-middle-left\"></div>\n <div class=\"tile-middle-middle\">\n <div class=\"text\"><span [textContent]=\"transaction.relationName\"></span></div>\n <div class=\"text\"><span [textContent]=\"transaction.getAdres()\"></span></div>\n </div>\n <div class=\"tile-middle-right\"></div>\n </div>\n <div class=\"tile-footer\">\n <div class=\"tile-bottom-left order-info-section\">\n <div class=\"label\"><span [textContent]=\"'ORDER_DATE' | localize\"></span></div>\n <div class=\"value\">\n <span [textContent]=\"transaction.getTransDate() | date:'dd MMM yyyy'\"></span></div>\n </div>\n <div class=\"tile-bottom-middle order-info-section\">\n <div class=\"label\"><span [textContent]=\"'DELIVERY_DATE' | localize\"></span></div>\n <div class=\"value\">\n <span [textContent]=\"transaction.getDeliveryDate() | date:'dd MMM yyyy'\"></span>\n <div *ngIf=\"transaction.getDeliveryDate()\">\n <co-icon *ngIf=\"transaction.deliveryDateDefinitive; else indefinite\"\n [iconData]=\"this.iconCacheService.getIcon(this.icons.Lock)\" class=\"lock-icon\"></co-icon>\n <ng-template #indefinite>\n <co-icon [iconData]=\"this.iconCacheService.getIcon(this.icons.Unlock)\" class=\"unlock-icon\"></co-icon>\n </ng-template>\n </div>\n </div>\n </div>\n <div class=\"tile-bottom-right order-info-section\">\n <div class=\"label\"><span [textContent]=\"'ORDER_RULE' | localize\"></span></div>\n <div class=\"value\">\n <span [textContent]=\"'68/00'\"></span></div>\n </div>\n </div>\n </div>\n </div>\n ",
|
|
11778
11774
|
encapsulation: i0.ViewEncapsulation.None
|
|
11779
11775
|
},] }
|
|
11780
11776
|
];
|
|
@@ -11791,7 +11787,7 @@
|
|
|
11791
11787
|
TransactionSearchSalesOrderTileComponent.decorators = [
|
|
11792
11788
|
{ type: i0.Component, args: [{
|
|
11793
11789
|
selector: "co-transaction-search-sales-order-tile",
|
|
11794
|
-
template: "\n <div class=\"transaction-tile-wrapper\" (click)=\"onTransactionClick(transaction)\">\n <div class=\"tile\">\n <div class=\"tile-header\">\n <div class=\"tile-upper-left\">\n <div class=\"transaction-tile-avatar\">\n <co-avatar [image]=\"transaction.execImage\" [relationId]=\"transaction.handledBy\"></co-avatar>\n </div>\n </div>\n <div class=\"tile-upper-middle\">\n <div class=\"header\"><span [textContent]=\"transaction.transNr\"></span></div>\n <div class=\"text\"><span [textContent]=\"transaction.brancheName\"></span></div>\n </div>\n <div class=\"tile-upper-right\">\n <div class=\"status-bar-wrapper\">\n <co-transaction-statusbar [transaction]=\"transaction\" [transactionKind]=\"transaction.transactionKind\"></co-transaction-statusbar>\n </div>\n <div class=\"header total-price-vat\"><span [textContent]=\"transaction.totalPriceWithVat | currency:'EUR'\"></span></div>\n </div>\n </div>\n <div class=\"tile-body\">\n <div class=\"tile-middle-left\"></div>\n <div class=\"tile-middle-middle\">\n <div class=\"text\"><span [textContent]=\"transaction.relationName\"></span></div>\n <div class=\"text\"><span [textContent]=\"transaction.getAdres()\"></span></div>\n </div>\n <div class=\"tile-middle-right\"></div>\n </div>\n <div class=\"tile-footer\">\n <div class=\"tile-bottom-left order-info-section\">\n <div class=\"label\"><span [textContent]=\"'ORDER_DATE' | localize\"></span></div>\n <div class=\"value\">\n <span [textContent]=\"transaction.getTransDate() | date:'dd MMM yyyy'\"></span></div>\n </div>\n <div class=\"tile-bottom-middle order-info-section\">\n <div class=\"label\"><span [textContent]=\"'DELIVERY_DATE' | localize\"></span></div>\n <div class=\"value\">\n <span [textContent]=\"transaction.getDeliveryDate() | date:'dd MMM yyyy'\"></span>\n <div *ngIf=\"transaction.getDeliveryDate()\">\n <co-icon *ngIf=\"transaction.deliveryDateDefinitive; else indefinite\"\n [iconData]=\"this.iconCacheService.getIcon(this.icons.Lock)\" class=\"lock-icon\"></co-icon>\n <ng-template #indefinite>\n <co-icon [iconData]=\"this.iconCacheService.getIcon(this.icons.Unlock)\" class=\"unlock-icon\"></co-icon>\n </ng-template>\n </div>\n </div>\n </div>\n <div class=\"tile-bottom-right order-info-section\">\n <div class=\"label\"><span [textContent]=\"'ORDER_RULE' | localize\"></span></div>\n <div class=\"value\">\n <span [textContent]=\"'68/00'\"></span></div>\n </div>\n </div>\n </div>\n </div>",
|
|
11790
|
+
template: "\n <div class=\"transaction-tile-wrapper\" (click)=\"onTransactionClick(transaction)\">\n <div class=\"tile\">\n <div class=\"tile-header\">\n <div class=\"tile-upper-left\">\n <div class=\"transaction-tile-avatar\">\n <co-avatar [image]=\"transaction.execImage\" [relationId]=\"transaction.handledBy\"></co-avatar>\n </div>\n </div>\n <div class=\"tile-upper-middle\">\n <div class=\"header\"><span [textContent]=\"transaction.transNr\"></span></div>\n <div class=\"text\"><span [textContent]=\"transaction.brancheName\"></span></div>\n </div>\n <div class=\"tile-upper-right\">\n <div class=\"status-bar-wrapper\" (click)=\"$event.stopPropagation()\">\n <co-transaction-statusbar [transaction]=\"transaction\" [transactionKind]=\"transaction.transactionKind\"></co-transaction-statusbar>\n </div>\n <div class=\"header total-price-vat\"><span [textContent]=\"transaction.totalPriceWithVat | currency:'EUR'\"></span></div>\n </div>\n </div>\n <div class=\"tile-body\">\n <div class=\"tile-middle-left\"></div>\n <div class=\"tile-middle-middle\">\n <div class=\"text\"><span [textContent]=\"transaction.relationName\"></span></div>\n <div class=\"text\"><span [textContent]=\"transaction.getAdres()\"></span></div>\n </div>\n <div class=\"tile-middle-right\"></div>\n </div>\n <div class=\"tile-footer\">\n <div class=\"tile-bottom-left order-info-section\">\n <div class=\"label\"><span [textContent]=\"'ORDER_DATE' | localize\"></span></div>\n <div class=\"value\">\n <span [textContent]=\"transaction.getTransDate() | date:'dd MMM yyyy'\"></span></div>\n </div>\n <div class=\"tile-bottom-middle order-info-section\">\n <div class=\"label\"><span [textContent]=\"'DELIVERY_DATE' | localize\"></span></div>\n <div class=\"value\">\n <span [textContent]=\"transaction.getDeliveryDate() | date:'dd MMM yyyy'\"></span>\n <div *ngIf=\"transaction.getDeliveryDate()\">\n <co-icon *ngIf=\"transaction.deliveryDateDefinitive; else indefinite\"\n [iconData]=\"this.iconCacheService.getIcon(this.icons.Lock)\" class=\"lock-icon\"></co-icon>\n <ng-template #indefinite>\n <co-icon [iconData]=\"this.iconCacheService.getIcon(this.icons.Unlock)\" class=\"unlock-icon\"></co-icon>\n </ng-template>\n </div>\n </div>\n </div>\n <div class=\"tile-bottom-right order-info-section\">\n <div class=\"label\"><span [textContent]=\"'ORDER_RULE' | localize\"></span></div>\n <div class=\"value\">\n <span [textContent]=\"'68/00'\"></span></div>\n </div>\n </div>\n </div>\n </div>",
|
|
11795
11791
|
encapsulation: i0.ViewEncapsulation.None
|
|
11796
11792
|
},] }
|
|
11797
11793
|
];
|