@colijnit/transaction 256.1.96 → 256.1.97

package/esm2015/lib/transaction-version.js

@@ -3,8 +3,8 @@ export class Version {
     constructor() {
         this.name = "@colijnit/transaction";
         this.description = "Colijn IT transaction package";
-        this.symVer = "256.1.96";
-        this.publishDate = "23/06/2025, 16:59:54";
+        this.symVer = "256.1.97";
+        this.publishDate = "26/06/2025, 17:16:13";
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsVUFBVSxDQUFDO1FBQ3BCLGdCQUFXLEdBQUcsc0JBQXNCLENBQUM7SUFDOUMsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMjU2LjEuOTZcIjtcbiAgcHVibGljIHB1Ymxpc2hEYXRlID0gXCIyMy8wNi8yMDI1LCAxNjo1OTo1NFwiO1xufSJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsVUFBVSxDQUFDO1FBQ3BCLGdCQUFXLEdBQUcsc0JBQXNCLENBQUM7SUFDOUMsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMjU2LjEuOTdcIjtcbiAgcHVibGljIHB1Ymxpc2hEYXRlID0gXCIyNi8wNi8yMDI1LCAxNzoxNjoxM1wiO1xufSJdfQ==

package/fesm2015/colijnit-transaction.js

@@ -290,8 +290,8 @@ class Version {
     constructor() {
         this.name = "@colijnit/transaction";
         this.description = "Colijn IT transaction package";
-        this.symVer = "256.1.96";
-        this.publishDate = "23/06/2025, 16:59:54";
+        this.symVer = "256.1.97";
+        this.publishDate = "26/06/2025, 17:16:13";
     }
 }
 
@@ -7162,11 +7162,11 @@ class TransactionConnectorService {
             }, overrideOld).getValue(branch, group);
         });
     }
-    getCashDrawers(cashDrawersRequest) {
+    getCashDrawers(cashDrawersRequest, overrideOld = false) {
         return __awaiter(this, void 0, void 0, function* () {
             return this._selectMultipleParameterizedCacheService.requestCache(CashDrawer, (cashDrawersRequest) => {
                 return this._adapterService.functionCall(this._adapterService.getCashDrawers, [cashDrawersRequest]);
-            }).getValue(cashDrawersRequest);
+            }, overrideOld).getValue(cashDrawersRequest);
         });
     }
     getPriceLists(code) {
@@ -11290,7 +11290,7 @@ class PendingReasonService extends TransactionBaseService {
                 success = success && (yield this._handleHeaderOperationStatus(status, response.transactionInfo));
             }
             const hasPendingReasons = response.headerOperationStatuses.filter(los => los.pendingReason !== "REASON_NONE").length > 0;
-            if (!hasPendingReasons) {
+            if (!hasPendingReasons && this.transactionKind !== TransactionKind.PurchaseOrder) {
                 if ((this.autoSave && saveTransaction && !this.manualSaveParam) || overrideSave) {
                     return this.saveTransactionAndCommit(response);
                 }
@@ -11396,7 +11396,7 @@ class PendingReasonService extends TransactionBaseService {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.connector.resolvePendingHeaderReason(pendingHeaderValues);
             // this.rememberCurrentTransaction(response);
-            return this.handleHeaderOperationStatuses(response);
+            return this.handleHeaderOperationStatuses(response, false);
         });
     }
     _confirmAction(uuid, reason, message, type) {
@@ -12321,7 +12321,7 @@ class TransactionService extends PendingReasonService {
             return false;
         });
     }
-    updateDiscountTransactionLine(uuid, lineUuid, type, discount, reason = "", code = "") {
+    updateDiscountTransactionLine(uuid, lineUuid, type, discount, reason = '', code = '') {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.connector.changeTransactionLineLineDiscount(uuid, lineUuid, type, discount, reason, code);
             if (response) {
@@ -12925,7 +12925,7 @@ class TransactionService extends PendingReasonService {
         return this.connector.getCashRegisters(branch, group, this.cashRegistersDirty);
     }
     getCashDrawers(cashDrawersRequest) {
-        return this.connector.getCashDrawers(cashDrawersRequest);
+        return this.connector.getCashDrawers(cashDrawersRequest, this.cashRegistersDirty);
     }
     getPriceLists() {
         return this.connector.getPriceLists();
@@ -12950,8 +12950,9 @@ class TransactionService extends PendingReasonService {
         if (transactionInfo && transactionInfo.branch) {
             transactionBranch = transactionInfo.branch.relationNr;
         }
-        else if (this.currentTransaction && this.currentTransaction.transactionInfo && this.currentTransaction.transactionInfo.branch)
+        else if (this.currentTransaction && this.currentTransaction.transactionInfo && this.currentTransaction.transactionInfo.branch) {
             transactionBranch = this.currentTransaction.transactionInfo.branch.relationNr;
+        }
         else {
             transactionBranch = this.currentBranch;
         }
@@ -13992,7 +13993,7 @@ class TransactionService extends PendingReasonService {
                     });
                 }
                 else {
-                    throwError("Failed to create transaction");
+                    throwError('Failed to create transaction');
                 }
             }
             else {
@@ -14004,7 +14005,7 @@ class TransactionService extends PendingReasonService {
 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" });
 TransactionService.decorators = [
     { type: Injectable, args: [{
-                providedIn: "root"
+                providedIn: 'root'
             },] }
 ];
 
@@ -48141,84 +48142,84 @@ PaymentComponent.decorators = [
     { type: Component, args: [{
                 selector: "co-payment",
                 template: `
-    <div class="payment-wrapper">
-      <div class="payment-methods-register-wrapper">
-        <div class="payment-methods-wrapper">
-          <div class="payment-methods-header">
-            <span class="payment-header-title" [textContent]="'SELECT' | localize"></span>
-            <!--span class="payment-header-title extra" [textContent]="'FREE' | localize:false"></span-->
-            <span class="payment-header-title" [textContent]="'PAYMENT_METHOD' | localize:false"></span>
-          </div>
-          <div class="payment-methods co-small-scrollbar">
-            <co-loader class="loader" *ngIf="showLoader"></co-loader>
-            <ng-container *ngIf="!showLoader">
-              <co-payment-tile *ngFor="let paymentMethod of paymentMethods; let index = index"
-                               [image]="paymentMethod.image"
-                               [description]="paymentMethod.payment.description"
-                               [selected]="paymentMethodIdx === index"
-                               (selectedChange)="paymentMethodSelected(paymentMethod.payment, index)"
-              ></co-payment-tile>
-            </ng-container>
-          </div>
-        </div>
-        <div class="payment-cash-register-wrapper" *ngIf="showCashRegisters">
-          <div class="payment-cash-register-header">
-            <span class="payment-header-title" [textContent]="'SELECT_CASH_REGISTER' | localize"></span>
-          </div>
-          <div class="payment-methods">
-            <co-payment-tile *ngFor="let cashRegister of cashRegisters; let index = index"
-                             [icon]="cashRegister.icon"
-                             [description]="cashRegister.description"
-                             [selected]="cashRegisterIdx === index"
-                             (selectedChange)="cashRegisterSelected(cashRegister, index)"
-            ></co-payment-tile>
-          </div>
-        </div>
-      </div>
-      <div class="payment-to-pay-wrapper">
-        <div class="payment-to-pay-total">
-          <div class="payment-to-pay-header">
-            <span class="payment-header-title" [textContent]="'TOTAL_AMOUNT_TO_PAY' | localize"></span>
-              <span class="payment-total-pay" [textContent]="depositAmount ? (depositAmount | coCurrency: true) : (paymentService.amount | coCurrency: true)"></span>
-          </div>
-          <div class="payment-input-button-wrapper">
-            <div class="payment-input-button">
-              <co-payment-to-pay
-                [amountToPay]="paymentService.amountToPay"></co-payment-to-pay>
-              <div class="payment-to-pay-button">
-                <co-button [iconData]="iconCacheService.getIcon(icons.CheckDuotone)" (click)="handlePayment()"
-                           [disabled]="paymentService.amountToPay === 0"></co-button>
+      <div class="payment-wrapper">
+          <div class="payment-methods-register-wrapper">
+              <div class="payment-methods-wrapper">
+                  <div class="payment-methods-header">
+                      <span class="payment-header-title" [textContent]="'SELECT' | localize"></span>
+                      <!--span class="payment-header-title extra" [textContent]="'FREE' | localize:false"></span-->
+                      <span class="payment-header-title" [textContent]="'PAYMENT_METHOD' | localize:false"></span>
+                  </div>
+                  <div class="payment-methods co-small-scrollbar">
+                      <co-loader class="loader" *ngIf="showLoader"></co-loader>
+                      <ng-container *ngIf="!showLoader">
+                          <co-payment-tile *ngFor="let paymentMethod of paymentMethods; let index = index"
+                                           [image]="paymentMethod.image"
+                                           [description]="paymentMethod.payment.description"
+                                           [selected]="paymentMethodIdx === index"
+                                           (selectedChange)="paymentMethodSelected(paymentMethod.payment, index)"
+                          ></co-payment-tile>
+                      </ng-container>
+                  </div>
+              </div>
+              <div class="payment-cash-register-wrapper" *ngIf="showCashRegisters">
+                  <div class="payment-cash-register-header">
+                      <span class="payment-header-title" [textContent]="'SELECT_CASH_REGISTER' | localize"></span>
+                  </div>
+                  <div class="payment-methods">
+                      <co-payment-tile *ngFor="let cashRegister of cashRegisters; let index = index"
+                                       [icon]="cashRegister.icon"
+                                       [description]="cashRegister.description"
+                                       [selected]="cashRegisterIdx === index"
+                                       (selectedChange)="cashRegisterSelected(cashRegister, index)"
+                      ></co-payment-tile>
+                  </div>
               </div>
-            </div>
-            <div class="payment-bookdate" *ngIf="showPaymentDate">
-              <co-input-date [(model)]="paymentDate"></co-input-date>
-            </div>
-            <div class="payment-error-message" *ngIf="paymentService.statusMessage"
-                 [textContent]="paymentService.statusMessage"></div>
           </div>
-        </div>
+          <div class="payment-to-pay-wrapper">
+              <div class="payment-to-pay-total">
+                  <div class="payment-to-pay-header">
+                      <span class="payment-header-title" [textContent]="'TOTAL_AMOUNT_TO_PAY' | localize"></span>
+                      <span class="payment-total-pay" [textContent]="paymentService.amountToPay | coCurrency: true"></span>
+                  </div>
+                  <div class="payment-input-button-wrapper">
+                      <div class="payment-input-button">
+                          <co-payment-to-pay
+                                  [amountToPay]="paymentService.amountToPay"></co-payment-to-pay>
+                          <div class="payment-to-pay-button">
+                              <co-button [iconData]="iconCacheService.getIcon(icons.CheckDuotone)" (click)="handlePayment()"
+                                         [disabled]="paymentService.amountToPay === 0"></co-button>
+                          </div>
+                      </div>
+                      <div class="payment-bookdate" *ngIf="showPaymentDate">
+                          <co-input-date [(model)]="paymentDate"></co-input-date>
+                      </div>
+                      <div class="payment-error-message" *ngIf="paymentService.statusMessage"
+                           [textContent]="paymentService.statusMessage"></div>
+                  </div>
+              </div>
 
-        <div class="payment-deposit">
-            <co-deposit-payment
-                    [branch]="branch"
-                    [transactionUuid]="transactionUuid"
-                    (depositPaymentFetched)="onDepositPaymentFetched($event)">
-            </co-deposit-payment>
-        </div>
-        <co-key-pad class="payment-to-pay-keypad" *ngIf="showKeyPad"
-                    [showValue]="false"
-                    [emitModelChangeOnEnter]="false"
-                    [model]="paymentService.amountToPay"
-                    (modelChange)="handleKeyPadModelChange($event)"
-                    (enterClick)="handlePayment()"
-        ></co-key-pad>
+              <div class="payment-deposit">
+                  <co-deposit-payment
+                          [branch]="branch"
+                          [transactionUuid]="transactionUuid"
+                          (depositPaymentFetched)="onDepositPaymentFetched($event)">
+                  </co-deposit-payment>
+              </div>
+              <co-key-pad class="payment-to-pay-keypad" *ngIf="showKeyPad"
+                          [showValue]="false"
+                          [emitModelChangeOnEnter]="false"
+                          [model]="paymentService.amountToPay"
+                          (modelChange)="handleKeyPadModelChange($event)"
+                          (enterClick)="handlePayment()"
+              ></co-key-pad>
+          </div>
       </div>
-    </div>
-    <co-dialog *ngIf="paymentService.showPspQrCode" (closeClick)="paymentService.showPspQrCode = false">
-      <co-payment-qr-code
-        [qrCodeImage]="paymentService.qrCodeImage"
-      ></co-payment-qr-code>
-    </co-dialog>
+      <co-dialog *ngIf="paymentService.showPspQrCode" (closeClick)="paymentService.showPspQrCode = false">
+          <co-payment-qr-code
+                  [qrCodeImage]="paymentService.qrCodeImage"
+          ></co-payment-qr-code>
+      </co-dialog>
   `,
                 providers: [
                     TransactionPaymentService
@@ -51287,6 +51288,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
             this._paymentSubs.push(this.transactionEventService.transactionPaymentDone.subscribe(() => {
                 this._getDepositInfo();
                 this._getOutstandingAmounts();
+                this.handleCloseDialog();
             }), this.screenConfigService.configSet.subscribe((configObjects) => this._getObjectConfiguration(configObjects)));
             this.showCashOnDelivery = yield this.transactionService.getInternalParameter(InternalParam.SellDirectlyFromSuppl);
         });
@@ -51318,7 +51320,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
         this.cashOnDelivery = value;
     }
     showPaymentButton() {
-        return this.orderPaymentAnalysis.some(t => t.outstandingAmount > 0) && this.chosenAmountToPay > 0;
+        return this.orderPaymentAnalysis.some(t => t.outstandingAmount !== 0) && this.chosenAmountToPay !== 0;
     }
     openPayment(event) {
         var _a;
@@ -51326,8 +51328,8 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
             event.preventDefault();
             event.stopPropagation();
             this.transactionIdToPay = (_a = this.transactionIdToPay) !== null && _a !== void 0 ? _a : this.transactionInfo.id;
-            if (this.orderPaymentAnalysis.filter(payment => payment.transactionKind === this.transKind.SalesInvoice && payment.outstandingAmount > 0).length === 1) {
-                const lastTransaction = this.orderPaymentAnalysis.filter(payment => payment.transactionKind === this.transKind.SalesInvoice && payment.outstandingAmount > 0)[0];
+            if (this.orderPaymentAnalysis.filter(payment => payment.transactionKind === this.transKind.SalesInvoice && payment.outstandingAmount !== 0).length === 1) {
+                const lastTransaction = this.orderPaymentAnalysis.filter(payment => payment.transactionKind === this.transKind.SalesInvoice && payment.outstandingAmount !== 0)[0];
                 this.transactionIdToPay = lastTransaction.transactionId;
             }
             if (yield this.lockTransaction()) {
@@ -51400,20 +51402,20 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
         }
     }
     _updateChosenAmountToPay() {
-        if (this.orderPaymentAnalysis.some(t => t.outstandingAmount > 0) &&
+        if (this.orderPaymentAnalysis.some(t => t.outstandingAmount !== 0) &&
             this.orderPaymentAnalysis.filter(payment => payment.transactionKind === this.transKind.SalesInvoice).length === 0) {
             this.chosenAmountToPay = this.paymentAnalysis.totalDeposit;
         }
         // Deposit only
         if (this.orderPaymentAnalysis.filter(payment => payment.transactionKind === this.transKind.SalesOrder &&
-            payment.outstandingAmount > 0).length === 1) {
+            payment.outstandingAmount !== 0).length === 1) {
             this.chosenAmountToPay = this.orderPaymentAnalysis[0].outstandingAmount;
         }
-        if (this.orderPaymentAnalysis.filter(payment => (payment.transactionKind === this.transKind.SalesInvoice) && (payment.outstandingAmount > 0)).length === 1) {
-            const remainingInvoice = this.orderPaymentAnalysis.filter(payment => (payment.transactionKind === this.transKind.SalesInvoice) && (payment.outstandingAmount > 0))[0];
+        if (this.orderPaymentAnalysis.filter(payment => (payment.transactionKind === this.transKind.SalesInvoice) && (payment.outstandingAmount !== 0)).length === 1) {
+            const remainingInvoice = this.orderPaymentAnalysis.filter(payment => (payment.transactionKind === this.transKind.SalesInvoice) && (payment.outstandingAmount !== 0))[0];
             this.chosenAmountToPay = remainingInvoice.outstandingAmount;
         }
-        if (this.orderPaymentAnalysis.filter(payment => (payment.transactionKind === this.transKind.SalesInvoice) && (payment.outstandingAmount > 0)).length > 1) {
+        if (this.orderPaymentAnalysis.filter(payment => (payment.transactionKind === this.transKind.SalesInvoice) && (payment.outstandingAmount !== 0)).length > 1) {
             this.chosenAmountToPay = 0;
         }
     }
@@ -51590,7 +51592,7 @@ TransactionHeaderPopupPaymentComponent.decorators = [
                               <strong>{{ paymentInfo.paidAmount | coCurrency:true }}</strong>
                           </td>
                           <td>{{ paymentInfo.settledAmount | coCurrency:true }}</td>
-                          <td [class.outstanding]="paymentInfo.outstandingAmount > 0">
+                          <td [class.outstanding]="paymentInfo.outstandingAmount !== 0">
                               <strong>{{ paymentInfo.outstandingAmount | coCurrency:true }}</strong>
                           </td>
                       </tr>