@colijnit/transaction 262.1.50 → 262.1.51
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.
|
@@ -359,8 +359,8 @@ import { DateField } from '@colijnit/ioneconnector/build/factory/decorators/date
|
|
|
359
359
|
class Version {
|
|
360
360
|
name = "@colijnit/transaction";
|
|
361
361
|
description = "Colijn IT transaction package";
|
|
362
|
-
symVer = "262.1.
|
|
363
|
-
publishDate = "
|
|
362
|
+
symVer = "262.1.51";
|
|
363
|
+
publishDate = "28/09/2026, 16:30:12";
|
|
364
364
|
}
|
|
365
365
|
|
|
366
366
|
class CheckoutModuleService extends BaseModuleService {
|
|
@@ -20353,7 +20353,9 @@ class TransactionSearchService {
|
|
|
20353
20353
|
}
|
|
20354
20354
|
async searchTransactions() {
|
|
20355
20355
|
if (!this.searchRequest.transKindList.length || this.searchRequest.transKindList.length <= 0) {
|
|
20356
|
-
|
|
20356
|
+
// A request set from outside (e.g. tempTransactionParameters of a dashboard widget search) can carry its own
|
|
20357
|
+
// transaction kind, while transactionType may still hold the kind of the previously visited transaction page.
|
|
20358
|
+
this.searchRequest.transactionKind = this.searchRequest.transactionKind || this.transactionType;
|
|
20357
20359
|
}
|
|
20358
20360
|
else {
|
|
20359
20361
|
this.searchRequest.transactionKind = undefined;
|
|
@@ -20364,7 +20366,12 @@ class TransactionSearchService {
|
|
|
20364
20366
|
const lowerBound = ((this.currentPage - 1) * this.transactionsPerPage) + 1;
|
|
20365
20367
|
this.searchRequest.paging = new PagingParameters(lowerBound, lowerBound + this.transactionsPerPage - 1, this.transactionsPerPage);
|
|
20366
20368
|
this.searchRequestSet.next(this.searchRequest);
|
|
20369
|
+
const searchedTransactionKind = this.searchRequest.transactionKind;
|
|
20367
20370
|
this._transactionService.searchTransactions(this.searchRequest).then(async (result) => {
|
|
20371
|
+
// Ignore results of a transaction kind that is no longer active, they don't match the loaded screen config
|
|
20372
|
+
if (searchedTransactionKind && searchedTransactionKind !== this._transactionType) {
|
|
20373
|
+
return;
|
|
20374
|
+
}
|
|
20368
20375
|
this.transactions = result && result.transactions ? result.transactions : [];
|
|
20369
20376
|
this.resultCount = result ? result.count : undefined;
|
|
20370
20377
|
this.resultSubject.next(true);
|
|
@@ -47818,103 +47825,103 @@ class TransactionStatusbarComponent {
|
|
|
47818
47825
|
setStatusbarDataForCashDesk() {
|
|
47819
47826
|
const transaction = this._transaction;
|
|
47820
47827
|
this.statusbarData = [];
|
|
47821
|
-
if (this.screenConfigService.
|
|
47828
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarBT)) {
|
|
47822
47829
|
const quantityNotToBeOrdered = transaction.quantityTotal - transaction.quantityToBeOrdered;
|
|
47823
47830
|
this.statusbarData.push(this.getStatusbarLine("ORDERED", transaction.quantityOrdered + quantityNotToBeOrdered)); //Besteld
|
|
47824
47831
|
}
|
|
47825
|
-
if (this.screenConfigService.
|
|
47832
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarTG)) {
|
|
47826
47833
|
this.statusbarData.push(this.getStatusbarLine("ALLOCATED", transaction.quantityAllocatedExcludingDeliveryCosts, transaction.quantityTotalExcludingDeliveryCosts)); //Toegewezen
|
|
47827
47834
|
}
|
|
47828
|
-
if (this.screenConfigService.
|
|
47835
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarTP)) {
|
|
47829
47836
|
this.statusbarData.push(this.getStatusbarLine("TO_BE_PICKED", transaction.quantityToBePickedAndPicked, transaction.quantityTotalExcludingDeliveryCosts)); //Te picken
|
|
47830
47837
|
}
|
|
47831
|
-
if (this.screenConfigService.
|
|
47838
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarGT)) {
|
|
47832
47839
|
this.statusbarData.push(this.getStatusbarLine("PICKED", transaction.quantityPickedExcludingDeliveryCosts, transaction.quantityTotalExcludingDeliveryCosts)); //Gepickt
|
|
47833
47840
|
}
|
|
47834
|
-
if (this.screenConfigService.
|
|
47841
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarGL)) {
|
|
47835
47842
|
this.statusbarData.push(this.getStatusbarLine("DELIVERED", transaction.quantityDelivered)); //Geleverd
|
|
47836
47843
|
}
|
|
47837
|
-
if (this.screenConfigService.
|
|
47844
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarGF)) {
|
|
47838
47845
|
this.statusbarData.push(this.getStatusbarLine("INVOICED", transaction.quantityInvoiced)); //Gefactureerd
|
|
47839
47846
|
}
|
|
47840
47847
|
}
|
|
47841
47848
|
setStatusbardataForSalesOrder() {
|
|
47842
47849
|
const transaction = this._transaction;
|
|
47843
47850
|
this.statusbarData = [];
|
|
47844
|
-
if (this.screenConfigService.
|
|
47851
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarBT)) {
|
|
47845
47852
|
const quantityNotToBeOrdered = transaction.quantityTotal - transaction.quantityToBeOrdered;
|
|
47846
47853
|
this.statusbarData.push(this.getStatusbarLine("ORDERED", transaction.quantityOrdered + quantityNotToBeOrdered)); //Besteld
|
|
47847
47854
|
}
|
|
47848
|
-
if (this.screenConfigService.
|
|
47855
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarTG)) {
|
|
47849
47856
|
this.statusbarData.push(this.getStatusbarLine("ALLOCATED", transaction.quantityAllocatedExcludingDeliveryCosts, transaction.quantityTotalExcludingDeliveryCosts)); //Toegewezen
|
|
47850
47857
|
}
|
|
47851
|
-
if (this.screenConfigService.
|
|
47858
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarPA)) {
|
|
47852
47859
|
this.statusbarData.push(this.getStatusbarLine("PLANNING_REQUESTED", transaction.quantityPlanningRequested)); //Voorkeur aangevraagd
|
|
47853
47860
|
}
|
|
47854
|
-
if (this.screenConfigService.
|
|
47861
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarPV)) {
|
|
47855
47862
|
this.statusbarData.push(this.getStatusbarLine("PLANNING_PREFERRED_DATE_ENTERED", transaction.quantityPlanningPreferredDateEntered)); //Voorkeur bekend
|
|
47856
47863
|
}
|
|
47857
|
-
if (this.screenConfigService.
|
|
47864
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarTP)) {
|
|
47858
47865
|
this.statusbarData.push(this.getStatusbarLine("TO_BE_PICKED", transaction.quantityToBePickedAndPicked, transaction.quantityTotalExcludingDeliveryCosts)); //Te picken
|
|
47859
47866
|
}
|
|
47860
|
-
if (this.screenConfigService.
|
|
47867
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarGT)) {
|
|
47861
47868
|
this.statusbarData.push(this.getStatusbarLine("PICKED", transaction.quantityPickedExcludingDeliveryCosts, transaction.quantityTotalExcludingDeliveryCosts)); //Gepickt
|
|
47862
47869
|
}
|
|
47863
|
-
if (this.screenConfigService.
|
|
47870
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarGP)) {
|
|
47864
47871
|
this.statusbarData.push(this.getStatusbarLine("PLANNED", transaction.quantityPlanningFinal)); //Gepland
|
|
47865
47872
|
}
|
|
47866
|
-
if (this.screenConfigService.
|
|
47873
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarGL)) {
|
|
47867
47874
|
this.statusbarData.push(this.getStatusbarLine("DELIVERED", transaction.quantityDelivered)); //Geleverd
|
|
47868
47875
|
}
|
|
47869
|
-
if (this.screenConfigService.
|
|
47876
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarGF)) {
|
|
47870
47877
|
this.statusbarData.push(this.getStatusbarLine("INVOICED", transaction.quantityInvoiced)); //Gefactureerd
|
|
47871
47878
|
}
|
|
47872
47879
|
}
|
|
47873
47880
|
setStatusbarDataForPurchaseOrder() {
|
|
47874
47881
|
const transaction = this._transaction;
|
|
47875
47882
|
this.statusbarData = [];
|
|
47876
|
-
if (this.screenConfigService.
|
|
47883
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarBT)) {
|
|
47877
47884
|
this.statusbarData.push(this.getStatusbarLine("RESERVED_ORDERED", transaction.quantityOrdered)); //bevestigd
|
|
47878
47885
|
}
|
|
47879
|
-
if (this.screenConfigService.
|
|
47886
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarIB)) {
|
|
47880
47887
|
this.statusbarData.push(this.getStatusbarLine("CONFIRMED", transaction.quantityPurchaseConfirmed)); //bevestigd
|
|
47881
47888
|
}
|
|
47882
|
-
if (this.screenConfigService.
|
|
47889
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarNT)) {
|
|
47883
47890
|
this.statusbarData.push(this.getStatusbarLine("TRANSPORT_NOTIFICATION", transaction.quantityTransportNotification)); //Transport notificatie
|
|
47884
47891
|
}
|
|
47885
|
-
if (this.screenConfigService.
|
|
47892
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarBN)) {
|
|
47886
47893
|
this.statusbarData.push(this.getStatusbarLine("ITEM_ACCEPTED_NOT_PROCESSED", transaction.quantityReceivedUnprocessedAndProcessed)); // Binnengemeld, niet verwerkt
|
|
47887
47894
|
}
|
|
47888
|
-
if (this.screenConfigService.
|
|
47895
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarBG)) {
|
|
47889
47896
|
this.statusbarData.push(this.getStatusbarLine("ITEM_ACCEPTED", transaction.quantityReceived)); // Binnengemeld
|
|
47890
47897
|
}
|
|
47891
|
-
if (this.screenConfigService.
|
|
47898
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarFC)) {
|
|
47892
47899
|
this.statusbarData.push(this.getStatusbarLine("INVOICE_CHECK", transaction.quantityInvoiceControl)); //Factuur controle
|
|
47893
47900
|
}
|
|
47894
47901
|
}
|
|
47895
47902
|
setStatusbardataForInterBranchOrder() {
|
|
47896
47903
|
const transaction = this._transaction;
|
|
47897
47904
|
this.statusbarData = [];
|
|
47898
|
-
if (this.screenConfigService.
|
|
47905
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarBT)) {
|
|
47899
47906
|
const quantityNotToBeOrdered = transaction.quantityTotal - transaction.quantityToBeOrdered;
|
|
47900
47907
|
this.statusbarData.push(this.getStatusbarLine("ORDERED", transaction.quantityOrdered + quantityNotToBeOrdered)); //Besteld
|
|
47901
47908
|
}
|
|
47902
|
-
if (this.screenConfigService.
|
|
47909
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarTG)) {
|
|
47903
47910
|
this.statusbarData.push(this.getStatusbarLine("ALLOCATED", transaction.quantityAllocatedExcludingDeliveryCosts, transaction.quantityTotalExcludingDeliveryCosts)); //Toegewezen
|
|
47904
47911
|
}
|
|
47905
|
-
if (this.screenConfigService.
|
|
47912
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarTP)) {
|
|
47906
47913
|
this.statusbarData.push(this.getStatusbarLine("TO_BE_PICKED", transaction.quantityToBePickedAndPicked, transaction.quantityTotalExcludingDeliveryCosts)); //Te picken
|
|
47907
47914
|
}
|
|
47908
|
-
if (this.screenConfigService.
|
|
47915
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarGT)) {
|
|
47909
47916
|
this.statusbarData.push(this.getStatusbarLine("PICKED", transaction.quantityPickedExcludingDeliveryCosts, transaction.quantityTotalExcludingDeliveryCosts)); //Gepickt
|
|
47910
47917
|
}
|
|
47911
|
-
if (this.screenConfigService.
|
|
47918
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarBN)) {
|
|
47912
47919
|
this.statusbarData.push(this.getStatusbarLine("ITEM_ACCEPTED_NOT_PROCESSED", transaction.quantityReceivedUnprocessedAndProcessed)); // Binnengemeld, niet verwerkt
|
|
47913
47920
|
}
|
|
47914
|
-
if (this.screenConfigService.
|
|
47921
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarBG)) {
|
|
47915
47922
|
this.statusbarData.push(this.getStatusbarLine("ITEM_ACCEPTED", transaction.quantityReceived)); // Binnengemeld
|
|
47916
47923
|
}
|
|
47917
|
-
if (this.screenConfigService.
|
|
47924
|
+
if (this.screenConfigService.immediatelyVisible(this._configNames.statusBarGL)) {
|
|
47918
47925
|
this.statusbarData.push(this.getStatusbarLine("DELIVERED", transaction.quantityDelivered)); //Geleverd
|
|
47919
47926
|
}
|
|
47920
47927
|
}
|
|
@@ -72516,15 +72523,19 @@ class TransactionSearchResultComponent {
|
|
|
72516
72523
|
this._deliveryPlanningService = _deliveryPlanningService;
|
|
72517
72524
|
}
|
|
72518
72525
|
ngOnInit() {
|
|
72519
|
-
this._subs.push(this.searchService.searchRequestSet.subscribe((request) => {
|
|
72526
|
+
this._subs.push(this.searchService.searchRequestSet.subscribe(async (request) => {
|
|
72520
72527
|
if (request) {
|
|
72521
|
-
|
|
72522
|
-
|
|
72523
|
-
|
|
72524
|
-
|
|
72525
|
-
|
|
72526
|
-
|
|
72527
|
-
|
|
72528
|
+
const transactionKind = request.transactionKind;
|
|
72529
|
+
// The screen config service is a root singleton holding the config of one transaction kind at a time,
|
|
72530
|
+
// so hide the results until the config of this transaction kind is loaded.
|
|
72531
|
+
this.screenConfigLoaded = false;
|
|
72532
|
+
this._transactionKind = transactionKind;
|
|
72533
|
+
this.batchPageActive = transactionKind === 'V' || transactionKind === 'I' || transactionKind === 'S' || transactionKind === 'L';
|
|
72534
|
+
const config = await this.screenConfigService.loadConfig([transactionKind]);
|
|
72535
|
+
if (this._transactionKind === transactionKind && config && config.length > 0) {
|
|
72536
|
+
this.screenConfigLoaded = true;
|
|
72537
|
+
this._changeDetectorRef.markForCheck();
|
|
72538
|
+
}
|
|
72528
72539
|
}
|
|
72529
72540
|
}), this.searchService.resultsUpdated.subscribe(() => {
|
|
72530
72541
|
if (this.batchPageActive && this.searchService.showBatchOptions) {
|