@colijnit/transaction 12.1.133 → 12.1.134

package/lib/component/digital-signature/digital-signature.component.d.ts

@@ -1,7 +1,9 @@
+import { EventEmitter } from "@angular/core";
 import { SharedService } from "../../service/shared.service";
 export declare class DigitalSignatureComponent {
     private _sharedService;
     set documentId(id: number);
+    documentStored: EventEmitter<void>;
     documentBody: string;
     showDocSign: boolean;
     private _documentId;

package/lib/component/payment/payment.component.d.ts

@@ -69,4 +69,5 @@ export declare class PaymentComponent implements OnInit, OnDestroy {
     private _getPaymentMethods;
     private _handlePayment;
     private _doPayment;
+    private _getToPayDetails;
 }

package/lib/component/transaction/style/material.scss

@@ -13,3 +13,5 @@
 @import "../../transaction-labeled-warehouse-location-button/style/material";
 @import "../../transaction-line-checkbox-list/style/material";
 @import "../../transaction-card/transaction-card/style/material";
+//@import "../../transaction-document-button/style/material";
+@import "../../transaction-document-text-dialog/style/material";

package/lib/component/transaction-document-text-dialog/style/_layout.scss

@@ -0,0 +1,32 @@
+@include export-module('co-transaction-document-text-dialog') {
+  .co-dialog {
+    font-family: $tp-co-transaction-document-text-dialog-font-family;
+    font-size: $tp-co-transaction-document-text-dialog-font-size;
+
+    .transaction-document-text-dialog-content {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+    }
+
+    .document-text-input {
+      padding-top: $tp-co-transaction-document-text-input-padding;
+
+      .editor-title {
+        font-weight: $tp-co-transaction-document-text-dialog-edit-title-font-weight;
+        font-size: $tp-co-transaction-document-text-dialog-edit-title-font-size;
+      }
+
+      .transaction-text-choice-row {
+        display: flex;
+        flex-direction: row;
+        justify-content: left;
+      }
+
+      .transaction-text-editor {
+        width: $tp-co-transaction-document-text-editor-width;
+        height: $tp-co-transaction-document-text-editor-height;
+      }
+    }
+  }
+}

package/lib/component/transaction-document-text-dialog/style/_material-definition.scss

@@ -0,0 +1,17 @@
+$tp-co-transaction-document-text-dialog-font-family: $tp-font-family !default;
+$tp-co-transaction-document-text-dialog-font-size: $tp-font-size !default;
+$tp-co-transaction-document-text-editor-width: 600px !default;
+$tp-co-transaction-document-text-editor-height: 200px !default;
+$tp-co-transaction-document-text-dialog-edit-title-font-weight: bold !default;
+$tp-co-transaction-document-text-dialog-edit-title-font-size: 20px !default;
+$tp-co-transaction-document-text-input-padding: 30px !default;
+
+$tp-co-transaction-document-button-bar-font-family: $tp-font-family !default;
+$tp-co-transaction-document-button-bar-font-size: $tp-font-size !default;
+//$tp-co-transaction-button-bar-button-size: 65px !default;
+$tp-co-transaction-document-button-background-color: white !default;
+$tp-co-transaction-document-button-border-radius: $tp-default-border-radius !default;
+$tp-co-transaction-document-button-padding: 5px !default;
+$tp-co-transaction-document-button-icon-size: 60px !default;
+$tp-co-transaction-document-button-icon-margin: 0 0 5px 0 !default;
+$tp-co-transaction-document-button-label-font-size: $tp-font-size-small !default;

package/lib/component/transaction-document-text-dialog/style/_theme.scss

@@ -0,0 +1,5 @@
+@include export-module('co-transaction-document-button-bar-theme') {
+  .co-transaction-document-button-bar {
+
+  }
+}

package/lib/component/transaction-document-text-dialog/style/material.scss

@@ -0,0 +1,4 @@
+@import "../../../style/mixin";
+@import "./_material-definition";
+@import "./_layout";
+@import "./_theme";

package/lib/component/transaction-quick-access/transaction-quick-access-send-method-base.component.d.ts

@@ -31,6 +31,7 @@ export declare abstract class TransactionQuickAccessSendMethodBaseComponent exte
     relationSet(): void;
     handleSendMethodOkClick(method: string): Promise<void>;
     handleSend(method: string): Promise<void>;
+    commitAndRefreshTransaction(): void;
     protected abstract printDocument(request: ReportingDocumentPrintSignDocBaseRequest): any;
     protected abstract emailDocument(request: ReportingDocumentEmailSignDocBaseRequest): any;
     protected abstract pdfDocument(request: ReportingDocumentPdfBaseRequest): any;

package/lib/component/transaction-search/transaction-filter-categories/style/_layout.scss

@@ -1,6 +1,6 @@
 @import "../../../../style/mixin";
 
-@include export-module('co-transaction-filter-categories-layout') {
+@include export-module('') {
   .co-transaction-filter-categories {
     font-family: $tp-co-transaction-filter-categories-font-family;
     font-size: $tp-co-transaction-filter-categories-font-size;

package/lib/component/transaction-search/transaction-filter-content/sales-order-filter-content/transaction-sales-order-filter-content-article/transaction-sales-order-filter-content-article.component.d.ts

@@ -1,4 +1,4 @@
-import { FilterItemViewmodel } from "@colijnit/corecomponents_v12";
+import { FilterItemMode, FilterItemViewmodel } from "@colijnit/corecomponents_v12";
 import { TransactionService } from "../../../../../service/transaction.service";
 import { TransactionFilterContentBaseComponent } from "../../../../core/base/transaction-filter-content-base.component";
 import { FilterRequestService } from "../../../service/filter-request.service";
@@ -9,6 +9,7 @@ export declare class TransactionSalesOrderFilterContentArticleComponent extends
     filterRequestService: FilterRequestService;
     transactionService: TransactionService;
     private _relationService;
+    readonly modes: typeof FilterItemMode;
     showClass(): boolean;
     exceedanceCodes: FilterItemViewmodel[];
     exceedanceCodeFields: {

package/lib/component/transaction-search/transaction-filter-content/sales-order-filter-content/transaction-sales-order-filter-content-logistics/transaction-sales-order-filter-content-logistics.component.d.ts

@@ -1,4 +1,4 @@
-import { FilterItemViewmodel } from '@colijnit/corecomponents_v12';
+import { FilterItemMode, FilterItemViewmodel } from '@colijnit/corecomponents_v12';
 import { TransactionService } from '../../../../../service/transaction.service';
 import { TransactionFilterContentBaseComponent } from '../../../../core/base/transaction-filter-content-base.component';
 import { FilterRequestService } from '../../../service/filter-request.service';
@@ -7,6 +7,7 @@ export declare class TransactionSalesOrderFilterContentLogisticsComponent extend
     searchService: TransactionSearchService;
     filterRequestService: FilterRequestService;
     transactionService: TransactionService;
+    readonly modes: typeof FilterItemMode;
     showClass(): boolean;
     deliveryMethods: any[];
     deliveryMethodFields: {

package/lib/component/transaction-search/transaction-filter-content/sales-order-filter-content/transaction-sales-order-filter-content-order/transaction-sales-order-filter-content-order.component.d.ts

@@ -1,4 +1,4 @@
-import { FilterItemViewmodel } from '@colijnit/corecomponents_v12';
+import { FilterItemMode, FilterItemViewmodel } from '@colijnit/corecomponents_v12';
 import { TransactionService } from '../../../../../service/transaction.service';
 import { TransactionFilterContentBaseComponent } from '../../../../core/base/transaction-filter-content-base.component';
 import { FilterRequestService } from '../../../service/filter-request.service';
@@ -9,6 +9,7 @@ export declare class TransactionSalesOrderFilterContentOrderComponent extends Tr
     filterRequestService: FilterRequestService;
     transactionService: TransactionService;
     relationService: RelationService;
+    readonly modes: typeof FilterItemMode;
     showClass(): boolean;
     salesPersons: FilterItemViewmodel[];
     salesPersonsFields: {

package/lib/component/transaction-search/transaction-filter-historic-state/transaction-filter-historic-state.component.d.ts

@@ -1,6 +1,7 @@
 import { EventEmitter } from "@angular/core";
 import { QuantityInHistoricState } from "@colijnit/transactionapi/build/enum/quantity-in-historic-state.enum";
 import { DictionaryService } from "../../../service/dictionary.service";
+import { FilterItemMode } from "@colijnit/corecomponents_v12";
 export interface HistoricStates {
     description: string;
     code: QuantityInHistoricState;
@@ -8,10 +9,13 @@ export interface HistoricStates {
 }
 export declare class TransactionFilterHistoricStateComponent {
     private _dictionary;
+    model: any;
+    mode: FilterItemMode;
     set label(value: string);
     get label(): string;
     expanded: boolean;
     collectionChange: EventEmitter<any>;
+    modelChange: EventEmitter<any>;
     showClass(): boolean;
     private _label;
     groupName: string;

package/lib/component/transaction-search/transaction-filter-item/transaction-filter-item.component.d.ts

@@ -1,7 +1,10 @@
 import { EventEmitter } from "@angular/core";
 import { TransactionSearchService } from "../service/transaction-search.service";
+import { FilterItemMode } from "@colijnit/corecomponents_v12";
 export declare class TransactionFilterItemComponent {
     searchService: TransactionSearchService;
+    model: any;
+    mode: FilterItemMode;
     collection: any[];
     placeholder: string;
     customContent: boolean;
@@ -9,6 +12,7 @@ export declare class TransactionFilterItemComponent {
     minSearchCharsToLoadCollection: number;
     searchCollectionPlaceholder: string;
     collectionLoadFn: Function;
+    modelChange: EventEmitter<any>;
     collectionChange: EventEmitter<any>;
     constructor(searchService: TransactionSearchService);
     searchPlaceholder: string;

package/lib/component/transaction-tags/style/_layout.scss

@@ -5,6 +5,24 @@
     .transaction-tags-wrapper {
       display: flex;
       column-gap: $tp-co-transaction-tags-column-gap;
+      .edit-tags-wrapper {
+        display: flex;
+        column-gap: $tp-co-transaction-tags-column-gap;
+        .co-button {
+          color: $tp-co-transaction-tags-edit-button-color;
+          background: $tp-co-transaction-tags-edit-button-background-color;
+          .co-icon {
+            width: $tp-co-transaction-tags-edit-button-icon-size;
+            height: $tp-co-transaction-tags-edit-button-icon-size;
+            svg { // for fontawesome icons
+              fill: $tp-co-transaction-tags-edit-button-icon-color;
+            }
+            & [fill] { // for own icons
+              fill: $tp-co-transaction-tags-edit-button-icon-color;
+            }
+          }
+        }
+      }
     }
     .co-transaction-tag {
       user-select: none;

package/lib/component/transaction-tags/style/_material-definition.scss

@@ -9,3 +9,7 @@ $tp-co-transaction-tags-column-gap: 5px !default;
 $tp-co-transaction-tags-align-items: flex-start !default;
 $tp-co-transaction-tags-border-radius: 10px !default;
 $tp-co-transaction-tags-padding: 5px 10px !default;
+$tp-co-transaction-tags-edit-button-icon-size: 20px !default;
+$tp-co-transaction-tags-edit-button-icon-color: $tp-color-action !default;
+$tp-co-transaction-tags-edit-button-color: $tp-color-action !default;
+$tp-co-transaction-tags-edit-button-background-color: $tp-default-background-accent !default;

package/lib/component/transaction-tags/transaction-tags.component.d.ts

@@ -2,14 +2,25 @@ import { OnDestroy } from "@angular/core";
 import { TransactionService } from "../../service/transaction.service";
 import { TransactionEventService } from "../../service/transaction-event.service";
 import { TagTreeItem } from "@colijnit/mainapi/build/model/tag-tree-item.bo";
+import { IconCacheService } from "../../service/icon-cache.service";
+import { Icon } from "../../enum/icon.enum";
 export declare class TransactionTagsComponent implements OnDestroy {
     private _transactionService;
     private _transactionEventService;
+    iconCacheService: IconCacheService;
+    readonly icons: typeof Icon;
     showClass(): boolean;
     tags: TagTreeItem[];
+    allTags: TagTreeItem[];
+    editingTags: TagTreeItem[];
+    showEditTagsDialog: boolean;
     private _table;
+    private _key;
     private _subs;
-    constructor(_transactionService: TransactionService, _transactionEventService: TransactionEventService);
+    constructor(_transactionService: TransactionService, _transactionEventService: TransactionEventService, iconCacheService: IconCacheService);
     ngOnDestroy(): void;
     private _getJoinedTags;
+    private _getTabCategory;
+    handleEditTags(): Promise<void>;
+    handleSaveTags(tags: TagTreeItem[]): void;
 }

package/lib/res/dictionary/dictionaries.d.ts

@@ -3745,6 +3745,7 @@ export declare class Dictionaries {
         EDIT_SERVICEPROVISION_CONTRACT: string;
         EDIT_SKILL: string;
         EDIT_SOFTWARE_CONTRACT: string;
+        EDIT_TAGS: string;
         EDIT_TEXT: string;
         EDIT_TIME: string;
         EDIT_TRANSACTION_LINE: string;
@@ -11991,6 +11992,7 @@ export declare class Dictionaries {
         EDIT_SERVICEPROVISION_CONTRACT: string;
         EDIT_SKILL: string;
         EDIT_SOFTWARE_CONTRACT: string;
+        EDIT_TAGS: string;
         EDIT_TEXT: string;
         EDIT_TIME: string;
         EDIT_TRANSACTION_LINE: string;

package/lib/service/transaction-connector-adapter.service.d.ts

@@ -108,6 +108,7 @@ import { EmailHistoricPosReceiptRequest } from "@colijnit/transactionapi/build/m
 import { DoPaymentRequest } from "@colijnit/transactionapi/build/model/do-payment-request";
 import { CalculateAmountToPayRequest } from "@colijnit/transactionapi/build/model/calculate-amount-to-pay-request";
 import { AmountToPay } from "@colijnit/transactionapi/build/model/amount-to-pay";
+import { TagCategory } from "@colijnit/mainapi/build/enum/tab-category.enum";
 export declare class TransactionConnectorAdapterService {
     private _optionsService;
     private _selectMultipleCacheService;
@@ -247,9 +248,9 @@ export declare class TransactionConnectorAdapterService {
     getOrderConfirmationEmailLayouts(transactionUUID: string): Promise<ReportLayoutSelectionEmail[]>;
     getOrderConfirmationPrintLayouts(transactionUUID: string): Promise<ReportLayoutSelectionPrint[]>;
     getOrderConfirmationDefaultSendMethod(relationId: number): Promise<number>;
-    printOrderConfirmation(request: PrintOrderConfirmationRequest): Promise<CoDocument>;
+    printOrderConfirmation(request: PrintOrderConfirmationRequest): Promise<CoDocument | boolean>;
     printHistoricOrderConfirmation(request: PrintHistoricOrderConfirmationRequest): Promise<void>;
-    emailOrderConfirmation(request: EmailOrderConfirmationRequest): Promise<CoDocument>;
+    emailOrderConfirmation(request: EmailOrderConfirmationRequest): Promise<CoDocument | boolean>;
     emailHistoricOrderConfirmation(request: EmailHistoricOrderConfirmationRequest): Promise<void>;
     pdfOrderConfirmation(request: PdfOrderConfirmationRequest): Promise<void>;
     printPurchaseOrder(request: PrintPurchaseOrderRequest): Promise<void>;
@@ -262,21 +263,21 @@ export declare class TransactionConnectorAdapterService {
     generateAndSendPurchaseOrdersForSalesOrder(transactionId: number, lineNumbers: number[]): Promise<boolean>;
     getPurchaseAdviceLines(filters: PurchaseAdviceFilters, goodId?: number): Promise<PurchaseAdviceLine[]>;
     generateAndSendPurchaseOrders(purchaseAdviceLines: PurchaseAdviceLine[]): Promise<boolean>;
-    emailDeliveryNote(emailDeliveryNoteRequest: EmailDeliveryNoteRequest): Promise<CoDocument>;
+    emailDeliveryNote(emailDeliveryNoteRequest: EmailDeliveryNoteRequest): Promise<CoDocument | boolean>;
     emailHistoricDeliveryNote(emailHistoricDeliveryNoteRequest: EmailHistoricDeliveryNoteRequest): Promise<boolean>;
     pdfDeliveryNote(pdfDeliveryNoteRequest: PdfDeliveryNoteRequest): Promise<boolean>;
     pdfHistoricDeliveryNote(pdfHistoricDeliveryNoteRequest: PdfHistoricDeliveryNoteRequest): Promise<boolean>;
-    printDeliveryNote(printDeliveryNoteRequest: PrintDeliveryNoteRequest): Promise<CoDocument>;
+    printDeliveryNote(printDeliveryNoteRequest: PrintDeliveryNoteRequest): Promise<CoDocument | boolean>;
     printHistoricDeliveryNote(printHistoricDeliveryNoteRequest: PrintHistoricDeliveryNoteRequest): Promise<boolean>;
     getDeliveryNoteDefaultSendMethod(relationId: number): Promise<number>;
     getDeliveryNoteEmailLayouts(transactionUUID: string): Promise<ReportLayoutSelectionEmail[]>;
     getDeliveryNotePrintLayouts(transactionUUID: string): Promise<ReportLayoutSelectionPrint[]>;
     getDefaultEmailAddressListForInvoice(transactionUUID: any): Promise<string[]>;
-    emailInvoice(emailInvoiceRequest: EmailInvoiceRequest): Promise<CoDocument>;
+    emailInvoice(emailInvoiceRequest: EmailInvoiceRequest): Promise<CoDocument | boolean>;
     emailHistoricInvoice(emailHistoricInvoiceRequest: EmailHistoricInvoiceRequest): Promise<boolean>;
     pdfInvoice(pdfInvoiceRequest: PdfInvoiceRequest): Promise<boolean>;
     pdfHistoricInvoice(pdfHistoricInvoiceRequest: PdfHistoricInvoiceRequest): Promise<boolean>;
-    printInvoice(printInvoiceRequest: PrintInvoiceRequest): Promise<CoDocument>;
+    printInvoice(printInvoiceRequest: PrintInvoiceRequest): Promise<CoDocument | boolean>;
     printHistoricInvoice(printHistoricInvoiceRequest: PrintHistoricInvoiceRequest): Promise<boolean>;
     printPosReceipt(printPosReceiptRequest: PrintPosReceiptRequest): Promise<boolean>;
     printHistoricPosReceipt(printHistoricPosReceiptRequest: PrintHistoricPosReceiptRequest): Promise<boolean>;
@@ -290,6 +291,8 @@ export declare class TransactionConnectorAdapterService {
     getCurrencies(active?: boolean): Promise<Currency[]>;
     getPaymentConditions(name?: string): Promise<PaymentCondition[]>;
     getJoinedTags(table: string, key: string): Promise<TagTreeItem[]>;
+    mergeJoinedTags(table: string, key: string, tags: TagTreeItem[]): Promise<boolean>;
+    getTagsFullTree(category: TagCategory, includeTags: boolean): Promise<TagTreeItem[]>;
     getTransactionInfo(transId: number, lineNr: number): Promise<TransactionInfoHistory[]>;
     getRefTransactions(transId: number): Promise<RefTransaction[]>;
     getInternalParameterValue(param: InternalParam): Promise<InternalParam>;

package/lib/service/transaction-connector.service.d.ts

@@ -99,6 +99,7 @@ import { PrintPosReceiptRequest } from "@colijnit/transactionapi/build/model/pri
 import { PrintHistoricPosReceiptRequest } from "@colijnit/transactionapi/build/model/print-historic-pos-receipt-request";
 import { EmailPosReceiptRequest } from "@colijnit/transactionapi/build/model/email-pos-receipt-request";
 import { EmailHistoricPosReceiptRequest } from "@colijnit/transactionapi/build/model/email-historic-pos-receipt-request";
+import { TagCategory } from "@colijnit/mainapi/build/enum/tab-category.enum";
 export declare class TransactionConnectorService {
     private _adapterService;
     private _selectSingleCacheService;
@@ -226,9 +227,9 @@ export declare class TransactionConnectorService {
     getOrderConfirmationPrintLayouts(transactionUUID: string): Promise<ReportLayoutSelectionPrint[]>;
     getOrderConfirmationDefaultSendMethod(relationId: number): Promise<number>;
     getDefaultEmailAddressListForOrderConfirmation(transactionUUID: string): Promise<string[]>;
-    printOrderConfirmation(request: PrintOrderConfirmationRequest): Promise<CoDocument>;
+    printOrderConfirmation(request: PrintOrderConfirmationRequest): Promise<CoDocument | boolean>;
     printHistoricOrderConfirmation(request: PrintHistoricOrderConfirmationRequest): Promise<void>;
-    emailOrderConfirmation(request: EmailOrderConfirmationRequest): Promise<CoDocument>;
+    emailOrderConfirmation(request: EmailOrderConfirmationRequest): Promise<CoDocument | boolean>;
     emailHistoricOrderConfirmation(request: EmailHistoricOrderConfirmationRequest): Promise<void>;
     pdfOrderConfirmation(request: PdfOrderConfirmationRequest): Promise<void>;
     printPurchaseOrder(request: PrintPurchaseOrderRequest): Promise<void>;
@@ -240,21 +241,21 @@ export declare class TransactionConnectorService {
     generateAndSendPurchaseOrdersForSalesOrder(transactionId: number, lineNumbers: number[]): Promise<boolean>;
     getPurchaseAdviceLines(filters: PurchaseAdviceFilters, goodId?: number): Promise<PurchaseAdviceLine[]>;
     generateAndSendPurchaseOrders(purchaseAdviceLines: PurchaseAdviceLine[]): Promise<boolean>;
-    emailDeliveryNote(emailDeliveryNoteRequest: EmailDeliveryNoteRequest): Promise<CoDocument>;
+    emailDeliveryNote(emailDeliveryNoteRequest: EmailDeliveryNoteRequest): Promise<CoDocument | boolean>;
     emailHistoricDeliveryNote(emailHistoricDeliveryNoteRequest: EmailHistoricDeliveryNoteRequest): Promise<boolean>;
     pdfDeliveryNote(pdfDeliveryNoteRequest: PdfDeliveryNoteRequest): Promise<boolean>;
     pdfHistoricDeliveryNote(pdfHistoricDeliveryNoteRequest: PdfHistoricDeliveryNoteRequest): Promise<boolean>;
-    printDeliveryNote(printDeliveryNoteRequest: PrintDeliveryNoteRequest): Promise<CoDocument>;
+    printDeliveryNote(printDeliveryNoteRequest: PrintDeliveryNoteRequest): Promise<CoDocument | boolean>;
     printHistoricDeliveryNote(printHistoricDeliveryNoteRequest: PrintHistoricDeliveryNoteRequest): Promise<boolean>;
     getDeliveryNoteDefaultSendMethod(relationId: number): Promise<number>;
     getDeliveryNoteEmailLayouts(transactionUUID: string): Promise<ReportLayoutSelectionEmail[]>;
     getDeliveryNotePrintLayouts(transactionUUID: string): Promise<ReportLayoutSelectionPrint[]>;
     getDefaultEmailAddressListForInvoice(transactionUUID: string): Promise<string[]>;
-    emailInvoice(emailInvoiceRequest: EmailInvoiceRequest): Promise<CoDocument>;
+    emailInvoice(emailInvoiceRequest: EmailInvoiceRequest): Promise<CoDocument | boolean>;
     emailHistoricInvoice(emailHistoricInvoiceRequest: EmailHistoricInvoiceRequest): Promise<boolean>;
     pdfInvoice(pdfInvoiceRequest: PdfInvoiceRequest): Promise<boolean>;
     pdfHistoricInvoice(pdfHistoricInvoiceRequest: PdfHistoricInvoiceRequest): Promise<boolean>;
-    printInvoice(printInvoiceRequest: PrintInvoiceRequest): Promise<CoDocument>;
+    printInvoice(printInvoiceRequest: PrintInvoiceRequest): Promise<CoDocument | boolean>;
     printHistoricInvoice(printHistoricInvoiceRequest: PrintHistoricInvoiceRequest): Promise<boolean>;
     printPosReceipt(printPosReceiptRequest: PrintPosReceiptRequest): Promise<boolean>;
     printHistoricPosReceipt(printHistoricPosReceiptRequest: PrintHistoricPosReceiptRequest): Promise<boolean>;
@@ -268,6 +269,8 @@ export declare class TransactionConnectorService {
     getCurrencies(active?: boolean): Promise<Currency[]>;
     getPaymentConditions(name?: string): Promise<PaymentCondition[]>;
     getJoinedTags(table: string, key: string): Promise<TagTreeItem[]>;
+    mergeJoinedTags(table: string, key: string, tags: TagTreeItem[]): Promise<boolean>;
+    getTagsFullTree(category: TagCategory, includeTags: boolean): Promise<TagTreeItem[]>;
     getTransactionInfo(transId: number, lineNr: number): Promise<TransactionInfoHistory[]>;
     getRefTransactions(transId: number): Promise<RefTransaction[]>;
     getInternalParameterValue(param: InternalParam): Promise<InternalParam>;

package/lib/service/transaction.service.d.ts

@@ -86,6 +86,7 @@ import { PrintPosReceiptRequest } from "@colijnit/transactionapi/build/model/pri
 import { PrintHistoricPosReceiptRequest } from "@colijnit/transactionapi/build/model/print-historic-pos-receipt-request";
 import { EmailPosReceiptRequest } from "@colijnit/transactionapi/build/model/email-pos-receipt-request";
 import { EmailHistoricPosReceiptRequest } from "@colijnit/transactionapi/build/model/email-historic-pos-receipt-request";
+import { TagCategory } from "@colijnit/mainapi/build/enum/tab-category.enum";
 export declare class TransactionService extends PendingReasonService {
     private readonly _createTransactionMethods;
     private readonly _relationKindFromTransactionKind;
@@ -204,9 +205,9 @@ export declare class TransactionService extends PendingReasonService {
     getOrderConfirmationPrintLayouts(transactionUUID: string): Promise<ReportLayoutSelectionPrint[]>;
     getOrderConfirmationDefaultSendMethod(relationId: number): Promise<number>;
     getDefaultEmailAddressListForOrderConfirmation(transactionUUID: any): Promise<string[]>;
-    printOrderConfirmation(request: PrintOrderConfirmationRequest): Promise<CoDocument>;
+    printOrderConfirmation(request: PrintOrderConfirmationRequest): Promise<CoDocument | boolean>;
     printHistoricOrderConfirmation(request: PrintHistoricDeliveryNoteRequest): Promise<void>;
-    emailOrderConfirmation(request: EmailOrderConfirmationRequest): Promise<CoDocument>;
+    emailOrderConfirmation(request: EmailOrderConfirmationRequest): Promise<CoDocument | boolean>;
     emailHistoricOrderConfirmation(request: EmailHistoricOrderConfirmationRequest): Promise<void>;
     pdfOrderConfirmation(request: PdfOrderConfirmationRequest): Promise<void>;
     printPurchaseOrder(request: PrintPurchaseOrderRequest): Promise<void>;
@@ -218,21 +219,21 @@ export declare class TransactionService extends PendingReasonService {
     generateAndSendPurchaseOrdersForSalesOrder(transactionId: number, version: number): Promise<boolean>;
     getPurchaseAdviceLines(filters: PurchaseAdviceFilters, goodId?: number): Promise<PurchaseAdviceLine[]>;
     generateAndSendPurchaseOrders(purchaseAdviceLines: PurchaseAdviceLine[]): Promise<boolean>;
-    emailDeliveryNote(emailDeliveryNoteRequest: EmailDeliveryNoteRequest): Promise<CoDocument>;
+    emailDeliveryNote(emailDeliveryNoteRequest: EmailDeliveryNoteRequest): Promise<CoDocument | boolean>;
     emailHistoricDeliveryNote(emailHistoricDeliveryNoteRequest: EmailHistoricDeliveryNoteRequest): Promise<boolean>;
     pdfDeliveryNote(pdfDeliveryNoteRequest: PdfDeliveryNoteRequest): Promise<boolean>;
     pdfHistoricDeliveryNote(pdfHistoricDeliveryNoteRequest: PdfHistoricDeliveryNoteRequest): Promise<boolean>;
-    printDeliveryNote(printDeliveryNoteRequest: PrintDeliveryNoteRequest): Promise<CoDocument>;
+    printDeliveryNote(printDeliveryNoteRequest: PrintDeliveryNoteRequest): Promise<CoDocument | boolean>;
     printHistoricDeliveryNote(printHistoricDeliveryNoteRequest: PrintHistoricDeliveryNoteRequest): Promise<boolean>;
     getDeliveryNoteDefaultSendMethod(relationId: number): Promise<number>;
     getDeliveryNoteEmailLayouts(transactionUUID: string): Promise<ReportLayoutSelectionEmail[]>;
     getDeliveryNotePrintLayouts(transactionUUID: string): Promise<ReportLayoutSelectionPrint[]>;
     getDefaultEmailAddressListForInvoice(transactionUUID: any): Promise<string[]>;
-    emailInvoice(emailInvoiceRequest: EmailInvoiceRequest): Promise<CoDocument>;
+    emailInvoice(emailInvoiceRequest: EmailInvoiceRequest): Promise<CoDocument | boolean>;
     emailHistoricInvoice(emailHistoricInvoiceRequest: EmailHistoricInvoiceRequest): Promise<boolean>;
     pdfInvoice(pdfInvoiceRequest: PdfInvoiceRequest): Promise<boolean>;
     pdfHistoricInvoice(pdfHistoricInvoiceRequest: PdfHistoricInvoiceRequest): Promise<boolean>;
-    printInvoice(printInvoiceRequest: PrintInvoiceRequest): Promise<CoDocument>;
+    printInvoice(printInvoiceRequest: PrintInvoiceRequest): Promise<CoDocument | boolean>;
     printHistoricInvoice(printHistoricInvoiceRequest: PrintHistoricInvoiceRequest): Promise<boolean>;
     printPosReceipt(printPosReceiptRequest: PrintPosReceiptRequest): Promise<boolean>;
     printHistoricPosReceipt(printHistoricPosReceiptRequest: PrintHistoricPosReceiptRequest): Promise<boolean>;
@@ -247,6 +248,8 @@ export declare class TransactionService extends PendingReasonService {
     getCurrencies(active?: boolean): Promise<Currency[]>;
     getPaymentConditions(name?: string): Promise<PaymentCondition[]>;
     getJoinedTags(table: string, key: string): Promise<TagTreeItem[]>;
+    mergeJoinedTags(table: string, key: string, tags: TagTreeItem[]): Promise<boolean>;
+    getTagsFullTree(category: TagCategory, includeTags: boolean): Promise<TagTreeItem[]>;
     getInternalParameter(param: InternalParam): Promise<boolean>;
     getObjectConfiguration(screenCfgModule: string, params?: string | string[], insertMode?: boolean): Promise<ObjectConfiguration[]>;
     getHistoricDocuments(transId: number, documentCode: LayoutCode): Promise<HistoricReport[]>;
@@ -255,6 +258,7 @@ export declare class TransactionService extends PendingReasonService {
     handleSetSelectedLinesToBePicked(): Promise<void>;
     handleSetSelectedLinesToPick(): Promise<void>;
     getPurchaseOrderForTransactionLine(transId: number, lineNr: number): Promise<TransactionInfoHistory[]>;
+    commitAndRefreshTransaction(): Promise<void>;
     protected _handleAfterRememberCurrentTransaction(transactionInfoResponse: TransactionInfoResponse): Promise<void>;
     private _handleBusinessRuleDepositPercentageAmount;
     private _handleBusinessRuleDepositAmount;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/transaction",
-  "version": "12.1.133",
+  "version": "12.1.134",
   "description": "Colijn IT transaction module for Angular 12",
   "repository": "npm/npm",
   "author": "Colijn IT",
@@ -9,16 +9,16 @@
   "peerDependencies": {
     "@angular/common": ">=12.2.0",
     "@angular/core": ">=12.2.0",
-    "@colijnit/articleapi": ">=1.0.23",
-    "@colijnit/catalog": ">=12.1.31",
+    "@colijnit/articleapi": ">=1.0.26",
+    "@colijnit/catalog": ">=12.1.37",
     "@colijnit/corecomponents": ">=1.12.0",
-    "@colijnit/corecomponents_v12": ">=12.1.5",
-    "@colijnit/ioneconnector": ">=2.1.15",
-    "@colijnit/mainapi": ">=1.0.15",
-    "@colijnit/relationapi": ">=1.0.6",
-    "@colijnit/sharedapi": ">=1.0.14",
+    "@colijnit/corecomponents_v12": ">=12.1.8",
+    "@colijnit/ioneconnector": ">=3.1.0",
+    "@colijnit/mainapi": ">=1.0.21",
+    "@colijnit/relationapi": ">=1.0.7",
+    "@colijnit/sharedapi": ">=1.0.16",
     "@colijnit/sharedcomponents": ">=1.0.46",
-    "@colijnit/transactionapi": ">=1.1.90",
+    "@colijnit/transactionapi": ">=1.1.93",
     "@types/three": ">=0.125.0",
     "@tweenjs/tween.js": ">=17.2.0",
     "three": ">=0.125.0"