@colijnit/transaction 12.1.152 → 12.1.154

package/fesm2015/colijnit-transaction.js

@@ -89,7 +89,7 @@ import { TurnoverGroupImage } from '@colijnit/articleapi/build/model/turnover-gr
 import { MainArticle } from '@colijnit/articleapi/build/model/main-article.bo';
 import { InternalParam } from '@colijnit/mainapi/build/enum/internal-param.enum';
 import { RelationKind } from '@colijnit/relationapi/build/enum/relation-kind.enum';
-import { BaseModuleScreenConfigService, BaseModuleService, FormMasterService, SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME, CoDialogModule, ButtonModule, CollapsibleModule, InputCheckboxModule, InputTextModule, ListOfValuesModule, FormModule, ScreenConfigurationModule, InputRadioButtonModule, IconModule, InputTextComponent, TooltipDirectiveModule, CheckmarkOverlayModule, InputSearchModule, ColumnAlign, SimpleGridColumnDirective, OverlayService, ObserveVisibilityModule, ClickoutsideModule, OverlayModule, CalendarComponent, InputNumberPickerModule, InputDatePickerComponent, InputDatePickerModule, ColorSequenceService, PriceDisplayPipeModule, Carousel3dModule, CarouselModule, FilterPipeModule, InputTextareaComponent, InputTextareaModule, FormComponent, PopupModule, ContentViewMode, SimpleGridModule, GridToolbarButtonModule, InputDateRangePickerModule, CoDialogWizardModule, ViewModeButtonsModule, FilterItemModule, FilterItemMode, FilterViewmodel, PaginationModule, PaginationBarModule, IconCollapseHandleModule } from '@colijnit/corecomponents_v12';
+import { BaseModuleScreenConfigService, BaseModuleService, FormMasterService, SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME, CoDialogModule, ButtonModule, CollapsibleModule, InputCheckboxModule, InputTextModule, ListOfValuesModule, FormModule, ScreenConfigurationModule, InputRadioButtonModule, IconModule, InputTextComponent, TooltipDirectiveModule, CheckmarkOverlayModule, InputSearchModule, ColumnAlign, SimpleGridColumnDirective, OverlayService, ObserveVisibilityModule, ClickoutsideModule, OverlayModule, CalendarComponent, InputNumberPickerModule, InputDatePickerComponent, InputDatePickerModule, ColorSequenceService, PriceDisplayPipeModule, Carousel3dModule, CarouselModule, FilterPipeModule, InputTextareaComponent, InputTextareaModule, FormComponent, InputCheckboxComponent, PopupModule, ContentViewMode, SimpleGridModule, GridToolbarButtonModule, InputDateRangePickerModule, CoDialogWizardModule, ViewModeButtonsModule, FilterItemModule, FilterItemMode, FilterViewmodel, PaginationModule, PaginationBarModule, IconCollapseHandleModule } from '@colijnit/corecomponents_v12';
 import { trigger, state, style, transition, animate } from '@angular/animations';
 import * as i4 from '@colijnit/sharedcomponents';
 import { SharedService as SharedService$1, sendMethodsWithIcon, StatusbarModule, KeyPadModule, SendMethodDialogModule, StockModule, DocsignModule, SimpleTagsModule } from '@colijnit/sharedcomponents';
@@ -199,8 +199,8 @@ class Version {
     constructor() {
         this.name = "@colijnit/transaction";
         this.description = "Colijn IT transaction package";
-        this.symVer = "12.1.152";
-        this.publishDate = "18-10-2023 16:56:58";
+        this.symVer = "12.1.154";
+        this.publishDate = "20-10-2023 19:08:26";
     }
 }
 
@@ -1251,6 +1251,12 @@ class BusinessObjectCacheManagerService {
         const cacheId = id.toString();
         return this._selectSingleCache.has(key) && this._selectSingleCache.get(key)[cacheId];
     }
+    deleteSingleCacheItem(key, id = BusinessObjectCacheManagerService._NullBoId) {
+        const cacheId = id.toString();
+        if (this._selectSingleCache.has(key)) {
+            this._selectSingleCache.delete(key);
+        }
+    }
     // Returns the parameterized cache item with the given key. T is the type of the cache value items requested, e.g. Color.
     getSelectMultipleParameterCacheItem(key) {
         return this._selectMultipleParameterizedCache.get(key);
@@ -4657,7 +4663,10 @@ class SelectSingleCacheService {
     constructor(_boCacheManager) {
         this._boCacheManager = _boCacheManager;
     }
-    requestCache(clazz, sourceId, loadFunction) {
+    requestCache(clazz, sourceId, loadFunction, reload = false) {
+        if (reload) {
+            this._boCacheManager.deleteSingleCacheItem(clazz, sourceId);
+        }
         if (!this._boCacheManager.hasSingleCacheItem(clazz, sourceId)) {
             this._createCacheItem(clazz, sourceId, loadFunction);
         }
@@ -5807,6 +5816,9 @@ class TransactionScreenConfigurationService extends BaseModuleScreenConfigServic
         this.screenModuleName = "Transactions";
         this._screenConfigurationObjectCache = new Map();
     }
+    clear() {
+        this._screenConfigurationObjectCache.clear();
+    }
     loadConfigForModule(params, insertRights) {
         return __awaiter(this, void 0, void 0, function* () {
             if (params) {
@@ -6725,6 +6737,7 @@ class RelationService {
         this._selectMultipleCacheService = _selectMultipleCacheService;
         this._selectSingleCacheService = _selectSingleCacheService;
         this._selectMultipleParameterizedCacheService = _selectMultipleParameterizedCacheService;
+        this.relationSuggestionsRequestClear = new Subject();
         this._lockMethods = new Map([
             [RelationKind$1.Customer, (relationNr) => this._lockCustomerFullObject(relationNr)],
             [RelationKind$1.Supplier, (relationNr) => this._lockSupplierFullObject(relationNr)],
@@ -6749,14 +6762,14 @@ class RelationService {
         this._boFactory = new BusinessObjectFactory();
     }
     getCustomerFullObject(relationNo) {
-        // return this._selectSingleCacheService.requestCache<CustomerFullObject>(CustomerFullObject, relationNo, () => {
-        return this._adapterService.getCustomerFullObject(relationNo);
-        // }).getValue();
+        return this._selectSingleCacheService.requestCache(CustomerFullObject, relationNo, () => {
+            return this._adapterService.getCustomerFullObject(relationNo);
+        }).getValue();
     }
     getSupplierFullObject(relationNo) {
-        // return this._selectSingleCacheService.requestCache<SupplierFullObject>(SupplierFullObject, relationNo, () => {
-        return this._adapterService.getSupplierFullObject(relationNo);
-        // }).getValue();
+        return this._selectSingleCacheService.requestCache(SupplierFullObject, relationNo, () => {
+            return this._adapterService.getSupplierFullObject(relationNo);
+        }).getValue();
     }
     insertAddress(address) {
         return this._adapterService.insertAddress(address);
@@ -6765,19 +6778,27 @@ class RelationService {
         return this._adapterService.updateAddress(address);
     }
     insertCustomer(relation) {
-        return this._adapterService.insertCustomer(relation);
+        return this._selectSingleCacheService.requestCache(CustomerFullObject, relation.relationNumber, () => {
+            return this._adapterService.insertCustomer(relation);
+        }, true).getValue();
     }
     updateCustomer(relation) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this._adapterService.updateCustomer(relation);
+            return this._selectSingleCacheService.requestCache(CustomerFullObject, relation.relationNumber, () => {
+                return this._adapterService.updateCustomer(relation);
+            }, true).getValue();
         });
     }
     insertSupplier(relation) {
-        return this._adapterService.insertSupplier(relation);
+        return this._selectSingleCacheService.requestCache(SupplierFullObject, relation.relationNumber, () => {
+            return this._adapterService.insertSupplier(relation);
+        }, true).getValue();
     }
     updateSupplier(relation) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this._adapterService.updateSupplier(relation);
+            return this._selectSingleCacheService.requestCache(SupplierFullObject, relation.relationNumber, () => {
+                return this._adapterService.updateSupplier(relation);
+            }, true).getValue();
         });
     }
     getRelationListObjects(relationRequest) {
@@ -7083,6 +7104,14 @@ class TransactionBaseService extends BaseModuleService {
         const clazz = this._getRelationClass(this.transactionKind);
         this.relation = new clazz;
     }
+    setRelationOnTransaction(relationNr, relationKind) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const relation = yield this.relationService.getRelation(relationKind, relationNr);
+            if (relation) {
+                this.relation = relation;
+            }
+        });
+    }
     resetCurrentTransaction() {
         this.currentTransaction = new TransactionInfoResponse();
         this._relation = new CustomerFullObject();
@@ -7090,7 +7119,10 @@ class TransactionBaseService extends BaseModuleService {
     }
     saveTransaction(rememberTransaction = true) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield this.connector.saveTransaction(this.currentTransaction.transactionInfo.uuid);
+            const response = yield this.connector.saveTransaction(this.currentTransaction.transactionInfo.uuid)
+                .catch(() => {
+                return null;
+            });
             if (response && response.isSuccess) {
                 this._resetLockTransaction();
                 if (rememberTransaction) {
@@ -7592,6 +7624,7 @@ class TransactionService extends PendingReasonService {
     logOut() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.connector.logOut();
+            this.logout.next();
         });
     }
     preparePakBinnenInternalParam() {
@@ -9395,6 +9428,9 @@ class CheckoutComponent {
         this.service.transactionKind = this.transactionType;
         this.relationType = this.service.getRelationKindFromTransactionKind();
         this.service.createNewRelation();
+        if (this.relationNr) {
+            this.service.setRelationOnTransaction(this.relationNr, this.relationType);
+        }
     }
     ngOnDestroy() {
         this._subs.forEach(s => s.unsubscribe());
@@ -9557,6 +9593,7 @@ CheckoutComponent.propDecorators = {
     checkoutDelivery: [{ type: ViewChild, args: ["checkoutDelivery",] }],
     checkoutPayment: [{ type: ViewChild, args: ["checkoutPayment",] }],
     newTransaction: [{ type: Input }],
+    relationNr: [{ type: Input }],
     sellerId: [{ type: Input }],
     transactionType: [{ type: Input }],
     showCreateTransactionButton: [{ type: Input }],
@@ -9742,6 +9779,7 @@ class CheckoutOverviewRelationEditComponent {
     emptyRelation(event) {
         this.service.createNewRelation();
         this._requestForSuggestions = {};
+        this._relationService.relationSuggestionsRequestClear.next();
         this.hideSidebar();
         this.updateRelation(this.service.relation);
     }
@@ -10931,13 +10969,18 @@ CoreModule.decorators = [
 ];
 
 class RelationBaseComponent {
-    constructor() {
+    constructor(relationService) {
+        this.relationService = relationService;
         this.relKind = RelationKind;
         this.cfgNames = TransactionCfgName;
         this.relationChange = new EventEmitter();
         this.inputChangeForSuggestions = new EventEmitter();
         this._relation = NULL_RELATION_OBJECT;
+        this._subs = [];
         this.suggestionRequest = {};
+        this._subs.push(this.relationService.relationSuggestionsRequestClear.subscribe(() => {
+            this.suggestionRequest = {};
+        }));
     }
     set relation(value) {
         if (value) {
@@ -10951,6 +10994,9 @@ class RelationBaseComponent {
     get relationAsCustomer() {
         return this._relation && this._relation;
     }
+    ngOnDestroy() {
+        this._subs.forEach(s => s.unsubscribe());
+    }
     // overridden by descendant classes
     relationSet() {
     }
@@ -10958,6 +11004,9 @@ class RelationBaseComponent {
 RelationBaseComponent.decorators = [
     { type: Directive }
 ];
+RelationBaseComponent.ctorParameters = () => [
+    { type: RelationService }
+];
 RelationBaseComponent.propDecorators = {
     relation: [{ type: Input }],
     relationChange: [{ type: Output }],
@@ -10965,8 +11014,9 @@ RelationBaseComponent.propDecorators = {
 };
 
 class RelationAddressSelectComponent extends RelationBaseComponent {
-    constructor(_formMasterService) {
-        super();
+    constructor(relationService, _formMasterService) {
+        super(relationService);
+        this.relationService = relationService;
         this._formMasterService = _formMasterService;
         this.icons = Icon;
         this.collection = [];
@@ -11088,6 +11138,7 @@ RelationAddressSelectComponent.decorators = [
             },] }
 ];
 RelationAddressSelectComponent.ctorParameters = () => [
+    { type: RelationService },
     { type: FormMasterService }
 ];
 RelationAddressSelectComponent.propDecorators = {
@@ -11102,11 +11153,12 @@ RelationAddressSelectComponent.propDecorators = {
 };
 
 class RelationAddressComponent extends RelationBaseComponent {
-    constructor(_dictionary, _connector, _formMasterService) {
-        super();
+    constructor(_dictionary, _connector, _formMasterService, relationService) {
+        super(relationService);
         this._dictionary = _dictionary;
         this._connector = _connector;
         this._formMasterService = _formMasterService;
+        this.relationService = relationService;
         this.addressChange = new EventEmitter();
         this.countries = [];
         this.fields = { text: "description", value: "code" };
@@ -11259,7 +11311,8 @@ RelationAddressComponent.decorators = [
 RelationAddressComponent.ctorParameters = () => [
     { type: DictionaryService },
     { type: TransactionConnectorService },
-    { type: FormMasterService }
+    { type: FormMasterService },
+    { type: RelationService }
 ];
 RelationAddressComponent.propDecorators = {
     configNames: [{ type: Input }],
@@ -12726,6 +12779,8 @@ class TransactionSearchService {
                     this.searchTransactions();
                 }
             }
+        }), this._transactionService.logout.subscribe(() => {
+            this._resetCache();
         }));
     }
     set transactionType(value) {
@@ -12799,6 +12854,12 @@ class TransactionSearchService {
             this.showFilterSidebar = true;
         }, 10);
     }
+    _resetCache() {
+        this.searchRequest = new TransactionSearchViewRequest();
+        this._settingsService.settings.transactionParameters = new TransactionSearchViewRequest();
+        this.transactions.length = 0;
+        this._screenConfigService.clear();
+    }
     _resetRequest() {
         this.searchRequest = this._settingsService.settings.transactionParameters;
     }
@@ -13378,8 +13439,8 @@ class TransactionQuickAccessOrderConfirmationComponent extends TransactionBaseCo
             .map((line) => {
             const details = new PurchaseOrderConfirmationLineDetails();
             details.lineNumber = line.lineNr;
-            details.amountConfirmed = line.quantityPurchaseToConfirm;
-            details.confirmedDate = this.purchaseOrderConfirmation.confirmationDate;
+            details.amountConfirmed = +line.purchasePortalLine.amountToBeConfirmed;
+            details.confirmedDate = line.purchasePortalLine.deliveryDateConfirmed ? new Date(line.purchasePortalLine.deliveryDateConfirmed) : this.purchaseOrderConfirmation.confirmationDate;
             details.confirmedPrice = +line.purchasePortalLine.confirmedPrice;
             return details;
         });
@@ -15654,6 +15715,9 @@ class TransactionPurchaseOrderLineBaseComponent extends TransactionBaseComponent
         this._subs = [];
     }
     ngOnInit() {
+        if (this.transactionLine.purchasePortalLine.amountToBeConfirmed === null || this.transactionLine.purchasePortalLine.amountToBeConfirmed === undefined) {
+            this.transactionLine.purchasePortalLine.amountToBeConfirmed = this.transactionLine.amount.toString();
+        }
         this._subs.push(this.transactionEventService.selectAllSalesOrderLinesForPurchase.subscribe((value) => {
             this.selected = value && this.showCheckboxForLine;
             this.detectChanges();
@@ -15779,28 +15843,24 @@ TransactionPurchaseOrderLineComponent.decorators = [
                           [model]="transactionLine.purchasePortalLine.articleNoSupplier ? transactionLine.purchasePortalLine.articleNoSupplier : '-'"
                           [leftIconData]="iconCacheService.getIcon(icons.RegularIndustryTag)"
                           [customHeight]="true"
-                          [tooltip]="'ARTICLE_NO_SUPPLIER' | localize"
                   ></co-input-text>
                   <co-transaction-line-confirmed-price class="transaction-line-confirmed-price price"
                                                        [screenConfigurationObject]="cfgNames.LineConfirmedPrice"
                                                        [(price)]="transactionLine.purchasePortalLine.confirmedPrice"
                                                        [showLabel]="false"
                                                        [defaultEditMode]="false"
-                                                       [tooltip]="'CONFIRMED_PRICE' | localize"
                   ></co-transaction-line-confirmed-price>
                   <co-input-number-picker class="amount-number-picker"
                                           [screenConfigurationObject]="cfgNames.LineConfirmedAmount"
                                           [required]="true"
-                                          [(model)]="+transactionLine.purchasePortalLine.amountConfirmed"
+                                          [(model)]="transactionLine.purchasePortalLine.amountToBeConfirmed"
                                           [min]="1"
                                           [max]="+transactionLine.purchasePortalLine.amountOrdered"
                                           [leftIconData]="iconCacheService.getIcon(icons.FileCircleInfoRegular)"
-                                          [tooltip]="'CONFIRMED' | localize"
                   ></co-input-number-picker>
                   <co-transaction-line-supplier-delivery-date-button
                           [screenConfigurationObject]="cfgNames.LineConfirmedDate"
                           [transactionLine]="transactionLine"
-                          [tooltip]="'CONFIRMED_DATE' | localize"
                   ></co-transaction-line-supplier-delivery-date-button>
               </div>
           </div>
@@ -19747,7 +19807,7 @@ TransactionLineDeliveryDateButtonComponent.decorators = [
       [label]="transactionLine.deliveryDate | date:'d MMM yyyy'"
       [rightIconData]="iconCacheService.getIcon(icons.CalendarDayRegular)"
       (click)="handleShowHideClick()"
-      ></co-transaction-button>
+    ></co-transaction-button>
   `,
                 providers: [
                     OverlayService,
@@ -21735,11 +21795,12 @@ PaymentService.ctorParameters = () => [
 ];
 
 class PaymentComponent {
-    constructor(_transactionService, _sharedService, _paymentService, _transactionEventService) {
+    constructor(_transactionService, _sharedService, _paymentService, _transactionEventService, iconCacheService) {
         this._transactionService = _transactionService;
         this._sharedService = _sharedService;
         this._paymentService = _paymentService;
         this._transactionEventService = _transactionEventService;
+        this.iconCacheService = iconCacheService;
         this.icons = Icon;
         this.updateDepositAmount = true;
         this.payed = new EventEmitter();
@@ -21752,6 +21813,7 @@ class PaymentComponent {
         this.showPspQrCode = false;
         this.showLoader = true;
         this.amountToPay = 0;
+        this.depositAmount = 0;
         this.statusMessage = "";
         this._amount = 0;
         this._paymentStatusPollIntervalMs = 5000;
@@ -21846,6 +21908,7 @@ class PaymentComponent {
                 const info = yield this._paymentService.getDepositPaymentInfo(this.transactionUuid);
                 if (info) {
                     this.amountToPay = info.depositRemainderAmount;
+                    this.depositAmount = info.depositAmount;
                 }
             }
             else {
@@ -21955,47 +22018,59 @@ PaymentComponent.decorators = [
                 selector: "co-payment",
                 template: `
     <div class="payment-wrapper">
-      <div class="payment-methods-header">
-        <span class="payment-header-title" [textContent]="'SELECT_A' | 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-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 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 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-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 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">
-        <co-payment-to-pay [amountToPay]="amountToPay"></co-payment-to-pay>
+        <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 === 0 ? depositAmount : (depositAmount | coCurrency)"></span>
+          </div>
+          <div class="payment-input-button-wrapper">
+            <div class="payment-input-button">
+                <co-payment-to-pay [amountToPay]="amountToPay"></co-payment-to-pay>
+                <div class="payment-to-pay-button">
+                    <co-button [iconData]="iconCacheService.getIcon(icons.CheckDuotone)" (click)="handlePayment()" [disabled]="amountToPay === 0"></co-button>
+                </div>
+            </div>
+            <div class="payment-error-message" *ngIf="statusMessage" [textContent]="statusMessage"></div>
+          </div>
+        </div>
+
         <div class="payment-deposit">
           <co-deposit-payment [branch]="branch" [transactionUuid]="transactionUuid"></co-deposit-payment>
         </div>
-        <div class="payment-to-pay-button">
-          <!--
-                    <co-loader *ngIf="statusMessage"></co-loader>
-          -->
-          <div class="payment-error-message" *ngIf="statusMessage" [textContent]="statusMessage"></div>
-          <co-button [label]="'PAY' | localize" (click)="handlePayment()" [disabled]="amountToPay === 0"></co-button>
-        </div>
         <co-key-pad class="payment-to-pay-keypad"
                     [showValue]="false"
                     [emitModelChangeOnEnter]="false"
@@ -22018,7 +22093,8 @@ PaymentComponent.ctorParameters = () => [
     { type: TransactionService },
     { type: SharedService },
     { type: PaymentService },
-    { type: TransactionEventService }
+    { type: TransactionEventService },
+    { type: IconCacheService }
 ];
 PaymentComponent.propDecorators = {
     transId: [{ type: Input }],
@@ -22183,9 +22259,10 @@ DepositPaymentComponent.decorators = [
           [image]="payment.paymentMethod?.image"
           [description]="payment.paymentMethod?.payment.description"
         ></co-payment-tile>
-        <div class="deposit-payment-spacer"></div>
+        <div class="down-payment-date-wrapper">
+          <div class="down-payment-date" [textContent]="payment.depositPayment?.date | date:'d MMMM yyyy'"></div>
+        </div>
         <div class="down-payment-amount-wrapper">
-          <div class="down-payment-date" [textContent]="payment.depositPayment?.date | date:'d MMMM yyyy | HH:mm'"></div>
           <div class="down-payment-amount" [textContent]="payment.depositPayment?.depositPaymentAmount | coCurrency"></div>
         </div>
       </div>
@@ -22284,7 +22361,8 @@ PaymentModule.decorators = [
                     PaymentQrCodeModule,
                     DepositPaymentModule,
                     LoaderModule,
-                    PaymentToPayModule
+                    PaymentToPayModule,
+                    IconModule
                 ],
                 declarations: [
                     PaymentComponent
@@ -22363,11 +22441,11 @@ RelationTypeModule.decorators = [
 ];
 
 class RelationGeneralComponent extends RelationBaseComponent {
-    constructor(_service, _dialogService, _relationService) {
-        super();
+    constructor(_service, _dialogService, relationService) {
+        super(relationService);
         this._service = _service;
         this._dialogService = _dialogService;
-        this._relationService = _relationService;
+        this.relationService = relationService;
         this.relType = RelationNameKind;
         this.genderType = GenderType;
         this.readonly = false;
@@ -22417,7 +22495,6 @@ RelationGeneralComponent.decorators = [
             [(model)]="relation.firstName"
             [placeholder]="'FIRST_NAME' | localize"
             (modelChange)="firstNameChange($event)"
-            [required]="true"
         ></co-input-text>
         <co-input-text
             class="checkout-prefix-name default-width"
@@ -22433,7 +22510,7 @@ RelationGeneralComponent.decorators = [
             [(model)]="relation.familyName"
             [placeholder]="'LAST_NAME' | localize"
             (modelChange)="familyNameChange($event)"
-            [required]="true"></co-input-text>
+        ></co-input-text>
       </div>
       <div class="default-data-row" [screenConfigurationObject]="configNames?.relationGender" screenConfigNativeElement>
         <co-input-radio-button class="default-width"
@@ -22654,10 +22731,10 @@ RelationGeneralModule.decorators = [
 ];
 
 class RelationAddressesComponent extends RelationBaseComponent {
-    constructor(_formMasterService, _relationService, iconCacheService) {
-        super();
+    constructor(_formMasterService, relationService, iconCacheService) {
+        super(relationService);
         this._formMasterService = _formMasterService;
-        this._relationService = _relationService;
+        this.relationService = relationService;
         this.iconCacheService = iconCacheService;
         this.icons = Icon;
         this.readonly = false;
@@ -22689,12 +22766,12 @@ class RelationAddressesComponent extends RelationBaseComponent {
             if (!address.nawNr) { // new address
                 address.startDate = new Date();
                 address.sequence = this.relation.getNextAddressSequence();
-                const savedAddress = yield this._relationService.insertAddress(address);
+                const savedAddress = yield this.relationService.insertAddress(address);
                 this.relation.addresses.push(savedAddress);
                 this.changeAddress(savedAddress);
             }
             else {
-                const savedAddress = yield this._relationService.updateAddress(address);
+                const savedAddress = yield this.relationService.updateAddress(address);
                 const idx = this.relation.addresses.findIndex(a => a.nawNr === address.nawNr);
                 if (idx > -1) {
                     this.relation.addresses[idx] = savedAddress;
@@ -22817,8 +22894,9 @@ RelationAddressesModule.decorators = [
 class PrivacySettingViewModel {
 }
 class RelationPreferencesComponent extends RelationBaseComponent {
-    constructor(_service) {
-        super();
+    constructor(relationService, _service) {
+        super(relationService);
+        this.relationService = relationService;
         this._service = _service;
         this.readonly = false;
         this.privacySettings = [];
@@ -22874,6 +22952,7 @@ RelationPreferencesComponent.decorators = [
             },] }
 ];
 RelationPreferencesComponent.ctorParameters = () => [
+    { type: RelationService },
     { type: TransactionService }
 ];
 RelationPreferencesComponent.propDecorators = {
@@ -25447,6 +25526,7 @@ class TransactionHeaderDefinitiveComponent extends TransactionBaseComponent {
                 const success = yield this.transactionService.updateHeaderTransactionDefinitive(this.transactionInfo.uuid, definitive, this.lockAndSave);
                 if (!success) {
                     this.transactionInfo.transactionDefinitive = oldDefinitive;
+                    this.checkbox.setModel(this.transactionInfo.transactionDefinitive);
                     return success;
                 }
             }
@@ -25475,6 +25555,7 @@ TransactionHeaderDefinitiveComponent.decorators = [
             },] }
 ];
 TransactionHeaderDefinitiveComponent.propDecorators = {
+    checkbox: [{ type: ViewChild, args: [InputCheckboxComponent,] }],
     showClass: [{ type: HostBinding, args: ["class.co-transaction-header-definitive",] }]
 };
 
@@ -26243,6 +26324,7 @@ class TransactionHeaderPartialDeliveryComponent extends TransactionBaseComponent
                 this.showLoader = false;
                 if (!success) {
                     this.transactionInfo.allowPartialDelivery = oldPartial;
+                    this.checkbox.setModel(this.transactionInfo.allowPartialDelivery);
                     return success;
                 }
                 else {
@@ -26278,6 +26360,7 @@ TransactionHeaderPartialDeliveryComponent.decorators = [
             },] }
 ];
 TransactionHeaderPartialDeliveryComponent.propDecorators = {
+    checkbox: [{ type: ViewChild, args: [InputCheckboxComponent,] }],
     showClass: [{ type: HostBinding, args: ["class.co-transaction-header-partial-delivery",] }]
 };
 
@@ -27691,10 +27774,13 @@ TransactionHeaderPaymentComponent.decorators = [
       </div>
     </co-dialog>
 -->
-    <co-dialog class="payment-dialog" [customCssClass]="'co-small-scrollbar'" *ngIf="showPaymentDialog"
-               [modal]="true"
-               (closeClick)="showPaymentDialog = false"
-    >
+    <co-dialog class="payment-dialog" [modal]="true" [headerTemplate]="headerTemplate" *ngIf="showPaymentDialog" (closeClick)="showPaymentDialog = false">
+      <ng-template #headerTemplate>
+        <div class="payment-wrapper-popup-title">
+          <co-icon [iconData]="iconCacheService.getIcon(icons.CreditCardRegularCheck)"></co-icon>
+          <div class="co-dialog-header-title" [textContent]="'PAYMENT_METHOD' | localize"></div>
+        </div>
+      </ng-template>
       <co-payment
         [transId]="transactionInfo.id"
         [branch]="transactionInfo.branch?.relationNr"
@@ -29793,8 +29879,6 @@ class TransactionLinePurchaseConfirmationComponent extends TransactionBaseCompon
                     existingBatch.docAmount = this.docDeliveryBatch.docAmount;
                     existingBatch.docDate = this.docDeliveryBatch.docDate;
                     existingBatch.reference = this.docDeliveryBatch.reference;
-                    existingBatch.docAmountOrg = this.docDeliveryBatch.docAmountOrg;
-                    existingBatch.docDateOrg = this.docDeliveryBatch.docDateOrg;
                 }
                 else { // or create a new one
                     this.docDeliveryBatch.deleteLine = 'F';
@@ -29824,7 +29908,7 @@ class TransactionLinePurchaseConfirmationComponent extends TransactionBaseCompon
     }
     handleSelectHistoryRow(row) {
         this.docDeliveryBatch = row;
-        // this.docDeliveryBatch.docDate = new Date(row.docDate);
+        this.docDeliveryBatch.docDate = new Date(row.docDate);
     }
     handleCancelClick() {
         this._initNewDocDeliveryBatch();
@@ -29837,7 +29921,9 @@ class TransactionLinePurchaseConfirmationComponent extends TransactionBaseCompon
     }
     _initNewDocDeliveryBatch() {
         this.docDeliveryBatch = new DocDeliveryBatch();
-        this.docDeliveryBatch.docAmount = +this.transactionLine.purchasePortalLine.amountOrdered;
+        this.docDeliveryBatch.docAmount = this.transactionLine.purchasePortalLine.docBatchArray.length === 0
+            ? +this.transactionLine.amount
+            : +this.transactionLine.purchasePortalLine.amountOrdered;
         this.docDeliveryBatch.confirmedPrice = +this.transactionLine.purchasePortalLine.netOrderPrice;
     }
 }
@@ -33219,24 +33305,53 @@ class TransactionLineSupplierDeliveryDateButtonComponent extends TransactionBase
         this._overlayService = _overlayService;
         this._elementRef = _elementRef;
         this.icons = Icon;
+        this.showCalender = false;
     }
     showClass() {
         return true;
     }
-    handleShowDialog(event) {
+    handleShowHideClick() {
+        this.showCalender = !this.showCalender;
+        if (this.showCalender) {
+            this._showPopup();
+        }
+        else {
+            this._hidePopup();
+        }
+    }
+    _showPopup() {
+        this.showCalender = true;
+        this._calendarPopupComponentRef = this._overlayService.createComponent(CalendarComponent, {
+            parentForOverlay: this.parentComponent,
+            selectedDate: new Date(this.transactionLine.purchasePortalLine.deliveryDateConfirmed
+                ? this.transactionLine.purchasePortalLine.deliveryDateConfirmed
+                : new Date())
+        }, {
+            dateSelected: (date) => this._handleDateChanged(date),
+            clickedOutside: () => this.handleShowHideClick()
+        });
+    }
+    _handleDateChanged(date) {
+        this.transactionLine.purchasePortalLine.deliveryDateConfirmed = date.toDateString();
+        this.handleShowHideClick();
+        this.detectChanges();
+    }
+    _hidePopup() {
+        this.showCalender = false;
+        this._overlayService.removeComponent(this._calendarPopupComponentRef);
     }
 }
 TransactionLineSupplierDeliveryDateButtonComponent.decorators = [
     { type: Component, args: [{
                 selector: 'co-transaction-line-supplier-delivery-date-button',
                 template: `
-        <co-transaction-button class="big center-align"
+        <co-transaction-button #parentComponent class="big center-align"
                                [hidden]="hidden"
                                [readonly]="readonly"
                                [iconData]="iconCacheService.getIcon(icons.RegularIndustryClock)"
                                [label]="transactionLine.purchasePortalLine.deliveryDateConfirmed | date:'d MMM yyyy'"
                                [rightIconData]="iconCacheService.getIcon(icons.CalendarDayRegular)"
-                               (click)="handleShowDialog($event)"
+                               (click)="handleShowHideClick()"
         ></co-transaction-button>
     `,
                 providers: [
@@ -33261,6 +33376,7 @@ TransactionLineSupplierDeliveryDateButtonComponent.ctorParameters = () => [
     { type: ElementRef }
 ];
 TransactionLineSupplierDeliveryDateButtonComponent.propDecorators = {
+    parentComponent: [{ type: ViewChild, args: ['parentComponent', { read: ElementRef },] }],
     showClass: [{ type: HostBinding, args: ['class.co-transaction-line-supplier-delivery-date-button',] }]
 };