@colijnit/transaction 12.1.74 → 12.1.76

package/bundles/colijnit-transaction.umd.js

@@ -3338,12 +3338,12 @@
                 });
             });
         };
-        TransactionConnectorAdapterService.prototype.addTransactionLine = function (uuid, articleLine, articleNo, amount, warehouseNo, commissionCode, isReturn, aboveLineNr, belowLineNr) {
+        TransactionConnectorAdapterService.prototype.addTransactionLine = function (uuid, articleLine, articleNo, amount, isReturn, aboveLineNr, belowLineNr) {
             return __awaiter(this, void 0, void 0, function () {
                 var _this = this;
                 return __generator(this, function (_a) {
                     return [2 /*return*/, new Promise(function (resolve, reject) {
-                            return _this.connector.addTransactionLine(uuid, articleLine, articleNo, amount, warehouseNo, commissionCode, isReturn, aboveLineNr, belowLineNr).then(function (result) {
+                            return _this.connector.addTransactionLine(uuid, articleLine, articleNo, amount, isReturn, aboveLineNr, belowLineNr).then(function (result) {
                                 if (result.validationResult && result.validationResult.success) {
                                     resolve(_this._boFactory.makeWithRawBackendData(transactionInfoResponse_bo.TransactionInfoResponse, result.resultObject));
                                 }
@@ -5388,10 +5388,10 @@
                 });
             });
         };
-        TransactionConnectorService.prototype.addTransactionLine = function (uuid, articleLine, articleNo, amount, warehouseNo, commissionCode, isReturn, aboveLineNr, belowLineNr) {
+        TransactionConnectorService.prototype.addTransactionLine = function (uuid, articleLine, articleNo, amount, isReturn, aboveLineNr, belowLineNr) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
-                    return [2 /*return*/, this._adapterService.addTransactionLine(uuid, articleLine, articleNo, amount, warehouseNo, commissionCode, isReturn, aboveLineNr, belowLineNr)];
+                    return [2 /*return*/, this._adapterService.addTransactionLine(uuid, articleLine, articleNo, amount, isReturn, aboveLineNr, belowLineNr)];
                 });
             });
         };
@@ -7717,6 +7717,8 @@
                 var _this = this;
                 return __generator(this, function (_a) {
                     return [2 /*return*/, new Promise(function (resolve) {
+                            // todo fix this
+                            request.branchNr = "1";
                             _this.connector.createSalesOrder(request).then(function (response) {
                                 _this.rememberCurrentTransaction(response);
                                 resolve(true);
@@ -7743,6 +7745,8 @@
                 var _this = this;
                 return __generator(this, function (_a) {
                     return [2 /*return*/, new Promise(function (resolve) {
+                            // todo fix this
+                            request.branchNr = "1";
                             _this.connector.createPurchaseOrder(request).then(function (response) {
                                 _this.rememberCurrentTransaction(response);
                                 resolve(true);
@@ -7756,6 +7760,8 @@
                 var _this = this;
                 return __generator(this, function (_a) {
                     return [2 /*return*/, new Promise(function (resolve) {
+                            // todo fix this
+                            request.branchNr = "1";
                             _this.connector.createServiceOrder(request).then(function (response) {
                                 _this.rememberCurrentTransaction(response);
                                 resolve(true);
@@ -7908,7 +7914,7 @@
                         case 0: return [4 /*yield*/, this._checkAndCreateTransaction()];
                         case 1:
                             _a.sent();
-                            return [4 /*yield*/, this.connector.addTransactionLine(this.currentTransaction.transactionInfo.uuid, transactionLineType_enum.TransactionLineType.ArticleLine, articleNo, null, null, null, isReturn, aboveLineNr, belowLineNr)];
+                            return [4 /*yield*/, this.connector.addTransactionLine(this.currentTransaction.transactionInfo.uuid, transactionLineType_enum.TransactionLineType.ArticleLine, articleNo, null, isReturn, aboveLineNr, belowLineNr)];
                         case 2:
                             response = _a.sent();
                             return [2 /*return*/, this.handleLineOperationStatuses(response)];
@@ -7932,7 +7938,7 @@
         //       });
         //   });
         // }
-        TransactionService.prototype.addTransactionLine = function (lineType, articleNo, amount, warehouseNo, commissionCode, isReturn, aboveLineNr, belowLineNr, remember) {
+        TransactionService.prototype.addTransactionLine = function (lineType, articleNo, amount, isReturn, aboveLineNr, belowLineNr, remember) {
             if (remember === void 0) { remember = true; }
             return __awaiter(this, void 0, void 0, function () {
                 var _this = this;
@@ -7942,7 +7948,7 @@
                         case 1:
                             _a.sent();
                             return [2 /*return*/, new Promise(function (resolve, reject) {
-                                    _this.connector.addTransactionLine(_this.currentTransaction.transactionInfo.uuid, lineType, articleNo, amount, warehouseNo, commissionCode, isReturn, aboveLineNr, belowLineNr)
+                                    _this.connector.addTransactionLine(_this.currentTransaction.transactionInfo.uuid, lineType, articleNo, amount, isReturn, aboveLineNr, belowLineNr)
                                         .then(function (response) { return __awaiter(_this, void 0, void 0, function () {
                                         return __generator(this, function (_a) {
                                             this.rememberCurrentTransaction(response);
@@ -8461,8 +8467,6 @@
                         createMethod = this._createTransactionMethods.get(this.transactionKind);
                         if (createMethod) {
                             request = new createTransactionRequest.CreateTransactionRequest();
-                            // todo fix this
-                            request.branchNr = "1";
                             return [2 /*return*/, createMethod.call(this, request)];
                         }
                         else {
@@ -8696,12 +8700,12 @@
             set: function (value) {
                 this._relation = value;
                 if (this._relation) {
+                    if (this._relation instanceof supplierFullObject_bo.SupplierFullObject) {
+                        this._relation.type = relationNameKind_enum.RelationNameKind.Company;
+                    }
                     if (this._relation instanceof customerFullObject_bo.CustomerFullObject) {
                         this.customerGroup = this._relation.customerGroup;
                     }
-                    else {
-                        this._relation.type = relationNameKind_enum.RelationNameKind.Company;
-                    }
                     this.address = this._relation.getFirstAddressOrCreateNew();
                     var firstActiveAddress = this._relation.activeAddresses.length > 0 ? this._relation.activeAddresses[0] : undefined;
                     this.deliveryAddressNawNr = firstActiveAddress ? firstActiveAddress.nawNr : 0;
@@ -19843,7 +19847,9 @@
                     this.getPurchasePortalLine.filterObject = this.purchasePortalFilter;
                     this.transactionService.getPurchasePortalLines(this.getPurchasePortalLine).then(function (result) {
                         _this.transactionService.purchasePortalLine = result;
-                        _this.filteredDocBatchArray = _this.transactionService.purchasePortalLine[0].docBatchArray.filter(function (value) { return value.historical === 'G'; });
+                        _this.transactionService.purchasePortalLine.forEach(function (element) {
+                            _this.filteredDocBatchArray = element.docBatchArray.filter(function (value) { return value.historical === 'G'; });
+                        });
                     });
                     return [2 /*return*/];
                 });
@@ -19942,10 +19948,23 @@
             this.showAddOrder = false;
             this.newDocBatchArray = new docDeliveryBatch_bo.DocDeliveryBatch();
             this.docBatchSaved = new i0.EventEmitter();
+            this.isEditMode = false;
         }
         TransactionConfirmationDetailsComponent.prototype.showClass = function () {
             return true;
         };
+        Object.defineProperty(TransactionConfirmationDetailsComponent.prototype, "isEditing", {
+            get: function () {
+                return this.isEditMode;
+            },
+            set: function (value) {
+                this.isEditMode = value;
+                console.log(this.isEditMode);
+                console.log(this.isEditing);
+            },
+            enumerable: false,
+            configurable: true
+        });
         TransactionConfirmationDetailsComponent.prototype.addButtonClicked = function () {
             this.showAddOrder = !this.showAddOrder;
         };
@@ -19955,10 +19974,12 @@
                     switch (_a.label) {
                         case 0:
                             if (!(this.newDocBatchArray.docAmount && this.newDocBatchArray.confirmedPrice)) return [3 /*break*/, 2];
-                            this.newDocBatchArray.docDateOrg = new Date();
                             this.newDocBatchArray.deleteLine = "F";
                             this.newDocBatchArray.historical = "G";
-                            this.transactionService.purchasePortalLine[0].docBatchArray.push(this.newDocBatchArray);
+                            if (!this.newDocBatchArray.docDateOrg) {
+                                this.newDocBatchArray.docDateOrg = this.newDocBatchArray.docDate;
+                                this.transactionService.purchasePortalLine[0].docBatchArray.push(this.newDocBatchArray);
+                            }
                             this.transactionService.purchasePortalLine[0].docKind = "IB";
                             return [4 /*yield*/, this.transactionService.updatePurchasePortalLines(this.transactionService.purchasePortalLine[0])];
                         case 1:
@@ -19972,12 +19993,16 @@
                 });
             });
         };
+        TransactionConfirmationDetailsComponent.prototype.handleCancelClick = function () {
+            this.newDocBatchArray = new docDeliveryBatch_bo.DocDeliveryBatch();
+            this.isEditing = false;
+        };
         return TransactionConfirmationDetailsComponent;
     }());
     TransactionConfirmationDetailsComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "co-transaction-confirmation-details",
-                    template: "\n    <div class=\"confirmation-details-wrapper\">\n      <co-form>\n        <div class=\"details-header\">\n          <span class=\"header-left-text\" [textContent]=\"'ORDER_CONFIRMATIONS' | localize\"></span>\n          <co-icon class=\"header-left-text\" [iconData]=\"iconCacheService.getIcon(icons.PlusRound)\"\n                   (click)=\"addButtonClicked()\"></co-icon>\n          <div class=\"details-header-right\">\n            <span class=\"header-right-text\" [textContent]=\"'REQUESTED_DELIVERY' | localize\"></span>\n            <span class=\"header-right-text-colon\" [textContent]=\"':   '\"></span>\n            <span class=\"header-right-text\" [textContent]=\"transactionLines.deliveryDate | date:'dd-MM-YYYY'\"></span>\n          </div>\n        </div>\n        <div *ngIf=\"showAddOrder\" class=\"columns-wrapper\">\n          <div class=\"details-column\">\n            <co-input-text  class=\"details-input\"\n                            [(model)]=\"newDocBatchArray.docAmount\"\n                            [placeholder]=\"'AMOUNT' | localize\"\n                            required\n            >\n            </co-input-text>\n            <co-input-date class=\"details-input\"\n                           [(model)]=\"newDocBatchArray.docDate\"\n                           required\n            >\n            </co-input-date>\n            <co-input-text  class=\"details-input\"\n                            [(model)]=\"newDocBatchArray.confirmedPrice\"\n                            [placeholder]=\"'CONFIRMED_PRICE' | localize\"\n                            required\n            >\n            </co-input-text>\n          </div>\n\n          <div class=\"divider-wrapper\">\n            <div class=\"divider\"></div>\n          </div>\n\n          <div class=\"details-column\">\n            <co-input-text class=\"details-input\"\n                           [(model)]=\"newDocBatchArray.reference\"\n                           [placeholder]=\"'REFERENCE' | localize\">\n            </co-input-text>\n\n            <co-input-text class=\"details-input\"\n                           [(model)]=\"newDocBatchArray.deliveryBatch\"\n                           [placeholder]=\"'DELIVERY_BATCH' | localize\">\n            </co-input-text>\n          </div>\n        </div>\n      </co-form>\n\n      <div *ngIf=\"showAddOrder\" class=\"save-cancel-wrapper\">\n        <co-default-ok-cancel-buttons (okClick)=\"handleOkClick()\"></co-default-ok-cancel-buttons>\n      </div>\n    </div>\n  ",
+                    template: "\n    <div class=\"confirmation-details-wrapper\">\n      <co-form>\n        <div class=\"details-header\">\n          <span class=\"header-left-text\" [textContent]=\"'ORDER_CONFIRMATIONS' | localize\"></span>\n          <co-icon class=\"header-left-text\" [iconData]=\"iconCacheService.getIcon(icons.PlusRound)\"\n                   (click)=\"addButtonClicked()\"></co-icon>\n          <div class=\"details-header-right\">\n            <span class=\"header-right-text\" [textContent]=\"'REQUESTED_DELIVERY' | localize\"></span>\n            <span class=\"header-right-text-colon\" [textContent]=\"':   '\"></span>\n            <span class=\"header-right-text\" [textContent]=\"transactionLines.deliveryDate | date:'dd-MM-YYYY'\"></span>\n          </div>\n        </div>\n        <div class=\"header-inform-user\" *ngIf=\"isEditing\">\n          <span class=\"header-inform-user editting\" [textContent]=\"'EDITING_DATA_ROW' | localize\"></span>\n        </div>\n        <div *ngIf=\"showAddOrder\" class=\"columns-wrapper\">\n          <div class=\"details-column\">\n            <co-input-text  class=\"details-input\"\n                            [(model)]=\"newDocBatchArray.docAmount\"\n                            [placeholder]=\"'AMOUNT' | localize\"\n                            required\n            >\n            </co-input-text>\n            <co-input-date class=\"details-input\"\n                           [(model)]=\"newDocBatchArray.docDate\"\n                           required\n            >\n            </co-input-date>\n            <co-input-text  class=\"details-input\"\n                            [(model)]=\"newDocBatchArray.confirmedPrice\"\n                            [placeholder]=\"'CONFIRMED_PRICE' | localize\"\n                            required\n            >\n            </co-input-text>\n          </div>\n\n          <div class=\"divider-wrapper\">\n            <div class=\"divider\"></div>\n          </div>\n\n          <div class=\"details-column\">\n            <co-input-text class=\"details-input\"\n                           [(model)]=\"newDocBatchArray.reference\"\n                           [placeholder]=\"'REFERENCE' | localize\">\n            </co-input-text>\n\n            <co-input-text class=\"details-input\"\n                           [(model)]=\"newDocBatchArray.deliveryBatch\"\n                           [placeholder]=\"'DELIVERY_BATCH' | localize\">\n            </co-input-text>\n          </div>\n        </div>\n      </co-form>\n\n      <div *ngIf=\"showAddOrder\" class=\"save-cancel-wrapper\">\n        <co-default-ok-cancel-buttons (okClick)=\"handleOkClick()\" (cancelClick)=\"handleCancelClick()\"></co-default-ok-cancel-buttons>\n      </div>\n    </div>\n  ",
                     encapsulation: i0.ViewEncapsulation.None,
                     providers: [
                         corecomponents_v12.FormMasterService
@@ -19993,6 +20018,7 @@
         transactionInfoNr: [{ type: i0.Input }],
         showClass: [{ type: i0.HostBinding, args: ["class.co-transaction-confirmation-details",] }],
         newDocBatchArray: [{ type: i0.Input }],
+        isEditing: [{ type: i0.Input }],
         docBatchSaved: [{ type: i0.Output }]
     };
 
@@ -20092,6 +20118,7 @@
             this.goodsReceiptStatus = new goodsReceiptStatusWithHistory_bo.GoodsReceiptStatusWithHistory();
             this.selectedLineDocBatchArray = new docDeliveryBatch_bo.DocDeliveryBatch();
             this.isDocBatchSaved = false;
+            this.editingMode = false;
             this._transactionInfo = new transactionInfo_bo.TransactionInfo();
         }
         Object.defineProperty(TransactionLineSidePanelPurchaseComponent.prototype, "transactionInfo", {
@@ -20126,6 +20153,7 @@
         };
         TransactionLineSidePanelPurchaseComponent.prototype.fillInputOnClick = function (data) {
             this.selectedLineDocBatchArray = data;
+            this.editingMode = true;
         };
         TransactionLineSidePanelPurchaseComponent.prototype.docBatchSaved = function (data) {
             this.isDocBatchSaved = data;
@@ -20135,7 +20163,7 @@
     TransactionLineSidePanelPurchaseComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "co-transaction-line-side-panel-purchase",
-                    template: "\n    <ng-container [ngSwitch]=\"category\">\n      <ng-container *ngSwitchCase=\"categories.PurchaseOrderOrderConfirmation\">\n        <co-transaction-confirmation-details\n          [transactionInfoNr]=\"transactionInfo.transactionNr\"\n          [transactionLines]=\"transactionLine\"\n          [newDocBatchArray]=\"selectedLineDocBatchArray\"\n          (docBatchSaved)=\"docBatchSaved($event)\"\n        ></co-transaction-confirmation-details>\n        <co-transaction-confirmation-history\n          [transactionLines]=\"transactionLine\"\n          [transactionInfoNr]=\"transactionInfo.transactionNr\"\n          [transactionId]=\"transactionInfo.id\"\n          (lineSelected)=\"fillInputOnClick($event)\"\n          [isDocBatchSaved]=\"isDocBatchSaved\"\n          (docBatchApplied)=\"docBatchSaved($event)\"\n        ></co-transaction-confirmation-history>\n      </ng-container>\n\n      <ng-container *ngSwitchCase=\"categories.PurchaseOrderReceivedGoods\">\n        <co-transaction-side-panel-edit-request-details\n          [category]=\"categories.PurchaseOrderReceivedGoods\"\n          [transactionInfo]=\"transactionInfo\"\n          [transactionLine]=\"transactionLine\"\n          [amountLeftToReceive]=\"goodsReceiptStatus.quantityToReceive\"\n          (reloadReceivingGoodsHistory)=\"getGoodsReceiptStatusWithHistory()\"\n        ></co-transaction-side-panel-edit-request-details>\n        <co-transaction-receiving-goods-history\n          *ngIf=\"transactionLine.amount >= 0\"\n          [transactionInfo]=\"transactionInfo\"\n          [transactionLine]=\"transactionLine\"\n          [goodsReceiptHistory]=\"goodsReceiptStatus.goodsReceiptHistory\"\n          (reloadReceivingGoodsHistory)=\"getGoodsReceiptStatusWithHistory()\"\n        ></co-transaction-receiving-goods-history>\n        <co-transaction-available-stock-grid\n          *ngIf=\"transactionLine.amount < 0\"\n          [transactionInfo]=\"transactionInfo\"\n          [transactionLine]=\"transactionLine\"\n        ></co-transaction-available-stock-grid>\n      </ng-container>\n\n      <ng-container *ngSwitchDefault>\n        <co-transaction-line-side-panel-default\n          [transactionInfo]=\"transactionInfo\"\n          [transactionLine]=\"transactionLine\"\n        ></co-transaction-line-side-panel-default>\n      </ng-container>\n    </ng-container>\n  ",
+                    template: "\n    <ng-container [ngSwitch]=\"category\">\n      <ng-container *ngSwitchCase=\"categories.PurchaseOrderOrderConfirmation\">\n        <co-transaction-confirmation-details\n          [transactionInfoNr]=\"transactionInfo.transactionNr\"\n          [transactionLines]=\"transactionLine\"\n          [newDocBatchArray]=\"selectedLineDocBatchArray\"\n          [isEditing]=\"editingMode\"\n          (docBatchSaved)=\"docBatchSaved($event)\"\n        ></co-transaction-confirmation-details>\n        <co-transaction-confirmation-history\n          [transactionLines]=\"transactionLine\"\n          [transactionInfoNr]=\"transactionInfo.transactionNr\"\n          [transactionId]=\"transactionInfo.id\"\n          (lineSelected)=\"fillInputOnClick($event)\"\n          [isDocBatchSaved]=\"isDocBatchSaved\"\n          (docBatchApplied)=\"docBatchSaved($event)\"\n        ></co-transaction-confirmation-history>\n      </ng-container>\n\n      <ng-container *ngSwitchCase=\"categories.PurchaseOrderReceivedGoods\">\n        <co-transaction-side-panel-edit-request-details\n          [category]=\"categories.PurchaseOrderReceivedGoods\"\n          [transactionInfo]=\"transactionInfo\"\n          [transactionLine]=\"transactionLine\"\n          [amountLeftToReceive]=\"goodsReceiptStatus.quantityToReceive\"\n          (reloadReceivingGoodsHistory)=\"getGoodsReceiptStatusWithHistory()\"\n        ></co-transaction-side-panel-edit-request-details>\n        <co-transaction-receiving-goods-history\n          *ngIf=\"transactionLine.amount >= 0\"\n          [transactionInfo]=\"transactionInfo\"\n          [transactionLine]=\"transactionLine\"\n          [goodsReceiptHistory]=\"goodsReceiptStatus.goodsReceiptHistory\"\n          (reloadReceivingGoodsHistory)=\"getGoodsReceiptStatusWithHistory()\"\n        ></co-transaction-receiving-goods-history>\n        <co-transaction-available-stock-grid\n          *ngIf=\"transactionLine.amount < 0\"\n          [transactionInfo]=\"transactionInfo\"\n          [transactionLine]=\"transactionLine\"\n        ></co-transaction-available-stock-grid>\n      </ng-container>\n\n      <ng-container *ngSwitchDefault>\n        <co-transaction-line-side-panel-default\n          [transactionInfo]=\"transactionInfo\"\n          [transactionLine]=\"transactionLine\"\n        ></co-transaction-line-side-panel-default>\n      </ng-container>\n    </ng-container>\n  ",
                     encapsulation: i0.ViewEncapsulation.None
                 },] }
     ];