@colijnit/transaction 257.1.61 → 257.1.63

package/fesm2015/colijnit-transaction.js

@@ -295,8 +295,8 @@ class Version {
     constructor() {
         this.name = "@colijnit/transaction";
         this.description = "Colijn IT transaction package";
-        this.symVer = "257.1.61";
-        this.publishDate = "27/05/2025, 17:45:36";
+        this.symVer = "257.1.63";
+        this.publishDate = "29/05/2025, 16:40:43";
     }
 }
 
@@ -11114,7 +11114,7 @@ class TransactionBaseService extends BaseModuleService {
         return __awaiter(this, void 0, void 0, function* () {
             this.transactionEventService.transactionLineAdded.next(undefined); // reset line added
             const transactionInfoResponse = yield this.connector.getTransactionById(transactionId);
-            if (transactionInfoResponse.isSuccess) {
+            if (transactionInfoResponse && transactionInfoResponse.isSuccess) {
                 yield this.rememberCurrentTransaction(transactionInfoResponse);
             }
         });
@@ -11131,7 +11131,7 @@ class TransactionBaseService extends BaseModuleService {
             });
             const transactionInfoResponse = yield this.connector.getTransactionByNrAndKind(transactionKind, transactionNr);
             finished = true;
-            if (transactionInfoResponse.isSuccess) {
+            if (transactionInfoResponse && transactionInfoResponse.isSuccess) {
                 yield this.rememberCurrentTransaction(transactionInfoResponse);
             }
             return transactionInfoResponse;
@@ -15568,20 +15568,21 @@ class CustomerGroupsComponent {
         return __awaiter(this, void 0, void 0, function* () {
             this._connector.getCustomerGroups().then((groups) => {
                 this.customerGroups = groups;
-                this._setSelectedCustomerGroup();
+                if (!this._model && this.defaultValue !== null) {
+                    this.handleCustomerGroupChange(this.customerGroups.find(c => c.groepsnummer === this.defaultValue.toString()));
+                }
             });
         });
     }
     handleCustomerGroupChange(customerGroup) {
         this.selectedCustomerGroup = customerGroup;
-        this.modelChange.emit(this.selectedCustomerGroup.groepsnummer);
+        this._model = this.selectedCustomerGroup.groepsnummer;
+        this.modelChange.emit(this._model);
     }
     _setSelectedCustomerGroup() {
-        var _a, _b;
         if (!this.customerGroups) {
             return;
         }
-        (_a = this._model) !== null && _a !== void 0 ? _a : (this._model = (_b = this.defaultValue) === null || _b === void 0 ? void 0 : _b.toString());
         this.selectedCustomerGroup = this.customerGroups.find(c => c.groepsnummer === this.model);
     }
 }
@@ -30165,11 +30166,15 @@ class DialogTransactionLineWarehouseComponent extends DialogTransactionLineBaseC
             let warehouseUpdateSuccess = true;
             if (this.transactionLine.warehouseNumber !== this.warehouse) {
                 const oldWarehouse = this.transactionLine.warehouseNumber;
-                const warehouseSuccess = yield this.transactionService.updateWarehouseTransactionLine(this.transactionService.currentTransaction.transactionInfo.uuid, this.transactionLine.uuid, this.warehouse);
-                if (!warehouseSuccess) {
-                    this.transactionLine.warehouseNumber = oldWarehouse;
-                    warehouseUpdateSuccess = false;
-                }
+                this.transactionService.tryToLockTransaction(this.transactionInfo.id, this.transactionInfo.version).then((locked) => __awaiter(this, void 0, void 0, function* () {
+                    if (locked) {
+                        const warehouseSuccess = yield this.transactionService.updateWarehouseTransactionLine(this.transactionService.currentTransaction.transactionInfo.uuid, this.transactionLine.uuid, this.warehouse);
+                        if (!warehouseSuccess) {
+                            this.transactionLine.warehouseNumber = oldWarehouse;
+                            warehouseUpdateSuccess = false;
+                        }
+                    }
+                }));
             }
             if (this.transactionLine.interBranchSourceWarehouseNr !== this.sourceWarehouse) {
                 const oldSourceWarehouse = this.transactionLine.interBranchSourceWarehouseNr;
@@ -30206,55 +30211,55 @@ class DialogTransactionLineWarehouseComponent extends DialogTransactionLineBaseC
 }
 DialogTransactionLineWarehouseComponent.decorators = [
     { type: Component, args: [{
-                selector: "co-dialog-transaction-line-warehouse",
+                selector: 'co-dialog-transaction-line-warehouse',
                 template: `
-    <co-dialog [headerTemplate]="dialogHeader" [footerTemplate]="footerTemplate" [showCloseIcon]="useModel" (closeClick)="handleCloseDialog($event, buttonType.Cancel)">
+      <co-dialog [headerTemplate]="dialogHeader" [footerTemplate]="footerTemplate" [showCloseIcon]="useModel" (closeClick)="handleCloseDialog($event, buttonType.Cancel)">
 
-      <div class="warehouse-tabs">
-        <div class="warehouse-tab" [textContent]="'SOURCE_WAREHOUSE' | localize" [class.active]="activeTab === tab.Source"
-             (click)="showTab(tab.Source)"></div>
-        <div class="warehouse-tab" [textContent]="'TARGET_WAREHOUSE' | localize" [class.active]="activeTab === tab.Target"
-             (click)="showTab(tab.Target)"></div>
-      </div>
+          <div class="warehouse-tabs">
+              <div class="warehouse-tab" [textContent]="'SOURCE_WAREHOUSE' | localize" [class.active]="activeTab === tab.Source"
+                   (click)="showTab(tab.Source)"></div>
+              <div class="warehouse-tab" [textContent]="'TARGET_WAREHOUSE' | localize" [class.active]="activeTab === tab.Target"
+                   (click)="showTab(tab.Target)"></div>
+          </div>
 
-      <co-transaction-line-warehouse *ngIf="activeTab === tab.Source"
-        [useModel]="false"
-        [value]="sourceWarehouse"
-        [searchText]="searchText"
-        (valueChange)="handleSourceValueChange($event)"
-      ></co-transaction-line-warehouse>
-      <co-transaction-line-warehouse *ngIf="activeTab === tab.Target"
-        [useModel]="false"
-        [value]="warehouse"
-        [searchText]="searchText"
-        (valueChange)="handleTargetValueChange($event)"
-      ></co-transaction-line-warehouse>
+          <co-transaction-line-warehouse *ngIf="activeTab === tab.Source"
+                                         [useModel]="false"
+                                         [value]="sourceWarehouse"
+                                         [searchText]="searchText"
+                                         (valueChange)="handleSourceValueChange($event)"
+          ></co-transaction-line-warehouse>
+          <co-transaction-line-warehouse *ngIf="activeTab === tab.Target"
+                                         [useModel]="false"
+                                         [value]="warehouse"
+                                         [searchText]="searchText"
+                                         (valueChange)="handleTargetValueChange($event)"
+          ></co-transaction-line-warehouse>
 
-    </co-dialog>
-    <ng-template #dialogHeader>
-      <co-dialog-header-search [title]="'WAREHOUSE'" (search)="handleSearch($event)"></co-dialog-header-search>
-    </ng-template>
+      </co-dialog>
+      <ng-template #dialogHeader>
+          <co-dialog-header-search [title]="'WAREHOUSE'" (search)="handleSearch($event)"></co-dialog-header-search>
+      </ng-template>
 
-    <ng-template #footerTemplate>
+      <ng-template #footerTemplate>
 
-      <div class="transaction-line-warehouse-cc-section">
-        <div class="transaction-line-warehouse-cc-warehouses-section">
-          <co-icon class="icon" [iconData]="iconCacheService.getIcon(icons.RegularWarehouseCircleArrowRight)"></co-icon>
-          <co-input-text [readonly]="true" [placeholder]="'SOURCE_WAREHOUSE' | localize" [model]="interBranchSourceWarehouseDescription" ></co-input-text>
-          <co-icon class="icon" [iconData]="iconCacheService.getIcon(icons.RegularWarehouseCircleArrowLeft)"></co-icon>
-          <co-input-text [readonly]="true" [placeholder]="'TARGET_WAREHOUSE' | localize" [model]="warehouseDescription"></co-input-text>
-        </div>
-      </div>
-      <div class="co-dialog-footer-button-wrapper">
-        <co-button [label]="'OK' | localize" (click)="handleOkClick()"></co-button>
-      </div>
-    </ng-template>
+          <div class="transaction-line-warehouse-cc-section">
+              <div class="transaction-line-warehouse-cc-warehouses-section">
+                  <co-icon class="icon" [iconData]="iconCacheService.getIcon(icons.RegularWarehouseCircleArrowRight)"></co-icon>
+                  <co-input-text [readonly]="true" [placeholder]="'SOURCE_WAREHOUSE' | localize" [model]="interBranchSourceWarehouseDescription"></co-input-text>
+                  <co-icon class="icon" [iconData]="iconCacheService.getIcon(icons.RegularWarehouseCircleArrowLeft)"></co-icon>
+                  <co-input-text [readonly]="true" [placeholder]="'TARGET_WAREHOUSE' | localize" [model]="warehouseDescription"></co-input-text>
+              </div>
+          </div>
+          <div class="co-dialog-footer-button-wrapper">
+              <co-button [label]="'OK' | localize" (click)="handleOkClick()"></co-button>
+          </div>
+      </ng-template>
   `,
                 encapsulation: ViewEncapsulation.None
             },] }
 ];
 DialogTransactionLineWarehouseComponent.propDecorators = {
-    showClass: [{ type: HostBinding, args: ["class.co-dialog-transaction-line-warehouse",] }]
+    showClass: [{ type: HostBinding, args: ['class.co-dialog-transaction-line-warehouse',] }]
 };
 
 class TransactionLineWarehouseComponent extends TransactionFilterPopupLineBaseComponent {
@@ -33436,7 +33441,7 @@ class TransactionLineSidePanelArticleDetailsComponent {
     }
     _getAlternateSuppliers() {
         this.alternateSuppliers = [];
-        if (!this.suppliers || this.suppliers.length === 0) {
+        if (!this.suppliers || this.suppliers.length === 0 || !this.purchaseAdviceLine) {
             return;
         }
         this.selectedSupplierId = this.purchaseAdviceLine.supplierId;
@@ -33943,34 +33948,39 @@ class TransactionLineDropShipmentButtonComponent extends TransactionLineBaseComp
 }
 TransactionLineDropShipmentButtonComponent.decorators = [
     { type: Component, args: [{
-                selector: "co-transaction-line-drop-shipment-button",
+                selector: 'co-transaction-line-drop-shipment-button',
                 template: `
-    <div class="inside-field">
-      <co-transaction-line-label *ngIf="transactionService.internalParameterAllowsDropShipment && supplierAllowsDropShipment && inputLabel"
-                                 [insideLabel]="'DROPSHIPMENT'"></co-transaction-line-label>
-      <co-transaction-button *ngIf="transactionService.internalParameterAllowsDropShipment && supplierAllowsDropShipment"
-                             [hidden]="hidden"
-                             [readonly]="readonly"
-                             [label]="'DROPSHIPMENT' | localize"
-                             (click)="handleToggleDropShipment($event)"
-      ></co-transaction-button>
-      <co-transaction-button *ngIf="!transactionService.internalParameterAllowsDropShipment || !supplierAllowsDropShipment"
-                             class="disabled-button"
-                             [hidden]="hidden"
-                             [readonly]="readonly"
-                             [label]="'DROPSHIPMENT_NO' | localize"
-      ></co-transaction-button>
-    </div>
-    <co-dialog-transaction-line-warehouse *ngIf="showDialogWarehouse && !readonly"
-                                          [autoClose]="true"
-                                          (close)="showDialogWarehouse = false"
-    ></co-dialog-transaction-line-warehouse>
+      <div class="inside-field">
+          <co-transaction-line-label
+                  *ngIf="transactionService.internalParameterAllowsDropShipment && supplierAllowsDropShipment && inputLabel"
+                  [insideLabel]="'DROPSHIPMENT'">
+          </co-transaction-line-label>
+          <co-transaction-button
+                  *ngIf="transactionService.internalParameterAllowsDropShipment && supplierAllowsDropShipment"
+                  [hidden]="hidden"
+                  [readonly]="readonly"
+                  [label]="'DROPSHIPMENT' | localize"
+                  (click)="handleToggleDropShipment($event)">
+          </co-transaction-button>
+          <co-transaction-button
+                  *ngIf="!transactionService.internalParameterAllowsDropShipment || !supplierAllowsDropShipment"
+                  class="disabled-button"
+                  [hidden]="hidden"
+                  [readonly]="readonly"
+                  [label]="'DROPSHIPMENT_NO' | localize">
+          </co-transaction-button>
+      </div>
+
+      <co-dialog-transaction-line-warehouse
+              *ngIf="showDialogWarehouse && !readonly"
+              [autoClose]="true"
+              (close)="showDialogWarehouse = false">
+      </co-dialog-transaction-line-warehouse>
   `,
                 providers: [{
                         provide: SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME,
                         useExisting: forwardRef(() => TransactionLineDropShipmentButtonComponent)
-                    }
-                ],
+                    }],
                 encapsulation: ViewEncapsulation.None
             },] }
 ];
@@ -33989,7 +33999,7 @@ TransactionLineDropShipmentButtonComponent.ctorParameters = () => [
 TransactionLineDropShipmentButtonComponent.propDecorators = {
     showLabel: [{ type: Input }],
     inputLabel: [{ type: Input }],
-    showClass: [{ type: HostBinding, args: ["class.co-transaction-line-drop-shipment-button",] }]
+    showClass: [{ type: HostBinding, args: ['class.co-transaction-line-drop-shipment-button',] }]
 };
 
 class TransactionLineDropShipmentButtonModule {
@@ -47882,6 +47892,12 @@ class TransactionLinesComponent extends TransactionLinesBaseComponent {
         this._subs.forEach(s => s.unsubscribe());
         super.ngOnDestroy();
     }
+    getDisplayIndex(i, lines) {
+        return lines
+            .slice(0, i + 1)
+            .filter(line => !line.isText)
+            .length;
+    }
     transactionSet() {
         super.transactionSet();
         this._checkActiveLine();
@@ -47898,9 +47914,9 @@ TransactionLinesComponent.decorators = [
                 selector: "co-transaction-lines",
                 template: `
     <div *ngIf="customerPortal">
-        <div class="draggable-transaction-line" *ngFor="let line of (historicTransactionLines ? historicTransactionLines : transactionLines); let i = index">
+        <div class="draggable-transaction-line" *ngFor="let line of (historicTransactionLines ? historicTransactionLines : transactionLines) as lines; let i = index">
         <co-transaction-line
-                [lineIndex]="i+1"
+                [lineIndex]="getDisplayIndex(i, lines)"
                 [transactionLine]="line"
           [activeCategory]="category.SalesCustomerPortal"
           [preview]="preview"
@@ -47921,7 +47937,7 @@ TransactionLinesComponent.decorators = [
          (cdkDropListEntered)="handleDropListEntered($event)"
     >
       <div class="draggable-transaction-line"
-           *ngFor="let line of (historicTransactionLines ? historicTransactionLines : transactionLines);let isFirst = first; let i = index; trackBy:trackByFn;"
+           *ngFor="let line of (historicTransactionLines ? historicTransactionLines : transactionLines) as lines;let isFirst = first; let i = index; trackBy:trackByFn;"
            [cdkDragDisabled]="activeCategory !== category.SalesOrderOverview && activeCategory !== category.SalesOrderQuotation &&
                               activeCategory !== category.PurchaseOrderOverview && activeCategory !== category.ServiceOrderOverview"
            cdkDrag>
@@ -47931,7 +47947,7 @@ TransactionLinesComponent.decorators = [
                  [iconData]="iconCacheService.getIcon(icons.GripDotsVerticalSolid)">
         </co-icon>
         <co-transaction-line
-                [lineIndex]="i+1"
+                [lineIndex]="getDisplayIndex(i, lines)"
                 [draggedOver]="lineDraggedOver === line.lineNr"
           [transactionLine]="line"
           [activeCategory]="activeCategory"
@@ -47946,13 +47962,13 @@ TransactionLinesComponent.decorators = [
         ></co-transaction-line>
       </div>
       <ng-container *ngIf="activeCategory === category.SalesOrderDeliveryNote || activeCategory === category.SalesOrderInvoice || activeCategory === category.SalesOrderPlanning">
-          <div class="draggable-transaction-line" *ngFor="let line of deliveryCostLines; let i = index; trackBy:trackByFn;" cdkDrag>
+          <div class="draggable-transaction-line" *ngFor="let line of deliveryCostLines as lines; let i = index; trackBy:trackByFn;" cdkDrag>
           <co-icon *ngIf="!preview" class="transaction-line-drag-handle"
                    [class.show]="line === selectedTransactionLine" cdkDragHandle
                    [iconData]="iconCacheService.getIcon(icons.GripDotsVerticalSolid)">
           </co-icon>
           <co-transaction-line
-                  [lineIndex]="i+1"
+                  [lineIndex]="getDisplayIndex(i, lines)"
                   [transactionLine]="line"
             [activeCategory]="activeCategory"
             [preview]="preview"
@@ -48717,80 +48733,83 @@ 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]="amount === 0 ? amount : (amount | coCurrency)"></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]="amount === 0 ? amount : (amount | coCurrency)"></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)"
+                                      [disabled]="paymentService.amountToPay === 0"
+                                      (click)="handlePayment()">
+                              </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"></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"></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
@@ -51871,6 +51890,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);
         });
@@ -51902,7 +51922,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;
@@ -52210,9 +52230,9 @@ TransactionHeaderPopupPaymentComponent.decorators = [
 
       <co-dialog
               class="payment-dialog"
+              *ngIf="showPaymentDialog"
               [modal]="true"
               [headerTemplate]="headerTemplate"
-              *ngIf="showPaymentDialog"
               (closeClick)="handleCloseDialog()">
           <ng-template #headerTemplate>
               <div class="co-dialog-wrapper-popup-title">
@@ -52228,8 +52248,8 @@ TransactionHeaderPopupPaymentComponent.decorators = [
                   [remainingPayment]="true"
                   [currencyId]="transactionInfo.currencyId"
                   [doNotFetchAmountToPayForRemaining]="true"
-                  [showPaymentDate]="true"
-          ></co-payment>
+                  [showPaymentDate]="true">
+          </co-payment>
       </co-dialog>
   `,
                 encapsulation: ViewEncapsulation.None