@colijnit/transaction 12.1.74 → 12.1.76

package/fesm2015/colijnit-transaction.js

@@ -2823,10 +2823,10 @@ class TransactionConnectorAdapterService {
             });
         });
     }
-    addTransactionLine(uuid, articleLine, articleNo, amount, warehouseNo, commissionCode, isReturn, aboveLineNr, belowLineNr) {
+    addTransactionLine(uuid, articleLine, articleNo, amount, isReturn, aboveLineNr, belowLineNr) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
-                return this.connector.addTransactionLine(uuid, articleLine, articleNo, amount, warehouseNo, commissionCode, isReturn, aboveLineNr, belowLineNr).then((result) => {
+                return this.connector.addTransactionLine(uuid, articleLine, articleNo, amount, isReturn, aboveLineNr, belowLineNr).then((result) => {
                     if (result.validationResult && result.validationResult.success) {
                         resolve(this._boFactory.makeWithRawBackendData(TransactionInfoResponse, result.resultObject));
                     }
@@ -4198,9 +4198,9 @@ class TransactionConnectorService {
             return this._adapterService.getPostalCodeRetrieval(postcalCode, houseNo);
         });
     }
-    addTransactionLine(uuid, articleLine, articleNo, amount, warehouseNo, commissionCode, isReturn, aboveLineNr, belowLineNr) {
+    addTransactionLine(uuid, articleLine, articleNo, amount, isReturn, aboveLineNr, belowLineNr) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this._adapterService.addTransactionLine(uuid, articleLine, articleNo, amount, warehouseNo, commissionCode, isReturn, aboveLineNr, belowLineNr);
+            return this._adapterService.addTransactionLine(uuid, articleLine, articleNo, amount, isReturn, aboveLineNr, belowLineNr);
         });
     }
     addTextLineToTransaction(uuid, showOnDocuments, text, amount, articleBound, refArticleLineNr, aboveLineNr, belowLineNr) {
@@ -5754,6 +5754,8 @@ class TransactionService extends PendingReasonService {
     createSalesOrder(request) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve) => {
+                // todo fix this
+                request.branchNr = "1";
                 this.connector.createSalesOrder(request).then((response) => {
                     this.rememberCurrentTransaction(response);
                     resolve(true);
@@ -5774,6 +5776,8 @@ class TransactionService extends PendingReasonService {
     createPurchaseOrder(request) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve) => {
+                // todo fix this
+                request.branchNr = "1";
                 this.connector.createPurchaseOrder(request).then((response) => {
                     this.rememberCurrentTransaction(response);
                     resolve(true);
@@ -5784,6 +5788,8 @@ class TransactionService extends PendingReasonService {
     createServiceOrder(request) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve) => {
+                // todo fix this
+                request.branchNr = "1";
                 this.connector.createServiceOrder(request).then((response) => {
                     this.rememberCurrentTransaction(response);
                     resolve(true);
@@ -5892,7 +5898,7 @@ class TransactionService extends PendingReasonService {
     addArticle(articleNo, isReturn = false, aboveLineNr = 0, belowLineNr = 0) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this._checkAndCreateTransaction();
-            const response = yield this.connector.addTransactionLine(this.currentTransaction.transactionInfo.uuid, TransactionLineType.ArticleLine, articleNo, null, null, null, isReturn, aboveLineNr, belowLineNr);
+            const response = yield this.connector.addTransactionLine(this.currentTransaction.transactionInfo.uuid, TransactionLineType.ArticleLine, articleNo, null, isReturn, aboveLineNr, belowLineNr);
             return this.handleLineOperationStatuses(response);
         });
     }
@@ -5912,11 +5918,11 @@ class TransactionService extends PendingReasonService {
     //       });
     //   });
     // }
-    addTransactionLine(lineType, articleNo, amount, warehouseNo, commissionCode, isReturn, aboveLineNr, belowLineNr, remember = true) {
+    addTransactionLine(lineType, articleNo, amount, isReturn, aboveLineNr, belowLineNr, remember = true) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this._checkAndCreateTransaction();
             return new Promise((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((response) => __awaiter(this, void 0, void 0, function* () {
                     this.rememberCurrentTransaction(response);
                     resolve(response);
@@ -6228,8 +6234,6 @@ class TransactionService extends PendingReasonService {
                 const createMethod = this._createTransactionMethods.get(this.transactionKind);
                 if (createMethod) {
                     const request = new CreateTransactionRequest();
-                    // todo fix this
-                    request.branchNr = "1";
                     return createMethod.call(this, request);
                 }
                 else {
@@ -6436,12 +6440,12 @@ class CheckoutOverviewRelationEditComponent {
     set relation(value) {
         this._relation = value;
         if (this._relation) {
+            if (this._relation instanceof SupplierFullObject) {
+                this._relation.type = RelationNameKind.Company;
+            }
             if (this._relation instanceof CustomerFullObject) {
                 this.customerGroup = this._relation.customerGroup;
             }
-            else {
-                this._relation.type = RelationNameKind.Company;
-            }
             this.address = this._relation.getFirstAddressOrCreateNew();
             const firstActiveAddress = this._relation.activeAddresses.length > 0 ? this._relation.activeAddresses[0] : undefined;
             this.deliveryAddressNawNr = firstActiveAddress ? firstActiveAddress.nawNr : 0;
@@ -18655,7 +18659,9 @@ class TransactionConfirmationHistoryComponent {
             this.getPurchasePortalLine.filterObject = this.purchasePortalFilter;
             this.transactionService.getPurchasePortalLines(this.getPurchasePortalLine).then((result) => {
                 this.transactionService.purchasePortalLine = result;
-                this.filteredDocBatchArray = this.transactionService.purchasePortalLine[0].docBatchArray.filter(value => value.historical === 'G');
+                this.transactionService.purchasePortalLine.forEach((element) => {
+                    this.filteredDocBatchArray = element.docBatchArray.filter(value => value.historical === 'G');
+                });
             });
         });
     }
@@ -18758,20 +18764,31 @@ class TransactionConfirmationDetailsComponent {
         this.showAddOrder = false;
         this.newDocBatchArray = new DocDeliveryBatch();
         this.docBatchSaved = new EventEmitter();
+        this.isEditMode = false;
     }
     showClass() {
         return true;
     }
+    set isEditing(value) {
+        this.isEditMode = value;
+        console.log(this.isEditMode);
+        console.log(this.isEditing);
+    }
+    get isEditing() {
+        return this.isEditMode;
+    }
     addButtonClicked() {
         this.showAddOrder = !this.showAddOrder;
     }
     handleOkClick() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.newDocBatchArray.docAmount && this.newDocBatchArray.confirmedPrice) {
-                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";
                 yield this.transactionService.updatePurchasePortalLines(this.transactionService.purchasePortalLine[0]);
                 this.docBatchSaved.emit(true);
@@ -18782,6 +18799,10 @@ class TransactionConfirmationDetailsComponent {
             }
         });
     }
+    handleCancelClick() {
+        this.newDocBatchArray = new DocDeliveryBatch();
+        this.isEditing = false;
+    }
 }
 TransactionConfirmationDetailsComponent.decorators = [
     { type: Component, args: [{
@@ -18799,6 +18820,9 @@ TransactionConfirmationDetailsComponent.decorators = [
             <span class="header-right-text" [textContent]="transactionLines.deliveryDate | date:'dd-MM-YYYY'"></span>
           </div>
         </div>
+        <div class="header-inform-user" *ngIf="isEditing">
+          <span class="header-inform-user editting" [textContent]="'EDITING_DATA_ROW' | localize"></span>
+        </div>
         <div *ngIf="showAddOrder" class="columns-wrapper">
           <div class="details-column">
             <co-input-text  class="details-input"
@@ -18839,7 +18863,7 @@ TransactionConfirmationDetailsComponent.decorators = [
       </co-form>
 
       <div *ngIf="showAddOrder" class="save-cancel-wrapper">
-        <co-default-ok-cancel-buttons (okClick)="handleOkClick()"></co-default-ok-cancel-buttons>
+        <co-default-ok-cancel-buttons (okClick)="handleOkClick()" (cancelClick)="handleCancelClick()"></co-default-ok-cancel-buttons>
       </div>
     </div>
   `,
@@ -18858,6 +18882,7 @@ TransactionConfirmationDetailsComponent.propDecorators = {
     transactionInfoNr: [{ type: Input }],
     showClass: [{ type: HostBinding, args: ["class.co-transaction-confirmation-details",] }],
     newDocBatchArray: [{ type: Input }],
+    isEditing: [{ type: Input }],
     docBatchSaved: [{ type: Output }]
 };
 
@@ -18954,6 +18979,7 @@ class TransactionLineSidePanelPurchaseComponent {
         this.goodsReceiptStatus = new GoodsReceiptStatusWithHistory();
         this.selectedLineDocBatchArray = new DocDeliveryBatch();
         this.isDocBatchSaved = false;
+        this.editingMode = false;
         this._transactionInfo = new TransactionInfo();
     }
     set transactionInfo(value) {
@@ -18980,6 +19006,7 @@ class TransactionLineSidePanelPurchaseComponent {
     }
     fillInputOnClick(data) {
         this.selectedLineDocBatchArray = data;
+        this.editingMode = true;
     }
     docBatchSaved(data) {
         this.isDocBatchSaved = data;
@@ -18995,6 +19022,7 @@ TransactionLineSidePanelPurchaseComponent.decorators = [
           [transactionInfoNr]="transactionInfo.transactionNr"
           [transactionLines]="transactionLine"
           [newDocBatchArray]="selectedLineDocBatchArray"
+          [isEditing]="editingMode"
           (docBatchSaved)="docBatchSaved($event)"
         ></co-transaction-confirmation-details>
         <co-transaction-confirmation-history