@colijnit/transaction 257.1.46 → 257.1.48

package/bundles/colijnit-transaction.umd.js

@@ -33,8 +33,8 @@
         function Version() {
             this.name = "@colijnit/transaction";
             this.description = "Colijn IT transaction package";
-            this.symVer = "257.1.46";
-            this.publishDate = "09/04/2025, 11:44:07";
+            this.symVer = "257.1.48";
+            this.publishDate = "9-4-2025 17:53:48";
         }
         return Version;
     }());
@@ -9544,7 +9544,7 @@
                         case 1:
                             response = _a.sent();
                             if (response && response.validationResult && response.validationResult.success) {
-                                return [2 /*return*/, response.resultObject];
+                                return [2 /*return*/, this._boFactory.makeWithRawBackendData(transactionInfoResponse_bo.TransactionInfoResponse, response.resultObject)];
                             }
                             else {
                                 this._handleExceptionFromResponse(response);
@@ -20065,10 +20065,19 @@
         };
         TransactionService.prototype.processReservation = function (request) {
             return __awaiter(this, void 0, void 0, function () {
+                var lockSuccess, response;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.connector.processReservation(request)];
-                        case 1: return [2 /*return*/, _a.sent()];
+                        case 0: return [4 /*yield*/, this.tryToLockTransaction(this.currentTransaction.transactionInfo.id, this.currentTransaction.transactionInfo.version)];
+                        case 1:
+                            lockSuccess = _a.sent();
+                            if (!lockSuccess) return [3 /*break*/, 3];
+                            return [4 /*yield*/, this.connector.processReservation(request)];
+                        case 2:
+                            response = _a.sent();
+                            this.transactionDirty = true;
+                            return [2 /*return*/, this.handleLineOperationStatuses(response)];
+                        case 3: return [2 /*return*/, false];
                     }
                 });
             });
@@ -26629,16 +26638,16 @@
         }
         TransactionSalesReservationService.prototype.getSalesOrderLines = function (salesOrderId) {
             return __awaiter(this, void 0, void 0, function () {
-                var _b;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                var _a;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             if (!salesOrderId) return [3 /*break*/, 2];
-                            _b = this;
+                            _a = this;
                             return [4 /*yield*/, this._transaction.getSalesOrderLines(this.makeGetSalesOrderLinesRequest(salesOrderId))];
                         case 1:
-                            _b.purchaseReservations = _c.sent();
-                            _c.label = 2;
+                            _a.purchaseReservations = _b.sent();
+                            _b.label = 2;
                         case 2: return [2 /*return*/];
                     }
                 });
@@ -26669,11 +26678,10 @@
             }
         };
         TransactionSalesReservationService.prototype.processReservation = function (reservationLines, transId) {
-            var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var request, response;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                var request, success;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
                         case 0:
                             request = new processOrderReservationRequest_bo.ProcessOrderReservationRequest();
                             request.transId = transId;
@@ -26681,42 +26689,26 @@
                             request.reservationLines = reservationLines;
                             return [4 /*yield*/, this._transaction.processReservation(request)];
                         case 1:
-                            response = _b.sent();
-                            if (!((_a = response === null || response === void 0 ? void 0 : response.transactionInfo) === null || _a === void 0 ? void 0 : _a.id)) return [3 /*break*/, 7];
-                            this._transaction.currentTransaction = response;
-                            return [4 /*yield*/, this._transaction.saveTransaction(true)];
+                            success = _a.sent();
+                            if (!success) return [3 /*break*/, 3];
+                            return [4 /*yield*/, this.getSalesOrderLines(request.transId)];
                         case 2:
-                            _b.sent();
-                            return [4 /*yield*/, this._transaction.commit()];
-                        case 3:
-                            _b.sent();
-                            if (!this._transaction.currentTransaction.transactionInfo.id) return [3 /*break*/, 5];
-                            return [4 /*yield*/, this._transaction.getTransactionById(this._transaction.currentTransaction.transactionInfo.id)];
-                        case 4:
-                            _b.sent();
-                            _b.label = 5;
-                        case 5: return [4 /*yield*/, this.getSalesOrderLines(request.transId)];
-                        case 6:
-                            _b.sent();
+                            _a.sent();
                             this.resetLineData();
                             return [2 /*return*/, true];
-                        case 7: return [2 /*return*/, false];
+                        case 3: return [2 /*return*/, false];
                     }
                 });
             });
         };
         TransactionSalesReservationService.prototype.resetLineData = function () {
-            this.salesReservationLines = [];
             this.salesReservationLines = [];
             this.lineNr = undefined;
         };
         return TransactionSalesReservationService;
     }());
-    TransactionSalesReservationService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function TransactionSalesReservationService_Factory() { return new TransactionSalesReservationService(i0__namespace.ɵɵinject(TransactionService)); }, token: TransactionSalesReservationService, providedIn: "root" });
     TransactionSalesReservationService.decorators = [
-        { type: i0.Injectable, args: [{
-                    providedIn: "root"
-                },] }
+        { type: i0.Injectable }
     ];
     TransactionSalesReservationService.ctorParameters = function () { return [
         { type: TransactionService }
@@ -26908,6 +26900,7 @@
         TransactionQuickAccessOrderPurchaseComponent.prototype.ngOnInit = function () {
             var _this = this;
             _super.prototype.ngOnInit.call(this);
+            this.transactionHeaderService.reservationMode = false;
             this._subs.push(this.transactionEventService.transactionLineChanged.subscribe(function () { return _this._checkPurchaseOrders(); }));
             var transItem = this.transaction;
             this.selectedTransactions.push(transItem);
@@ -56061,7 +56054,8 @@
                     selector: 'co-transaction-internal',
                     template: "\n      <ng-container *ngIf=\"loaded && customerPortal\">\n          <div class=\"transaction-lines-wrapper\"\n               *ngIf=\"transaction.transactionInfo.transactionKind !== 'S'\">\n              <co-transaction-header-customer-portal [showPreferredPlanning]=\"showPreferredPlanning\" [transaction]=\"transaction\"></co-transaction-header-customer-portal>\n              <co-transaction-lines\n                      [activeCategory]=\"activeCategory\"\n                      (saveTransactionLine)=\"saveTransactionLineText($event)\"\n                      [customerPortal]=\"customerPortal\">\n              </co-transaction-lines>\n          </div>\n          <div class=\"transaction-lines-wrapper\" *ngIf=\"transaction && transaction.transactionInfo && transaction.transactionInfo.transactionKind === 'S'\">\n              <co-transaction-service-overview\n                      [posOrderData]=\"posOrderData\">\n              </co-transaction-service-overview>\n          </div>\n\n      </ng-container>\n      <ng-container *ngIf=\"loaded  && !customerPortal\">\n          <co-click-block></co-click-block>\n          <co-transaction-header *ngIf=\"showHeader\" [transaction]=\"transaction\"></co-transaction-header>\n          <div class=\"transaction-lines-header\">\n              <co-transaction-quick-access *ngIf=\"showQuickAccess\" class=\"transaction-lines-header-item\"\n                                           [transactionKind]=\"transaction.transactionInfo.transactionKind\"\n                                           [activeCategory]=\"activeCategory\"\n              >\n              </co-transaction-quick-access>\n              <co-transaction-button-bar *ngIf=\"showButtonBar\"\n                                         class=\"transaction-lines-header-item\"\n                                         [selectedCategory]=\"activeCategory\"\n                                         (buttonClicked)=\"handleButtonBarButtonClicked($event)\">\n              </co-transaction-button-bar>\n\n              <div class=\"transaction-lines-header-item right\">\n                  <co-avatar\n                          class=\"transaction-sales-avatar\"\n                          [relationId]=\"transaction.transactionInfo.handledBy\"\n                          [screenConfigurationObject]=\"cfgNames.HeaderHandledBy\"\n                          screenConfigNativeElement>\n                  </co-avatar>\n                  <co-avatar\n                          class=\"transaction-sales-avatar\"\n                          [relationId]=\"transaction.transactionInfo.branch?.relationId\"\n                          [screenConfigurationObject]=\"cfgNames.HeaderBranch\"\n                          screenConfigNativeElement>\n                  </co-avatar>\n                  <co-view-mode-buttons *ngIf=\"!shouldShowTiles() && showViewModeButtons\"\n                                        [showViewModes]=\"[viewModes.List, viewModes.Tiles]\"\n                                        (viewModeChange)=\"handleViewModeChange($event)\">\n                  </co-view-mode-buttons>\n              </div>\n          </div>\n\n          <div class=\"transaction-lines-content-wrapper\">\n              <!--<co-transaction-document-button-bar [transaction]=\"transaction\"></co-transaction-document-button-bar>-->\n              <div class=\"transaction-lines-content\">\n                  <div *ngIf=\"activeCategory === category.ServiceOrderService && transaction && transaction.transactionInfo && transaction.transactionInfo.transactionKind === 'S'\">\n                      <co-transaction-service-overview [posOrderData]=\"posOrderData\"></co-transaction-service-overview>\n                  </div>\n                  <div class=\"transaction-tiles-wrapper\" *ngIf=\"activeViewMode === viewModes.Tiles || shouldShowTiles() || transactionPlanning\">\n                      <co-transaction-cards\n                              [activeCategory]=\"activeCategory\"\n                              [class.planning-cards]=\"transactionPlanning\">\n                      </co-transaction-cards>\n                  </div>\n                  <div class=\"transaction-lines-wrapper\"\n                       *ngIf=\"(activeViewMode === viewModes.List && !shouldShowTiles()) && activeCategory !== category.ServiceOrderService && !transactionPlanning\">\n                      <co-transaction-lines\n                              [activeCategory]=\"activeCategory\"\n                              (saveTransactionLine)=\"saveTransactionLineText($event)\">\n                      </co-transaction-lines>\n                  </div>\n                  <div class=\"transaction-footer-wrapper\">\n                      <div class=\"transaction-footer-left\">\n                          <co-add-product\n                                  *ngIf=\"activeCategory === categories.SalesOrderCashRegister ||\n                                         activeCategory === categories.SalesOrderOverview ||\n                                         activeCategory === categories.PurchaseOrderOverview ||\n                                         activeCategory === categories.SalesOrderQuotation ||\n                                         activeCategory === categories.ServiceOrderOverview\">\n                          </co-add-product>\n                          <co-transaction-button *ngIf=\"activeCategory === categories.SalesOrderCashRegister ||\n                                                 activeCategory === categories.SalesOrderOverview ||\n                                                 activeCategory === categories.PurchaseOrderOverview ||\n                                                 activeCategory === categories.SalesOrderQuotation ||\n                                                 activeCategory === categories.ServiceOrderOverview\"\n                                                 class=\"custom-width text-rule\"\n                                                 [iconData]=\"iconCacheService.getIcon(icons.TextSolid)\"\n                                                 (click)=\"handleTransactionText()\">\n                          </co-transaction-button>\n                      </div>\n\n                      <div class=\"transaction-footer-center\">\n                          <co-transaction-margin *ngIf=\"activeCategory === categories.SalesOrderMarginInfo\"></co-transaction-margin>\n                      </div>\n                      <co-transaction-totals *ngIf=\"(activeCategory !== category.ServiceOrderService && activeCategory !== category.SalesOrderPurchase)\"\n                                             [showDiscount]=\"true\">\n                      </co-transaction-totals>\n                  </div>\n              </div>\n\n              <co-transaction-lines-side-panel *ngIf=\"transaction && (transaction.transactionInfo.transactionKind === transactionKind.CashDesk && !fullyInvoiced())\"\n                                               [posOrderData]=\"posOrderData\"\n                                               [transaction]=\"transaction\">\n              </co-transaction-lines-side-panel>\n\n              <!--        <co-transaction-line-side-panel *ngIf=\"showSidePanel\"-->\n              <!--          [transaction]=\"transaction\"-->\n              <!--          [transactionInfo]=\"transaction.transactionInfo\"-->\n              <!--          [transactionLine]=\"sidePanelTransactionLine\"-->\n              <!--          [activeCategory]=\"activeCategory\"-->\n              <!--          (cancelClick)=\"showSidePanel = false\">-->\n              <!--        </co-transaction-line-side-panel>-->\n\n\n              <co-transaction-sales-reservation-popup *ngIf=\"showReservationPopup\" [transactionId]=\"transaction.transactionInfo.id\"></co-transaction-sales-reservation-popup>\n              <!--Popup voor wijzigen volgorde van tekstregels-->\n              <co-transaction-article-text-overview *ngIf=\"showArticleTextOverview\"\n                                                    [transactionInfo]=\"transaction.transactionInfo\"\n                                                    [transactionLine]=\"transactionLine\"\n                                                    (closeClick)=\"closeArticleTextOverview()\"\n                                                    (cancelClick)=\"closeArticleTextOverview()\">\n              </co-transaction-article-text-overview>\n\n              <!--Popup voor aanmaken en updaten transactietekstregels-->\n              <co-transaction-article-text *ngIf=\"showTransactionText\"\n                                           [header]=\"'ORDER_TEXT_LINE' | localize\"\n                                           [transactionUuid]=\"transaction.transactionInfo.uuid\"\n                                           [editText]=\"textToEdit\"\n                                           [orderLineSetDTO]=\"selectedOrderLineSetDTO\"\n                                           [transactionLine]=\"transactionLine\"\n                                           (saveClick)=\"saveTransactionLineText($event)\"\n                                           (closeClick)=\"closeTransactionText()\"\n                                           (cancelClick)=\"closeTransactionText()\"\n                                           (saveOrderLineSetClick)=\"saveOrderLineSet($event)\">\n              </co-transaction-article-text>\n\n              <!--Popup voor aanmaken en updaten artikeltekstregels-->\n              <co-transaction-article-text *ngIf=\"showArticleText\"\n                                           [header]=\"'PRODUCT_DESCRIPTION_AND_TEXTS' | localize\"\n                                           [transactionUuid]=\"transaction.transactionInfo.uuid\"\n                                           [showArticleImageDescription]=\"transactionLine.articleBound\"\n                                           [showImage]=\"false\"\n                                           [articleLineNr]=\"transactionLine.lineNr\"\n                                           [articleRef]=\"transactionLine.articleNumber\"\n                                           [transactionLine]=\"transactionLine\"\n                                           [editText]=\"textToEdit\"\n                                           (saveClick)=\"saveArticleLineText($event)\"\n                                           (closeClick)=\"closeArticleText()\"\n                                           (cancelClick)=\"closeArticleText()\">\n              </co-transaction-article-text>\n\n              <co-transaction-copy-order *ngIf=\"showCopyOrderDialog\"\n                                         (closeDialog)=\"showCopyOrderDialog = false\">\n              </co-transaction-copy-order>\n\n              <!-- Pop up voor voorraad-->\n              <co-transaction-article-stock-dialog\n                      *ngIf=\"showArticleStockPopup\"\n                      [article]=\"stockGoodId\"\n                      (closeClick)=\"closeArticleStockPopup()\">\n              </co-transaction-article-stock-dialog>\n\n          </div>\n      </ng-container>\n  ",
                     providers: [
-                        TransactionHeaderService
+                        TransactionHeaderService,
+                        TransactionSalesReservationService
                     ],
                     encapsulation: i0.ViewEncapsulation.None
                 },] }
@@ -58435,24 +58429,27 @@
         AddProductComponent.prototype.ngOnDestroy = function () {
             this._subs.forEach(function (s) { return s.unsubscribe(); });
         };
+        /**
+         *  First check if there's a single article found
+         *  This is a two check step:
+         *  Check if there is an exact match on barcode, ean or articlenumber
+         *  If not: check with search like
+         *  Else open catalogus
+         * @param text
+         */
         AddProductComponent.prototype.handleSearch = function (text) {
             return __awaiter(this, void 0, void 0, function () {
                 var fullMatchSearch, article, foundArticles, article;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            console.log('searching: ' + text);
                             this.searchText = text;
                             this._prepareCatalogRequest();
-                            this.searchText = "";
-                            this._changeDetector.detectChanges();
                             if (!!this.pendingAddArticleAction) return [3 /*break*/, 13];
-                            console.log('no Pending Action ' + text);
                             return [4 /*yield*/, this.transactionService.getArticleListWithBarcodeArticleNrEanCode(text)];
                         case 1:
                             fullMatchSearch = _a.sent();
                             if (!(fullMatchSearch && fullMatchSearch.length === 1)) return [3 /*break*/, 6];
-                            console.log('Match' + text);
                             return [4 /*yield*/, this.transactionService.getArticleExtended(fullMatchSearch[0].articleNr)];
                         case 2:
                             article = _a.sent();
@@ -58466,13 +58463,10 @@
                             _a.sent();
                             _a.label = 5;
                         case 5: return [3 /*break*/, 13];
-                        case 6:
-                            console.log('No Match' + text);
-                            return [4 /*yield*/, this.transactionService.getArticles(this.catalogParameters)];
+                        case 6: return [4 /*yield*/, this.transactionService.getArticles(this.catalogParameters)];
                         case 7:
                             foundArticles = _a.sent();
                             if (!(foundArticles && foundArticles.length === 1)) return [3 /*break*/, 12];
-                            console.log('Found Article ' + text);
                             return [4 /*yield*/, this.transactionService.getArticleExtended(foundArticles[0].articleNumber)];
                         case 8:
                             article = _a.sent();
@@ -58487,10 +58481,11 @@
                             _a.label = 11;
                         case 11: return [3 /*break*/, 13];
                         case 12:
-                            console.log('No Found Article ' + text);
                             this.showCatalogDialog();
                             _a.label = 13;
-                        case 13: return [2 /*return*/];
+                        case 13:
+                            this.searchText = "";
+                            return [2 /*return*/];
                     }
                 });
             });
@@ -58566,7 +58561,6 @@
                         case 0: return [4 /*yield*/, this.transactionService.addArticle(articleNr, quantity, 0, 0, true, true)];
                         case 1:
                             success = _a.sent();
-                            console.log(success);
                             if (success) {
                                 this.searchText = "";
                             }