@colijnit/transaction 257.1.75 → 257.1.76
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 +23 -21
- package/bundles/colijnit-transaction.umd.js.map +1 -1
- package/colijnit-transaction.metadata.json +1 -1
- package/esm2015/lib/component/payment/payment.component.js +2 -2
- package/esm2015/lib/component/transaction-header/transaction-header-popup/transaction-header-popup-payment.component.js +9 -9
- package/esm2015/lib/service/pending-reason.service.js +4 -3
- package/esm2015/lib/service/transaction-connector.service.js +3 -3
- package/esm2015/lib/service/transaction.service.js +7 -6
- package/esm2015/lib/transaction-version.js +3 -3
- package/fesm2015/colijnit-transaction.js +21 -20
- package/fesm2015/colijnit-transaction.js.map +1 -1
- package/lib/service/transaction-connector.service.d.ts +1 -1
- package/lib/service/transaction.service.d.ts +8 -8
- package/package.json +2 -2
|
@@ -3,8 +3,8 @@ export class Version {
|
|
|
3
3
|
constructor() {
|
|
4
4
|
this.name = "@colijnit/transaction";
|
|
5
5
|
this.description = "Colijn IT transaction package";
|
|
6
|
-
this.symVer = "257.1.
|
|
7
|
-
this.publishDate = "
|
|
6
|
+
this.symVer = "257.1.76";
|
|
7
|
+
this.publishDate = "26/06/2025, 17:24:00";
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsVUFBVSxDQUFDO1FBQ3BCLGdCQUFXLEdBQUcsc0JBQXNCLENBQUM7SUFDOUMsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMjU3LjEuNzZcIjtcbiAgcHVibGljIHB1Ymxpc2hEYXRlID0gXCIyNi8wNi8yMDI1LCAxNzoyNDowMFwiO1xufSJdfQ==
|
|
@@ -295,8 +295,8 @@ class Version {
|
|
|
295
295
|
constructor() {
|
|
296
296
|
this.name = "@colijnit/transaction";
|
|
297
297
|
this.description = "Colijn IT transaction package";
|
|
298
|
-
this.symVer = "257.1.
|
|
299
|
-
this.publishDate = "
|
|
298
|
+
this.symVer = "257.1.76";
|
|
299
|
+
this.publishDate = "26/06/2025, 17:24:00";
|
|
300
300
|
}
|
|
301
301
|
}
|
|
302
302
|
|
|
@@ -7296,11 +7296,11 @@ class TransactionConnectorService {
|
|
|
7296
7296
|
}, overrideOld).getValue(branch, group);
|
|
7297
7297
|
});
|
|
7298
7298
|
}
|
|
7299
|
-
getCashDrawers(cashDrawersRequest) {
|
|
7299
|
+
getCashDrawers(cashDrawersRequest, overrideOld = false) {
|
|
7300
7300
|
return __awaiter(this, void 0, void 0, function* () {
|
|
7301
7301
|
return this._selectMultipleParameterizedCacheService.requestCache(CashDrawer, (cashDrawersRequest) => {
|
|
7302
7302
|
return this._adapterService.functionCall(this._adapterService.getCashDrawers, [cashDrawersRequest]);
|
|
7303
|
-
}).getValue(cashDrawersRequest);
|
|
7303
|
+
}, overrideOld).getValue(cashDrawersRequest);
|
|
7304
7304
|
});
|
|
7305
7305
|
}
|
|
7306
7306
|
getPriceLists(code) {
|
|
@@ -11486,7 +11486,7 @@ class PendingReasonService extends TransactionBaseService {
|
|
|
11486
11486
|
success = success && (yield this._handleHeaderOperationStatus(status, response.transactionInfo));
|
|
11487
11487
|
}
|
|
11488
11488
|
const hasPendingReasons = response.headerOperationStatuses.filter(los => los.pendingReason !== "REASON_NONE").length > 0;
|
|
11489
|
-
if (!hasPendingReasons) {
|
|
11489
|
+
if (!hasPendingReasons && this.transactionKind !== TransactionKind.PurchaseOrder) {
|
|
11490
11490
|
if ((this.autoSave && saveTransaction && !this.manualSaveParam) || overrideSave) {
|
|
11491
11491
|
return this.saveTransactionAndCommit(response);
|
|
11492
11492
|
}
|
|
@@ -11592,7 +11592,7 @@ class PendingReasonService extends TransactionBaseService {
|
|
|
11592
11592
|
return __awaiter(this, void 0, void 0, function* () {
|
|
11593
11593
|
const response = yield this.connector.resolvePendingHeaderReason(pendingHeaderValues);
|
|
11594
11594
|
// this.rememberCurrentTransaction(response);
|
|
11595
|
-
return this.handleHeaderOperationStatuses(response);
|
|
11595
|
+
return this.handleHeaderOperationStatuses(response, false);
|
|
11596
11596
|
});
|
|
11597
11597
|
}
|
|
11598
11598
|
_confirmAction(uuid, reason, message, type) {
|
|
@@ -12517,7 +12517,7 @@ class TransactionService extends PendingReasonService {
|
|
|
12517
12517
|
return false;
|
|
12518
12518
|
});
|
|
12519
12519
|
}
|
|
12520
|
-
updateDiscountTransactionLine(uuid, lineUuid, type, discount, reason =
|
|
12520
|
+
updateDiscountTransactionLine(uuid, lineUuid, type, discount, reason = '', code = '') {
|
|
12521
12521
|
return __awaiter(this, void 0, void 0, function* () {
|
|
12522
12522
|
const response = yield this.connector.changeTransactionLineLineDiscount(uuid, lineUuid, type, discount, reason, code);
|
|
12523
12523
|
if (response) {
|
|
@@ -13121,7 +13121,7 @@ class TransactionService extends PendingReasonService {
|
|
|
13121
13121
|
return this.connector.getCashRegisters(branch, group, this.cashRegistersDirty);
|
|
13122
13122
|
}
|
|
13123
13123
|
getCashDrawers(cashDrawersRequest) {
|
|
13124
|
-
return this.connector.getCashDrawers(cashDrawersRequest);
|
|
13124
|
+
return this.connector.getCashDrawers(cashDrawersRequest, this.cashRegistersDirty);
|
|
13125
13125
|
}
|
|
13126
13126
|
getPriceLists() {
|
|
13127
13127
|
return this.connector.getPriceLists();
|
|
@@ -13146,8 +13146,9 @@ class TransactionService extends PendingReasonService {
|
|
|
13146
13146
|
if (transactionInfo && transactionInfo.branch) {
|
|
13147
13147
|
transactionBranch = transactionInfo.branch.relationNr;
|
|
13148
13148
|
}
|
|
13149
|
-
else if (this.currentTransaction && this.currentTransaction.transactionInfo && this.currentTransaction.transactionInfo.branch)
|
|
13149
|
+
else if (this.currentTransaction && this.currentTransaction.transactionInfo && this.currentTransaction.transactionInfo.branch) {
|
|
13150
13150
|
transactionBranch = this.currentTransaction.transactionInfo.branch.relationNr;
|
|
13151
|
+
}
|
|
13151
13152
|
else {
|
|
13152
13153
|
transactionBranch = this.currentBranch;
|
|
13153
13154
|
}
|
|
@@ -14240,7 +14241,7 @@ class TransactionService extends PendingReasonService {
|
|
|
14240
14241
|
});
|
|
14241
14242
|
}
|
|
14242
14243
|
else {
|
|
14243
|
-
throwError(
|
|
14244
|
+
throwError('Failed to create transaction');
|
|
14244
14245
|
}
|
|
14245
14246
|
}
|
|
14246
14247
|
else {
|
|
@@ -14252,7 +14253,7 @@ class TransactionService extends PendingReasonService {
|
|
|
14252
14253
|
TransactionService.ɵprov = i0.ɵɵdefineInjectable({ factory: function TransactionService_Factory() { return new TransactionService(i0.ɵɵinject(TransactionSettingsService), i0.ɵɵinject(TransactionDialogService), i0.ɵɵinject(TransactionConnectorService), i0.ɵɵinject(ArticleConnectorService), i0.ɵɵinject(DictionaryService), i0.ɵɵinject(TransactionEventService), i0.ɵɵinject(TransactionRelationService), i0.ɵɵinject(TransactionScreenConfigurationService), i0.ɵɵinject(i9.RelationService), i0.ɵɵinject(i10.SharedService)); }, token: TransactionService, providedIn: "root" });
|
|
14253
14254
|
TransactionService.decorators = [
|
|
14254
14255
|
{ type: Injectable, args: [{
|
|
14255
|
-
providedIn:
|
|
14256
|
+
providedIn: 'root'
|
|
14256
14257
|
},] }
|
|
14257
14258
|
];
|
|
14258
14259
|
|
|
@@ -49056,7 +49057,7 @@ PaymentComponent.decorators = [
|
|
|
49056
49057
|
<div class="payment-to-pay-total">
|
|
49057
49058
|
<div class="payment-to-pay-header">
|
|
49058
49059
|
<span class="payment-header-title" [textContent]="'TOTAL_AMOUNT_TO_PAY' | localize"></span>
|
|
49059
|
-
<span class="payment-total-pay" [textContent]="
|
|
49060
|
+
<span class="payment-total-pay" [textContent]="paymentService.amountToPay | coCurrency: true"></span>
|
|
49060
49061
|
</div>
|
|
49061
49062
|
<div class="payment-input-button-wrapper">
|
|
49062
49063
|
<div class="payment-input-button">
|
|
@@ -52225,8 +52226,8 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
|
|
|
52225
52226
|
event.preventDefault();
|
|
52226
52227
|
event.stopPropagation();
|
|
52227
52228
|
this.transactionIdToPay = (_a = this.transactionIdToPay) !== null && _a !== void 0 ? _a : this.transactionInfo.id;
|
|
52228
|
-
if (this.orderPaymentAnalysis.filter(payment => payment.transactionKind === this.transKind.SalesInvoice && payment.outstandingAmount
|
|
52229
|
-
const lastTransaction = this.orderPaymentAnalysis.filter(payment => payment.transactionKind === this.transKind.SalesInvoice && payment.outstandingAmount
|
|
52229
|
+
if (this.orderPaymentAnalysis.filter(payment => payment.transactionKind === this.transKind.SalesInvoice && payment.outstandingAmount !== 0).length === 1) {
|
|
52230
|
+
const lastTransaction = this.orderPaymentAnalysis.filter(payment => payment.transactionKind === this.transKind.SalesInvoice && payment.outstandingAmount !== 0)[0];
|
|
52230
52231
|
this.transactionIdToPay = lastTransaction.transactionId;
|
|
52231
52232
|
}
|
|
52232
52233
|
if (yield this.lockTransaction()) {
|
|
@@ -52301,20 +52302,20 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
|
|
|
52301
52302
|
}
|
|
52302
52303
|
}
|
|
52303
52304
|
_updateChosenAmountToPay() {
|
|
52304
|
-
if (this.orderPaymentAnalysis.some(t => t.outstandingAmount
|
|
52305
|
+
if (this.orderPaymentAnalysis.some(t => t.outstandingAmount !== 0) &&
|
|
52305
52306
|
this.orderPaymentAnalysis.filter(payment => payment.transactionKind === this.transKind.SalesInvoice).length === 0) {
|
|
52306
52307
|
this.chosenAmountToPay = this.paymentAnalysis.totalDeposit;
|
|
52307
52308
|
}
|
|
52308
52309
|
// Deposit only
|
|
52309
52310
|
if (this.orderPaymentAnalysis.filter(payment => payment.transactionKind === this.transKind.SalesOrder &&
|
|
52310
|
-
payment.outstandingAmount
|
|
52311
|
+
payment.outstandingAmount !== 0).length === 1) {
|
|
52311
52312
|
this.chosenAmountToPay = this.orderPaymentAnalysis[0].outstandingAmount;
|
|
52312
52313
|
}
|
|
52313
|
-
if (this.orderPaymentAnalysis.filter(payment => (payment.transactionKind === this.transKind.SalesInvoice) && (payment.outstandingAmount
|
|
52314
|
-
const remainingInvoice = this.orderPaymentAnalysis.filter(payment => (payment.transactionKind === this.transKind.SalesInvoice) && (payment.outstandingAmount
|
|
52314
|
+
if (this.orderPaymentAnalysis.filter(payment => (payment.transactionKind === this.transKind.SalesInvoice) && (payment.outstandingAmount !== 0)).length === 1) {
|
|
52315
|
+
const remainingInvoice = this.orderPaymentAnalysis.filter(payment => (payment.transactionKind === this.transKind.SalesInvoice) && (payment.outstandingAmount !== 0))[0];
|
|
52315
52316
|
this.chosenAmountToPay = remainingInvoice.outstandingAmount;
|
|
52316
52317
|
}
|
|
52317
|
-
if (this.orderPaymentAnalysis.filter(payment => (payment.transactionKind === this.transKind.SalesInvoice) && (payment.outstandingAmount
|
|
52318
|
+
if (this.orderPaymentAnalysis.filter(payment => (payment.transactionKind === this.transKind.SalesInvoice) && (payment.outstandingAmount !== 0)).length > 1) {
|
|
52318
52319
|
this.chosenAmountToPay = 0;
|
|
52319
52320
|
}
|
|
52320
52321
|
}
|
|
@@ -52491,7 +52492,7 @@ TransactionHeaderPopupPaymentComponent.decorators = [
|
|
|
52491
52492
|
<strong>{{ paymentInfo.paidAmount | coCurrency:true }}</strong>
|
|
52492
52493
|
</td>
|
|
52493
52494
|
<td>{{ paymentInfo.settledAmount | coCurrency:true }}</td>
|
|
52494
|
-
<td [class.outstanding]="paymentInfo.outstandingAmount
|
|
52495
|
+
<td [class.outstanding]="paymentInfo.outstandingAmount !== 0">
|
|
52495
52496
|
<strong>{{ paymentInfo.outstandingAmount | coCurrency:true }}</strong>
|
|
52496
52497
|
</td>
|
|
52497
52498
|
</tr>
|