@colijnit/transaction 12.1.152 → 12.1.154

package/bundles/colijnit-transaction.umd.js

@@ -32,8 +32,8 @@
         function Version() {
             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";
         }
         return Version;
     }());
@@ -1557,6 +1557,13 @@
             var cacheId = id.toString();
             return this._selectSingleCache.has(key) && this._selectSingleCache.get(key)[cacheId];
         };
+        BusinessObjectCacheManagerService.prototype.deleteSingleCacheItem = function (key, id) {
+            if (id === void 0) { id = BusinessObjectCacheManagerService._NullBoId; }
+            var 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.
         BusinessObjectCacheManagerService.prototype.getSelectMultipleParameterCacheItem = function (key) {
             return this._selectMultipleParameterizedCache.get(key);
@@ -6657,7 +6664,11 @@
         function SelectSingleCacheService(_boCacheManager) {
             this._boCacheManager = _boCacheManager;
         }
-        SelectSingleCacheService.prototype.requestCache = function (clazz, sourceId, loadFunction) {
+        SelectSingleCacheService.prototype.requestCache = function (clazz, sourceId, loadFunction, reload) {
+            if (reload === void 0) { reload = false; }
+            if (reload) {
+                this._boCacheManager.deleteSingleCacheItem(clazz, sourceId);
+            }
             if (!this._boCacheManager.hasSingleCacheItem(clazz, sourceId)) {
                 this._createCacheItem(clazz, sourceId, loadFunction);
             }
@@ -8457,6 +8468,9 @@
             _this._screenConfigurationObjectCache = new Map();
             return _this;
         }
+        TransactionScreenConfigurationService.prototype.clear = function () {
+            this._screenConfigurationObjectCache.clear();
+        };
         TransactionScreenConfigurationService.prototype.loadConfigForModule = function (params, insertRights) {
             return __awaiter(this, void 0, void 0, function () {
                 var transactionKind, config;
@@ -9376,6 +9390,7 @@
             this._selectMultipleCacheService = _selectMultipleCacheService;
             this._selectSingleCacheService = _selectSingleCacheService;
             this._selectMultipleParameterizedCacheService = _selectMultipleParameterizedCacheService;
+            this.relationSuggestionsRequestClear = new rxjs.Subject();
             this._lockMethods = new Map([
                 [relationKind_enum$1.RelationKind.Customer, function (relationNr) { return _this._lockCustomerFullObject(relationNr); }],
                 [relationKind_enum$1.RelationKind.Supplier, function (relationNr) { return _this._lockSupplierFullObject(relationNr); }],
@@ -9400,14 +9415,16 @@
             this._boFactory = new businessObjectFactory.BusinessObjectFactory();
         }
         RelationService.prototype.getCustomerFullObject = function (relationNo) {
-            // return this._selectSingleCacheService.requestCache<CustomerFullObject>(CustomerFullObject, relationNo, () => {
-            return this._adapterService.getCustomerFullObject(relationNo);
-            // }).getValue();
+            var _this = this;
+            return this._selectSingleCacheService.requestCache(customerFullObject_bo.CustomerFullObject, relationNo, function () {
+                return _this._adapterService.getCustomerFullObject(relationNo);
+            }).getValue();
         };
         RelationService.prototype.getSupplierFullObject = function (relationNo) {
-            // return this._selectSingleCacheService.requestCache<SupplierFullObject>(SupplierFullObject, relationNo, () => {
-            return this._adapterService.getSupplierFullObject(relationNo);
-            // }).getValue();
+            var _this = this;
+            return this._selectSingleCacheService.requestCache(supplierFullObject_bo.SupplierFullObject, relationNo, function () {
+                return _this._adapterService.getSupplierFullObject(relationNo);
+            }).getValue();
         };
         RelationService.prototype.insertAddress = function (address) {
             return this._adapterService.insertAddress(address);
@@ -9416,22 +9433,34 @@
             return this._adapterService.updateAddress(address);
         };
         RelationService.prototype.insertCustomer = function (relation) {
-            return this._adapterService.insertCustomer(relation);
+            var _this = this;
+            return this._selectSingleCacheService.requestCache(customerFullObject_bo.CustomerFullObject, relation.relationNumber, function () {
+                return _this._adapterService.insertCustomer(relation);
+            }, true).getValue();
         };
         RelationService.prototype.updateCustomer = function (relation) {
             return __awaiter(this, void 0, void 0, function () {
+                var _this = this;
                 return __generator(this, function (_a) {
-                    return [2 /*return*/, this._adapterService.updateCustomer(relation)];
+                    return [2 /*return*/, this._selectSingleCacheService.requestCache(customerFullObject_bo.CustomerFullObject, relation.relationNumber, function () {
+                            return _this._adapterService.updateCustomer(relation);
+                        }, true).getValue()];
                 });
             });
         };
         RelationService.prototype.insertSupplier = function (relation) {
-            return this._adapterService.insertSupplier(relation);
+            var _this = this;
+            return this._selectSingleCacheService.requestCache(supplierFullObject_bo.SupplierFullObject, relation.relationNumber, function () {
+                return _this._adapterService.insertSupplier(relation);
+            }, true).getValue();
         };
         RelationService.prototype.updateSupplier = function (relation) {
             return __awaiter(this, void 0, void 0, function () {
+                var _this = this;
                 return __generator(this, function (_a) {
-                    return [2 /*return*/, this._adapterService.updateSupplier(relation)];
+                    return [2 /*return*/, this._selectSingleCacheService.requestCache(supplierFullObject_bo.SupplierFullObject, relation.relationNumber, function () {
+                            return _this._adapterService.updateSupplier(relation);
+                        }, true).getValue()];
                 });
             });
         };
@@ -9828,6 +9857,22 @@
             var clazz = this._getRelationClass(this.transactionKind);
             this.relation = new clazz;
         };
+        TransactionBaseService.prototype.setRelationOnTransaction = function (relationNr, relationKind) {
+            return __awaiter(this, void 0, void 0, function () {
+                var relation;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.relationService.getRelation(relationKind, relationNr)];
+                        case 1:
+                            relation = _a.sent();
+                            if (relation) {
+                                this.relation = relation;
+                            }
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
         TransactionBaseService.prototype.resetCurrentTransaction = function () {
             this.currentTransaction = new transactionInfoResponse_bo.TransactionInfoResponse();
             this._relation = new customerFullObject_bo.CustomerFullObject();
@@ -9839,7 +9884,10 @@
                 var response;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.connector.saveTransaction(this.currentTransaction.transactionInfo.uuid)];
+                        case 0: return [4 /*yield*/, this.connector.saveTransaction(this.currentTransaction.transactionInfo.uuid)
+                                .catch(function () {
+                                return null;
+                            })];
                         case 1:
                             response = _a.sent();
                             if (response && response.isSuccess) {
@@ -10603,6 +10651,7 @@
                         case 0: return [4 /*yield*/, this.connector.logOut()];
                         case 1:
                             _a.sent();
+                            this.logout.next();
                             return [2 /*return*/];
                     }
                 });
@@ -13600,6 +13649,9 @@
             this.service.transactionKind = this.transactionType;
             this.relationType = this.service.getRelationKindFromTransactionKind();
             this.service.createNewRelation();
+            if (this.relationNr) {
+                this.service.setRelationOnTransaction(this.relationNr, this.relationType);
+            }
         };
         CheckoutComponent.prototype.ngOnDestroy = function () {
             this._subs.forEach(function (s) { return s.unsubscribe(); });
@@ -13769,6 +13821,7 @@
         checkoutDelivery: [{ type: i0.ViewChild, args: ["checkoutDelivery",] }],
         checkoutPayment: [{ type: i0.ViewChild, args: ["checkoutPayment",] }],
         newTransaction: [{ type: i0.Input }],
+        relationNr: [{ type: i0.Input }],
         sellerId: [{ type: i0.Input }],
         transactionType: [{ type: i0.Input }],
         showCreateTransactionButton: [{ type: i0.Input }],
@@ -13981,6 +14034,7 @@
         CheckoutOverviewRelationEditComponent.prototype.emptyRelation = function (event) {
             this.service.createNewRelation();
             this._requestForSuggestions = {};
+            this._relationService.relationSuggestionsRequestClear.next();
             this.hideSidebar();
             this.updateRelation(this.service.relation);
         };
@@ -15012,13 +15066,19 @@
     ];
 
     var RelationBaseComponent = /** @class */ (function () {
-        function RelationBaseComponent() {
+        function RelationBaseComponent(relationService) {
+            var _this = this;
+            this.relationService = relationService;
             this.relKind = relationKind_enum.RelationKind;
             this.cfgNames = TransactionCfgName;
             this.relationChange = new i0.EventEmitter();
             this.inputChangeForSuggestions = new i0.EventEmitter();
             this._relation = nulRelationObject.NULL_RELATION_OBJECT;
+            this._subs = [];
             this.suggestionRequest = {};
+            this._subs.push(this.relationService.relationSuggestionsRequestClear.subscribe(function () {
+                _this.suggestionRequest = {};
+            }));
         }
         Object.defineProperty(RelationBaseComponent.prototype, "relation", {
             get: function () {
@@ -15040,6 +15100,9 @@
             enumerable: false,
             configurable: true
         });
+        RelationBaseComponent.prototype.ngOnDestroy = function () {
+            this._subs.forEach(function (s) { return s.unsubscribe(); });
+        };
         // overridden by descendant classes
         RelationBaseComponent.prototype.relationSet = function () {
         };
@@ -15048,6 +15111,9 @@
     RelationBaseComponent.decorators = [
         { type: i0.Directive }
     ];
+    RelationBaseComponent.ctorParameters = function () { return [
+        { type: RelationService }
+    ]; };
     RelationBaseComponent.propDecorators = {
         relation: [{ type: i0.Input }],
         relationChange: [{ type: i0.Output }],
@@ -15056,8 +15122,9 @@
 
     var RelationAddressSelectComponent = /** @class */ (function (_super) {
         __extends(RelationAddressSelectComponent, _super);
-        function RelationAddressSelectComponent(_formMasterService) {
-            var _this = _super.call(this) || this;
+        function RelationAddressSelectComponent(relationService, _formMasterService) {
+            var _this = _super.call(this, relationService) || this;
+            _this.relationService = relationService;
             _this._formMasterService = _formMasterService;
             _this.icons = Icon;
             _this.collection = [];
@@ -15157,6 +15224,7 @@
                 },] }
     ];
     RelationAddressSelectComponent.ctorParameters = function () { return [
+        { type: RelationService },
         { type: corecomponents_v12.FormMasterService }
     ]; };
     RelationAddressSelectComponent.propDecorators = {
@@ -15172,11 +15240,12 @@
 
     var RelationAddressComponent = /** @class */ (function (_super) {
         __extends(RelationAddressComponent, _super);
-        function RelationAddressComponent(_dictionary, _connector, _formMasterService) {
-            var _this = _super.call(this) || this;
+        function RelationAddressComponent(_dictionary, _connector, _formMasterService, relationService) {
+            var _this = _super.call(this, relationService) || this;
             _this._dictionary = _dictionary;
             _this._connector = _connector;
             _this._formMasterService = _formMasterService;
+            _this.relationService = relationService;
             _this.addressChange = new i0.EventEmitter();
             _this.countries = [];
             _this.fields = { text: "description", value: "code" };
@@ -15296,7 +15365,8 @@
     RelationAddressComponent.ctorParameters = function () { return [
         { type: DictionaryService },
         { type: TransactionConnectorService },
-        { type: corecomponents_v12.FormMasterService }
+        { type: corecomponents_v12.FormMasterService },
+        { type: RelationService }
     ]; };
     RelationAddressComponent.propDecorators = {
         configNames: [{ type: i0.Input }],
@@ -16683,6 +16753,8 @@
                         _this.searchTransactions();
                     }
                 }
+            }), this._transactionService.logout.subscribe(function () {
+                _this._resetCache();
             }));
         }
         Object.defineProperty(TransactionSearchService.prototype, "transactionType", {
@@ -16783,6 +16855,12 @@
                 _this.showFilterSidebar = true;
             }, 10);
         };
+        TransactionSearchService.prototype._resetCache = function () {
+            this.searchRequest = new transactionSearchViewRequest.TransactionSearchViewRequest();
+            this._settingsService.settings.transactionParameters = new transactionSearchViewRequest.TransactionSearchViewRequest();
+            this.transactions.length = 0;
+            this._screenConfigService.clear();
+        };
         TransactionSearchService.prototype._resetRequest = function () {
             this.searchRequest = this._settingsService.settings.transactionParameters;
         };
@@ -17138,8 +17216,8 @@
                 .map(function (line) {
                 var details = new purchaseOrderConfirmationLineDetails.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;
             });
@@ -18880,6 +18958,9 @@
         }
         TransactionPurchaseOrderLineBaseComponent.prototype.ngOnInit = function () {
             var _this = this;
+            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(function (value) {
                 _this.selected = value && _this.showCheckboxForLine;
                 _this.detectChanges();
@@ -18964,7 +19045,7 @@
     TransactionPurchaseOrderLineComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "co-transaction-purchase-order-line",
-                    template: "\n      <co-transaction-base-line\n              [transactionInfo]=\"transactionInfo\"\n              [transactionLine]=\"transactionLine\"\n              [preview]=\"preview\"\n              [checkbox]=\"showCheckboxForLine\"\n              [checkboxValue]=\"selected\"\n              (click)=\"handleOpenSidePanel($event)\"\n              (checkboxValueChanged)=\"selected = $event\"\n              observeVisibility #observer=visibilityObserve (visibilityChange)=\"handleVisibilityChange(transactionLine, $event)\">\n          <div class=\"transaction-line-content-wrapper\">\n              <co-transaction-line-statusbar data-action=\"openSidePanel\"\n                                             [screenConfigurationObject]=\"cfgNames.StatusBar\"\n                                             [configNames]=\"statusBarConfigNames\"\n                                             [transactionInfo]=\"transactionInfo\"\n                                             [transactionLine]=\"transactionLine\"\n                                             [activeCategory]=\"transactionTypeCategory.PurchaseOrderOrderConfirmation\"\n              ></co-transaction-line-statusbar>\n              <div class=\"transaction-line-content\" data-action=\"openSidePanel\">\n                  <co-input-text\n                          [screenConfigurationObject]=\"cfgNames.LineAmount\"\n                          [model]=\"transactionLine.amount\"\n                          [leftIconData]=\"iconCacheService.getIcon(icons.CartShoppingRegular)\"\n                          [readonly]=\"true\"\n                          [customHeight]=\"true\"\n                  ></co-input-text>\n                  <co-input-text class=\"transaction-input-right-align\"\n                                 [screenConfigurationObject]=\"cfgNames.LineGrossOrderPrice\"\n                                 [model]=\"transactionLine.purchasePortalLine.grossOrderPrice | coCurrency\"\n                                 [readonly]=\"true\"\n                                 [customHeight]=\"true\"\n                  ></co-input-text>\n                  <co-transaction-line-discount-button\n                          [screenConfigurationObject]=\"cfgNames.LineDiscount\"\n                          [transactionLine]=\"transactionLine\"\n                          [transactionInfo]=\"transactionInfo\"\n                  ></co-transaction-line-discount-button>\n                  <co-input-text class=\"transaction-input-right-align\"\n                                 [screenConfigurationObject]=\"cfgNames.LineNetOrderPrice\"\n                                 [model]=\"transactionLine.purchasePortalLine.netOrderPrice | coCurrency\"\n                                 [readonly]=\"true\"\n                                 [customHeight]=\"true\"\n                  ></co-input-text>\n                  <co-transaction-line-delivery-date-button\n                          [screenConfigurationObject]=\"cfgNames.DeliveryDate\"\n                          [transactionLine]=\"transactionLine\"\n                          [transactionInfo]=\"transactionInfo\"></co-transaction-line-delivery-date-button>\n              </div>\n              <div class=\"transaction-line-content\" data-action=\"openSidePanel\">\n                  <co-input-text\n                          [screenConfigurationObject]=\"cfgNames.LineArticleNrSupplier\"\n                          [model]=\"transactionLine.purchasePortalLine.articleNoSupplier ? transactionLine.purchasePortalLine.articleNoSupplier : '-'\"\n                          [leftIconData]=\"iconCacheService.getIcon(icons.RegularIndustryTag)\"\n                          [customHeight]=\"true\"\n                          [tooltip]=\"'ARTICLE_NO_SUPPLIER' | localize\"\n                  ></co-input-text>\n                  <co-transaction-line-confirmed-price class=\"transaction-line-confirmed-price price\"\n                                                       [screenConfigurationObject]=\"cfgNames.LineConfirmedPrice\"\n                                                       [(price)]=\"transactionLine.purchasePortalLine.confirmedPrice\"\n                                                       [showLabel]=\"false\"\n                                                       [defaultEditMode]=\"false\"\n                                                       [tooltip]=\"'CONFIRMED_PRICE' | localize\"\n                  ></co-transaction-line-confirmed-price>\n                  <co-input-number-picker class=\"amount-number-picker\"\n                                          [screenConfigurationObject]=\"cfgNames.LineConfirmedAmount\"\n                                          [required]=\"true\"\n                                          [(model)]=\"+transactionLine.purchasePortalLine.amountConfirmed\"\n                                          [min]=\"1\"\n                                          [max]=\"+transactionLine.purchasePortalLine.amountOrdered\"\n                                          [leftIconData]=\"iconCacheService.getIcon(icons.FileCircleInfoRegular)\"\n                                          [tooltip]=\"'CONFIRMED' | localize\"\n                  ></co-input-number-picker>\n                  <co-transaction-line-supplier-delivery-date-button\n                          [screenConfigurationObject]=\"cfgNames.LineConfirmedDate\"\n                          [transactionLine]=\"transactionLine\"\n                          [tooltip]=\"'CONFIRMED_DATE' | localize\"\n                  ></co-transaction-line-supplier-delivery-date-button>\n              </div>\n          </div>\n      </co-transaction-base-line>\n  ",
+                    template: "\n      <co-transaction-base-line\n              [transactionInfo]=\"transactionInfo\"\n              [transactionLine]=\"transactionLine\"\n              [preview]=\"preview\"\n              [checkbox]=\"showCheckboxForLine\"\n              [checkboxValue]=\"selected\"\n              (click)=\"handleOpenSidePanel($event)\"\n              (checkboxValueChanged)=\"selected = $event\"\n              observeVisibility #observer=visibilityObserve (visibilityChange)=\"handleVisibilityChange(transactionLine, $event)\">\n          <div class=\"transaction-line-content-wrapper\">\n              <co-transaction-line-statusbar data-action=\"openSidePanel\"\n                                             [screenConfigurationObject]=\"cfgNames.StatusBar\"\n                                             [configNames]=\"statusBarConfigNames\"\n                                             [transactionInfo]=\"transactionInfo\"\n                                             [transactionLine]=\"transactionLine\"\n                                             [activeCategory]=\"transactionTypeCategory.PurchaseOrderOrderConfirmation\"\n              ></co-transaction-line-statusbar>\n              <div class=\"transaction-line-content\" data-action=\"openSidePanel\">\n                  <co-input-text\n                          [screenConfigurationObject]=\"cfgNames.LineAmount\"\n                          [model]=\"transactionLine.amount\"\n                          [leftIconData]=\"iconCacheService.getIcon(icons.CartShoppingRegular)\"\n                          [readonly]=\"true\"\n                          [customHeight]=\"true\"\n                  ></co-input-text>\n                  <co-input-text class=\"transaction-input-right-align\"\n                                 [screenConfigurationObject]=\"cfgNames.LineGrossOrderPrice\"\n                                 [model]=\"transactionLine.purchasePortalLine.grossOrderPrice | coCurrency\"\n                                 [readonly]=\"true\"\n                                 [customHeight]=\"true\"\n                  ></co-input-text>\n                  <co-transaction-line-discount-button\n                          [screenConfigurationObject]=\"cfgNames.LineDiscount\"\n                          [transactionLine]=\"transactionLine\"\n                          [transactionInfo]=\"transactionInfo\"\n                  ></co-transaction-line-discount-button>\n                  <co-input-text class=\"transaction-input-right-align\"\n                                 [screenConfigurationObject]=\"cfgNames.LineNetOrderPrice\"\n                                 [model]=\"transactionLine.purchasePortalLine.netOrderPrice | coCurrency\"\n                                 [readonly]=\"true\"\n                                 [customHeight]=\"true\"\n                  ></co-input-text>\n                  <co-transaction-line-delivery-date-button\n                          [screenConfigurationObject]=\"cfgNames.DeliveryDate\"\n                          [transactionLine]=\"transactionLine\"\n                          [transactionInfo]=\"transactionInfo\"></co-transaction-line-delivery-date-button>\n              </div>\n              <div class=\"transaction-line-content\" data-action=\"openSidePanel\">\n                  <co-input-text\n                          [screenConfigurationObject]=\"cfgNames.LineArticleNrSupplier\"\n                          [model]=\"transactionLine.purchasePortalLine.articleNoSupplier ? transactionLine.purchasePortalLine.articleNoSupplier : '-'\"\n                          [leftIconData]=\"iconCacheService.getIcon(icons.RegularIndustryTag)\"\n                          [customHeight]=\"true\"\n                  ></co-input-text>\n                  <co-transaction-line-confirmed-price class=\"transaction-line-confirmed-price price\"\n                                                       [screenConfigurationObject]=\"cfgNames.LineConfirmedPrice\"\n                                                       [(price)]=\"transactionLine.purchasePortalLine.confirmedPrice\"\n                                                       [showLabel]=\"false\"\n                                                       [defaultEditMode]=\"false\"\n                  ></co-transaction-line-confirmed-price>\n                  <co-input-number-picker class=\"amount-number-picker\"\n                                          [screenConfigurationObject]=\"cfgNames.LineConfirmedAmount\"\n                                          [required]=\"true\"\n                                          [(model)]=\"transactionLine.purchasePortalLine.amountToBeConfirmed\"\n                                          [min]=\"1\"\n                                          [max]=\"+transactionLine.purchasePortalLine.amountOrdered\"\n                                          [leftIconData]=\"iconCacheService.getIcon(icons.FileCircleInfoRegular)\"\n                  ></co-input-number-picker>\n                  <co-transaction-line-supplier-delivery-date-button\n                          [screenConfigurationObject]=\"cfgNames.LineConfirmedDate\"\n                          [transactionLine]=\"transactionLine\"\n                  ></co-transaction-line-supplier-delivery-date-button>\n              </div>\n          </div>\n      </co-transaction-base-line>\n  ",
                     encapsulation: i0.ViewEncapsulation.None,
                     changeDetection: i0.ChangeDetectionStrategy.OnPush
                 },] }
@@ -22403,7 +22484,7 @@
     TransactionLineDeliveryDateButtonComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "co-transaction-line-delivery-date-button",
-                    template: "\n    <co-transaction-button\n      #parentComponent\n      class=\"big center-align\"\n      [hidden]=\"hidden\"\n      [readonly]=\"readonly\"\n      [iconData]=\"iconCacheService.getIcon(icons.SharpLightTruckMovingClock)\"\n      [label]=\"transactionLine.deliveryDate | date:'d MMM yyyy'\"\n      [rightIconData]=\"iconCacheService.getIcon(icons.CalendarDayRegular)\"\n      (click)=\"handleShowHideClick()\"\n      ></co-transaction-button>\n  ",
+                    template: "\n    <co-transaction-button\n      #parentComponent\n      class=\"big center-align\"\n      [hidden]=\"hidden\"\n      [readonly]=\"readonly\"\n      [iconData]=\"iconCacheService.getIcon(icons.SharpLightTruckMovingClock)\"\n      [label]=\"transactionLine.deliveryDate | date:'d MMM yyyy'\"\n      [rightIconData]=\"iconCacheService.getIcon(icons.CalendarDayRegular)\"\n      (click)=\"handleShowHideClick()\"\n    ></co-transaction-button>\n  ",
                     providers: [
                         corecomponents_v12.OverlayService,
                         {
@@ -24566,11 +24647,12 @@
     ]; };
 
     var PaymentComponent = /** @class */ (function () {
-        function PaymentComponent(_transactionService, _sharedService, _paymentService, _transactionEventService) {
+        function PaymentComponent(_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 i0.EventEmitter();
@@ -24583,6 +24665,7 @@
             this.showPspQrCode = false;
             this.showLoader = true;
             this.amountToPay = 0;
+            this.depositAmount = 0;
             this.statusMessage = "";
             this._amount = 0;
             this._paymentStatusPollIntervalMs = 5000;
@@ -24700,6 +24783,7 @@
                             info = _a.sent();
                             if (info) {
                                 this.amountToPay = info.depositRemainderAmount;
+                                this.depositAmount = info.depositAmount;
                             }
                             return [3 /*break*/, 3];
                         case 2:
@@ -24839,7 +24923,7 @@
     PaymentComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "co-payment",
-                    template: "\n    <div class=\"payment-wrapper\">\n      <div class=\"payment-methods-header\">\n        <span class=\"payment-header-title\" [textContent]=\"'SELECT_A' | localize\"></span>\n        <span class=\"payment-header-title extra\" [textContent]=\"'FREE' | localize:false\"></span>\n        <span class=\"payment-header-title\" [textContent]=\"'PAYMENT_METHOD' | localize:false\"></span>\n      </div>\n      <div class=\"payment-methods\">\n        <co-loader class=\"loader\" *ngIf=\"showLoader\"></co-loader>\n        <ng-container *ngIf=\"!showLoader\">\n          <co-payment-tile *ngFor=\"let paymentMethod of paymentMethods; let index = index\"\n                           [image]=\"paymentMethod.image\"\n                           [description]=\"paymentMethod.payment.description\"\n                           [selected]=\"paymentMethodIdx === index\"\n                           (selectedChange)=\"paymentMethodSelected(paymentMethod.payment, index)\"\n          ></co-payment-tile>\n        </ng-container>\n      </div>\n      <div class=\"payment-cash-register-wrapper\" *ngIf=\"showCashRegisters\">\n        <div class=\"payment-cash-register-header\">\n          <span class=\"payment-header-title\" [textContent]=\"'SELECT_CASH_REGISTER' | localize\"></span>\n        </div>\n        <div class=\"payment-methods\">\n          <co-payment-tile *ngFor=\"let cashRegister of cashRegisters; let index = index\"\n                           [icon]=\"cashRegister.icon\"\n                           [description]=\"cashRegister.description\"\n                           [selected]=\"cashRegisterIdx === index\"\n                           (selectedChange)=\"cashRegisterSelected(cashRegister, index)\"\n          ></co-payment-tile>\n        </div>\n      </div>\n      <div class=\"payment-to-pay-wrapper\">\n        <co-payment-to-pay [amountToPay]=\"amountToPay\"></co-payment-to-pay>\n        <div class=\"payment-deposit\">\n          <co-deposit-payment [branch]=\"branch\" [transactionUuid]=\"transactionUuid\"></co-deposit-payment>\n        </div>\n        <div class=\"payment-to-pay-button\">\n          <!--\n                    <co-loader *ngIf=\"statusMessage\"></co-loader>\n          -->\n          <div class=\"payment-error-message\" *ngIf=\"statusMessage\" [textContent]=\"statusMessage\"></div>\n          <co-button [label]=\"'PAY' | localize\" (click)=\"handlePayment()\" [disabled]=\"amountToPay === 0\"></co-button>\n        </div>\n        <co-key-pad class=\"payment-to-pay-keypad\"\n                    [showValue]=\"false\"\n                    [emitModelChangeOnEnter]=\"false\"\n                    [model]=\"amountToPay\"\n                    (modelChange)=\"handleKeyPadModelChange($event)\"\n                    (enterClick)=\"handlePayment()\"\n        ></co-key-pad>\n      </div>\n    </div>\n    <co-dialog *ngIf=\"showPspQrCode\" (closeClick)=\"showPspQrCode = false\">\n      <co-payment-qr-code\n          [qrCodeImage]=\"qrCodeImage\"\n      ></co-payment-qr-code>\n    </co-dialog>\n  ",
+                    template: "\n    <div class=\"payment-wrapper\">\n      <div class=\"payment-methods-register-wrapper\">\n        <div class=\"payment-methods-wrapper\">\n          <div class=\"payment-methods-header\">\n            <span class=\"payment-header-title\" [textContent]=\"'SELECT' | localize\"></span>\n            <!--span class=\"payment-header-title extra\" [textContent]=\"'FREE' | localize:false\"></span-->\n            <span class=\"payment-header-title\" [textContent]=\"'PAYMENT_METHOD' | localize:false\"></span>\n          </div>\n          <div class=\"payment-methods co-small-scrollbar\">\n            <co-loader class=\"loader\" *ngIf=\"showLoader\"></co-loader>\n            <ng-container *ngIf=\"!showLoader\">\n              <co-payment-tile *ngFor=\"let paymentMethod of paymentMethods; let index = index\"\n                               [image]=\"paymentMethod.image\"\n                               [description]=\"paymentMethod.payment.description\"\n                               [selected]=\"paymentMethodIdx === index\"\n                               (selectedChange)=\"paymentMethodSelected(paymentMethod.payment, index)\"\n              ></co-payment-tile>\n            </ng-container>\n          </div>\n        </div>\n        <div class=\"payment-cash-register-wrapper\" *ngIf=\"showCashRegisters\">\n          <div class=\"payment-cash-register-header\">\n            <span class=\"payment-header-title\" [textContent]=\"'SELECT_CASH_REGISTER' | localize\"></span>\n          </div>\n          <div class=\"payment-methods\">\n            <co-payment-tile *ngFor=\"let cashRegister of cashRegisters; let index = index\"\n                             [icon]=\"cashRegister.icon\"\n                             [description]=\"cashRegister.description\"\n                             [selected]=\"cashRegisterIdx === index\"\n                             (selectedChange)=\"cashRegisterSelected(cashRegister, index)\"\n            ></co-payment-tile>\n          </div>\n        </div>\n      </div>\n      <div class=\"payment-to-pay-wrapper\">\n        <div class=\"payment-to-pay-total\">\n          <div class=\"payment-to-pay-header\">\n            <span class=\"payment-header-title\" [textContent]=\"'TOTAL_AMOUNT_TO_PAY' | localize\"></span>\n            <span class=\"payment-total-pay\" [textContent]=\"depositAmount === 0 ? depositAmount : (depositAmount | coCurrency)\"></span>\n          </div>\n          <div class=\"payment-input-button-wrapper\">\n            <div class=\"payment-input-button\">\n                <co-payment-to-pay [amountToPay]=\"amountToPay\"></co-payment-to-pay>\n                <div class=\"payment-to-pay-button\">\n                    <co-button [iconData]=\"iconCacheService.getIcon(icons.CheckDuotone)\" (click)=\"handlePayment()\" [disabled]=\"amountToPay === 0\"></co-button>\n                </div>\n            </div>\n            <div class=\"payment-error-message\" *ngIf=\"statusMessage\" [textContent]=\"statusMessage\"></div>\n          </div>\n        </div>\n\n        <div class=\"payment-deposit\">\n          <co-deposit-payment [branch]=\"branch\" [transactionUuid]=\"transactionUuid\"></co-deposit-payment>\n        </div>\n        <co-key-pad class=\"payment-to-pay-keypad\"\n                    [showValue]=\"false\"\n                    [emitModelChangeOnEnter]=\"false\"\n                    [model]=\"amountToPay\"\n                    (modelChange)=\"handleKeyPadModelChange($event)\"\n                    (enterClick)=\"handlePayment()\"\n        ></co-key-pad>\n      </div>\n    </div>\n    <co-dialog *ngIf=\"showPspQrCode\" (closeClick)=\"showPspQrCode = false\">\n      <co-payment-qr-code\n          [qrCodeImage]=\"qrCodeImage\"\n      ></co-payment-qr-code>\n    </co-dialog>\n  ",
                     encapsulation: i0.ViewEncapsulation.None
                 },] }
     ];
@@ -24847,7 +24931,8 @@
         { type: TransactionService },
         { type: SharedService },
         { type: PaymentService },
-        { type: TransactionEventService }
+        { type: TransactionEventService },
+        { type: IconCacheService }
     ]; };
     PaymentComponent.propDecorators = {
         transId: [{ type: i0.Input }],
@@ -25004,7 +25089,7 @@
     DepositPaymentComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "co-deposit-payment",
-                    template: "\n    <div class=\"down-payment-payments-title\" [textContent]=\"'PAYMENTS_MADE' | localize\" *ngIf=\"showTitle\"></div>\n    <div class=\"down-payment-payments-wrapper\">\n      <co-loader class=\"loader\" *ngIf=\"showLoader\"></co-loader>\n      <div class=\"down-payment-payments\" *ngFor=\"let payment of depositPayments\">\n        <co-payment-tile\n          [image]=\"payment.paymentMethod?.image\"\n          [description]=\"payment.paymentMethod?.payment.description\"\n        ></co-payment-tile>\n        <div class=\"deposit-payment-spacer\"></div>\n        <div class=\"down-payment-amount-wrapper\">\n          <div class=\"down-payment-date\" [textContent]=\"payment.depositPayment?.date | date:'d MMMM yyyy | HH:mm'\"></div>\n          <div class=\"down-payment-amount\" [textContent]=\"payment.depositPayment?.depositPaymentAmount | coCurrency\"></div>\n        </div>\n      </div>\n    </div>\n  ",
+                    template: "\n    <div class=\"down-payment-payments-title\" [textContent]=\"'PAYMENTS_MADE' | localize\" *ngIf=\"showTitle\"></div>\n    <div class=\"down-payment-payments-wrapper\">\n      <co-loader class=\"loader\" *ngIf=\"showLoader\"></co-loader>\n      <div class=\"down-payment-payments\" *ngFor=\"let payment of depositPayments\">\n        <co-payment-tile\n          [image]=\"payment.paymentMethod?.image\"\n          [description]=\"payment.paymentMethod?.payment.description\"\n        ></co-payment-tile>\n        <div class=\"down-payment-date-wrapper\">\n          <div class=\"down-payment-date\" [textContent]=\"payment.depositPayment?.date | date:'d MMMM yyyy'\"></div>\n        </div>\n        <div class=\"down-payment-amount-wrapper\">\n          <div class=\"down-payment-amount\" [textContent]=\"payment.depositPayment?.depositPaymentAmount | coCurrency\"></div>\n        </div>\n      </div>\n    </div>\n  ",
                     encapsulation: i0.ViewEncapsulation.None
                 },] }
     ];
@@ -25103,7 +25188,8 @@
                         PaymentQrCodeModule,
                         DepositPaymentModule,
                         LoaderModule,
-                        PaymentToPayModule
+                        PaymentToPayModule,
+                        corecomponents_v12.IconModule
                     ],
                     declarations: [
                         PaymentComponent
@@ -25172,11 +25258,11 @@
 
     var RelationGeneralComponent = /** @class */ (function (_super) {
         __extends(RelationGeneralComponent, _super);
-        function RelationGeneralComponent(_service, _dialogService, _relationService) {
-            var _this = _super.call(this) || this;
+        function RelationGeneralComponent(_service, _dialogService, relationService) {
+            var _this = _super.call(this, relationService) || this;
             _this._service = _service;
             _this._dialogService = _dialogService;
-            _this._relationService = _relationService;
+            _this.relationService = relationService;
             _this.relType = relationNameKind_enum.RelationNameKind;
             _this.genderType = genderType_enum.GenderType;
             _this.readonly = false;
@@ -25218,7 +25304,7 @@
     RelationGeneralComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "co-relation-general",
-                    template: "\n    <div *ngIf=\"relationType === relType.Private\" class=\"collapseable\" @showHidePrivateRelationFields>\n      <div class=\"default-data-row\">\n        <co-input-text\n            class=\"checkout-first-name\"\n            [screenConfigurationObject]=\"configNames?.relationFirstName\"\n            [readonly]=\"readonly\"\n            [(model)]=\"relation.firstName\"\n            [placeholder]=\"'FIRST_NAME' | localize\"\n            (modelChange)=\"firstNameChange($event)\"\n            [required]=\"true\"\n        ></co-input-text>\n        <co-input-text\n            class=\"checkout-prefix-name default-width\"\n            [screenConfigurationObject]=\"configNames?.relationPrefix\"\n            [readonly]=\"readonly\"\n            [(model)]=\"relation.prefix\"\n            [placeholder]=\"'PREFIX' | localize\"\n        ></co-input-text>\n        <co-input-text\n            class=\"checkout-last-name\"\n            [screenConfigurationObject]=\"configNames?.relationLastName\"\n            [readonly]=\"readonly\"\n            [(model)]=\"relation.familyName\"\n            [placeholder]=\"'LAST_NAME' | localize\"\n            (modelChange)=\"familyNameChange($event)\"\n            [required]=\"true\"></co-input-text>\n      </div>\n      <div class=\"default-data-row\" [screenConfigurationObject]=\"configNames?.relationGender\" screenConfigNativeElement>\n        <co-input-radio-button class=\"default-width\"\n                               [readonly]=\"readonly\"\n                               [label]=\"'MALE' | localize\"\n                               [model]=\"relation.gender === genderType.Male\"\n                               (modelChange)=\"changeGenderType(genderType.Male)\"\n        ></co-input-radio-button>\n        <co-input-radio-button class=\"default-width\"\n                               [readonly]=\"readonly\"\n                               [label]=\"'FEMALE' | localize\"\n                               [model]=\"relation.gender === genderType.Female\"\n                               (modelChange)=\"changeGenderType(genderType.Female)\"\n        ></co-input-radio-button>\n        <co-input-radio-button class=\"default-width\"\n                               [readonly]=\"readonly\"\n                               [label]=\"'UNKNOWN' | localize\"\n                               [model]=\"relation.gender === genderType.Unspecified\"\n                               (modelChange)=\"changeGenderType(genderType.Unspecified)\"\n        ></co-input-radio-button>\n      </div>\n      <co-relation-contact-details\n          [configNames]=\"configNames?.contactDetails\"\n          [readonly]=\"readonly\"\n          [relation]=\"relation\"\n          [relationKind]=\"relationKind\"\n          (inputChangeForSuggestions)=\"inputChangeForSuggestions.emit($event)\"\n      ></co-relation-contact-details>\n      <!--\n            <div class=\"default-data-row\">\n              <co-input-date [readonly]=\"readonly\" [placeholder]=\"'DATE_OF_BIRTH' | localize \" [(model)]=\"dateOfBirth\"></co-input-date>\n            </div>\n      -->\n    </div>\n    <div *ngIf=\"relationType === relType.Company\" class=\"default-data-row collapseable\" @showHideCompanyRelationFields>\n      <co-input-text [readonly]=\"readonly\"\n                     [(model)]=\"relation.familyName\"\n                     [screenConfigurationObject]=\"configNames?.relationCompany\"\n                     [placeholder]=\"'COMPANY_NAME' | localize\"\n                     [required]=\"true\"\n                     (modelChange)=\"familyNameChange($event)\"\n      ></co-input-text>\n    </div>\n  ",
+                    template: "\n    <div *ngIf=\"relationType === relType.Private\" class=\"collapseable\" @showHidePrivateRelationFields>\n      <div class=\"default-data-row\">\n        <co-input-text\n            class=\"checkout-first-name\"\n            [screenConfigurationObject]=\"configNames?.relationFirstName\"\n            [readonly]=\"readonly\"\n            [(model)]=\"relation.firstName\"\n            [placeholder]=\"'FIRST_NAME' | localize\"\n            (modelChange)=\"firstNameChange($event)\"\n        ></co-input-text>\n        <co-input-text\n            class=\"checkout-prefix-name default-width\"\n            [screenConfigurationObject]=\"configNames?.relationPrefix\"\n            [readonly]=\"readonly\"\n            [(model)]=\"relation.prefix\"\n            [placeholder]=\"'PREFIX' | localize\"\n        ></co-input-text>\n        <co-input-text\n            class=\"checkout-last-name\"\n            [screenConfigurationObject]=\"configNames?.relationLastName\"\n            [readonly]=\"readonly\"\n            [(model)]=\"relation.familyName\"\n            [placeholder]=\"'LAST_NAME' | localize\"\n            (modelChange)=\"familyNameChange($event)\"\n        ></co-input-text>\n      </div>\n      <div class=\"default-data-row\" [screenConfigurationObject]=\"configNames?.relationGender\" screenConfigNativeElement>\n        <co-input-radio-button class=\"default-width\"\n                               [readonly]=\"readonly\"\n                               [label]=\"'MALE' | localize\"\n                               [model]=\"relation.gender === genderType.Male\"\n                               (modelChange)=\"changeGenderType(genderType.Male)\"\n        ></co-input-radio-button>\n        <co-input-radio-button class=\"default-width\"\n                               [readonly]=\"readonly\"\n                               [label]=\"'FEMALE' | localize\"\n                               [model]=\"relation.gender === genderType.Female\"\n                               (modelChange)=\"changeGenderType(genderType.Female)\"\n        ></co-input-radio-button>\n        <co-input-radio-button class=\"default-width\"\n                               [readonly]=\"readonly\"\n                               [label]=\"'UNKNOWN' | localize\"\n                               [model]=\"relation.gender === genderType.Unspecified\"\n                               (modelChange)=\"changeGenderType(genderType.Unspecified)\"\n        ></co-input-radio-button>\n      </div>\n      <co-relation-contact-details\n          [configNames]=\"configNames?.contactDetails\"\n          [readonly]=\"readonly\"\n          [relation]=\"relation\"\n          [relationKind]=\"relationKind\"\n          (inputChangeForSuggestions)=\"inputChangeForSuggestions.emit($event)\"\n      ></co-relation-contact-details>\n      <!--\n            <div class=\"default-data-row\">\n              <co-input-date [readonly]=\"readonly\" [placeholder]=\"'DATE_OF_BIRTH' | localize \" [(model)]=\"dateOfBirth\"></co-input-date>\n            </div>\n      -->\n    </div>\n    <div *ngIf=\"relationType === relType.Company\" class=\"default-data-row collapseable\" @showHideCompanyRelationFields>\n      <co-input-text [readonly]=\"readonly\"\n                     [(model)]=\"relation.familyName\"\n                     [screenConfigurationObject]=\"configNames?.relationCompany\"\n                     [placeholder]=\"'COMPANY_NAME' | localize\"\n                     [required]=\"true\"\n                     (modelChange)=\"familyNameChange($event)\"\n      ></co-input-text>\n    </div>\n  ",
                     animations: [
                         animations.trigger("showHidePrivateRelationFields", [
                             animations.state("void", animations.style({ height: 0 })),
@@ -25378,10 +25464,10 @@
 
     var RelationAddressesComponent = /** @class */ (function (_super) {
         __extends(RelationAddressesComponent, _super);
-        function RelationAddressesComponent(_formMasterService, _relationService, iconCacheService) {
-            var _this = _super.call(this) || this;
+        function RelationAddressesComponent(_formMasterService, relationService, iconCacheService) {
+            var _this = _super.call(this, relationService) || this;
             _this._formMasterService = _formMasterService;
-            _this._relationService = _relationService;
+            _this.relationService = relationService;
             _this.iconCacheService = iconCacheService;
             _this.icons = Icon;
             _this.readonly = false;
@@ -25418,13 +25504,13 @@
                             if (!!address.nawNr) return [3 /*break*/, 2];
                             address.startDate = new Date();
                             address.sequence = this.relation.getNextAddressSequence();
-                            return [4 /*yield*/, this._relationService.insertAddress(address)];
+                            return [4 /*yield*/, this.relationService.insertAddress(address)];
                         case 1:
                             savedAddress = _a.sent();
                             this.relation.addresses.push(savedAddress);
                             this.changeAddress(savedAddress);
                             return [3 /*break*/, 4];
-                        case 2: return [4 /*yield*/, this._relationService.updateAddress(address)];
+                        case 2: return [4 /*yield*/, this.relationService.updateAddress(address)];
                         case 3:
                             savedAddress = _a.sent();
                             idx = this.relation.addresses.findIndex(function (a) { return a.nawNr === address.nawNr; });
@@ -25518,8 +25604,9 @@
     }());
     var RelationPreferencesComponent = /** @class */ (function (_super) {
         __extends(RelationPreferencesComponent, _super);
-        function RelationPreferencesComponent(_service) {
-            var _this = _super.call(this) || this;
+        function RelationPreferencesComponent(relationService, _service) {
+            var _this = _super.call(this, relationService) || this;
+            _this.relationService = relationService;
             _this._service = _service;
             _this.readonly = false;
             _this.privacySettings = [];
@@ -25569,6 +25656,7 @@
                 },] }
     ];
     RelationPreferencesComponent.ctorParameters = function () { return [
+        { type: RelationService },
         { type: TransactionService }
     ]; };
     RelationPreferencesComponent.propDecorators = {
@@ -28025,6 +28113,7 @@
                             success = _a.sent();
                             if (!success) {
                                 this.transactionInfo.transactionDefinitive = oldDefinitive;
+                                this.checkbox.setModel(this.transactionInfo.transactionDefinitive);
                                 return [2 /*return*/, success];
                             }
                             _a.label = 2;
@@ -28047,6 +28136,7 @@
                 },] }
     ];
     TransactionHeaderDefinitiveComponent.propDecorators = {
+        checkbox: [{ type: i0.ViewChild, args: [corecomponents_v12.InputCheckboxComponent,] }],
         showClass: [{ type: i0.HostBinding, args: ["class.co-transaction-header-definitive",] }]
     };
 
@@ -28878,6 +28968,7 @@
                             this.showLoader = false;
                             if (!success) {
                                 this.transactionInfo.allowPartialDelivery = oldPartial;
+                                this.checkbox.setModel(this.transactionInfo.allowPartialDelivery);
                                 return [2 /*return*/, success];
                             }
                             else {
@@ -28905,6 +28996,7 @@
                 },] }
     ];
     TransactionHeaderPartialDeliveryComponent.propDecorators = {
+        checkbox: [{ type: i0.ViewChild, args: [corecomponents_v12.InputCheckboxComponent,] }],
         showClass: [{ type: i0.HostBinding, args: ["class.co-transaction-header-partial-delivery",] }]
     };
 
@@ -29973,7 +30065,7 @@
     TransactionHeaderPaymentComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "co-transaction-header-payment",
-                    template: "\n    <div class=\"transaction-header-payment-wrapper\">\n      <div class=\"transaction-header-payment-wrapper-content\" [class.show-remaining]=\"showRemainingPayment\">\n        <co-transaction-header-block\n          [firstBlockTemplate]=\"firstBlock\"\n          [secondBlockTemplate]=\"secondBlock\"\n          [thirdBlockTemplate]=\"thirdBlock\"\n          [hiddenBlockTemplate]=\"hiddenBlock\"\n          (headerClick)=\"showDialog = true\"\n        >\n        </co-transaction-header-block>\n        <co-transaction-header-block *ngIf=\"showRemainingPayment\"\n          [firstBlockTemplate]=\"firstBlockRest\"\n          (headerClick)=\"showDialog = true\"\n        >\n        </co-transaction-header-block>\n      </div>\n    </div>\n    <ng-template #firstBlock>\n      <div class=\"transaction-header-block-row\">\n        <div class=\"transaction-header-icon\" [screenConfigurationObject]=\"cfgNames.HeaderPaymentAvatarHeader\" screenConfigNativeElement>\n          <co-icon class=\"header-order-icon\"\n                   (click)=\"showDialog = true\"\n                   [iconData]=\"iconCacheService.getIcon(icons.CreditCardRegular)\">\n          </co-icon>\n        </div>\n        <div class=\"header-downpayment-amount-wrapper\" [screenConfigurationObject]=\"cfgNames.HeaderPaymentAmountHeader\" screenConfigNativeElement>\n          <div class=\"header-deposit-label co-transaction-label\" [textContent]=\"'DOWNPAYMENT_AMOUNT' | localize\"></div>\n          <co-transaction-header-deposit-amount class=\"transaction-header-deposit\"\n                                                [screenConfigurationObject]=\"cfgNames.HeaderPaymentAmountHeader\"\n                                                [transaction]=\"transaction\"\n                                                [defaultEditMode]=\"false\"\n                                                [showLabel]=\"false\"\n          ></co-transaction-header-deposit-amount>\n        </div>\n      </div>\n    </ng-template>\n    <ng-template #firstBlockRest>\n      <div class=\"transaction-header-block-row\">\n        <div class=\"transaction-header-icon\" [screenConfigurationObject]=\"cfgNames.HeaderPaymentAvatarHeader\" screenConfigNativeElement>\n          <co-icon class=\"header-order-icon\"\n                   (click)=\"showPaymentDialog = true\"\n                   [iconData]=\"iconCacheService.getIcon(icons.CreditCardRegularCheck)\">\n          </co-icon>\n        </div>\n        <div class=\"header-remaining-payment-amount-wrapper\" [screenConfigurationObject]=\"cfgNames.HeaderPaymentAmountHeader\" screenConfigNativeElement>\n          <div class=\"header-deposit-label co-transaction-label\" [textContent]=\"'REMAINING_PAYMENT' | localize\"></div>\n          <co-transaction-header-remaining-amount class=\"transaction-header-remaining\"\n                                                  [screenConfigurationObject]=\"cfgNames.HeaderPaymentAmountHeader\"\n                                                  [transactionUuid]=\"transaction.transactionInfo.uuid\"\n                                                  (remainingAmountChange)=\"remainingToPay = $event\"\n          ></co-transaction-header-remaining-amount>\n        </div>\n      </div>\n    </ng-template>\n    <ng-template #secondBlock>\n      <div class=\"transaction-header-block-row\">\n        <div class=\"header-downpayment-percentage-wrapper\" [screenConfigurationObject]=\"cfgNames.HeaderPaymentPercentageHeader\" screenConfigNativeElement>\n          <div class=\"header-deposit-label co-transaction-label\" [textContent]=\"'%' | localize\"></div>\n          <co-transaction-header-deposit-percentage class=\"transaction-header-deposit\"\n                                                    [screenConfigurationObject]=\"cfgNames.HeaderPaymentPercentageHeader\"\n                                                    [transactionInfo]=\"transactionInfo\"\n                                                    [defaultEditMode]=\"false\"\n                                                    [showLabel]=\"false\"\n          ></co-transaction-header-deposit-percentage>\n        </div>\n      </div>\n    </ng-template>\n    <ng-template #thirdBlock>\n      <div class=\"transaction-header-block-row\">\n        <div class=\"header-payment-button-wrapper\" (click)=\"openPayment($event)\" [screenConfigurationObject]=\"cfgNames.HeaderPaymentPaymentHeader\" screenConfigNativeElement>\n            <co-icon class=\"header-order-icon\" [iconData]=\"iconCacheService.getIcon(icons.CreditCardRegularCheck)\">\n            </co-icon>\n          <div class=\"spacer\"></div>\n          <div class=\"payment-payed-wrapper\">\n            <!--div class=\"header-payed-label co-transaction-label\" [textContent]=\"'DOWNPAYMENT_DONE' | localize\"></div-->\n            <span class=\"payment-paid\" [class.success]=\"paid >= toPay\" [textContent]=\"(paid | coCurrency) || 0\"></span>\n          </div>\n          <!--co-transaction-header-payment-button *ngIf=\"transactionInfo.transactionKind !== transKind.PurchaseOrder\"\n                                                [transactionInfo]=\"transactionInfo\"\n          ></co-transaction-header-payment-button-->\n        </div>\n      </div>\n    </ng-template>\n    <ng-template #hiddenBlock>\n      <!--div class=\"transaction-header-block-row\">\n        <div class=\"header-branch-label co-transaction-label\" [textContent]=\"'BRANCH' | localize\"></div>\n        <div class=\"branch-label\" [textContent]=\"transactionInfo.branch?.familyName\"></div>\n      </div-->\n    </ng-template>\n    <co-transaction-header-popup *ngIf=\"showDialog\"\n                                 [activeCategoryDescription]=\"'PAYMENT_INFORMATION'\"\n                                 [relation]=\"relation\"\n                                 [transaction]=\"transaction\"\n                                 (closeClick)=\"showDialog = false\"></co-transaction-header-popup>\n<!--\n    <co-dialog class=\"transaction-header-payment-dialog\" [headerTemplate]=\"headerTemplate\" *ngIf=\"showDialog\" (closeClick)=\"showDialog = false\">\n      <ng-template #headerTemplate>\n        <div class=\"co-dialog-header-title\" [textContent]=\"'PAYMENT_INFORMATION' | localize\"></div>\n        <co-transaction-header-block\n          [headerBlockTemplate]=\"headerBlock\"\n          [firstBlockTemplate]=\"firstBlock\"\n          [secondBlockTemplate]=\"secondBlock\"\n        >\n        </co-transaction-header-block>\n      </ng-template>\n      <div class=\"payment-dialog-section\">\n        <co-deposit-payment [branch]=\"transactionInfo.branch?.relationNr\" [transactionUuid]=\"transactionInfo.uuid\"></co-deposit-payment>\n      </div>\n    </co-dialog>\n-->\n    <co-dialog class=\"payment-dialog\" [customCssClass]=\"'co-small-scrollbar'\" *ngIf=\"showPaymentDialog\"\n               [modal]=\"true\"\n               (closeClick)=\"showPaymentDialog = false\"\n    >\n      <co-payment\n        [transId]=\"transactionInfo.id\"\n        [branch]=\"transactionInfo.branch?.relationNr\"\n        [transactionUuid]=\"transactionInfo.uuid\"\n        [amount]=\"showRemainingPayment ? remainingToPay : toPay\"\n        [updateDepositAmount]=\"!showRemainingPayment\"\n        [currencyId]=\"transactionInfo.currencyId\"\n      ></co-payment>\n    </co-dialog>\n  ",
+                    template: "\n    <div class=\"transaction-header-payment-wrapper\">\n      <div class=\"transaction-header-payment-wrapper-content\" [class.show-remaining]=\"showRemainingPayment\">\n        <co-transaction-header-block\n          [firstBlockTemplate]=\"firstBlock\"\n          [secondBlockTemplate]=\"secondBlock\"\n          [thirdBlockTemplate]=\"thirdBlock\"\n          [hiddenBlockTemplate]=\"hiddenBlock\"\n          (headerClick)=\"showDialog = true\"\n        >\n        </co-transaction-header-block>\n        <co-transaction-header-block *ngIf=\"showRemainingPayment\"\n          [firstBlockTemplate]=\"firstBlockRest\"\n          (headerClick)=\"showDialog = true\"\n        >\n        </co-transaction-header-block>\n      </div>\n    </div>\n    <ng-template #firstBlock>\n      <div class=\"transaction-header-block-row\">\n        <div class=\"transaction-header-icon\" [screenConfigurationObject]=\"cfgNames.HeaderPaymentAvatarHeader\" screenConfigNativeElement>\n          <co-icon class=\"header-order-icon\"\n                   (click)=\"showDialog = true\"\n                   [iconData]=\"iconCacheService.getIcon(icons.CreditCardRegular)\">\n          </co-icon>\n        </div>\n        <div class=\"header-downpayment-amount-wrapper\" [screenConfigurationObject]=\"cfgNames.HeaderPaymentAmountHeader\" screenConfigNativeElement>\n          <div class=\"header-deposit-label co-transaction-label\" [textContent]=\"'DOWNPAYMENT_AMOUNT' | localize\"></div>\n          <co-transaction-header-deposit-amount class=\"transaction-header-deposit\"\n                                                [screenConfigurationObject]=\"cfgNames.HeaderPaymentAmountHeader\"\n                                                [transaction]=\"transaction\"\n                                                [defaultEditMode]=\"false\"\n                                                [showLabel]=\"false\"\n          ></co-transaction-header-deposit-amount>\n        </div>\n      </div>\n    </ng-template>\n    <ng-template #firstBlockRest>\n      <div class=\"transaction-header-block-row\">\n        <div class=\"transaction-header-icon\" [screenConfigurationObject]=\"cfgNames.HeaderPaymentAvatarHeader\" screenConfigNativeElement>\n          <co-icon class=\"header-order-icon\"\n                   (click)=\"showPaymentDialog = true\"\n                   [iconData]=\"iconCacheService.getIcon(icons.CreditCardRegularCheck)\">\n          </co-icon>\n        </div>\n        <div class=\"header-remaining-payment-amount-wrapper\" [screenConfigurationObject]=\"cfgNames.HeaderPaymentAmountHeader\" screenConfigNativeElement>\n          <div class=\"header-deposit-label co-transaction-label\" [textContent]=\"'REMAINING_PAYMENT' | localize\"></div>\n          <co-transaction-header-remaining-amount class=\"transaction-header-remaining\"\n                                                  [screenConfigurationObject]=\"cfgNames.HeaderPaymentAmountHeader\"\n                                                  [transactionUuid]=\"transaction.transactionInfo.uuid\"\n                                                  (remainingAmountChange)=\"remainingToPay = $event\"\n          ></co-transaction-header-remaining-amount>\n        </div>\n      </div>\n    </ng-template>\n    <ng-template #secondBlock>\n      <div class=\"transaction-header-block-row\">\n        <div class=\"header-downpayment-percentage-wrapper\" [screenConfigurationObject]=\"cfgNames.HeaderPaymentPercentageHeader\" screenConfigNativeElement>\n          <div class=\"header-deposit-label co-transaction-label\" [textContent]=\"'%' | localize\"></div>\n          <co-transaction-header-deposit-percentage class=\"transaction-header-deposit\"\n                                                    [screenConfigurationObject]=\"cfgNames.HeaderPaymentPercentageHeader\"\n                                                    [transactionInfo]=\"transactionInfo\"\n                                                    [defaultEditMode]=\"false\"\n                                                    [showLabel]=\"false\"\n          ></co-transaction-header-deposit-percentage>\n        </div>\n      </div>\n    </ng-template>\n    <ng-template #thirdBlock>\n      <div class=\"transaction-header-block-row\">\n        <div class=\"header-payment-button-wrapper\" (click)=\"openPayment($event)\" [screenConfigurationObject]=\"cfgNames.HeaderPaymentPaymentHeader\" screenConfigNativeElement>\n            <co-icon class=\"header-order-icon\" [iconData]=\"iconCacheService.getIcon(icons.CreditCardRegularCheck)\">\n            </co-icon>\n          <div class=\"spacer\"></div>\n          <div class=\"payment-payed-wrapper\">\n            <!--div class=\"header-payed-label co-transaction-label\" [textContent]=\"'DOWNPAYMENT_DONE' | localize\"></div-->\n            <span class=\"payment-paid\" [class.success]=\"paid >= toPay\" [textContent]=\"(paid | coCurrency) || 0\"></span>\n          </div>\n          <!--co-transaction-header-payment-button *ngIf=\"transactionInfo.transactionKind !== transKind.PurchaseOrder\"\n                                                [transactionInfo]=\"transactionInfo\"\n          ></co-transaction-header-payment-button-->\n        </div>\n      </div>\n    </ng-template>\n    <ng-template #hiddenBlock>\n      <!--div class=\"transaction-header-block-row\">\n        <div class=\"header-branch-label co-transaction-label\" [textContent]=\"'BRANCH' | localize\"></div>\n        <div class=\"branch-label\" [textContent]=\"transactionInfo.branch?.familyName\"></div>\n      </div-->\n    </ng-template>\n    <co-transaction-header-popup *ngIf=\"showDialog\"\n                                 [activeCategoryDescription]=\"'PAYMENT_INFORMATION'\"\n                                 [relation]=\"relation\"\n                                 [transaction]=\"transaction\"\n                                 (closeClick)=\"showDialog = false\"></co-transaction-header-popup>\n<!--\n    <co-dialog class=\"transaction-header-payment-dialog\" [headerTemplate]=\"headerTemplate\" *ngIf=\"showDialog\" (closeClick)=\"showDialog = false\">\n      <ng-template #headerTemplate>\n        <div class=\"co-dialog-header-title\" [textContent]=\"'PAYMENT_INFORMATION' | localize\"></div>\n        <co-transaction-header-block\n          [headerBlockTemplate]=\"headerBlock\"\n          [firstBlockTemplate]=\"firstBlock\"\n          [secondBlockTemplate]=\"secondBlock\"\n        >\n        </co-transaction-header-block>\n      </ng-template>\n      <div class=\"payment-dialog-section\">\n        <co-deposit-payment [branch]=\"transactionInfo.branch?.relationNr\" [transactionUuid]=\"transactionInfo.uuid\"></co-deposit-payment>\n      </div>\n    </co-dialog>\n-->\n    <co-dialog class=\"payment-dialog\" [modal]=\"true\" [headerTemplate]=\"headerTemplate\" *ngIf=\"showPaymentDialog\" (closeClick)=\"showPaymentDialog = false\">\n      <ng-template #headerTemplate>\n        <div class=\"payment-wrapper-popup-title\">\n          <co-icon [iconData]=\"iconCacheService.getIcon(icons.CreditCardRegularCheck)\"></co-icon>\n          <div class=\"co-dialog-header-title\" [textContent]=\"'PAYMENT_METHOD' | localize\"></div>\n        </div>\n      </ng-template>\n      <co-payment\n        [transId]=\"transactionInfo.id\"\n        [branch]=\"transactionInfo.branch?.relationNr\"\n        [transactionUuid]=\"transactionInfo.uuid\"\n        [amount]=\"showRemainingPayment ? remainingToPay : toPay\"\n        [updateDepositAmount]=\"!showRemainingPayment\"\n        [currencyId]=\"transactionInfo.currencyId\"\n      ></co-payment>\n    </co-dialog>\n  ",
                     providers: [{
                             provide: corecomponents_v12.SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME,
                             useExisting: i0.forwardRef(function () { return TransactionHeaderPaymentComponent; })
@@ -31837,8 +31929,6 @@
                                 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';
@@ -31880,7 +31970,7 @@
         };
         TransactionLinePurchaseConfirmationComponent.prototype.handleSelectHistoryRow = function (row) {
             this.docDeliveryBatch = row;
-            // this.docDeliveryBatch.docDate = new Date(row.docDate);
+            this.docDeliveryBatch.docDate = new Date(row.docDate);
         };
         TransactionLinePurchaseConfirmationComponent.prototype.handleCancelClick = function () {
             this._initNewDocDeliveryBatch();
@@ -31893,7 +31983,9 @@
         };
         TransactionLinePurchaseConfirmationComponent.prototype._initNewDocDeliveryBatch = function () {
             this.docDeliveryBatch = new docDeliveryBatch_bo.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;
         };
         return TransactionLinePurchaseConfirmationComponent;
@@ -34847,19 +34939,49 @@
             _this._overlayService = _overlayService;
             _this._elementRef = _elementRef;
             _this.icons = Icon;
+            _this.showCalender = false;
             return _this;
         }
         TransactionLineSupplierDeliveryDateButtonComponent.prototype.showClass = function () {
             return true;
         };
-        TransactionLineSupplierDeliveryDateButtonComponent.prototype.handleShowDialog = function (event) {
+        TransactionLineSupplierDeliveryDateButtonComponent.prototype.handleShowHideClick = function () {
+            this.showCalender = !this.showCalender;
+            if (this.showCalender) {
+                this._showPopup();
+            }
+            else {
+                this._hidePopup();
+            }
+        };
+        TransactionLineSupplierDeliveryDateButtonComponent.prototype._showPopup = function () {
+            var _this = this;
+            this.showCalender = true;
+            this._calendarPopupComponentRef = this._overlayService.createComponent(corecomponents_v12.CalendarComponent, {
+                parentForOverlay: this.parentComponent,
+                selectedDate: new Date(this.transactionLine.purchasePortalLine.deliveryDateConfirmed
+                    ? this.transactionLine.purchasePortalLine.deliveryDateConfirmed
+                    : new Date())
+            }, {
+                dateSelected: function (date) { return _this._handleDateChanged(date); },
+                clickedOutside: function () { return _this.handleShowHideClick(); }
+            });
+        };
+        TransactionLineSupplierDeliveryDateButtonComponent.prototype._handleDateChanged = function (date) {
+            this.transactionLine.purchasePortalLine.deliveryDateConfirmed = date.toDateString();
+            this.handleShowHideClick();
+            this.detectChanges();
+        };
+        TransactionLineSupplierDeliveryDateButtonComponent.prototype._hidePopup = function () {
+            this.showCalender = false;
+            this._overlayService.removeComponent(this._calendarPopupComponentRef);
         };
         return TransactionLineSupplierDeliveryDateButtonComponent;
     }(TransactionBaseComponent));
     TransactionLineSupplierDeliveryDateButtonComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'co-transaction-line-supplier-delivery-date-button',
-                    template: "\n        <co-transaction-button class=\"big center-align\"\n                               [hidden]=\"hidden\"\n                               [readonly]=\"readonly\"\n                               [iconData]=\"iconCacheService.getIcon(icons.RegularIndustryClock)\"\n                               [label]=\"transactionLine.purchasePortalLine.deliveryDateConfirmed | date:'d MMM yyyy'\"\n                               [rightIconData]=\"iconCacheService.getIcon(icons.CalendarDayRegular)\"\n                               (click)=\"handleShowDialog($event)\"\n        ></co-transaction-button>\n    ",
+                    template: "\n        <co-transaction-button #parentComponent class=\"big center-align\"\n                               [hidden]=\"hidden\"\n                               [readonly]=\"readonly\"\n                               [iconData]=\"iconCacheService.getIcon(icons.RegularIndustryClock)\"\n                               [label]=\"transactionLine.purchasePortalLine.deliveryDateConfirmed | date:'d MMM yyyy'\"\n                               [rightIconData]=\"iconCacheService.getIcon(icons.CalendarDayRegular)\"\n                               (click)=\"handleShowHideClick()\"\n        ></co-transaction-button>\n    ",
                     providers: [
                         corecomponents_v12.OverlayService,
                         {
@@ -34882,6 +35004,7 @@
         { type: i0.ElementRef }
     ]; };
     TransactionLineSupplierDeliveryDateButtonComponent.propDecorators = {
+        parentComponent: [{ type: i0.ViewChild, args: ['parentComponent', { read: i0.ElementRef },] }],
         showClass: [{ type: i0.HostBinding, args: ['class.co-transaction-line-supplier-delivery-date-button',] }]
     };