@colijnit/transaction 257.1.33 → 257.1.35

package/fesm2015/colijnit-transaction.js

@@ -286,8 +286,8 @@ class Version {
     constructor() {
         this.name = "@colijnit/transaction";
         this.description = "Colijn IT transaction package";
-        this.symVer = "257.1.33";
-        this.publishDate = "25/03/2025, 17:30:02";
+        this.symVer = "257.1.35";
+        this.publishDate = "27-3-2025 09:42:01";
     }
 }
 
@@ -17606,6 +17606,10 @@ class TransactionLineImageAndDescriptionComponent extends TransactionLineBaseCom
     transactionLineSet() {
         super.transactionLineSet();
         this._loadLineImage();
+        if (this.transactionLine.configurationReadable) {
+            // @ts-ignore
+            this.transactionLine.configurationReadable = this.transactionLine.configurationReadable.replaceAll('\n', '<br>');
+        }
     }
     visibilitySet() {
         super.visibilitySet();
@@ -17660,10 +17664,10 @@ TransactionLineImageAndDescriptionComponent.decorators = [
            screenConfigNativeElement>
         <div [ngClass]="{'article-text-expand': true, 'large-article': !expanded && !customerPortal}"  class="co-small-scrollbar">
           <div class="article-text" *ngFor="let text of transactionLine.articleTextAsArray">
-            <span [innerHTML]="text | safeHtml" (dblclick)="handleOpenArticleText()"></span>
+            <div [innerHTML]="text | safeHtml" (dblclick)="handleOpenArticleText()"></div>
           </div>
           <div *ngIf="!popUpView && transactionLine.configurationReadable" class="configuration-text">
-            <span [innerHTML]="transactionLine.configurationReadable"></span>
+            <div [innerHTML]="transactionLine.configurationReadable"></div>
           </div>
         </div>
         <div class="expand-wrapper" (click)="expandClicked()" *ngIf="!customerPortal">
@@ -21360,8 +21364,11 @@ class TransactionQuickAccessOrderPurchaseComponent extends TransactionQuickAcces
         this.reportDocumentPrintRequest = new ReportingDocumentPrintSignDocBaseRequest();
         this.reportDocumentPdfRequest = new ReportingDocumentPdfBaseRequest();
         this.batchTransactionSendingRequest = new BatchTransactionSendingRequest();
+        this.printPurchaseOrderForSalesOrderRequest = new PrintPurchaseOrderForSalesOrderRequest();
         this.useDefaultLayout = false;
         this.useDefaultShippingMethods = false;
+        this.saveDefaultPrinterForUser = false;
+        this.saveDefaultPrinterForAllUsers = false;
         this.printerList = [];
         this.defaultSendMethodInitialized = false;
         this._subs = [];
@@ -21399,33 +21406,38 @@ class TransactionQuickAccessOrderPurchaseComponent extends TransactionQuickAcces
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             this.showSendMethodDialog = false;
-            if (methodData.sendMethod === 'COMBINED') {
-                this.useDefaultLayout = methodData.useDefaultLayout;
-                this.useDefaultShippingMethods = methodData.useDefaultShippingMethods;
-                if (!this.useDefaultShippingMethods) {
-                    this.overruledEmail = methodData.overruledEmail;
-                    this.overruledEdi = methodData.overruledEdi;
-                    this.overruledPrint = methodData.overruledPrint;
-                }
-                if (methodData.printerName) {
-                    this.selectedPrinter = this.printerList.find(p => p.name === methodData.printerName) || null;
-                }
-                this.batchTransactionSendingRequest.useRelationSpecificReports = this.useDefaultLayout;
-                this.batchTransactionSendingRequest.useRelationSpecificSendMethods = this.useDefaultShippingMethods;
-                this.batchTransactionSendingRequest.printerName = ((_a = this.selectedPrinter) === null || _a === void 0 ? void 0 : _a.name) || null;
-                if (!this.useDefaultShippingMethods) {
-                    this.batchTransactionSendingRequest.overruleSendMethodForEmail = (_b = this.overruledEmail) === null || _b === void 0 ? void 0 : _b.code;
-                    this.batchTransactionSendingRequest.overruleSendMethodForPrinting = (_c = this.overruledPrint) === null || _c === void 0 ? void 0 : _c.code;
-                    this.batchTransactionSendingRequest.overruleSendMethodForEDI = (_d = this.overruledEdi) === null || _d === void 0 ? void 0 : _d.code;
-                }
-                yield this.printDocument(this.reportDocumentPrintRequest);
-                this._setDefaultMethod(this.defaultSendMethod);
-            }
-            else {
-                const methodString = methodData.toString();
-                yield this.printDocument(this.reportDocumentPrintRequest);
-                this._setDefaultMethod(methodString);
-            }
+            this.useDefaultLayout = methodData.useDefaultLayout;
+            this.useDefaultShippingMethods = methodData.useDefaultShippingMethods;
+            this.saveDefaultPrinterForUser = methodData.saveDefaultPrinterForUser;
+            this.saveDefaultPrinterForAllUsers = methodData.saveDefaultPrinterForAllUsers;
+            if (!this.useDefaultShippingMethods) {
+                this.overruledEmail = methodData.overruledEmail;
+                this.overruledEdi = methodData.overruledEdi;
+                this.overruledPrint = methodData.overruledPrint;
+            }
+            if (!this.useDefaultLayout) {
+                this.reportIdForPrinting = methodData.reportIdForPrinting.reportId;
+                this.reportIdForEmail = methodData.reportIdForEmail.reportId;
+            }
+            if (methodData.printerName) {
+                this.selectedPrinter = this.printerList.find(p => p.name === methodData.printerName) || null;
+            }
+            this.printPurchaseOrderForSalesOrderRequest.useRelationSpecificReports = this.useDefaultLayout;
+            this.printPurchaseOrderForSalesOrderRequest.useRelationSpecificSendMethods = this.useDefaultShippingMethods;
+            this.printPurchaseOrderForSalesOrderRequest.saveDefaultPrinterForUser = this.saveDefaultPrinterForUser;
+            this.printPurchaseOrderForSalesOrderRequest.saveDefaultPrinterForAllUsers = this.saveDefaultPrinterForAllUsers;
+            this.printPurchaseOrderForSalesOrderRequest.printerName = ((_a = this.selectedPrinter) === null || _a === void 0 ? void 0 : _a.name) || null;
+            if (!this.useDefaultShippingMethods) {
+                this.printPurchaseOrderForSalesOrderRequest.overruleSendMethodForEmail = (_b = this.overruledEmail) === null || _b === void 0 ? void 0 : _b.code;
+                this.printPurchaseOrderForSalesOrderRequest.overruleSendMethodForPrinting = (_c = this.overruledPrint) === null || _c === void 0 ? void 0 : _c.code;
+                this.printPurchaseOrderForSalesOrderRequest.overruleSendMethodForEDI = (_d = this.overruledEdi) === null || _d === void 0 ? void 0 : _d.code;
+            }
+            if (!this.useDefaultLayout) {
+                this.printPurchaseOrderForSalesOrderRequest.reportIdForPrinting = this.reportIdForPrinting;
+                this.printPurchaseOrderForSalesOrderRequest.reportIdForEmail = this.reportIdForEmail;
+            }
+            yield this.printDocument(this.reportDocumentPrintRequest);
+            this._setDefaultMethod(this.defaultSendMethod);
         });
     }
     handleReservationModeClick() {
@@ -21491,8 +21503,15 @@ class TransactionQuickAccessOrderPurchaseComponent extends TransactionQuickAcces
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const printPurchaseOrderForSalesOrderRequest = Object.assign(new PrintPurchaseOrderForSalesOrderRequest(), request);
-            (_a = printPurchaseOrderForSalesOrderRequest.useRelationSpecificReports) !== null && _a !== void 0 ? _a : (printPurchaseOrderForSalesOrderRequest.useRelationSpecificReports = true);
-            (_b = printPurchaseOrderForSalesOrderRequest.useRelationSpecificSendMethods) !== null && _b !== void 0 ? _b : (printPurchaseOrderForSalesOrderRequest.useRelationSpecificSendMethods = true);
+            printPurchaseOrderForSalesOrderRequest.useRelationSpecificReports = (_a = this.printPurchaseOrderForSalesOrderRequest.useRelationSpecificReports) !== null && _a !== void 0 ? _a : true;
+            printPurchaseOrderForSalesOrderRequest.useRelationSpecificSendMethods = (_b = this.printPurchaseOrderForSalesOrderRequest.useRelationSpecificSendMethods) !== null && _b !== void 0 ? _b : true;
+            printPurchaseOrderForSalesOrderRequest.reportIdForPrinting = this.printPurchaseOrderForSalesOrderRequest.reportIdForPrinting;
+            printPurchaseOrderForSalesOrderRequest.reportIdForEmail = this.printPurchaseOrderForSalesOrderRequest.reportIdForEmail;
+            printPurchaseOrderForSalesOrderRequest.overruleSendMethodForEmail = this.printPurchaseOrderForSalesOrderRequest.overruleSendMethodForEmail;
+            printPurchaseOrderForSalesOrderRequest.overruleSendMethodForPrinting = this.printPurchaseOrderForSalesOrderRequest.overruleSendMethodForPrinting;
+            printPurchaseOrderForSalesOrderRequest.overruleSendMethodForEDI = this.printPurchaseOrderForSalesOrderRequest.overruleSendMethodForEDI;
+            printPurchaseOrderForSalesOrderRequest.saveDefaultPrinterForUser = this.printPurchaseOrderForSalesOrderRequest.saveDefaultPrinterForUser;
+            printPurchaseOrderForSalesOrderRequest.saveDefaultPrinterForAllUsers = this.printPurchaseOrderForSalesOrderRequest.saveDefaultPrinterForAllUsers;
             yield this.transactionService.generateAndSendPurchaseOrdersForSalesOrder(printPurchaseOrderForSalesOrderRequest, this.transactionInfo.version);
         });
     }
@@ -21529,6 +21548,7 @@ TransactionQuickAccessOrderPurchaseComponent.decorators = [
                            [emailLayouts]="emailLayouts"
                            [printLayouts]="printLayouts"
                            [defaultPrinterName]="defaultPrinterName"
+                           [disablePdfPreview]="true"
                            [isDocSignEnabled]="true"
                            [pdfDoc]="pdfDoc"
                            [(reportingDocumentEmailRequest)]="reportDocumentEmailRequest"
@@ -22120,6 +22140,7 @@ TransactionQuickAccessPurchaseOrderOverviewComponent.decorators = [
                            [emailAddresses]="emailAddresses"
                            [emailLayouts]="emailLayouts"
                            [printLayouts]="printLayouts"
+                           [disablePdfPreview]="true"
                            [isDocSignEnabled]="true"
                            [(reportingDocumentEmailRequest)]="reportDocumentEmailRequest"
                            [(reportingDocumentPrintRequest)]="reportDocumentPrintRequest"
@@ -58078,6 +58099,7 @@ class AddProductComponent {
         this.showRelatedProductsPopup = false;
         this.cartPlusIcon = this.iconService.getIcon(this.icons.CartPlusRegular);
         this.cartMinIcon = this.iconService.getIcon(this.icons.CartMinusRegular);
+        this.pendingAddArticleAction = false;
         this._showCatalog = false;
         this._subs = [];
     }
@@ -58108,35 +58130,40 @@ class AddProductComponent {
             }
             this.searchText = text;
             this._prepareCatalogRequest();
-            this.searchText = undefined;
+            this._changeDetector.detectChanges();
+            this.searchText = "";
             // 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
-            const fullMatchSearch = yield this.transactionService.getArticleListWithBarcodeArticleNrEanCode(text);
-            if (fullMatchSearch && fullMatchSearch.length === 1) {
-                const article = yield this.transactionService.getArticleExtended(fullMatchSearch[0].articleNr);
-                if (article.goodType === "B") {
-                    this.showCatalogDialog();
-                }
-                else {
-                    yield this.handleAddArticle(article);
-                }
-            }
-            else {
-                const foundArticles = yield this.transactionService.getArticles(this.catalogParameters);
-                if (foundArticles && foundArticles.length === 1) {
-                    const article = yield this.transactionService.getArticleExtended(foundArticles[0].articleNumber);
+            if (!this.pendingAddArticleAction) {
+                const fullMatchSearch = yield this.transactionService.getArticleListWithBarcodeArticleNrEanCode(text);
+                if (fullMatchSearch && fullMatchSearch.length === 1) {
+                    const article = yield this.transactionService.getArticleExtended(fullMatchSearch[0].articleNr);
                     if (article.goodType === "B") {
                         this.showCatalogDialog();
                     }
                     else {
+                        this.pendingAddArticleAction = true;
                         yield this.handleAddArticle(article);
                     }
                 }
                 else {
-                    this.showCatalogDialog();
+                    const foundArticles = yield this.transactionService.getArticles(this.catalogParameters);
+                    if (foundArticles && foundArticles.length === 1) {
+                        const article = yield this.transactionService.getArticleExtended(foundArticles[0].articleNumber);
+                        if (article.goodType === "B") {
+                            this.showCatalogDialog();
+                        }
+                        else {
+                            this.pendingAddArticleAction = true;
+                            yield this.handleAddArticle(article);
+                        }
+                    }
+                    else {
+                        this.showCatalogDialog();
+                    }
                 }
             }
         });
@@ -58148,9 +58175,13 @@ class AddProductComponent {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.handleAddArticleInternally) {
                 const success = yield this.transactionService.addArticle(article.articleNumber, this.return ? -1 : 1);
-                if (!success) {
+                if (success) {
+                    this.searchText = "";
+                }
+                else {
                     this.transactionService.rollback();
                 }
+                this.pendingAddArticleAction = false;
             }
             else {
                 this.addArticle.next({
@@ -58160,6 +58191,7 @@ class AddProductComponent {
                     belowLineNr: 0,
                     lastArticle: true
                 });
+                this.pendingAddArticleAction = false;
             }
         });
     }
@@ -58170,29 +58202,7 @@ class AddProductComponent {
             // }
             this.showCatalog = false;
             if (this.handleAddArticleInternally) {
-                if (data && data.article) {
-                    if (typeof data.article === 'string') {
-                        const article = JSON.parse(data.article);
-                        if (article.selectorData.compositions) { // configured (frozen) article
-                            yield this.transactionService.addArticle(article.selectorData.compositions[0].compositionArticleNo, data.quantity, 0, 0, true, true);
-                        }
-                        else if (article.selectorData.articleNr) { // flat article
-                            yield this.transactionService.addArticle(article.selectorData.articleNr, data.quantity, 0, 0, true, true);
-                        }
-                    }
-                    else { // flat (simple) article
-                        let articleNr;
-                        if (data.article instanceof ArticleExtended) {
-                            articleNr = data.article.articleNumber;
-                        }
-                        else {
-                            articleNr = data.article.hasOwnProperty('articleNr') ? data.article['articleNr'] : data.article['articleNo'];
-                        }
-                        if (articleNr) {
-                            yield this.transactionService.addArticle(articleNr, data.quantity, 0, 0, true, true);
-                        }
-                    }
-                }
+                yield this._handleArticleTypeOnAdd(data);
             }
             else {
                 if (data && data.article instanceof ArticleExtended) {
@@ -58207,6 +58217,46 @@ class AddProductComponent {
             }
         });
     }
+    _tryAddArticle(articleNr, quantity) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const success = yield this.transactionService.addArticle(articleNr, quantity, 0, 0, true, true);
+            console.log(success);
+            if (success) {
+                this.searchText = "";
+            }
+            else {
+                // keep the search text
+                this.searchText = this.inputSearchText.model;
+            }
+        });
+    }
+    _handleArticleTypeOnAdd(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (data && data.article) {
+                if (typeof data.article === 'string') {
+                    const article = JSON.parse(data.article);
+                    if (article.selectorData.compositions) { // configured (frozen) article
+                        yield this._tryAddArticle(article.selectorData.compositions[0].compositionArticleNo, data.quantity);
+                    }
+                    else if (article.selectorData.articleNr) { // flat article
+                        yield this._tryAddArticle(article.selectorData.articleNr, data.quantity);
+                    }
+                }
+                else { // flat (simple) article
+                    let articleNr;
+                    if (data.article instanceof ArticleExtended) {
+                        articleNr = data.article.articleNumber;
+                    }
+                    else {
+                        articleNr = data.article.hasOwnProperty('articleNr') ? data.article['articleNr'] : data.article['articleNo'];
+                    }
+                    if (articleNr) {
+                        yield this._tryAddArticle(articleNr, data.quantity);
+                    }
+                }
+            }
+        });
+    }
     getActualQuantity(quantityInput) {
         let quantity = 0;
         if (this.return && quantityInput > 0) {
@@ -58225,6 +58275,11 @@ class AddProductComponent {
     }
     showCatalogDialog() {
         this.showCatalog = true;
+        this.pendingAddArticleAction = false;
+    }
+    handleCloseCatalogueClick() {
+        this.showCatalog = false;
+        this.searchText = "";
     }
     handleCartIconClick(event) {
         this.return = !this.return;
@@ -58234,7 +58289,7 @@ class AddProductComponent {
             this.searchText = this.inputSearchText.model;
         }
         this._prepareCatalogRequest();
-        this.searchText = undefined;
+        // this.searchText = undefined;
         this.showCatalogDialog();
     }
     handleIFrameFeedback(iFrameFeedbackObject) {
@@ -58296,7 +58351,7 @@ AddProductComponent.decorators = [
                            [isReturn]="return"
                            [showRelatedProductsPopup]="showRelatedProductsPopup"
                            [transaction]="transactionService.currentTransaction"
-                           (closeClick)="showCatalog = false"
+                           (closeClick)="handleCloseCatalogueClick()"
                            (articleClicked)="handleCatalogArticleClick($event)"
                            (addArticleClicked)="handleAddArticleClick($event)"
                            (addCatFarmArticleClicked)="handleAddCatFarmArticleClick($event)"