@colijnit/transaction 258.1.33 → 258.1.35

package/fesm2015/colijnit-transaction.js

@@ -247,7 +247,6 @@ import { QuantityInHistoricState } from '@colijnit/transactionapi/build/enum/qua
 import { DoPaymentRequest } from '@colijnit/transactionapi/build/model/do-payment-request';
 import { IonePaymentStatusCode } from '@colijnit/transactionapi/build/enum/ione-payment-status-code.enum';
 import { CashDrawersRequest } from '@colijnit/transactionapi/build/model/cash-drawers-request';
-import { CalculateAmountToPayRequest } from '@colijnit/transactionapi/build/model/calculate-amount-to-pay-request';
 import { GenderType } from '@colijnit/relationapi/build/enum/gender-type.enum';
 import { ContactOption } from '@colijnit/relationapi/build/model/contact-option.bo';
 import { BusinessObjectUtils } from '@colijnit/ioneconnector/build/utils/business-object-utils';
@@ -270,6 +269,7 @@ import { TrueFalseDbType } from '@colijnit/mainapi/build/enum/true-false-db-type
 import { OrderLineSetDTO } from '@colijnit/transactionapi/build/model/order-line-set-dto';
 import { TransactionAddOrderLineSetTextLineRequest } from '@colijnit/transactionapi/build/model/transaction-add-order-line-set-text-line-request';
 import { TransactionLineCopyRequest } from '@colijnit/transactionapi/build/model/transaction-line-copy-request.bo';
+import { CalculateAmountToPayRequest } from '@colijnit/transactionapi/build/model/calculate-amount-to-pay-request';
 import { TransactionLspInformationRequest } from '@colijnit/transactionapi/build/model/transaction-lsp-information-request';
 import { TransactionLspRequestLine } from '@colijnit/transactionapi/build/model/transaction-lsp-request-line.bo';
 import { ExternalCatalogAddArticleRequest } from '@colijnit/transactionapi/build/model/external-catalog-add-article-request';
@@ -294,8 +294,8 @@ class Version {
     constructor() {
         this.name = "@colijnit/transaction";
         this.description = "Colijn IT transaction package";
-        this.symVer = "258.1.33";
-        this.publishDate = "17-6-2025 18:18:30";
+        this.symVer = "258.1.35";
+        this.publishDate = "19-6-2025 10:49:58";
     }
 }
 
@@ -605,6 +605,7 @@ var Icon;
     Icon["ShelvesOpen"] = "shelves_open";
     Icon["ShelvesRegular"] = "shelves_regular";
     Icon["ShelvesSolid"] = "shelves_solid";
+    Icon["SidebarFlipRegular"] = "sidebar_flip_regular";
     Icon["SidePanel"] = "side_panel";
     Icon["SlidersUpRegular"] = "sliders_up_regular";
     Icon["SlideIn"] = "slide_in";
@@ -770,6 +771,7 @@ const IconSvg = {
     "shelves_open": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 640 512\"><path d=\"M32 0V16 160H608V16 0h32V16 160v16 16V416v16 16 48 16H608V496 448H32v48 16H0V496 448 432 416 192 176 160 16 0H32zm0 416H608V192H32V416zM448 32H384V96h64V32zM384 0h64 32V32 96v32H448 384 352V96 32 0h32zM128 288v64h64V288H128zM96 256h32 64 32v32 64 32H192 128 96V352 288 256zm192 32v64h64V288H288zm-32-32h32 64 32v32 64 32H352 288 256V352 288 256z\"/></svg>",
     "shelves_regular": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 640 512\"><path d=\"M24 0C37.3 0 48 10.7 48 24V160H592V24c0-13.3 10.7-24 24-24s24 10.7 24 24V184 440v48c0 13.3-10.7 24-24 24s-24-10.7-24-24V464H48v24c0 13.3-10.7 24-24 24s-24-10.7-24-24V440 184 24C0 10.7 10.7 0 24 0zM48 416H592V208H48V416zM352 32c0-17.7 14.3-32 32-32h64c17.7 0 32 14.3 32 32V96c0 17.7-14.3 32-32 32H384c-17.7 0-32-14.3-32-32V32zM128 256h64c17.7 0 32 14.3 32 32v64c0 17.7-14.3 32-32 32H128c-17.7 0-32-14.3-32-32V288c0-17.7 14.3-32 32-32zm160 0h64c17.7 0 32 14.3 32 32v64c0 17.7-14.3 32-32 32H288c-17.7 0-32-14.3-32-32V288c0-17.7 14.3-32 32-32z\"/></svg>",
     "shelves_solid": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 640 512\"><path d=\"M608 0c-17.6 0-32 14.4-32 31.1V160H64V31.1C64 14.4 49.6 0 32 0S0 14.4 0 31.1v480h64v-32h512v32h64v-480C640 14.4 625.6 0 608 0zM576 416H64V224h512V416zM368 128h96C472.8 128 480 120.8 480 112v-96C480 7.25 472.8 0 464 0h-96C359.2 0 352 7.25 352 16v96C352 120.8 359.2 128 368 128zM112 384h96C216.8 384 224 376.8 224 368v-96C224 263.2 216.8 256 208 256h-96C103.2 256 96 263.2 96 272v96C96 376.8 103.2 384 112 384zM272 384h96c8.75 0 16-7.25 16-16v-96C384 263.2 376.8 256 368 256h-96C263.2 256 256 263.2 256 272v96C256 376.8 263.2 384 272 384z\"/></svg>",
+    "sidebar_flip_regular": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 512 512\"><path d=\"M288 80l0 352L64 432c-8.8 0-16-7.2-16-16L48 96c0-8.8 7.2-16 16-16l224 0zM512 96c0-35.3-28.7-64-64-64L64 32C28.7 32 0 60.7 0 96L0 416c0 35.3 28.7 64 64 64l384 0c35.3 0 64-28.7 64-64l0-320zm-64 24c0 13.3-10.7 24-24 24l-48 0c-13.3 0-24-10.7-24-24s10.7-24 24-24l48 0c13.3 0 24 10.7 24 24zm-24 72c13.3 0 24 10.7 24 24s-10.7 24-24 24l-48 0c-13.3 0-24-10.7-24-24s10.7-24 24-24l48 0zm24 120c0 13.3-10.7 24-24 24l-48 0c-13.3 0-24-10.7-24-24s10.7-24 24-24l48 0c13.3 0 24 10.7 24 24z\"/></svg>",
     "side_panel": "<svg width=\"47px\" height=\"43px\" viewBox=\"0 0 47 43\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\"><defs><image width=\"47\" height=\"43\" xlink:href=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC8AAAArCAYAAADottG6AAAABHNCSVQICAgIfAhkiAAAAHtJREFUWIXt18EJwCAQAEENKSNv60gVgVQYSBWpw3f6OHvQx3Kw8xcX0QNrRERJaqMDVhhPMZ5iPMV4ivEU4ynGU/bZhb3/5Xm/pc3v6yytHdPrq58RiPEUHywl9bUxnuKDpaS+NsZTUsennjapT95RSTGeYjzFeErq+AEBrixGEVJ5mAAAAABJRU5ErkJggg==\" /></defs><use xlink:href=\"#img_1\" fill=\"#FFFFFF\" stroke=\"none\" /></svg>",
     "sliders_up_regular": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 512 512\"><path d=\"M96 0c13.3 0 24 10.7 24 24l0 59.7c32.5 10.2 56 40.5 56 76.3s-23.5 66.1-56 76.3L120 488c0 13.3-10.7 24-24 24s-24-10.7-24-24l0-251.7C39.5 226.1 16 195.8 16 160s23.5-66.1 56-76.3L72 24C72 10.7 82.7 0 96 0zm0 192a32 32 0 1 0 0-64 32 32 0 1 0 0 64zM256 384a32 32 0 1 0 0-64 32 32 0 1 0 0 64zm80-32c0 35.8-23.5 66.1-56 76.3l0 59.7c0 13.3-10.7 24-24 24s-24-10.7-24-24l0-59.7c-32.5-10.2-56-40.5-56-76.3s23.5-66.1 56-76.3L232 24c0-13.3 10.7-24 24-24s24 10.7 24 24l0 251.7c32.5 10.2 56 40.5 56 76.3zM448 192a32 32 0 1 0 -64 0 32 32 0 1 0 64 0zm-8 76.3L440 488c0 13.3-10.7 24-24 24s-24-10.7-24-24l0-219.7c-32.5-10.2-56-40.5-56-76.3s23.5-66.1 56-76.3L392 24c0-13.3 10.7-24 24-24s24 10.7 24 24l0 91.7c32.5 10.2 56 40.5 56 76.3s-23.5 66.1-56 76.3z\"/></svg>",
     "slide_in": "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 30 30\"><g ><g><path d=\"M2,2.17H28V28.17H2V2.17Zm24.76,1.24H3.24V26.93H26.76V3.4Z\" fill=\"#484f60\"/><polygon points=\"23.71 13.42 18.41 13.42 18.41 10.43 14.12 14.72 18.41 19.01 18.41 16.02 23.71 16.02 23.71 13.42\" fill=\"#484f60\"/><rect x=\"2\" y=\"2.17\" width=\"9\" height=\"26\" fill=\"#484f60\"/></g></g></svg>",
@@ -20199,7 +20201,7 @@ class TransactionQuickAccessOrderConfirmationComponent extends TransactionHeader
             details.lineNumber = line.lineNr;
             details.amountConfirmed = line.quantityPurchaseToConfirm ? +line.quantityPurchaseToConfirm : line.amount;
             details.confirmedDate = line.purchasePortalLine.deliveryDateConfirmed ? new Date(line.purchasePortalLine.deliveryDateConfirmed) : this.purchaseOrderConfirmation.confirmationDate;
-            details.confirmedPrice = typeof line.purchasePortalLine.confirmedPrice === 'number' ? +line.purchasePortalLine.confirmedPrice : calculatedConfirmedPrice;
+            details.confirmedPrice = line.purchasePortalLine.confirmedPrice ? +line.purchasePortalLine.confirmedPrice : calculatedConfirmedPrice;
             details.articleNoSupplier = line.purchasePortalLine.articleNoSupplier;
             return details;
         });
@@ -20625,14 +20627,30 @@ TransactionQuickAccessReceivedGoodsComponent.decorators = [
                 template: `
     <div class="quick-access-wrapper" *ngIf="!hideQuickAccessContent">
       <div class="sub-section">
-        <co-input-date
-          [placeholder]="'RECEIVED_DATE' | localize"
-          [(model)]="commitDate"
-        ></co-input-date>
-        <co-input-text
-          [placeholder]="'PACKING_SLIP' | localize"
-          [(model)]="packingSlipNr"
-        ></co-input-text>
+        <div class="sub-section-input">
+          <co-input-date
+            [placeholder]="'RECEIVED_DATE' | localize"
+            [(model)]="commitDate"
+          ></co-input-date>
+          <co-input-checkbox
+            class="checkbox-wrapper"
+            [label]="'SELECT_ALL' | localize"
+            [(model)]="localCheckboxState"
+            (modelChange)="handleSelectAllLines($event)"
+          ></co-input-checkbox>
+        </div>
+        <div class="sub-section-input">
+          <co-input-text
+            [placeholder]="'PACKING_SLIP' | localize"
+            [(model)]="packingSlipNr"
+          ></co-input-text>
+          <co-input-checkbox
+            class="checkbox-wrapper"
+            [label]="'NO_PACKAGE_STICKERS' | localize"
+            [(model)]="colliCheckboxState"
+            (modelChange)="handleSelectAllLines($event)"
+          ></co-input-checkbox>
+        </div>
   <!--
         <co-transaction-labeled-warehouse-location-button *ngIf="internalParamMLocat && showWarehouseLocationButton"
           [locationNr]="globalWarehouseLocation"
@@ -20649,20 +20667,6 @@ TransactionQuickAccessReceivedGoodsComponent.decorators = [
           (openSendMethodDialog)="showSendMethodDialog = true"
         ></co-quick-send-button>
       </div>
-      <div  class="sub-section"w>
-        <co-input-checkbox
-          class="checkbox-wrapper"
-          [label]="'SELECT_ALL' | localize"
-          [(model)]="localCheckboxState"
-          (modelChange)="handleSelectAllLines($event)"
-        ></co-input-checkbox>
-        <co-input-checkbox
-          class="checkbox-wrapper"
-          [label]="'NO_PACKAGE_STICKERS' | localize"
-          [(model)]="colliCheckboxState"
-          (modelChange)="handleSelectAllLines($event)"
-        ></co-input-checkbox>
-      </div>
     </div>
     <co-send-method-dialog *ngIf="showSendMethodDialog"
                            [printerList]="printerList"
@@ -23789,7 +23793,6 @@ TransactionPurchaseOrderLineComponent.decorators = [
                         <co-input-text
                           [class.warning]="showColorIndicator && transactionLine.amount !== transactionLine.quantityPurchaseToConfirm"
                           [model]="transactionLine.amount"
-                          [leftIconData]="iconCacheService.getIcon(icons.CartShoppingRegular)"
                           [readonly]="true"
                           [customHeight]="true"
                         ></co-input-text>
@@ -23840,7 +23843,7 @@ TransactionPurchaseOrderLineComponent.decorators = [
                         <co-input-text
                           [screenConfigurationObject]="cfgNames.LineConfirmedAmount"
                           [(model)]="+transactionLine.quantityPurchaseToConfirm"
-                          [leftIconData]="iconCacheService.getIcon(icons.FileCircleInfoRegular)"
+
                           [forceReadonly]="true"
                           [digitsOnly]="true"
                         ></co-input-text>
@@ -23851,7 +23854,7 @@ TransactionPurchaseOrderLineComponent.decorators = [
                         <co-transaction-line-label [insideLabel]="'ARTICLE_NR_SUPPLIER'"></co-transaction-line-label>
                         <co-input-text
                           [model]="transactionLine.purchasePortalLine.articleNoSupplier ? transactionLine.purchasePortalLine.articleNoSupplier : '-'"
-                          [leftIconData]="iconCacheService.getIcon(icons.RegularIndustryTag)"
+
                           [customHeight]="true"
                           [readonly]="true"
                         ></co-input-text>
@@ -33489,6 +33492,9 @@ class TransactionNavigationButtonListComponent {
             case TransactionKind.SalesInvoice:
                 return 'INVOICE';
                 break;
+            case TransactionKind.InternalDelivery:
+                return 'INTERNAL_DELIVERY';
+                break;
             default:
                 return this.insideLabel;
                 break;
@@ -48621,39 +48627,40 @@ TransactionLineToolbarComponent.decorators = [
     { type: Component, args: [{
                 selector: 'co-transaction-line-toolbar',
                 template: `
-      <div class="toolbar">
-          <div class="toolbar-item" *ngIf="canReopenExternalOrder"
-               (click)="handleReopenExternalOrderClick()">
-              <co-icon [iconData]="iconCacheService.getIcon(icons.DetailView)"></co-icon>
-          </div>
-          <div class="toolbar-item" (click)="handleAddDocumentButtonClick()"
-               [screenConfigurationObject]="configNames?.addDocumentBtn" screenConfigNativeElement>
-              <co-icon [iconData]="iconCacheService.getIcon(icons.Attachments)"></co-icon>
-          </div>
-          <div class="toolbar-item" (click)="handleArticleTextButtonClick()"
-               [screenConfigurationObject]="configNames?.addProductTextBtn" screenConfigNativeElement>
-              <co-icon [iconData]="iconCacheService.getIcon(icons.TextSizeSolid)"></co-icon>
-          </div>
-          <div class="toolbar-item" *ngIf="canCreateService" (click)="handleCreateServiceButtonClick()"
-               [screenConfigurationObject]="configNames?.sidePanelBtn" screenConfigNativeElement>
-              <co-icon [iconData]="iconCacheService.getIcon(icons.DetailView)"></co-icon>
-          </div>
-
-          <div class="toolbar-item" (click)="handleViewStockButtonClick()"
-               [screenConfigurationObject]="configNames?.sidePanelBtn" screenConfigNativeElement>
-              <co-icon [iconData]="iconCacheService.getIcon(icons.PalletBoxesRotate)"></co-icon>
-          </div>
+    <div class="toolbar">
+      <div class="toolbar-inner">
+        <div class="toolbar-item" [title]="'COPY' | localize" (click)="handleCopyLineButtonClick()"
+             [screenConfigurationObject]="configNames?.sidePanelBtn" screenConfigNativeElement>
+          <co-icon [iconData]="iconCacheService.getIcon(icons.PlusSimple)"></co-icon>
+        </div>
+        <div class="toolbar-item" *ngIf="canReopenExternalOrder"
+             (click)="handleReopenExternalOrderClick()">
+          <co-icon [iconData]="iconCacheService.getIcon(icons.DetailView)"></co-icon>
+        </div>
+        <div class="toolbar-item" [title]="'DOCUMENT' | localize" (click)="handleAddDocumentButtonClick()"
+             [screenConfigurationObject]="configNames?.addDocumentBtn" screenConfigNativeElement>
+          <co-icon [iconData]="iconCacheService.getIcon(icons.Attachments)"></co-icon>
+        </div>
+        <div class="toolbar-item" [title]="'TEXTS' | localize" (click)="handleArticleTextButtonClick()"
+             [screenConfigurationObject]="configNames?.addProductTextBtn" screenConfigNativeElement>
+          <co-icon [iconData]="iconCacheService.getIcon(icons.TextSizeSolid)"></co-icon>
+        </div>
+        <div class="toolbar-item" [title]="'SERVICE' | localize" *ngIf="canCreateService" (click)="handleCreateServiceButtonClick()"
+             [screenConfigurationObject]="configNames?.sidePanelBtn" screenConfigNativeElement>
+          <co-icon [iconData]="iconCacheService.getIcon(icons.DetailView)"></co-icon>
+        </div>
 
-          <div class="toolbar-item" (click)="handleSidePanelButtonClick()"
-               [screenConfigurationObject]="configNames?.sidePanelBtn" screenConfigNativeElement>
-              <co-icon [iconData]="iconCacheService.getIcon(icons.ObjectIntersectSolid)"></co-icon>
-          </div>
+        <div class="toolbar-item" [title]="'STOCK' | localize" (click)="handleViewStockButtonClick()"
+             [screenConfigurationObject]="configNames?.sidePanelBtn" screenConfigNativeElement>
+          <co-icon [iconData]="iconCacheService.getIcon(icons.PalletBoxesRotate)"></co-icon>
+        </div>
 
-          <div class="toolbar-item" (click)="handleCopyLineButtonClick()"
-               [screenConfigurationObject]="configNames?.sidePanelBtn" screenConfigNativeElement>
-              <co-icon [iconData]="iconCacheService.getIcon(icons.PlusSimple)"></co-icon>
-          </div>
+        <div class="toolbar-item" [title]="'SIDE_PANEL' | localize" (click)="handleSidePanelButtonClick()"
+             [screenConfigurationObject]="configNames?.sidePanelBtn" screenConfigNativeElement>
+          <co-icon [iconData]="iconCacheService.getIcon(icons.SidebarFlipRegular)"></co-icon>
+        </div>
       </div>
+    </div>
   `,
                 providers: [{
                         provide: SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME,
@@ -49287,7 +49294,7 @@ class TransactionPaymentService {
                 }
                 if (this.currentPaymentMethod.pinTerminal) {
                     pspTransactionUuid = yield this._paymentConnectorService.doPayment(request);
-                    yield this._triggerCalculateAmountToPay();
+                    // await this._triggerCalculateAmountToPay();
                 }
                 else {
                     this._paymentResult = yield this._paymentConnectorService.createIonePaymentLinkAndQRCode(this.transactionUuid, this.amountToPay, this.currentPaymentMethod.code);
@@ -49316,7 +49323,7 @@ class TransactionPaymentService {
                 this._paymentConnectorService.doPayment(request).then(() => __awaiter(this, void 0, void 0, function* () {
                     yield this.preparePaymentInfo();
                     if (!this.currentPaymentMethod.voucher) {
-                        yield this._triggerCalculateAmountToPay();
+                        // await this._triggerCalculateAmountToPay();
                     }
                     else {
                         this.amountToPay = 0;
@@ -49459,16 +49466,6 @@ class TransactionPaymentService {
             });
         });
     }
-    _triggerCalculateAmountToPay() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const amountToPayRequest = new CalculateAmountToPayRequest();
-            amountToPayRequest.transactionUuid = this.transactionUuid;
-            amountToPayRequest.paymentMethodCode = this.currentPaymentMethod.code;
-            this._paymentConnectorService.calculateAmountToPay(amountToPayRequest).then((result) => {
-                this.amountToPay = result.amountToPay;
-            });
-        });
-    }
 }
 TransactionPaymentService.decorators = [
     { type: Injectable }
@@ -50970,7 +50967,6 @@ TransactionHeaderDeliveryComponent.decorators = [
       [firstBlockTemplate]="firstBlock"
       [secondBlockTemplate]="secondBlock"
       [thirdBlockTemplate]="thirdBlock"
-      [hiddenBlockTemplate]="hiddenBlock"
       (headerClick)="showDialog = true"
     >
     </co-transaction-header-block>
@@ -51016,7 +51012,7 @@ TransactionHeaderDeliveryComponent.decorators = [
                                                     [screenConfigurationObject]="cfgNames.HeaderDeliveryMethod"
       ></co-transaction-header-delivery-method-button>
     </ng-template>
-    <ng-template #hiddenBlock>
+    <!--ng-template #hiddenBlock>
       <co-transaction-header-partial-delivery class="transaction-header-partial-delivery co-transaction-label"
                                               [screenConfigurationObject]="cfgNames.HeaderDeliveryPartialHeader"
                                               ></co-transaction-header-partial-delivery>
@@ -51024,7 +51020,7 @@ TransactionHeaderDeliveryComponent.decorators = [
                                                      [defaultEditMode]="false"
                                                      [showLabel]="false"
       ></co-transaction-header-preferred-delivery-date>
-    </ng-template>
+    </ng-template-->
     <co-transaction-header-popup *ngIf="showDialog"
                                  [activeCategoryDescription]="'DELIVERY_INFORMATION'"
                                  (closeClick)="showDialog = false"></co-transaction-header-popup>
@@ -51084,7 +51080,7 @@ TransactionHeaderBlockComponent.decorators = [
         <div class="transaction-header-block-content-first" *ngIf="firstBlockTemplate">
           <ng-container [ngTemplateOutlet]="firstBlockTemplate"></ng-container>
         </div>
-        <div class="transaction-header-block-content-second" *ngIf="secondBlockTemplate || thirdBlockTemplate">
+        <div class="transaction-header-block-content-second" *ngIf="secondBlockTemplate">
           <ng-container [ngTemplateOutlet]="secondBlockTemplate"></ng-container>
         </div>
         <div class="transaction-header-block-content-third" *ngIf="thirdBlockTemplate">
@@ -53001,22 +52997,24 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
         });
     }
     _getOutstandingAmounts() {
-        // keeping this for now, could be that we need to use this call after all
-        // const outstandingAmountsRequest: OutstandingAmountFilterCustomer = new OutstandingAmountFilterCustomer();
-        // outstandingAmountsRequest.transactionId = this.transactionInfo.id;
-        // this._paymentConnectorService.getOutstandingCustomerAmounts(outstandingAmountsRequest).then((response: OutstandingAmountCustomer[]) => {
-        //   this.outstandingCustomerAmount = response;
-        // });
-        const paymentAnalysisRequest = new OrderPaymentAnalysisFilter();
-        paymentAnalysisRequest.transactionId = this.transactionInfo.id;
-        this._paymentConnectorService.getSalesOrderPaymentAnalysis(paymentAnalysisRequest).then((response) => {
-            this.orderPaymentAnalysis = response;
-            this.orderPaymentAnalysis = this.orderPaymentAnalysis.map(transaction => (Object.assign(Object.assign({}, transaction), { isSelected: false })));
-        });
-        this._paymentConnectorService.getPaymentAnalysis(this.transactionInfo.uuid).then((response) => {
-            this.paymentAnalysis = response;
-            this.chosenAmountToPay = this.paymentAnalysis.totalToPay;
-            this._updateChosenAmountToPay();
+        return __awaiter(this, void 0, void 0, function* () {
+            // keeping this for now, could be that we need to use this call after all
+            // const outstandingAmountsRequest: OutstandingAmountFilterCustomer = new OutstandingAmountFilterCustomer();
+            // outstandingAmountsRequest.transactionId = this.transactionInfo.id;
+            // this._paymentConnectorService.getOutstandingCustomerAmounts(outstandingAmountsRequest).then((response: OutstandingAmountCustomer[]) => {
+            //   this.outstandingCustomerAmount = response;
+            // });
+            const paymentAnalysisRequest = new OrderPaymentAnalysisFilter();
+            paymentAnalysisRequest.transactionId = this.transactionInfo.id;
+            yield this._paymentConnectorService.getSalesOrderPaymentAnalysis(paymentAnalysisRequest).then((response) => {
+                this.orderPaymentAnalysis = response;
+                this.orderPaymentAnalysis = this.orderPaymentAnalysis.map(transaction => (Object.assign(Object.assign({}, transaction), { isSelected: false })));
+            });
+            yield this._paymentConnectorService.getPaymentAnalysis(this.transactionInfo.uuid).then((response) => {
+                this.paymentAnalysis = response;
+                this.chosenAmountToPay = this.paymentAnalysis.totalToPay;
+                this._updateChosenAmountToPay();
+            });
         });
     }
     _getRegisteredPaymentInfo() {
@@ -53038,7 +53036,13 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
             this.orderPaymentAnalysis.filter(payment => payment.transactionKind === this.transKind.SalesInvoice).length === 0) {
             this.chosenAmountToPay = this.paymentAnalysis.totalDeposit;
         }
-        if (this.orderPaymentAnalysis.filter(payment => (payment.transactionKind === this.transKind.SalesInvoice) && (payment.outstandingAmount > 0)).length === 1) {
+        // Deposit only
+        if (this.orderPaymentAnalysis.filter(payment => payment.transactionKind === this.transKind.SalesOrder &&
+            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];
             this.chosenAmountToPay = remainingInvoice.outstandingAmount;
         }
@@ -57678,6 +57682,7 @@ class TransactionHeaderComponent {
         this.cfgNames = TransactionCfgName;
         this.icons = Icon;
         this.toggleHeader = false;
+        this.showDialog = false;
         this.isPurchaseOrder = true;
         this._transaction = new TransactionInfoResponse();
     }
@@ -57705,7 +57710,7 @@ TransactionHeaderComponent.decorators = [
     { type: Component, args: [{
                 selector: 'co-transaction-header',
                 template: `
-      <div class="transaction-header-wrapper" [class.expanded]="toggleHeader">
+      <div class="transaction-header-wrapper"  [class.expanded]="!toggleHeader">
           <co-carousel>
               <co-transaction-header-relation #carouselItem
                                               [screenConfigurationObject]="cfgNames.RelationInfoHeader"
@@ -57723,12 +57728,12 @@ TransactionHeaderComponent.decorators = [
                                               [screenConfigurationObject]="cfgNames.DeliveryInfoHeader"
               ></co-transaction-header-delivery>
           </co-carousel>
-          <div class="expand-transaction-header">
+          <!--div class="expand-transaction-header">
               <co-icon class="expand-header-icon"
                        [iconData]="iconCacheService.getIcon(icons.ArrowPointDown)"
                        (click)="expandHeader()">
               </co-icon>
-          </div>
+          </div-->
       </div>
   `,
                 encapsulation: ViewEncapsulation.None
@@ -57787,10 +57792,12 @@ class TransactionHeaderRelationComponent extends TransactionHeaderBaseComponent
             if (address) {
                 this.firstAddress = address.displayAddress;
                 this.firstPostal = address.displayPostal;
+                this.firstStreet = address.city;
             }
             else {
                 this.firstAddress = "";
                 this.firstPostal = "";
+                this.firstStreet = "";
             }
         }
     }
@@ -57819,10 +57826,12 @@ TransactionHeaderRelationComponent.decorators = [
                     ></label>
                     <div class="header-relation-name text-overflow" [textContent]="relation.displayName"
                          [screenConfigurationObject]="cfgNames.HeaderRelationRelationHeader" screenConfigNativeElement></div>
-                    <div class="header-relation-address text-overflow" [textContent]="firstAddress"
-                         [screenConfigurationObject]="cfgNames.HeaderRelationAddressHeader" screenConfigNativeElement></div>
-                    <div class="header-relation-postal text-overflow" [textContent]="firstPostal"
-                         [screenConfigurationObject]="cfgNames.HeaderRelationPostalHeader" screenConfigNativeElement></div>
+                    <div class="header-relation-double text-overflow">
+                      <div class="header-relation-address" [textContent]="firstAddress"
+                           [screenConfigurationObject]="cfgNames.HeaderRelationAddressHeader" screenConfigNativeElement></div>
+                      <div class="header-relation-postal" [textContent]="firstStreet"
+                           [screenConfigurationObject]="cfgNames.HeaderRelationPostalHeader" screenConfigNativeElement></div>
+                    </div>
                 </div>
             </ng-container>
         </ng-template>
@@ -57914,12 +57923,11 @@ TransactionHeaderOrderComponent.decorators = [
       <co-transaction-header-block
               [firstBlockTemplate]="firstBlock"
               [secondBlockTemplate]="secondBlock"
-              [hiddenBlockTemplate]="hiddenBlock"
               (headerClick)="showDialog = true"
       >
       </co-transaction-header-block>
       <ng-template #firstBlock>
-        <div class="transaction-header-block-row" (click)="showDialog = true">
+        <div class="transaction-header-block-row">
           <div class="header-order-total-wrapper" [screenConfigurationObject]="cfgNames.HeaderOrderOrderTotalHeader" screenConfigNativeElement>
             <span class="header-order-total-label co-transaction-label" [textContent]="'ORDER_TOTAL' | localize"></span>
             <div class="header-order-total" [textContent]="transactionTotal.netAmount | coCurrency"></div>
@@ -57927,7 +57935,7 @@ TransactionHeaderOrderComponent.decorators = [
         </div>
       </ng-template>
       <ng-template #secondBlock>
-        <div class="transaction-header-block-row" (click)="showDialog = true" [screenConfigurationObject]="cfgNames.HeaderOrderDiscountHeader" screenConfigNativeElement>
+        <div class="transaction-header-block-row" [screenConfigurationObject]="cfgNames.HeaderOrderDiscountHeader" screenConfigNativeElement>
           <div class="transaction-header-discount-button">
             <div class="header-discount" (click)="openDiscount($event)">
               <co-icon class="header-discount-icon" [iconData]="iconCacheService.getIcon(icons.LightEuroSignMinus)"></co-icon>
@@ -57935,17 +57943,17 @@ TransactionHeaderOrderComponent.decorators = [
           </div>
         </div>
       </ng-template>
-      <ng-template #hiddenBlock>
+      <!--ng-template #hiddenBlock>
         <div class="transaction-header-block-row" [screenConfigurationObject]="cfgNames.HeaderOrderDefinitiveHeader" screenConfigNativeElement>
           <div class="header-order-definitive">
             <co-transaction-header-definitive class="transaction-header-order-definitive"
                 [screenConfigurationObject]="cfgNames.HeaderOrderDefinitiveHeader"
             ></co-transaction-header-definitive>
           </div>
-          <!--span class="header-order-line-amount-label co-transaction-label" [textContent]="'ORDER_LINES' | localize"></span>
-          <div class="header-order-line-amount" [textContent]="transactionLines.length"></div-->
+          <span class="header-order-line-amount-label co-transaction-label" [textContent]="'ORDER_LINES' | localize"></span>
+          <div class="header-order-line-amount" [textContent]="transactionLines.length"></div>
         </div>
-      </ng-template>
+      </ng-template-->
       <co-transaction-header-popup *ngIf="showDialog"
                                    [activeCategoryDescription]="'ORDER_INFORMATION1'"
                                    (closeClick)="showDialog = false"></co-transaction-header-popup>
@@ -58103,7 +58111,7 @@ class TransactionHeaderPaymentComponent extends TransactionHeaderBaseComponent {
         if (this.transactionInfo && this.transactionInfo.id && this.transactionInfo.uuid) {
             this._paymentConnectorService.getDepositPaymentInfo(this.transactionInfo.uuid).then((info) => {
                 if (info) {
-                    this.toPay = info.depositAmount;
+                    this.toPay = info.depositRemainderAmount;
                     this.paid = info.depositPaymentAmountTotal;
                 }
             });
@@ -58116,7 +58124,7 @@ TransactionHeaderPaymentComponent.decorators = [
                 template: `
       <div class="transaction-header-payment-wrapper">
           <div class="transaction-header-payment-wrapper-content" [class.show-remaining]="showRemainingPayment">
-              <co-transaction-header-block
+              <!--co-transaction-header-block
                       [firstBlockTemplate]="firstBlock"
                       [secondBlockTemplate]="secondBlock"
                       [thirdBlockTemplate]="thirdBlock"
@@ -58128,10 +58136,16 @@ TransactionHeaderPaymentComponent.decorators = [
                                            [firstBlockTemplate]="firstBlockRest"
                                            (headerClick)="showDialog = true"
               >
+              </co-transaction-header-block-->
+              <co-transaction-header-block
+                    [thirdBlockTemplate]="thirdBlock"
+                    [hiddenBlockTemplate]="hiddenBlock"
+                    (headerClick)="showDialog = true"
+              >
               </co-transaction-header-block>
           </div>
       </div>
-      <ng-template #firstBlock>
+      <!--ng-template #firstBlock>
           <div class="transaction-header-block-row" (click)="showDialog = true">
               <div class="header-downpayment-amount-wrapper" [screenConfigurationObject]="cfgNames.HeaderPaymentAmountHeader" screenConfigNativeElement>
                   <div class="header-deposit-label co-transaction-label" [textContent]="'DOWNPAYMENT_AMOUNT' | localize"></div>
@@ -58142,8 +58156,8 @@ TransactionHeaderPaymentComponent.decorators = [
                   ></co-transaction-header-deposit-amount>
               </div>
           </div>
-      </ng-template>
-      <ng-template #firstBlockRest>
+      </ng-template-->
+      <!--ng-template #firstBlockRest>
           <div class="transaction-header-block-row">
               <div class="transaction-header-icon" [screenConfigurationObject]="cfgNames.HeaderPaymentAvatarHeader" screenConfigNativeElement>
                   <co-icon class="header-order-icon"
@@ -58167,8 +58181,8 @@ TransactionHeaderPaymentComponent.decorators = [
                   </co-transaction-header-remaining-amount>
               </div>
           </div>
-      </ng-template>
-      <ng-template #secondBlock>
+      </ng-template-->
+      <!--ng-template #secondBlock>
           <div class="transaction-header-block-row">
               <div class="header-downpayment-percentage-wrapper" [screenConfigurationObject]="cfgNames.HeaderPaymentPercentageHeader" screenConfigNativeElement>
                   <div class="header-deposit-label co-transaction-label" [textContent]="'%' | localize"></div>
@@ -58179,7 +58193,7 @@ TransactionHeaderPaymentComponent.decorators = [
                   ></co-transaction-header-deposit-percentage>
               </div>
           </div>
-      </ng-template>
+      </ng-template-->
       <ng-template #thirdBlock>
           <div class="transaction-header-block-row">
               <div class="payment-payed-wrapper">