@colijnit/transaction 256.1.17 → 256.1.18

package/esm2015/lib/transaction-version.js

@@ -3,8 +3,8 @@ export class Version {
     constructor() {
         this.name = "@colijnit/transaction";
         this.description = "Colijn IT transaction package";
-        this.symVer = "256.1.17";
-        this.publishDate = "25/11/2024, 12:08:56";
+        this.symVer = "256.1.18";
+        this.publishDate = "26/11/2024, 15:02:32";
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsVUFBVSxDQUFDO1FBQ3BCLGdCQUFXLEdBQUcsc0JBQXNCLENBQUM7SUFDOUMsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMjU2LjEuMTdcIjtcbiAgcHVibGljIHB1Ymxpc2hEYXRlID0gXCIyNS8xMS8yMDI0LCAxMjowODo1NlwiO1xufSJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsVUFBVSxDQUFDO1FBQ3BCLGdCQUFXLEdBQUcsc0JBQXNCLENBQUM7SUFDOUMsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMjU2LjEuMThcIjtcbiAgcHVibGljIHB1Ymxpc2hEYXRlID0gXCIyNi8xMS8yMDI0LCAxNTowMjozMlwiO1xufSJdfQ==

package/fesm2015/colijnit-transaction.js

@@ -269,6 +269,7 @@ import { WorkflowCategoryType } from '@colijnit/mainapi/build/enum/workflow-cate
 import { PdfPosReceiptRequest } from '@colijnit/transactionapi/build/model/pdf-pos-receipt-request';
 import { TransactionAddPaymentLineRequest } from '@colijnit/transactionapi/build/model/transaction-add-payment-line-request';
 import { take } from 'rxjs/operators';
+import { SupplierStockForecast } from '@colijnit/transactionapi/build/model/supplier-stock-forecast';
 import { TagCategory } from '@colijnit/mainapi/build/enum/tab-category.enum';
 import { CssUtils } from '@colijnit/mainapi/build/utils/css-utils';
 import { CoDocument as CoDocument$1 } from '@colijnit/sharedapi/build/model/co-document.bo';
@@ -278,8 +279,8 @@ class Version {
     constructor() {
         this.name = "@colijnit/transaction";
         this.description = "Colijn IT transaction package";
-        this.symVer = "256.1.17";
-        this.publishDate = "25/11/2024, 12:08:56";
+        this.symVer = "256.1.18";
+        this.publishDate = "26/11/2024, 15:02:32";
     }
 }
 
@@ -4429,7 +4430,7 @@ class TransactionConnectorAdapterService {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.connector.changeLineDirectSell(request);
             if (response && response.validationResult && response.validationResult.success) {
-                return response.resultObject;
+                return this._boFactory.makeWithRawBackendData(TransactionInfoResponse, response.resultObject);
             }
             else {
                 this._handleExceptionFromResponse(response);
@@ -8846,6 +8847,8 @@ DialogTransactionLineWarehouseCcComponent.decorators = [
       [transactionUuid]="transactionInfo.uuid"
       [lineUuid]="transactionLine.uuid"
       [goodId]="transactionLine.goodId"
+      [transactionId]="transactionInfo.id"
+      [version]="transactionInfo.version"
       (showDirectSellModal)="showDirectSellModal($event)">
     </co-dialog-sell>
   `,
@@ -9624,7 +9627,6 @@ class TransactionBaseService extends BaseModuleService {
         this._transactionDirty = false;
         this._cashRegistersDirty = false;
         this._salesOrderConfirmationSent = false;
-        this._subs = [];
     }
     set activeRubric(value) {
         this._activeRubric = value;
@@ -9756,12 +9758,6 @@ class TransactionBaseService extends BaseModuleService {
             yield this.sharedService.init(options);
             yield this.relationService.init(options);
             yield this.connector.connect();
-            this._subs.push(this.transactionEventService.saveTransactionClick.subscribe(() => {
-                this.transactionEventService.blockScreen.next(true);
-                this.saveTransactionAndCommit();
-            }), this.transactionEventService.cancelTransactionClick.subscribe(() => {
-                this.rollback(true, true);
-            }));
         });
     }
     createNewRelation() {
@@ -10387,7 +10383,7 @@ class TransactionService extends PendingReasonService {
     }
     prepareJsPickingListInternalParam() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.getInternalParameter(InternalParam.PickingList).then((value) => this.internalParameterJsPickingList = value);
+            this.internalParameterJsPickingList = yield this.getInternalParameter(InternalParam.PickingList);
         });
     }
     prepareManualSaveInternalParam() {
@@ -11761,8 +11757,23 @@ class TransactionService extends PendingReasonService {
             return yield this.connector.getAvailableStockForSupplier(goodId, supplierRelationId);
         });
     }
-    changeLineDirectSell(request) {
-        return this.connector.changeLineDirectSell(request);
+    // public changeLineDirectSell(request: ChangeLineDirectSellRequest): Promise<void> {
+    //   return this.connector.changeLineDirectSell(request);
+    // }
+    changeLineDirectSell(transactionId, version, request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const lockSuccess = yield this.tryToLockTransaction(transactionId, version);
+            console.log('lockSuccess', lockSuccess);
+            if (lockSuccess) {
+                const response = yield this.connector.changeLineDirectSell(request);
+                let success = true;
+                if (response) {
+                    this.transactionDirty = true;
+                    success = yield this.handleHeaderOperationStatuses(response);
+                }
+                return success;
+            }
+        });
     }
     getGoodsAllocationHistory(transId, lineNr) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -52364,6 +52375,7 @@ class AddProductComponent {
             // if (!this.showRelatedProductsPopup) {
             //     this.showCatalog = false;
             // }
+            this.showCatalog = false;
             if (this.handleAddArticleInternally) {
                 if (data && data.article) {
                     if (typeof data.article === 'string') {
@@ -56394,6 +56406,7 @@ class DialogDirectSellComponent {
         this.availableStockCollection = new SupplierArticleStockForecast();
         this.formValid = false;
         this.fromStock = false;
+        this.selectedForecast = new SupplierStockForecast();
     }
     ngOnInit() {
         this._getDirectSellSuppliers();
@@ -56456,14 +56469,13 @@ class DialogDirectSellComponent {
             newPurchaseOrderNumber: this.fromStock ? null : this.selectedForecast.purchaseOrderNumber.toString(),
             newStockForecastDeliveryDate: this.fromStock ? null : this.selectedForecast.deliveryDate
         };
-        this.transactionService.changeLineDirectSell(changeLineDirectSellRequest).then((response) => {
+        this.transactionService.changeLineDirectSell(this.transactionId, this.version, changeLineDirectSellRequest).then((response) => {
             console.log(response);
         });
         this.hideModal();
     }
     _getAvailableStock() {
         return __awaiter(this, void 0, void 0, function* () {
-            // TODO this method doesn't retrieve any data for now, until we fix ESB instance as this is a call to a third party
             yield this.transactionService.getAvailableStockForSupplier(this.goodId, this.selectedSupplier.relationId).then((availableStock) => {
                 if (availableStock) {
                     this.availableStockCollection = availableStock;
@@ -56591,6 +56603,8 @@ DialogDirectSellComponent.propDecorators = {
     transactionUuid: [{ type: Input }],
     lineUuid: [{ type: Input }],
     goodId: [{ type: Input }],
+    transactionId: [{ type: Input }],
+    version: [{ type: Input }],
     showDirectSellModal: [{ type: Output }],
     checkboxes: [{ type: ViewChildren, args: ['checkbox',] }]
 };
@@ -56738,9 +56752,10 @@ TransactionCashRegisterOrderReceiptDialogModule.decorators = [
 ];
 
 class SaveCancelButtonsComponent {
-    constructor(iconCacheService, _transactionEventService) {
+    constructor(iconCacheService, _transactionEventService, _transactionService) {
         this.iconCacheService = iconCacheService;
         this._transactionEventService = _transactionEventService;
+        this._transactionService = _transactionService;
         this.icons = Icon;
         this.showLabels = true;
         this.movable = false;
@@ -56778,12 +56793,17 @@ class SaveCancelButtonsComponent {
         }
     }
     handleSaveClick(event) {
-        event.preventDefault();
-        this._transactionEventService.saveTransactionClick.next();
+        return __awaiter(this, void 0, void 0, function* () {
+            event.preventDefault();
+            this._transactionEventService.blockScreen.next(true);
+            yield this._transactionService.saveTransactionAndCommit();
+        });
     }
     handleCancelClick(event) {
-        event.preventDefault();
-        this._transactionEventService.cancelTransactionClick.next();
+        return __awaiter(this, void 0, void 0, function* () {
+            event.preventDefault();
+            yield this._transactionService.rollback(true, true);
+        });
     }
 }
 SaveCancelButtonsComponent.decorators = [
@@ -56824,7 +56844,8 @@ SaveCancelButtonsComponent.decorators = [
 ];
 SaveCancelButtonsComponent.ctorParameters = () => [
     { type: IconCacheService },
-    { type: TransactionEventService }
+    { type: TransactionEventService },
+    { type: TransactionService }
 ];
 SaveCancelButtonsComponent.propDecorators = {
     saveCancelButtonsWrapper: [{ type: ViewChild, args: ['saveCancelButtonsWrapper', { read: ElementRef },] }],