@colijnit/transaction 255.1.5 → 255.1.7
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 +77 -26
- package/bundles/colijnit-transaction.umd.js.map +1 -1
- package/colijnit-transaction-255.1.6.tgz +0 -0
- package/colijnit-transaction.metadata.json +1 -1
- package/esm2015/lib/component/add-product/add-product.component.js +2 -2
- package/esm2015/lib/component/transaction-header/transaction-header-popup/transaction-header-popup-create-service.component.js +2 -1
- package/esm2015/lib/component/transaction-line/transaction-purchase-line/transaction-purchase-line-base.component.js +4 -1
- package/esm2015/lib/component/transaction-line/transaction-purchase-line/transaction-purchase-line.component.js +2 -2
- package/esm2015/lib/component/transaction-line/transaction-receive-goods-line/transaction-receive-goods-line.component.js +2 -2
- package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-sales-quotation/transaction-quick-access-sales-quotation.component.js +6 -5
- package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-sales-quotation/transaction-quick-access-sales-quotation.module.js +4 -2
- package/esm2015/lib/component/transaction-search/service/transaction-search.service.js +4 -2
- package/esm2015/lib/component/transaction-search/transaction-search-tile/transaction-search-sales-line-select-tile/transaction-search-sales-line-select-tile.module.js +1 -1
- package/esm2015/lib/component/transaction-service-overview/transaction-service-overview.component.js +8 -3
- package/esm2015/lib/service/transaction-connector-adapter.service.js +13 -1
- package/esm2015/lib/service/transaction-event.service.js +2 -1
- package/esm2015/lib/service/transaction-mapping.service.js +5 -5
- package/esm2015/lib/service/transaction-payment-connector.service.js +6 -1
- package/esm2015/lib/service/transaction-payment.service.js +7 -1
- package/esm2015/lib/transaction-version.js +3 -3
- package/fesm2015/colijnit-transaction.js +53 -17
- package/fesm2015/colijnit-transaction.js.map +1 -1
- package/lib/component/transaction-line/transaction-purchase-line/transaction-purchase-line-base.component.d.ts +1 -0
- package/lib/service/transaction-connector-adapter.service.d.ts +1 -0
- package/lib/service/transaction-event.service.d.ts +1 -0
- package/lib/service/transaction-payment-connector.service.d.ts +1 -0
- package/package.json +3 -3
|
@@ -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 = "255.1.
|
|
37
|
-
this.publishDate = "
|
|
36
|
+
this.symVer = "255.1.7";
|
|
37
|
+
this.publishDate = "9-8-2024 16:39:55";
|
|
38
38
|
}
|
|
39
39
|
return Version;
|
|
40
40
|
}());
|
|
@@ -1325,6 +1325,7 @@
|
|
|
1325
1325
|
this.createTransaction = new rxjs.Subject();
|
|
1326
1326
|
this.transactionSet = new rxjs.Subject();
|
|
1327
1327
|
this.purchaseOrderNavigation = new rxjs.Subject();
|
|
1328
|
+
this.purchaseExistingOrderNavigation = new rxjs.Subject();
|
|
1328
1329
|
this.salesQuotationOrderNavigation = new rxjs.Subject();
|
|
1329
1330
|
this.relationNavigation = new rxjs.Subject();
|
|
1330
1331
|
this.articleNavigation = new rxjs.Subject();
|
|
@@ -8471,6 +8472,26 @@
|
|
|
8471
8472
|
});
|
|
8472
8473
|
});
|
|
8473
8474
|
};
|
|
8475
|
+
TransactionConnectorAdapterService.prototype.openDrawer = function (printerName) {
|
|
8476
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
8477
|
+
var response;
|
|
8478
|
+
return __generator(this, function (_a) {
|
|
8479
|
+
switch (_a.label) {
|
|
8480
|
+
case 0: return [4 /*yield*/, this.connector.openDrawer(printerName)];
|
|
8481
|
+
case 1:
|
|
8482
|
+
response = _a.sent();
|
|
8483
|
+
if (response && response.validationResult && response.validationResult.success) {
|
|
8484
|
+
return [2 /*return*/, response.resultObject];
|
|
8485
|
+
}
|
|
8486
|
+
else {
|
|
8487
|
+
this._handleExceptionFromResponse(response);
|
|
8488
|
+
return [2 /*return*/, null];
|
|
8489
|
+
}
|
|
8490
|
+
return [2 /*return*/];
|
|
8491
|
+
}
|
|
8492
|
+
});
|
|
8493
|
+
});
|
|
8494
|
+
};
|
|
8474
8495
|
TransactionConnectorAdapterService.prototype._openPdfContent = function (content) {
|
|
8475
8496
|
if (content) {
|
|
8476
8497
|
try {
|
|
@@ -21125,7 +21146,8 @@
|
|
|
21125
21146
|
this.transactions.length = 0;
|
|
21126
21147
|
};
|
|
21127
21148
|
TransactionSearchService.prototype._resetRequest = function () {
|
|
21128
|
-
|
|
21149
|
+
//Object.assign(new TransactionSettings(), this.settings, obj);
|
|
21150
|
+
this.searchRequest = Object.assign(new TransactionSettings(), this._settingsService.settings.transactionParameters);
|
|
21129
21151
|
this._settingsService.settings.tempTransactionParameters = undefined;
|
|
21130
21152
|
};
|
|
21131
21153
|
return TransactionSearchService;
|
|
@@ -23096,7 +23118,7 @@
|
|
|
23096
23118
|
TransactionReceiveGoodsLineComponent.decorators = [
|
|
23097
23119
|
{ type: i0.Component, args: [{
|
|
23098
23120
|
selector: "co-transaction-receive-goods-line",
|
|
23099
|
-
template: "\n <co-transaction-base-line\n [transactionInfo]=\"transactionInfo\"\n [transactionLine]=\"transactionLine\"\n [preview]=\"preview\"\n [
|
|
23121
|
+
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 (click)=\"handleLineClicked($event)\"\n observeVisibility #observer=visibilityObserve (visibilityChange)=\"handleVisibilityChange(transactionLine, $event)\">\n <div class=\"transaction-line-wrapper\">\n <div class=\"transaction-line-extended-wrapper\">\n <div class=\"column1\">\n <span class=\"transaction-field-label\" [textContent]=\"'STATUS' | localize\" *ngIf=\"isFirst\"></span>\n <co-transaction-line-statusbar\n [screenConfigurationObject]=\"cfgNames.StatusBar\"\n [configNames]=\"statusBarConfigNames\"\n [transactionInfo]=\"transactionInfo\"\n [transactionLine]=\"transactionLine\"\n [activeCategory]=\"transactionTypeCategory.PurchaseOrderReceivedGoods\"></co-transaction-line-statusbar>\n </div>\n <div class=\"column2\">\n <span class=\"transaction-field-label\" [textContent]=\"'WAREHOUSE' | localize\" *ngIf=\"isFirst\"></span>\n <co-transaction-line-warehouse-button\n [screenConfigurationObject]=\"cfgNames.LineWarehouse\"\n [transactionLine]=\"transactionLine\"\n [transactionInfo]=\"transactionInfo\"></co-transaction-line-warehouse-button>\n <co-transaction-line-warehouse-location-button\n *ngIf=\"transactionLine.isLocationRequired\"\n [screenConfigurationObject]=\"cfgNames.LineWarehouseLocationReceived\"\n [readonly]=\"warehouseLocationButtonDisabled\"\n [transactionLine]=\"transactionLine\">\n </co-transaction-line-warehouse-location-button>\n </div>\n <div class=\"column3\">\n <span class=\"transaction-field-label\" [textContent]=\"'DELIVERY_INFORMATION' | localize\" *ngIf=\"isFirst\"></span>\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 <co-input-text\n [leftIconData]=\"iconCacheService.getIcon(icons.RegularCartFlatbedBoxesCircleCheck)\"\n [readonly]=\"true\"\n [customHeight]=\"true\"\n ></co-input-text>\n\n </div>\n </div>\n <div class=\"transaction-line-section\">\n <span class=\"transaction-field-label\" [textContent]=\"'TOTALS_AND_DISCOUNT' | localize\" *ngIf=\"isFirst\"></span>\n <co-input-text class=\"side-panel-input\"\n *ngIf=\"transactionLine.isBatchNrRequired\"\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 class=\"transaction-line-totals\">\n <co-transaction-print-package-sticker\n [screenConfigurationObject]=\"cfgNames.StickerAmount\"\n [transactionLine]=\"transactionLine\"\n [transactionInfo]=\"transactionInfo\"\n ></co-transaction-print-package-sticker>\n <div class=\"transaction-line-totals-amount\">\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 <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 ></co-editable-label>\n </div>\n </div>\n </div>\n </co-transaction-base-line>\n ",
|
|
23100
23122
|
encapsulation: i0.ViewEncapsulation.None,
|
|
23101
23123
|
changeDetection: i0.ChangeDetectionStrategy.OnPush
|
|
23102
23124
|
},] }
|
|
@@ -23129,6 +23151,9 @@
|
|
|
23129
23151
|
TransactionPurchaseLineBaseComponent.prototype.handlePurchaseOrderNavigation = function (transNr) {
|
|
23130
23152
|
this.transactionEventService.purchaseOrderNavigation.next(transNr);
|
|
23131
23153
|
};
|
|
23154
|
+
TransactionPurchaseLineBaseComponent.prototype.handlePurchaseExistingOrderNavigation = function (transNr) {
|
|
23155
|
+
this.transactionEventService.purchaseExistingOrderNavigation.next(transNr);
|
|
23156
|
+
};
|
|
23132
23157
|
TransactionPurchaseLineBaseComponent.prototype.transactionLineSet = function () {
|
|
23133
23158
|
_super.prototype.transactionLineSet.call(this);
|
|
23134
23159
|
this.showCheckboxForLine = this.transactionLine.amount !== this.lineQuantityOrdered && this.transactionLine.commissionCode === '0';
|
|
@@ -23209,7 +23234,7 @@
|
|
|
23209
23234
|
TransactionPurchaseLineComponent.decorators = [
|
|
23210
23235
|
{ type: i0.Component, args: [{
|
|
23211
23236
|
selector: "co-transaction-purchase-line",
|
|
23212
|
-
template: "\n <co-transaction-base-line [transactionInfo]=\"transactionInfo\"\n [transactionLine]=\"transactionLine\"\n [preview]=\"preview\"\n [checkbox]=\"showCheckboxForLine && transactionInfo.transactionDefinitive\"\n [checkboxValue]=\"transactionLine.selected\"\n (checkboxValueChanged)=\"transactionLineSelectedChanged($event)\"\n [isFirst]=\"isFirst\"\n [showPurchaseDescAndPrice]=\"true\"\n observeVisibility #observer=visibilityObserve (visibilityChange)=\"handleVisibilityChange(transactionLine, $event)\">\n <div class=\"transaction-line-wrapper\" [class.transaction-not-definitive]=\"!transactionInfo.transactionDefinitive\">\n <div *ngIf=!preview class=\"transaction-line-extended-wrapper\">\n <div class=\"column1\">\n <span class=\"transaction-field-label\" [textContent]=\"'SUPPLIER' | localize\" *ngIf=\"isFirst\"></span>\n <co-transaction-line-supplier-button\n [screenConfigurationObject]=\"cfgNames.LineSupplier\"\n [transactionLine]=\"transactionLine\"\n [transactionInfo]=\"transactionInfo\"\n [readonly]=\"hasPurchaseOrder\"></co-transaction-line-supplier-button>\n <co-transaction-navigation-button-list *ngIf=\"transactionLine.commissionCode === '0'\"\n [screenConfigurationObject]=\"cfgNames.LineRefTransactions\"\n [refTransactions]=\"transactionLine.refTransactions\"\n [emptyLabel]=\"'NO_PURCHASE_ORDER' | localize\"\n (transactionClick)=\"
|
|
23237
|
+
template: "\n <co-transaction-base-line [transactionInfo]=\"transactionInfo\"\n [transactionLine]=\"transactionLine\"\n [preview]=\"preview\"\n [checkbox]=\"showCheckboxForLine && transactionInfo.transactionDefinitive\"\n [checkboxValue]=\"transactionLine.selected\"\n (checkboxValueChanged)=\"transactionLineSelectedChanged($event)\"\n [isFirst]=\"isFirst\"\n [showPurchaseDescAndPrice]=\"true\"\n observeVisibility #observer=visibilityObserve (visibilityChange)=\"handleVisibilityChange(transactionLine, $event)\">\n <div class=\"transaction-line-wrapper\" [class.transaction-not-definitive]=\"!transactionInfo.transactionDefinitive\">\n <div *ngIf=!preview class=\"transaction-line-extended-wrapper\">\n <div class=\"column1\">\n <span class=\"transaction-field-label\" [textContent]=\"'SUPPLIER' | localize\" *ngIf=\"isFirst\"></span>\n <co-transaction-line-supplier-button\n [screenConfigurationObject]=\"cfgNames.LineSupplier\"\n [transactionLine]=\"transactionLine\"\n [transactionInfo]=\"transactionInfo\"\n [readonly]=\"hasPurchaseOrder\"></co-transaction-line-supplier-button>\n <co-transaction-navigation-button-list *ngIf=\"transactionLine.commissionCode === '0'\"\n [screenConfigurationObject]=\"cfgNames.LineRefTransactions\"\n [refTransactions]=\"transactionLine.refTransactions\"\n [emptyLabel]=\"'NO_PURCHASE_ORDER' | localize\"\n (transactionClick)=\"handlePurchaseExistingOrderNavigation($event)\"\n ></co-transaction-navigation-button-list>\n </div>\n <div class=\"column2\">\n <span class=\"transaction-field-label\" [textContent]=\"'WAREHOUSE_AND_STATUS' | localize\" *ngIf=\"isFirst\"></span>\n <co-transaction-line-warehouse-button\n [screenConfigurationObject]=\"cfgNames.LineWarehouse\"\n [transactionLine]=\"transactionLine\"\n [transactionInfo]=\"transactionInfo\"></co-transaction-line-warehouse-button>\n <co-transaction-line-statusbar\n [screenConfigurationObject]=\"cfgNames.StatusBar\"\n [configNames]=\"statusBarConfigNames\"\n [transactionInfo]=\"transactionInfo\"\n [transactionLine]=\"transactionLine\"\n [activeCategory]=\"category.SalesOrderPurchase\"></co-transaction-line-statusbar>\n </div>\n <div class=\"column3\">\n <span class=\"transaction-field-label\" [textContent]=\"'DELIVERY_INFORMATION' | localize\" *ngIf=\"isFirst\"></span>\n <co-transaction-line-delivery-button\n [screenConfigurationObject]=\"cfgNames.LineDeliveryMethod\"\n [transactionLine]=\"transactionLine\"\n [transactionInfo]=\"transactionInfo\"></co-transaction-line-delivery-button>\n <co-transaction-line-confirmed-delivery-date-button\n [screenConfigurationObject]=\"cfgNames.LineConfirmedDeliveryDate\"\n [transactionLine]=\"transactionLine\"\n [transactionInfo]=\"transactionInfo\"\n ></co-transaction-line-confirmed-delivery-date-button>\n <co-transaction-line-drop-shipment-button\n [screenConfigurationObject]=\"cfgNames.LineDropShipment\"\n [transactionLine]=\"transactionLine\"\n [transactionInfo]=\"transactionInfo\"\n [class.active]=\"transactionLine.dropShipment\"></co-transaction-line-drop-shipment-button>\n </div>\n </div>\n <div class=\"transaction-line-section\">\n <span class=\"transaction-field-label\" [textContent]=\"'PURCHASE_PRICE' | localize\" *ngIf=\"isFirst\"></span>\n <div class=\"transaction-line-totals\">\n <co-transaction-line-price class=\"transaction-line-totals-price price\"\n [screenConfigurationObject]=\"cfgNames.LinePrice\"\n [transactionInfo]=\"transactionInfo\"\n [transactionLine]=\"transactionLine\"\n [showLabel]=\"false\"\n [defaultEditMode]=\"false\"\n [showPurchasePrice]=\"true\"\n\n ></co-transaction-line-price>\n <div *ngIf=!preview class=\"transaction-line-totals-amount\">\n <co-transaction-line-amount class=\"amount-number-picker\"\n [screenConfigurationObject]=\"cfgNames.LineAmount\"\n [transactionLine]=\"transactionLine\"\n [transactionInfo]=\"transactionInfo\"></co-transaction-line-amount>\n </div>\n </div>\n </div>\n </div>\n </co-transaction-base-line>\n ",
|
|
23213
23238
|
encapsulation: i0.ViewEncapsulation.None,
|
|
23214
23239
|
changeDetection: i0.ChangeDetectionStrategy.OnPush
|
|
23215
23240
|
},] }
|
|
@@ -25633,7 +25658,7 @@
|
|
|
25633
25658
|
TransactionQuickAccessSalesQuotationComponent.decorators = [
|
|
25634
25659
|
{ type: i0.Component, args: [{
|
|
25635
25660
|
selector: "co-transaction-quick-access-sales-quotation",
|
|
25636
|
-
template: "\n <div class=\"quick-access-content-wrapper\">\n <co-quick-send-button\n [defaultMethodIcon]=\"defaultSendMethodIcon\"\n [showLoader]=\"showLoader\"\n (sendIconClicked)=\"handleSend(defaultSendMethod)\"\n (openSendMethodDialog)=\"showSendMethodDialog = true\"\n ></co-quick-send-button>\n <co-transaction-send-documents\n [transactionInfo]=\"transactionInfo\"\n [transactionTypeCategory]=\"transactionTypeCategory.SalesOrderQuotation\"\n ></co-transaction-send-documents>\n <co-button\n [label]=\"'
|
|
25661
|
+
template: "\n <div class=\"quick-access-content-wrapper\">\n <co-quick-send-button\n [defaultMethodIcon]=\"defaultSendMethodIcon\"\n [showLoader]=\"showLoader\"\n (sendIconClicked)=\"handleSend(defaultSendMethod)\"\n (openSendMethodDialog)=\"showSendMethodDialog = true\"\n ></co-quick-send-button>\n <co-transaction-send-documents\n [transactionInfo]=\"transactionInfo\"\n [transactionTypeCategory]=\"transactionTypeCategory.SalesOrderQuotation\"\n ></co-transaction-send-documents>\n <co-transaction-button\n [label]=\"'SALES_ORDER' | localize\"\n [iconData]=\"iconCacheService.getIcon(icons.CartShoppingRegular)\"\n (click)=\"createSalesOrder()\"\n class=\"sales-quote-btn custom-width\"\n ></co-transaction-button>\n <co-transaction-navigation-button-list\n [refTransactions]=\"getCurrentRefTransactions()\"\n [showRelationButton]=\"false\"\n [emptyLabel]=\"'NO_SALES_QUOTE_ORDER' | localize\"\n (transactionClick)=\"handleSalesOrderNavigation($event)\"\n ></co-transaction-navigation-button-list>\n <co-send-method-dialog *ngIf=\"showSendMethodDialog\"\n [headerTitle]=\"'Verzendmethode'\"\n [printerList]=\"printerList\"\n [defaultSendMethod]=\"defaultSendMethod\"\n [visibleMethods]=\"[sendMethodType.Print, sendMethodType.Email, 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 </div>\n <co-digital-signature\n [documentId]=\"signatureDocumentId\"\n (documentStored)=\"commitAndRefreshTransaction()\"\n ></co-digital-signature>\n ",
|
|
25637
25662
|
encapsulation: i0.ViewEncapsulation.None
|
|
25638
25663
|
},] }
|
|
25639
25664
|
];
|
|
@@ -26049,6 +26074,13 @@
|
|
|
26049
26074
|
});
|
|
26050
26075
|
});
|
|
26051
26076
|
};
|
|
26077
|
+
TransactionPaymentConnectorService.prototype.openDrawer = function (printerName) {
|
|
26078
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
26079
|
+
return __generator(this, function (_a) {
|
|
26080
|
+
return [2 /*return*/, this._adapterService.openDrawer(printerName)];
|
|
26081
|
+
});
|
|
26082
|
+
});
|
|
26083
|
+
};
|
|
26052
26084
|
TransactionPaymentConnectorService.prototype.getPaymentMethodsViewModels = function (branchNr, transactionKind) {
|
|
26053
26085
|
if (transactionKind === void 0) { transactionKind = transactionKind_enum.TransactionKind.SalesOrder; }
|
|
26054
26086
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -26949,10 +26981,10 @@
|
|
|
26949
26981
|
{ title: 'DELIVERY_NOTE', icon: Icon.MemoCircleCheckRegular, category: TransactionTypeCategory.SalesOrderDeliveryNote, component: TransactionSalesDeliveryButtonBarButtonComponent, cfgName: this.cfgNames.RubricDelivery },
|
|
26950
26982
|
{ title: 'INVOICE', icon: Icon.Invoice, category: TransactionTypeCategory.SalesOrderInvoice, component: TransactionSalesInvoiceButtonBarButtonComponent, cfgName: this.cfgNames.RubricInvoice }
|
|
26951
26983
|
]],
|
|
26952
|
-
[
|
|
26953
|
-
|
|
26954
|
-
|
|
26955
|
-
|
|
26984
|
+
//[TransactionKind.SalesQuotation, [
|
|
26985
|
+
// {title: 'OVERVIEW', icon: Icon.CartShoppingRegular, category: TransactionTypeCategory.SalesOrderQuotation},
|
|
26986
|
+
// {title: 'DELIVERY_NOTE', icon: Icon.MemoCircleCheckRegular, category: TransactionTypeCategory.SalesOrderDeliveryNote, component: TransactionSalesDeliveryButtonBarButtonComponent, cfgName: this.cfgNames.RubricDelivery},
|
|
26987
|
+
//]],
|
|
26956
26988
|
[transactionKind_enum.TransactionKind.ServiceOrder, [
|
|
26957
26989
|
{ title: 'SERVICE', icon: Icon.Toolbox, category: TransactionTypeCategory.ServiceOrderService, component: TransactionServiceServiceButtonBarButtonComponent },
|
|
26958
26990
|
{ title: 'OVERVIEW', icon: Icon.CartShoppingRegular, category: TransactionTypeCategory.ServiceOrderOverview, component: TransactionSalesOverviewButtonBarButtonComponent, cfgName: this.cfgNames.RubricOverview },
|
|
@@ -32805,17 +32837,23 @@
|
|
|
32805
32837
|
request.cashRegisterNr = this.cashRegisterNr;
|
|
32806
32838
|
request.cashRegisterGroupId = this.cashRegisterGroupId;
|
|
32807
32839
|
request.cashRegisterDrawerId = this.cashRegisterDrawerId;
|
|
32808
|
-
if (!(this.currentPaymentMethod && this.currentPaymentMethod.externalSourceId)) return [3 /*break*/,
|
|
32840
|
+
if (!(this.currentPaymentMethod && this.currentPaymentMethod.externalSourceId)) return [3 /*break*/, 7];
|
|
32809
32841
|
pspTransactionUuid = "";
|
|
32810
|
-
if (!this.currentPaymentMethod.
|
|
32811
|
-
return [4 /*yield*/, this._paymentConnectorService.
|
|
32842
|
+
if (!this.currentPaymentMethod.openCashDrawer) return [3 /*break*/, 2];
|
|
32843
|
+
return [4 /*yield*/, this._paymentConnectorService.openDrawer(this.printerName)];
|
|
32812
32844
|
case 1:
|
|
32813
|
-
|
|
32814
|
-
|
|
32845
|
+
_b.sent();
|
|
32846
|
+
_b.label = 2;
|
|
32815
32847
|
case 2:
|
|
32848
|
+
if (!this.currentPaymentMethod.pinTerminal) return [3 /*break*/, 4];
|
|
32849
|
+
return [4 /*yield*/, this._paymentConnectorService.doPayment(request)];
|
|
32850
|
+
case 3:
|
|
32851
|
+
pspTransactionUuid = _b.sent();
|
|
32852
|
+
return [3 /*break*/, 6];
|
|
32853
|
+
case 4:
|
|
32816
32854
|
_a = this;
|
|
32817
32855
|
return [4 /*yield*/, this._paymentConnectorService.createIonePaymentLinkAndQRCode(this.transactionUuid, this.amountToPay, this.currentPaymentMethod.code)];
|
|
32818
|
-
case
|
|
32856
|
+
case 5:
|
|
32819
32857
|
_a._paymentResult = _b.sent();
|
|
32820
32858
|
if (this._paymentResult && this._paymentResult.imageBase64) {
|
|
32821
32859
|
this.qrCodeImage = this._dataUriToBase64(this._paymentResult.imageBase64, 'image/png');
|
|
@@ -32823,14 +32861,20 @@
|
|
|
32823
32861
|
this.showPspQrCode = true;
|
|
32824
32862
|
pspTransactionUuid = this._paymentResult.pspTransactionUUID;
|
|
32825
32863
|
}
|
|
32826
|
-
_b.label =
|
|
32827
|
-
case
|
|
32864
|
+
_b.label = 6;
|
|
32865
|
+
case 6:
|
|
32828
32866
|
if (pspTransactionUuid) {
|
|
32829
32867
|
this._paymentStatusPollIntervalCount = 0;
|
|
32830
32868
|
this._waitForPinPaymentStatus(pspTransactionUuid);
|
|
32831
32869
|
}
|
|
32832
|
-
return [3 /*break*/,
|
|
32833
|
-
case
|
|
32870
|
+
return [3 /*break*/, 10];
|
|
32871
|
+
case 7:
|
|
32872
|
+
if (!this.currentPaymentMethod.openCashDrawer) return [3 /*break*/, 9];
|
|
32873
|
+
return [4 /*yield*/, this._paymentConnectorService.openDrawer(this.printerName)];
|
|
32874
|
+
case 8:
|
|
32875
|
+
_b.sent();
|
|
32876
|
+
_b.label = 9;
|
|
32877
|
+
case 9:
|
|
32834
32878
|
this._paymentConnectorService.doPayment(request).then(function () { return __awaiter(_this, void 0, void 0, function () {
|
|
32835
32879
|
return __generator(this, function (_a) {
|
|
32836
32880
|
switch (_a.label) {
|
|
@@ -32845,8 +32889,8 @@
|
|
|
32845
32889
|
}
|
|
32846
32890
|
});
|
|
32847
32891
|
}); });
|
|
32848
|
-
_b.label =
|
|
32849
|
-
case
|
|
32892
|
+
_b.label = 10;
|
|
32893
|
+
case 10: return [2 /*return*/];
|
|
32850
32894
|
}
|
|
32851
32895
|
});
|
|
32852
32896
|
});
|
|
@@ -38129,6 +38173,7 @@
|
|
|
38129
38173
|
};
|
|
38130
38174
|
TransactionHeaderPopupCreateServiceComponent.prototype.closeTransactionPopup = function () {
|
|
38131
38175
|
this.transactionSearchService.transactionType = transactionKind_enum.TransactionKind.ServiceOrder;
|
|
38176
|
+
this.transactionSearchService.resetFilters();
|
|
38132
38177
|
this.showTransLinePopup = false;
|
|
38133
38178
|
};
|
|
38134
38179
|
TransactionHeaderPopupCreateServiceComponent.prototype.handleCatalogArticleClick = function (article) {
|
|
@@ -42009,7 +42054,8 @@
|
|
|
42009
42054
|
TransactionNavigationButtonListModule,
|
|
42010
42055
|
PipeModule,
|
|
42011
42056
|
TransactionSendDocumentsModule,
|
|
42012
|
-
DigitalSignatureModule
|
|
42057
|
+
DigitalSignatureModule,
|
|
42058
|
+
TransactionButtonModule
|
|
42013
42059
|
],
|
|
42014
42060
|
declarations: [
|
|
42015
42061
|
TransactionQuickAccessSalesQuotationComponent
|
|
@@ -48941,7 +48987,7 @@
|
|
|
48941
48987
|
AddProductComponent.prototype._prepareCatalogRequest = function () {
|
|
48942
48988
|
this.catalogParameters.general = this.searchText;
|
|
48943
48989
|
this.catalogParameters.showRegularArticles = true;
|
|
48944
|
-
this.catalogParameters.showConfiguredArticles =
|
|
48990
|
+
this.catalogParameters.showConfiguredArticles = false;
|
|
48945
48991
|
this.catalogParameters.showConfigurableArticles = true;
|
|
48946
48992
|
this.catalogParameters.showCompositionArticles = false;
|
|
48947
48993
|
this.catalogParameters.showCustomizedArticles = false;
|
|
@@ -50193,6 +50239,7 @@
|
|
|
50193
50239
|
_this.priorityDomainColl = [];
|
|
50194
50240
|
_this.causeCodeColl = [];
|
|
50195
50241
|
_this.entryTypeColl = [];
|
|
50242
|
+
_this.serviceMessageModel = '';
|
|
50196
50243
|
_this.documents = [];
|
|
50197
50244
|
_this.activities = [];
|
|
50198
50245
|
_this.showActivityHeader = false;
|
|
@@ -50220,7 +50267,7 @@
|
|
|
50220
50267
|
return [4 /*yield*/, this.transactionService.getEntryTypes("NL")];
|
|
50221
50268
|
case 3:
|
|
50222
50269
|
_c.entryTypeColl = _d.sent();
|
|
50223
|
-
this.serviceMessageModel = this.transactionServiceInfo.reportMessage;
|
|
50270
|
+
this.serviceMessageModel = this.transactionServiceInfo.reportMessage ? this.transactionServiceInfo.reportMessage : '';
|
|
50224
50271
|
this.priorityModel = this.priorityDomainColl.find(function (p) { return p.codeAsNumber === _this.transactionServiceInfo.priority; });
|
|
50225
50272
|
this.causeCodeModel = this.causeCodeColl.find(function (c) { return c.causeCode === _this.transactionServiceInfo.causeCode; });
|
|
50226
50273
|
this.entryTypeModel = this.entryTypeColl.find(function (e) { return e.code === _this.transactionServiceInfo.entryType; });
|
|
@@ -50337,7 +50384,11 @@
|
|
|
50337
50384
|
switch (_a.label) {
|
|
50338
50385
|
case 0:
|
|
50339
50386
|
if (this.transactionServiceInfo.reportMessage !== this.serviceMessageModel) {
|
|
50340
|
-
this.
|
|
50387
|
+
if (!(this.serviceMessageModel === null) && !(this.serviceMessageModel === undefined))
|
|
50388
|
+
this.transactionServiceInfo.reportMessage = this.serviceMessageModel;
|
|
50389
|
+
else {
|
|
50390
|
+
this.transactionServiceInfo.reportMessage = '';
|
|
50391
|
+
}
|
|
50341
50392
|
}
|
|
50342
50393
|
return [4 /*yield*/, this.transactionService.updateServiceHeaderReportMessage(this.transactionServiceInfo.reportMessage, true)];
|
|
50343
50394
|
case 1:
|