@colijnit/transaction 257.1.46 → 257.1.47
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 +50 -52
- package/bundles/colijnit-transaction.umd.js.map +1 -1
- package/colijnit-transaction-257.1.46.tgz +0 -0
- package/colijnit-transaction.metadata.json +1 -1
- package/esm2015/lib/component/add-product/add-product.component.js +10 -15
- package/esm2015/lib/component/transaction-internal/transaction-internal.component.js +4 -2
- package/esm2015/lib/component/transaction-line/transaction-receive-goods-line/transaction-receive-goods-line.component.js +9 -9
- package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-order-purchase/transaction-quick-access-order-purchase.component.js +2 -1
- package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-received-goods/transaction-quick-access-received-goods.component.js +44 -29
- package/esm2015/lib/component/transaction-reservation/service/transaction-sales-reservation.service.js +4 -17
- package/esm2015/lib/service/transaction-connector-adapter.service.js +2 -2
- package/esm2015/lib/service/transaction.service.js +10 -2
- package/esm2015/lib/transaction-version.js +3 -3
- package/fesm2015/colijnit-transaction.js +78 -69
- package/fesm2015/colijnit-transaction.js.map +1 -1
- package/lib/component/add-product/add-product.component.d.ts +8 -0
- package/lib/component/transaction-quick-access/transaction-quick-access-received-goods/transaction-quick-access-received-goods.component.d.ts +2 -0
- package/lib/service/transaction.service.d.ts +1 -1
- package/package.json +1 -1
|
@@ -33,8 +33,8 @@
|
|
|
33
33
|
function Version() {
|
|
34
34
|
this.name = "@colijnit/transaction";
|
|
35
35
|
this.description = "Colijn IT transaction package";
|
|
36
|
-
this.symVer = "257.1.
|
|
37
|
-
this.publishDate = "
|
|
36
|
+
this.symVer = "257.1.47";
|
|
37
|
+
this.publishDate = "9-4-2025 17:45:52";
|
|
38
38
|
}
|
|
39
39
|
return Version;
|
|
40
40
|
}());
|
|
@@ -9544,7 +9544,7 @@
|
|
|
9544
9544
|
case 1:
|
|
9545
9545
|
response = _a.sent();
|
|
9546
9546
|
if (response && response.validationResult && response.validationResult.success) {
|
|
9547
|
-
return [2 /*return*/, response.resultObject];
|
|
9547
|
+
return [2 /*return*/, this._boFactory.makeWithRawBackendData(transactionInfoResponse_bo.TransactionInfoResponse, response.resultObject)];
|
|
9548
9548
|
}
|
|
9549
9549
|
else {
|
|
9550
9550
|
this._handleExceptionFromResponse(response);
|
|
@@ -20065,10 +20065,19 @@
|
|
|
20065
20065
|
};
|
|
20066
20066
|
TransactionService.prototype.processReservation = function (request) {
|
|
20067
20067
|
return __awaiter(this, void 0, void 0, function () {
|
|
20068
|
+
var lockSuccess, response;
|
|
20068
20069
|
return __generator(this, function (_a) {
|
|
20069
20070
|
switch (_a.label) {
|
|
20070
|
-
case 0: return [4 /*yield*/, this.
|
|
20071
|
-
case 1:
|
|
20071
|
+
case 0: return [4 /*yield*/, this.tryToLockTransaction(this.currentTransaction.transactionInfo.id, this.currentTransaction.transactionInfo.version)];
|
|
20072
|
+
case 1:
|
|
20073
|
+
lockSuccess = _a.sent();
|
|
20074
|
+
if (!lockSuccess) return [3 /*break*/, 3];
|
|
20075
|
+
return [4 /*yield*/, this.connector.processReservation(request)];
|
|
20076
|
+
case 2:
|
|
20077
|
+
response = _a.sent();
|
|
20078
|
+
this.transactionDirty = true;
|
|
20079
|
+
return [2 /*return*/, this.handleLineOperationStatuses(response)];
|
|
20080
|
+
case 3: return [2 /*return*/, false];
|
|
20072
20081
|
}
|
|
20073
20082
|
});
|
|
20074
20083
|
});
|
|
@@ -25350,6 +25359,7 @@
|
|
|
25350
25359
|
_this.reportDocumentPrintRequest = new reportingDocumentPrintSignDocBaseRequest.ReportingDocumentPrintSignDocBaseRequest();
|
|
25351
25360
|
_this.reportDocumentPdfRequest = new pdfInvoiceRequest.PdfInvoiceRequest();
|
|
25352
25361
|
_this.localCheckboxState = false;
|
|
25362
|
+
_this.colliCheckboxState = false;
|
|
25353
25363
|
_this.commitDate = new Date();
|
|
25354
25364
|
_this.globalWarehouseLocation = '-';
|
|
25355
25365
|
_this.internalParamMLocat = false;
|
|
@@ -25395,6 +25405,9 @@
|
|
|
25395
25405
|
TransactionQuickAccessReceivedGoodsComponent.prototype.handleSelectAllLines = function (value) {
|
|
25396
25406
|
this.transactionEventService.selectAllPurchaseOrderLinesForReceiveGoods.next(value);
|
|
25397
25407
|
};
|
|
25408
|
+
TransactionQuickAccessReceivedGoodsComponent.prototype.handleNoColliStickers = function (value) {
|
|
25409
|
+
this.transactionEventService.selectAllPurchaseOrderLinesForReceiveGoods.next(value);
|
|
25410
|
+
};
|
|
25398
25411
|
TransactionQuickAccessReceivedGoodsComponent.prototype.handleGlobalLocationChange = function (location) {
|
|
25399
25412
|
var _this = this;
|
|
25400
25413
|
this.globalWarehouseLocation = location;
|
|
@@ -25445,7 +25458,7 @@
|
|
|
25445
25458
|
TransactionQuickAccessReceivedGoodsComponent.decorators = [
|
|
25446
25459
|
{ type: i0.Component, args: [{
|
|
25447
25460
|
selector: "co-transaction-quick-access-received-goods",
|
|
25448
|
-
template: "\n <div class=\"quick-access-wrapper\" *ngIf=\"!hideQuickAccessContent\">\n <
|
|
25461
|
+
template: "\n <div class=\"quick-access-wrapper\" *ngIf=\"!hideQuickAccessContent\">\n <div>\n <co-input-date\n [placeholder]=\"'RECEIVED_DATE' | localize\"\n [(model)]=\"commitDate\"\n ></co-input-date>\n <co-input-text\n [placeholder]=\"'PACKING_SLIP' | localize\"\n [(model)]=\"packingSlipNr\"\n ></co-input-text>\n <!--\n <co-transaction-labeled-warehouse-location-button *ngIf=\"internalParamMLocat && showWarehouseLocationButton\"\n [locationNr]=\"globalWarehouseLocation\"\n [warehouseNumber]=\"warehouseNumber\"\n (locationNrChange)=\"handleGlobalLocationChange($event)\"\n ></co-transaction-labeled-warehouse-location-button>\n -->\n <co-quick-send-button\n [showSendMethodIcon]=\"false\"\n [icon]=\"icons.CheckDuotone\"\n [showLoader]=\"showProcessingLoader\"\n [title]=\"'PROCESS'\"\n (sendIconClicked)=\"handleCommitEvent()\"\n (openSendMethodDialog)=\"showSendMethodDialog = true\"\n ></co-quick-send-button>\n </div>\n <div>\n <co-input-checkbox\n class=\"checkbox-wrapper\"\n [label]=\"'SELECT_ALL' | localize\"\n [(model)]=\"localCheckboxState\"\n (modelChange)=\"handleSelectAllLines($event)\"\n ></co-input-checkbox>\n <co-input-checkbox\n class=\"checkbox-wrapper\"\n [label]=\"'NO_PACKAGE_STICKERS' | localize\"\n [(model)]=\"colliCheckboxState\"\n (modelChange)=\"handleSelectAllLines($event)\"\n ></co-input-checkbox>\n </div>\n </div>\n <co-send-method-dialog *ngIf=\"showSendMethodDialog\"\n [printerList]=\"printerList\"\n [headerTitle]=\"'Printer en lay-out selectie'\"\n [defaultSendMethod]=\"defaultSendMethod\"\n [visibleMethods]=\"[sendMethodType.Print, sendMethodType.Pdf]\"\n [emailAddresses]=\"emailAddresses\"\n [emailLayouts]=\"emailLayouts\"\n [printLayouts]=\"printLayouts\"\n [isDocSignEnabled]=\"true\"\n [(reportingDocumentEmailRequest)]=\"reportDocumentEmailRequest\"\n [(reportingDocumentPrintRequest)]=\"reportDocumentPrintRequest\"\n [(reportingDocumentPdfRequest)]=\"reportDocumentPdfRequest\"\n (closeClick)=\"showSendMethodDialog = false\"\n (okClick)=\"handleSendMethodOkClick($event)\"\n ></co-send-method-dialog>\n ",
|
|
25449
25462
|
encapsulation: i0.ViewEncapsulation.None
|
|
25450
25463
|
},] }
|
|
25451
25464
|
];
|
|
@@ -26612,7 +26625,7 @@
|
|
|
26612
26625
|
TransactionReceiveGoodsLineComponent.decorators = [
|
|
26613
26626
|
{ type: i0.Component, args: [{
|
|
26614
26627
|
selector: "co-transaction-receive-goods-line",
|
|
26615
|
-
template: "\n <co-transaction-base-line\n [transactionInfo]=\"transactionInfo\"\n [transactionLine]=\"transactionLine\"\n [preview]=\"preview\"\n [isFirst]=\"isFirst\"\n [checkbox]=\"showCheckboxForLine\"\n [checkboxValue]=\"transactionLine.selected\"\n (checkboxValueChanged)=\"transactionLine.selected = $event\"\n >\n <div class=\"transaction-line-wrapper\">\n <div class=\"transaction-line-extended-wrapper\">\n <div class=\"column1 small-statusbar\">\n <co-transaction-line-statusbar\n [screenConfigurationObject]=\"cfgNames.StatusBar\"\n [configNames]=\"statusBarConfigNames\"\n [activeCategory]=\"transactionTypeCategory.PurchaseOrderReceivedGoods\"></co-transaction-line-statusbar>\n </div>\n <div class=\"column2\">\n <div class=\"transaction-field-wrapper\">\n <div class=\"inside-field\">\n <co-transaction-line-warehouse-button\n [screenConfigurationObject]=\"cfgNames.LineWarehouse\"\n [inputLabel]=\"true\"\n ></co-transaction-line-warehouse-button>\n </div>\n </div>\n <div class=\"transaction-field-wrapper\">\n <div class=\"inside-field\">\n <co-transaction-line-warehouse-location-button\n *ngIf=\"transactionLine.isLocationRequired\"\n [screenConfigurationObject]=\"cfgNames.LineWarehouseLocationReceived\"\n [readonly]=\"warehouseLocationButtonDisabled\"\n [inputLabel]=\"true\"\n >\n </co-transaction-line-warehouse-location-button>\n </div>\n </div>\n </div>\n <div class=\"column3\">\n <div class=\"transaction-field-wrapper\">\n <div class=\"inside-field\">\n <co-transaction-line-label [insideLabel]=\"'QUANTITY'\"></co-transaction-line-label>\n <co-input-text\n [model]=\"transactionLine.amount\"\n [leftIconData]=\"iconCacheService.getIcon(icons.CartShoppingRegular)\"\n [readonly]=\"true\"\n [customHeight]=\"true\"\n ></co-input-text>\n </div>\n </div>\n <div class=\"transaction-field-wrapper\">\n <div class=\"inside-field\">\n <co-transaction-line-label [insideLabel]=\"'QUANTITY_ACCEPTED'\"></co-transaction-line-label>\n <co-input-text\n [leftIconData]=\"iconCacheService.getIcon(icons.RegularCartFlatbedBoxesCircleCheck)\"\n [readonly]=\"true\"\n [customHeight]=\"true\"\n ></co-input-text>\n </div>\n </div>\n </div>\n <div class=\"column4\">\n <div class=\"transaction-field-wrapper\" *ngIf=\"transactionLine.isBatchNrRequired\">\n <div class=\"inside-field\">\n <co-transaction-line-label [insideLabel]=\"'BATCH_NR'\"></co-transaction-line-label>\n <co-input-text class=\"side-panel-input\"\n [(model)]=\"transactionLine.batchNr\"\n [type]=\"'number'\"\n [hideArrowButtons]=\"true\"\n [readonly]=\"true\"\n [required]=\"true\"\n [customHeight]=\"true\"\n ></co-input-text>\n </div>\n </div>\n <div class=\"transaction-field-wrapper\">\n <div class=\"inside-field\">\n <co-transaction-
|
|
26628
|
+
template: "\n <co-transaction-base-line\n [transactionInfo]=\"transactionInfo\"\n [transactionLine]=\"transactionLine\"\n [preview]=\"preview\"\n [isFirst]=\"isFirst\"\n [checkbox]=\"showCheckboxForLine\"\n [checkboxValue]=\"transactionLine.selected\"\n (checkboxValueChanged)=\"transactionLine.selected = $event\"\n >\n <div class=\"transaction-line-wrapper\">\n <div class=\"transaction-line-extended-wrapper\">\n <div class=\"column1 small-statusbar\">\n <co-transaction-line-statusbar\n [screenConfigurationObject]=\"cfgNames.StatusBar\"\n [configNames]=\"statusBarConfigNames\"\n [activeCategory]=\"transactionTypeCategory.PurchaseOrderReceivedGoods\"></co-transaction-line-statusbar>\n </div>\n <div class=\"column2\">\n <div class=\"transaction-field-wrapper\">\n <div class=\"inside-field\">\n <co-transaction-line-warehouse-button\n [screenConfigurationObject]=\"cfgNames.LineWarehouse\"\n [inputLabel]=\"true\"\n ></co-transaction-line-warehouse-button>\n </div>\n </div>\n <div class=\"transaction-field-wrapper\">\n <div class=\"inside-field\">\n <co-transaction-line-warehouse-location-button\n *ngIf=\"transactionLine.isLocationRequired\"\n [screenConfigurationObject]=\"cfgNames.LineWarehouseLocationReceived\"\n [readonly]=\"warehouseLocationButtonDisabled\"\n [inputLabel]=\"true\"\n >\n </co-transaction-line-warehouse-location-button>\n </div>\n </div>\n </div>\n <div class=\"column3\">\n <div class=\"transaction-field-wrapper\">\n <div class=\"inside-field\">\n <co-transaction-line-label [insideLabel]=\"'QUANTITY'\"></co-transaction-line-label>\n <co-input-text\n [model]=\"transactionLine.amount\"\n [leftIconData]=\"iconCacheService.getIcon(icons.CartShoppingRegular)\"\n [readonly]=\"true\"\n [customHeight]=\"true\"\n ></co-input-text>\n </div>\n </div>\n <div class=\"transaction-field-wrapper\">\n <div class=\"inside-field\">\n <co-transaction-line-label [insideLabel]=\"'QUANTITY_ACCEPTED'\"></co-transaction-line-label>\n <co-input-text\n [leftIconData]=\"iconCacheService.getIcon(icons.RegularCartFlatbedBoxesCircleCheck)\"\n [readonly]=\"true\"\n [customHeight]=\"true\"\n ></co-input-text>\n </div>\n </div>\n </div>\n <div class=\"column4\">\n <div class=\"transaction-field-wrapper\" *ngIf=\"transactionLine.isBatchNrRequired\">\n <div class=\"inside-field\">\n <co-transaction-line-label [insideLabel]=\"'BATCH_NR'\"></co-transaction-line-label>\n <co-input-text class=\"side-panel-input\"\n [(model)]=\"transactionLine.batchNr\"\n [type]=\"'number'\"\n [hideArrowButtons]=\"true\"\n [readonly]=\"true\"\n [required]=\"true\"\n [customHeight]=\"true\"\n ></co-input-text>\n </div>\n </div>\n <div class=\"transaction-field-wrapper\">\n <div class=\"inside-field\">\n <co-transaction-line-label [insideLabel]=\"'QUANTITY_TO_RECEIVE'\"></co-transaction-line-label>\n <co-input-number-picker class=\"amount-number-picker\"\n [screenConfigurationObject]=\"cfgNames.LineQuantityToReceive\"\n [model]=\"transactionLine.articleLineStatus?.quantityToReceive\"\n [decimals]=\"decimals\"\n [min]=\"1\"\n [max]=\"transactionLine.amount - lineQuantityReceived\"\n [leftIconData]=\"iconCacheService.getIcon(icons.CartFlatbedBoxesRegular)\"\n [readonly]=\"readonly || lineQuantityReceived === transactionLine.amount\"\n (modelChange)=\"changeLineAmount($event)\">\n </co-input-number-picker>\n </div>\n </div>\n <div class=\"transaction-field-wrapper\">\n <div class=\"inside-field\">\n <co-transaction-print-package-sticker\n [screenConfigurationObject]=\"cfgNames.StickerAmount\"\n [inputLabel]=\"true\"\n ></co-transaction-print-package-sticker>\n </div>\n </div>\n <div class=\"transaction-field-wrapper\">\n <div class=\"inside-field\">\n <co-editable-label class=\"transaction-line-totals-total price\"\n [model]=\"transactionLine.displayNetLineTotal | coCurrency: true\"\n [editModel]=\"transactionLine.displayNetLineTotal\"\n [commit]=\"!readonly\"\n [readonly]=\"true\"\n [editMode]=\"false\"\n [inputLabel]=\"true\"\n ></co-editable-label>\n </div>\n </div>\n </div>\n </div>\n </div>\n </co-transaction-base-line>\n ",
|
|
26616
26629
|
encapsulation: i0.ViewEncapsulation.None,
|
|
26617
26630
|
changeDetection: i0.ChangeDetectionStrategy.OnPush
|
|
26618
26631
|
},] }
|
|
@@ -26629,16 +26642,16 @@
|
|
|
26629
26642
|
}
|
|
26630
26643
|
TransactionSalesReservationService.prototype.getSalesOrderLines = function (salesOrderId) {
|
|
26631
26644
|
return __awaiter(this, void 0, void 0, function () {
|
|
26632
|
-
var
|
|
26633
|
-
return __generator(this, function (
|
|
26634
|
-
switch (
|
|
26645
|
+
var _a;
|
|
26646
|
+
return __generator(this, function (_b) {
|
|
26647
|
+
switch (_b.label) {
|
|
26635
26648
|
case 0:
|
|
26636
26649
|
if (!salesOrderId) return [3 /*break*/, 2];
|
|
26637
|
-
|
|
26650
|
+
_a = this;
|
|
26638
26651
|
return [4 /*yield*/, this._transaction.getSalesOrderLines(this.makeGetSalesOrderLinesRequest(salesOrderId))];
|
|
26639
26652
|
case 1:
|
|
26640
|
-
|
|
26641
|
-
|
|
26653
|
+
_a.purchaseReservations = _b.sent();
|
|
26654
|
+
_b.label = 2;
|
|
26642
26655
|
case 2: return [2 /*return*/];
|
|
26643
26656
|
}
|
|
26644
26657
|
});
|
|
@@ -26669,11 +26682,10 @@
|
|
|
26669
26682
|
}
|
|
26670
26683
|
};
|
|
26671
26684
|
TransactionSalesReservationService.prototype.processReservation = function (reservationLines, transId) {
|
|
26672
|
-
var _a;
|
|
26673
26685
|
return __awaiter(this, void 0, void 0, function () {
|
|
26674
|
-
var request,
|
|
26675
|
-
return __generator(this, function (
|
|
26676
|
-
switch (
|
|
26686
|
+
var request, success;
|
|
26687
|
+
return __generator(this, function (_a) {
|
|
26688
|
+
switch (_a.label) {
|
|
26677
26689
|
case 0:
|
|
26678
26690
|
request = new processOrderReservationRequest_bo.ProcessOrderReservationRequest();
|
|
26679
26691
|
request.transId = transId;
|
|
@@ -26681,42 +26693,26 @@
|
|
|
26681
26693
|
request.reservationLines = reservationLines;
|
|
26682
26694
|
return [4 /*yield*/, this._transaction.processReservation(request)];
|
|
26683
26695
|
case 1:
|
|
26684
|
-
|
|
26685
|
-
if (!
|
|
26686
|
-
this.
|
|
26687
|
-
return [4 /*yield*/, this._transaction.saveTransaction(true)];
|
|
26696
|
+
success = _a.sent();
|
|
26697
|
+
if (!success) return [3 /*break*/, 3];
|
|
26698
|
+
return [4 /*yield*/, this.getSalesOrderLines(request.transId)];
|
|
26688
26699
|
case 2:
|
|
26689
|
-
|
|
26690
|
-
return [4 /*yield*/, this._transaction.commit()];
|
|
26691
|
-
case 3:
|
|
26692
|
-
_b.sent();
|
|
26693
|
-
if (!this._transaction.currentTransaction.transactionInfo.id) return [3 /*break*/, 5];
|
|
26694
|
-
return [4 /*yield*/, this._transaction.getTransactionById(this._transaction.currentTransaction.transactionInfo.id)];
|
|
26695
|
-
case 4:
|
|
26696
|
-
_b.sent();
|
|
26697
|
-
_b.label = 5;
|
|
26698
|
-
case 5: return [4 /*yield*/, this.getSalesOrderLines(request.transId)];
|
|
26699
|
-
case 6:
|
|
26700
|
-
_b.sent();
|
|
26700
|
+
_a.sent();
|
|
26701
26701
|
this.resetLineData();
|
|
26702
26702
|
return [2 /*return*/, true];
|
|
26703
|
-
case
|
|
26703
|
+
case 3: return [2 /*return*/, false];
|
|
26704
26704
|
}
|
|
26705
26705
|
});
|
|
26706
26706
|
});
|
|
26707
26707
|
};
|
|
26708
26708
|
TransactionSalesReservationService.prototype.resetLineData = function () {
|
|
26709
|
-
this.salesReservationLines = [];
|
|
26710
26709
|
this.salesReservationLines = [];
|
|
26711
26710
|
this.lineNr = undefined;
|
|
26712
26711
|
};
|
|
26713
26712
|
return TransactionSalesReservationService;
|
|
26714
26713
|
}());
|
|
26715
|
-
TransactionSalesReservationService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function TransactionSalesReservationService_Factory() { return new TransactionSalesReservationService(i0__namespace.ɵɵinject(TransactionService)); }, token: TransactionSalesReservationService, providedIn: "root" });
|
|
26716
26714
|
TransactionSalesReservationService.decorators = [
|
|
26717
|
-
{ type: i0.Injectable
|
|
26718
|
-
providedIn: "root"
|
|
26719
|
-
},] }
|
|
26715
|
+
{ type: i0.Injectable }
|
|
26720
26716
|
];
|
|
26721
26717
|
TransactionSalesReservationService.ctorParameters = function () { return [
|
|
26722
26718
|
{ type: TransactionService }
|
|
@@ -26908,6 +26904,7 @@
|
|
|
26908
26904
|
TransactionQuickAccessOrderPurchaseComponent.prototype.ngOnInit = function () {
|
|
26909
26905
|
var _this = this;
|
|
26910
26906
|
_super.prototype.ngOnInit.call(this);
|
|
26907
|
+
this.transactionHeaderService.reservationMode = false;
|
|
26911
26908
|
this._subs.push(this.transactionEventService.transactionLineChanged.subscribe(function () { return _this._checkPurchaseOrders(); }));
|
|
26912
26909
|
var transItem = this.transaction;
|
|
26913
26910
|
this.selectedTransactions.push(transItem);
|
|
@@ -56061,7 +56058,8 @@
|
|
|
56061
56058
|
selector: 'co-transaction-internal',
|
|
56062
56059
|
template: "\n <ng-container *ngIf=\"loaded && customerPortal\">\n <div class=\"transaction-lines-wrapper\"\n *ngIf=\"transaction.transactionInfo.transactionKind !== 'S'\">\n <co-transaction-header-customer-portal [showPreferredPlanning]=\"showPreferredPlanning\" [transaction]=\"transaction\"></co-transaction-header-customer-portal>\n <co-transaction-lines\n [activeCategory]=\"activeCategory\"\n (saveTransactionLine)=\"saveTransactionLineText($event)\"\n [customerPortal]=\"customerPortal\">\n </co-transaction-lines>\n </div>\n <div class=\"transaction-lines-wrapper\" *ngIf=\"transaction && transaction.transactionInfo && transaction.transactionInfo.transactionKind === 'S'\">\n <co-transaction-service-overview\n [posOrderData]=\"posOrderData\">\n </co-transaction-service-overview>\n </div>\n\n </ng-container>\n <ng-container *ngIf=\"loaded && !customerPortal\">\n <co-click-block></co-click-block>\n <co-transaction-header *ngIf=\"showHeader\" [transaction]=\"transaction\"></co-transaction-header>\n <div class=\"transaction-lines-header\">\n <co-transaction-quick-access *ngIf=\"showQuickAccess\" class=\"transaction-lines-header-item\"\n [transactionKind]=\"transaction.transactionInfo.transactionKind\"\n [activeCategory]=\"activeCategory\"\n >\n </co-transaction-quick-access>\n <co-transaction-button-bar *ngIf=\"showButtonBar\"\n class=\"transaction-lines-header-item\"\n [selectedCategory]=\"activeCategory\"\n (buttonClicked)=\"handleButtonBarButtonClicked($event)\">\n </co-transaction-button-bar>\n\n <div class=\"transaction-lines-header-item right\">\n <co-avatar\n class=\"transaction-sales-avatar\"\n [relationId]=\"transaction.transactionInfo.handledBy\"\n [screenConfigurationObject]=\"cfgNames.HeaderHandledBy\"\n screenConfigNativeElement>\n </co-avatar>\n <co-avatar\n class=\"transaction-sales-avatar\"\n [relationId]=\"transaction.transactionInfo.branch?.relationId\"\n [screenConfigurationObject]=\"cfgNames.HeaderBranch\"\n screenConfigNativeElement>\n </co-avatar>\n <co-view-mode-buttons *ngIf=\"!shouldShowTiles() && showViewModeButtons\"\n [showViewModes]=\"[viewModes.List, viewModes.Tiles]\"\n (viewModeChange)=\"handleViewModeChange($event)\">\n </co-view-mode-buttons>\n </div>\n </div>\n\n <div class=\"transaction-lines-content-wrapper\">\n <!--<co-transaction-document-button-bar [transaction]=\"transaction\"></co-transaction-document-button-bar>-->\n <div class=\"transaction-lines-content\">\n <div *ngIf=\"activeCategory === category.ServiceOrderService && transaction && transaction.transactionInfo && transaction.transactionInfo.transactionKind === 'S'\">\n <co-transaction-service-overview [posOrderData]=\"posOrderData\"></co-transaction-service-overview>\n </div>\n <div class=\"transaction-tiles-wrapper\" *ngIf=\"activeViewMode === viewModes.Tiles || shouldShowTiles() || transactionPlanning\">\n <co-transaction-cards\n [activeCategory]=\"activeCategory\"\n [class.planning-cards]=\"transactionPlanning\">\n </co-transaction-cards>\n </div>\n <div class=\"transaction-lines-wrapper\"\n *ngIf=\"(activeViewMode === viewModes.List && !shouldShowTiles()) && activeCategory !== category.ServiceOrderService && !transactionPlanning\">\n <co-transaction-lines\n [activeCategory]=\"activeCategory\"\n (saveTransactionLine)=\"saveTransactionLineText($event)\">\n </co-transaction-lines>\n </div>\n <div class=\"transaction-footer-wrapper\">\n <div class=\"transaction-footer-left\">\n <co-add-product\n *ngIf=\"activeCategory === categories.SalesOrderCashRegister ||\n activeCategory === categories.SalesOrderOverview ||\n activeCategory === categories.PurchaseOrderOverview ||\n activeCategory === categories.SalesOrderQuotation ||\n activeCategory === categories.ServiceOrderOverview\">\n </co-add-product>\n <co-transaction-button *ngIf=\"activeCategory === categories.SalesOrderCashRegister ||\n activeCategory === categories.SalesOrderOverview ||\n activeCategory === categories.PurchaseOrderOverview ||\n activeCategory === categories.SalesOrderQuotation ||\n activeCategory === categories.ServiceOrderOverview\"\n class=\"custom-width text-rule\"\n [iconData]=\"iconCacheService.getIcon(icons.TextSolid)\"\n (click)=\"handleTransactionText()\">\n </co-transaction-button>\n </div>\n\n <div class=\"transaction-footer-center\">\n <co-transaction-margin *ngIf=\"activeCategory === categories.SalesOrderMarginInfo\"></co-transaction-margin>\n </div>\n <co-transaction-totals *ngIf=\"(activeCategory !== category.ServiceOrderService && activeCategory !== category.SalesOrderPurchase)\"\n [showDiscount]=\"true\">\n </co-transaction-totals>\n </div>\n </div>\n\n <co-transaction-lines-side-panel *ngIf=\"transaction && (transaction.transactionInfo.transactionKind === transactionKind.CashDesk && !fullyInvoiced())\"\n [posOrderData]=\"posOrderData\"\n [transaction]=\"transaction\">\n </co-transaction-lines-side-panel>\n\n <!-- <co-transaction-line-side-panel *ngIf=\"showSidePanel\"-->\n <!-- [transaction]=\"transaction\"-->\n <!-- [transactionInfo]=\"transaction.transactionInfo\"-->\n <!-- [transactionLine]=\"sidePanelTransactionLine\"-->\n <!-- [activeCategory]=\"activeCategory\"-->\n <!-- (cancelClick)=\"showSidePanel = false\">-->\n <!-- </co-transaction-line-side-panel>-->\n\n\n <co-transaction-sales-reservation-popup *ngIf=\"showReservationPopup\" [transactionId]=\"transaction.transactionInfo.id\"></co-transaction-sales-reservation-popup>\n <!--Popup voor wijzigen volgorde van tekstregels-->\n <co-transaction-article-text-overview *ngIf=\"showArticleTextOverview\"\n [transactionInfo]=\"transaction.transactionInfo\"\n [transactionLine]=\"transactionLine\"\n (closeClick)=\"closeArticleTextOverview()\"\n (cancelClick)=\"closeArticleTextOverview()\">\n </co-transaction-article-text-overview>\n\n <!--Popup voor aanmaken en updaten transactietekstregels-->\n <co-transaction-article-text *ngIf=\"showTransactionText\"\n [header]=\"'ORDER_TEXT_LINE' | localize\"\n [transactionUuid]=\"transaction.transactionInfo.uuid\"\n [editText]=\"textToEdit\"\n [orderLineSetDTO]=\"selectedOrderLineSetDTO\"\n [transactionLine]=\"transactionLine\"\n (saveClick)=\"saveTransactionLineText($event)\"\n (closeClick)=\"closeTransactionText()\"\n (cancelClick)=\"closeTransactionText()\"\n (saveOrderLineSetClick)=\"saveOrderLineSet($event)\">\n </co-transaction-article-text>\n\n <!--Popup voor aanmaken en updaten artikeltekstregels-->\n <co-transaction-article-text *ngIf=\"showArticleText\"\n [header]=\"'PRODUCT_DESCRIPTION_AND_TEXTS' | localize\"\n [transactionUuid]=\"transaction.transactionInfo.uuid\"\n [showArticleImageDescription]=\"transactionLine.articleBound\"\n [showImage]=\"false\"\n [articleLineNr]=\"transactionLine.lineNr\"\n [articleRef]=\"transactionLine.articleNumber\"\n [transactionLine]=\"transactionLine\"\n [editText]=\"textToEdit\"\n (saveClick)=\"saveArticleLineText($event)\"\n (closeClick)=\"closeArticleText()\"\n (cancelClick)=\"closeArticleText()\">\n </co-transaction-article-text>\n\n <co-transaction-copy-order *ngIf=\"showCopyOrderDialog\"\n (closeDialog)=\"showCopyOrderDialog = false\">\n </co-transaction-copy-order>\n\n <!-- Pop up voor voorraad-->\n <co-transaction-article-stock-dialog\n *ngIf=\"showArticleStockPopup\"\n [article]=\"stockGoodId\"\n (closeClick)=\"closeArticleStockPopup()\">\n </co-transaction-article-stock-dialog>\n\n </div>\n </ng-container>\n ",
|
|
56063
56060
|
providers: [
|
|
56064
|
-
TransactionHeaderService
|
|
56061
|
+
TransactionHeaderService,
|
|
56062
|
+
TransactionSalesReservationService
|
|
56065
56063
|
],
|
|
56066
56064
|
encapsulation: i0.ViewEncapsulation.None
|
|
56067
56065
|
},] }
|
|
@@ -58435,24 +58433,27 @@
|
|
|
58435
58433
|
AddProductComponent.prototype.ngOnDestroy = function () {
|
|
58436
58434
|
this._subs.forEach(function (s) { return s.unsubscribe(); });
|
|
58437
58435
|
};
|
|
58436
|
+
/**
|
|
58437
|
+
* First check if there's a single article found
|
|
58438
|
+
* This is a two check step:
|
|
58439
|
+
* Check if there is an exact match on barcode, ean or articlenumber
|
|
58440
|
+
* If not: check with search like
|
|
58441
|
+
* Else open catalogus
|
|
58442
|
+
* @param text
|
|
58443
|
+
*/
|
|
58438
58444
|
AddProductComponent.prototype.handleSearch = function (text) {
|
|
58439
58445
|
return __awaiter(this, void 0, void 0, function () {
|
|
58440
58446
|
var fullMatchSearch, article, foundArticles, article;
|
|
58441
58447
|
return __generator(this, function (_a) {
|
|
58442
58448
|
switch (_a.label) {
|
|
58443
58449
|
case 0:
|
|
58444
|
-
console.log('searching: ' + text);
|
|
58445
58450
|
this.searchText = text;
|
|
58446
58451
|
this._prepareCatalogRequest();
|
|
58447
|
-
this.searchText = "";
|
|
58448
|
-
this._changeDetector.detectChanges();
|
|
58449
58452
|
if (!!this.pendingAddArticleAction) return [3 /*break*/, 13];
|
|
58450
|
-
console.log('no Pending Action ' + text);
|
|
58451
58453
|
return [4 /*yield*/, this.transactionService.getArticleListWithBarcodeArticleNrEanCode(text)];
|
|
58452
58454
|
case 1:
|
|
58453
58455
|
fullMatchSearch = _a.sent();
|
|
58454
58456
|
if (!(fullMatchSearch && fullMatchSearch.length === 1)) return [3 /*break*/, 6];
|
|
58455
|
-
console.log('Match' + text);
|
|
58456
58457
|
return [4 /*yield*/, this.transactionService.getArticleExtended(fullMatchSearch[0].articleNr)];
|
|
58457
58458
|
case 2:
|
|
58458
58459
|
article = _a.sent();
|
|
@@ -58466,13 +58467,10 @@
|
|
|
58466
58467
|
_a.sent();
|
|
58467
58468
|
_a.label = 5;
|
|
58468
58469
|
case 5: return [3 /*break*/, 13];
|
|
58469
|
-
case 6:
|
|
58470
|
-
console.log('No Match' + text);
|
|
58471
|
-
return [4 /*yield*/, this.transactionService.getArticles(this.catalogParameters)];
|
|
58470
|
+
case 6: return [4 /*yield*/, this.transactionService.getArticles(this.catalogParameters)];
|
|
58472
58471
|
case 7:
|
|
58473
58472
|
foundArticles = _a.sent();
|
|
58474
58473
|
if (!(foundArticles && foundArticles.length === 1)) return [3 /*break*/, 12];
|
|
58475
|
-
console.log('Found Article ' + text);
|
|
58476
58474
|
return [4 /*yield*/, this.transactionService.getArticleExtended(foundArticles[0].articleNumber)];
|
|
58477
58475
|
case 8:
|
|
58478
58476
|
article = _a.sent();
|
|
@@ -58487,10 +58485,11 @@
|
|
|
58487
58485
|
_a.label = 11;
|
|
58488
58486
|
case 11: return [3 /*break*/, 13];
|
|
58489
58487
|
case 12:
|
|
58490
|
-
console.log('No Found Article ' + text);
|
|
58491
58488
|
this.showCatalogDialog();
|
|
58492
58489
|
_a.label = 13;
|
|
58493
|
-
case 13:
|
|
58490
|
+
case 13:
|
|
58491
|
+
this.searchText = "";
|
|
58492
|
+
return [2 /*return*/];
|
|
58494
58493
|
}
|
|
58495
58494
|
});
|
|
58496
58495
|
});
|
|
@@ -58566,7 +58565,6 @@
|
|
|
58566
58565
|
case 0: return [4 /*yield*/, this.transactionService.addArticle(articleNr, quantity, 0, 0, true, true)];
|
|
58567
58566
|
case 1:
|
|
58568
58567
|
success = _a.sent();
|
|
58569
|
-
console.log(success);
|
|
58570
58568
|
if (success) {
|
|
58571
58569
|
this.searchText = "";
|
|
58572
58570
|
}
|