@colijnit/transaction 261.20.34 → 261.20.35

package/fesm2022/colijnit-transaction.mjs

@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
 import { Injectable, EventEmitter, Pipe, HostBinding, Input, ViewEncapsulation, Component, Injector, InjectionToken, Optional, Inject, Output, ContentChildren, Directive, ElementRef, forwardRef, ViewChild, ViewContainerRef, ChangeDetectionStrategy, HostListener, ViewChildren, NgModule, LOCALE_ID, model } from '@angular/core';
 import { TransactionKind } from '@colijnit/transactionapi/build/enum/transaction-kind.enum';
 import * as i1$1 from '@colijnit/corecomponents_v12';
-import { BaseModuleService, BaseModuleScreenConfigService, SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME, InputTextComponent, SimpleGridColumnTemplateType, SimpleGridColumnDirective, FormMasterService, ColumnAlign, OverlayService, ContentViewMode, InputCheckboxComponent, InputDatePickerComponent, InputTextareaComponent, CoDialogModule, ButtonModule, CollapsibleModule, InputCheckboxModule, InputTextModule, ListOfValuesModule, InputSearchModule, FormModule, ScreenConfigurationModule, InputRadioButtonModule, IconModule, TooltipDirectiveModule, CheckmarkOverlayModule, PriceDisplayPipeModule, Carousel3dModule, CarouselModule, InputTextareaModule, FormComponent, InputDatePickerModule, FilterPipeModule, ObserveVisibilityModule, CoCurrencyPipeModule, ImageModule, FilterViewmodel, CoreComponentsTranslationModule, ColorPickerModule, ClickoutsideModule, OverlayModule, CalendarComponent, InputNumberPickerModule, SimpleGridModule, GridToolbarButtonModule, InputDateRangePickerModule, HourSchedulingComponentModule, HourSchedulingExpandableComponentModule, HourSchedulingExpandableTemplateModule, ViewModeButtonsModule, FilterItemMode, FilterItemComponent, FilterItemModule, PaginationModule, PaginationBarModule, IconCollapseHandleModule, PopupModule, CoDialogWizardModule, InputScannerModule, CoreComponentsIcon } from '@colijnit/corecomponents_v12';
+import { BaseModuleService, BaseModuleScreenConfigService, SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME, InputTextComponent, SimpleGridColumnTemplateType, SimpleGridColumnDirective, FormMasterService, ColumnAlign, OverlayService, ContentViewMode, InputCheckboxComponent, FormComponent, InputDatePickerComponent, InputTextareaComponent, CoDialogModule, ButtonModule, CollapsibleModule, InputCheckboxModule, InputTextModule, ListOfValuesModule, InputSearchModule, FormModule, ScreenConfigurationModule, InputRadioButtonModule, IconModule, TooltipDirectiveModule, CheckmarkOverlayModule, PriceDisplayPipeModule, Carousel3dModule, CarouselModule, InputTextareaModule, InputDatePickerModule, FilterPipeModule, ObserveVisibilityModule, CoCurrencyPipeModule, ImageModule, FilterViewmodel, CoreComponentsTranslationModule, ColorPickerModule, ClickoutsideModule, OverlayModule, CalendarComponent, InputNumberPickerModule, SimpleGridModule, GridToolbarButtonModule, InputDateRangePickerModule, HourSchedulingComponentModule, HourSchedulingExpandableComponentModule, HourSchedulingExpandableTemplateModule, ViewModeButtonsModule, FilterItemMode, FilterItemComponent, FilterItemModule, PaginationModule, PaginationBarModule, IconCollapseHandleModule, PopupModule, CoDialogWizardModule, InputScannerModule, CoreComponentsIcon } from '@colijnit/corecomponents_v12';
 import { TransactionInfo } from '@colijnit/transactionapi/build/model/transaction-info.bo';
 import { TransactionInfoResponse } from '@colijnit/transactionapi/build/model/transaction-info-response.bo';
 import { TransactionServiceInfo } from '@colijnit/transactionapi/build/model/transaction-service-info.bo';
@@ -355,8 +355,8 @@ import { DateField } from '@colijnit/ioneconnector/build/factory/decorators/date
 class Version {
     name = "@colijnit/transaction";
     description = "Colijn IT transaction package";
-    symVer = "261.20.34";
-    publishDate = "29-4-2026, 18:24:55";
+    symVer = "261.20.35";
+    publishDate = "5-5-2026, 18:02:14";
 }
 
 class CheckoutModuleService extends BaseModuleService {
@@ -15566,7 +15566,9 @@ class TransactionLineToolbarComponent {
     }
     async ngOnInit() {
         this._transactionKind = this._transactionService.currentTransaction.transactionInfo.transactionKind;
-        this.canCreateService = this._transactionKind === TransactionKind.SalesOrder;
+        this.canCreateService = ((this._transactionKind === TransactionKind.SalesOrder)
+            && (this.transactionLine && this.transactionLine.articleLineStatus
+                && this.transactionLine.articleLineStatus.quantityDelivered && this.transactionLine.articleLineStatus.quantityDelivered > 0));
         this.canReopenExternalOrder = this._isReopenableExternalCatalogLine();
         this.conversionUnitsAvailable = await this._getConversionUnitsAvailable();
         this.areAllowedToChangeOrder = (this._transactionKind !== TransactionKind.SalesOrder || !(this._transactionService.invoiceCompleted && !this._transactionService.canChangeSalesOrderWhenFullyInvoiced));
@@ -28765,6 +28767,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
 class DiscountCodesPopupComponent {
     iconCacheService;
     transactionService;
+    discountForm;
     transactionLine;
     discountType;
     showDiscountCodesPopup = new EventEmitter();
@@ -28784,10 +28787,12 @@ class DiscountCodesPopupComponent {
         this.showDiscountCodesPopup.emit(false);
     }
     updateDiscount() {
-        this.discountSet.emit({
-            newDiscountCode: this.selectedDiscountCode.discountCode,
-            newDiscountReason: this.discountRemark
-        });
+        if (this.discountForm.submit()) {
+            this.discountSet.emit({
+                newDiscountCode: this.selectedDiscountCode.discountCode,
+                newDiscountReason: this.discountRemark
+            });
+        }
     }
     _getDiscountCodes() {
         this.transactionService.getDiscountCodes().then((codes) => {
@@ -28815,7 +28820,7 @@ class DiscountCodesPopupComponent {
         });
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: DiscountCodesPopupComponent, deps: [{ token: IconCacheService }, { token: TransactionService }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.16", type: DiscountCodesPopupComponent, isStandalone: false, selector: "co-discount-codes-popup", inputs: { transactionLine: "transactionLine", discountType: "discountType" }, outputs: { showDiscountCodesPopup: "showDiscountCodesPopup", discountSet: "discountSet" }, ngImport: i0, template: `
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.16", type: DiscountCodesPopupComponent, isStandalone: false, selector: "co-discount-codes-popup", inputs: { transactionLine: "transactionLine", discountType: "discountType" }, outputs: { showDiscountCodesPopup: "showDiscountCodesPopup", discountSet: "discountSet" }, viewQueries: [{ propertyName: "discountForm", first: true, predicate: FormComponent, descendants: true }], ngImport: i0, template: `
       <co-dialog
               class="discount-codes-modal"
               [showCloseIcon]="true"
@@ -28823,16 +28828,20 @@ class DiscountCodesPopupComponent {
               [headerTemplate]="headerTemplate"
               [footerTemplate]="footerTemplate"
               (closeClick)="hideModal()">
-          <co-list-of-values
-                  [(model)]="selectedDiscountCode"
-                  [collection]="discountCodes"
-                  [displayField]="'description'"
-                  [label]="'DISCOUNT_REASON' | localize">
-          </co-list-of-values>
-          <co-input-textarea
-                  [placeholder]="'REMARK' | localize"
-                  [(model)]="discountRemark">
-          </co-input-textarea>
+          <co-form #discountForm>
+            <co-list-of-values
+                    [(model)]="selectedDiscountCode"
+                    [collection]="discountCodes"
+                    [required]="true"
+                    [displayField]="'description'"
+                    [label]="'DISCOUNT_REASON' | localize">
+            </co-list-of-values>
+            <co-input-textarea
+                    [placeholder]="'REMARK' | localize"
+                    [required]="true"
+                    [(model)]="discountRemark">
+            </co-input-textarea>
+          </co-form>
       </co-dialog>
       <ng-template #headerTemplate>
           <co-icon [iconData]="iconCacheService.getIcon(icons.PercentSolid)"></co-icon>
@@ -28852,7 +28861,7 @@ class DiscountCodesPopupComponent {
               </co-button>
           </div>
       </ng-template>
-  `, isInline: true, dependencies: [{ kind: "component", type: i1$1.CoDialogComponent, selector: "co-dialog", inputs: ["customCssClass", "headerTemplate", "footerTemplate", "showCloseIcon", "modal", "borderless"], outputs: ["closeClick"] }, { kind: "component", type: i1$1.ButtonComponent, selector: "co-button", inputs: ["label", "iconData", "iconDataRight", "isToggleButton", "isToggled", "hidden", "disabled"], outputs: ["onClick", "clickedWhileDisabled", "isToggledChange"] }, { kind: "component", type: i1$1.IconComponent, selector: "co-icon", inputs: ["icon", "iconData"] }, { kind: "component", type: i1$1.InputTextareaComponent, selector: "co-input-textarea", inputs: ["placeholder"] }, { kind: "component", type: i1$1.ListOfValuesComponent, selector: "co-list-of-values", inputs: ["model", "multiselect", "showToggleAll", "largeCollection", "displayField", "optionIcon", "collection", "collectionLoadFn", "collectionLoadFnProp", "leftIconData", "searchPlaceholder", "searchDisabled", "showChips"] }, { kind: "pipe", type: LocalizePipe, name: "localize" }], encapsulation: i0.ViewEncapsulation.None });
+  `, isInline: true, dependencies: [{ kind: "component", type: i1$1.CoDialogComponent, selector: "co-dialog", inputs: ["customCssClass", "headerTemplate", "footerTemplate", "showCloseIcon", "modal", "borderless"], outputs: ["closeClick"] }, { kind: "component", type: i1$1.FormComponent, selector: "co-form", inputs: ["readonly", "keepInView"], outputs: ["onChange", "validSubmit", "anySubmit", "validityChange", "readonlyChange", "invalidSubmit"] }, { kind: "component", type: i1$1.ButtonComponent, selector: "co-button", inputs: ["label", "iconData", "iconDataRight", "isToggleButton", "isToggled", "hidden", "disabled"], outputs: ["onClick", "clickedWhileDisabled", "isToggledChange"] }, { kind: "component", type: i1$1.IconComponent, selector: "co-icon", inputs: ["icon", "iconData"] }, { kind: "component", type: i1$1.InputTextareaComponent, selector: "co-input-textarea", inputs: ["placeholder"] }, { kind: "component", type: i1$1.ListOfValuesComponent, selector: "co-list-of-values", inputs: ["model", "multiselect", "showToggleAll", "largeCollection", "displayField", "optionIcon", "collection", "collectionLoadFn", "collectionLoadFnProp", "leftIconData", "searchPlaceholder", "searchDisabled", "showChips"] }, { kind: "pipe", type: LocalizePipe, name: "localize" }], encapsulation: i0.ViewEncapsulation.None });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: DiscountCodesPopupComponent, decorators: [{
             type: Component,
@@ -28866,16 +28875,20 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
               [headerTemplate]="headerTemplate"
               [footerTemplate]="footerTemplate"
               (closeClick)="hideModal()">
-          <co-list-of-values
-                  [(model)]="selectedDiscountCode"
-                  [collection]="discountCodes"
-                  [displayField]="'description'"
-                  [label]="'DISCOUNT_REASON' | localize">
-          </co-list-of-values>
-          <co-input-textarea
-                  [placeholder]="'REMARK' | localize"
-                  [(model)]="discountRemark">
-          </co-input-textarea>
+          <co-form #discountForm>
+            <co-list-of-values
+                    [(model)]="selectedDiscountCode"
+                    [collection]="discountCodes"
+                    [required]="true"
+                    [displayField]="'description'"
+                    [label]="'DISCOUNT_REASON' | localize">
+            </co-list-of-values>
+            <co-input-textarea
+                    [placeholder]="'REMARK' | localize"
+                    [required]="true"
+                    [(model)]="discountRemark">
+            </co-input-textarea>
+          </co-form>
       </co-dialog>
       <ng-template #headerTemplate>
           <co-icon [iconData]="iconCacheService.getIcon(icons.PercentSolid)"></co-icon>
@@ -28899,7 +28912,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                     encapsulation: ViewEncapsulation.None,
                     standalone: false
                 }]
-        }], ctorParameters: () => [{ type: IconCacheService }, { type: TransactionService }], propDecorators: { transactionLine: [{
+        }], ctorParameters: () => [{ type: IconCacheService }, { type: TransactionService }], propDecorators: { discountForm: [{
+                type: ViewChild,
+                args: [FormComponent]
+            }], transactionLine: [{
                 type: Input
             }], discountType: [{
                 type: Input
@@ -48514,10 +48530,14 @@ class TransactionLineImageAndDescriptionComponent extends TransactionLineBaseCom
     transactionLineSet() {
         super.transactionLineSet();
         this._loadLineImage();
-        if (this.transactionLine.configurationText) {
+        if (this.transactionLine && this.transactionLine.configurationText) {
             // @ts-ignore
             this.transactionLine.configurationText = this.transactionLine.configurationText.replaceAll('\n', '<br>');
         }
+        else if (this.transactionLine && this.transactionLine.configurationReadable) {
+            // @ts-ignore
+            this.transactionLine.configurationReadable = this.transactionLine.configurationReadable.replaceAll('\n', '<br>');
+        }
         this._shouldCheckExpandable = true;
     }
     visibilitySet() {
@@ -48609,22 +48629,32 @@ class TransactionLineImageAndDescriptionComponent extends TransactionLineBaseCom
               }
 
           </div>
-          @if (!preview && !popUpView && (transactionLine.articleBoundConcatenatedText || transactionLine.configurationText)) {
+
+          @if (!preview && !popUpView && (transactionLine.articleBoundConcatenatedText || transactionLine.configurationText || transactionLine.configurationReadable)) {
               <div
                       class="article-text-wrapper"
                       [screenConfigurationObject]="imageAndDescriptionConfigNames?.articleText"
                       [screenConfigNativeElement]="true">
-                  <div #articleTextExpand [ngClass]="{'article-text-expand': true, 'large-article': !expanded && !customerPortal}" class="co-small-scrollbar">
+                  <div #articleTextExpand
+                       [ngClass]="{'article-text-expand': true, 'large-article': !expanded && !customerPortal}"
+                       class="co-small-scrollbar">
                       @for (text of transactionLine.articleTextAsArray; track text) {
+                        @if (text && text.length > 0) {
                           <div class="article-text">
                               <div [innerHTML]="text | safeHtml" (click)="handleOpenArticleText()"></div>
                           </div>
+                        }
                       }
                       @if (!popUpView && transactionLine.configurationText) {
                           <div class="configuration-text">
                               <div [innerHTML]="transactionLine.configurationText"></div>
                           </div>
                       }
+                      @if (!popUpView && !transactionLine.configurationText && transactionLine.configurationReadable) {
+                            <div class="configuration-text">
+                                <div [innerHTML]="transactionLine.configurationReadable"></div>
+                            </div>
+                      }
                   </div>
                   @if (!customerPortal && showExpandButton) {
                       <div class="expand-wrapper" (click)="expandClicked()">
@@ -48696,22 +48726,32 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
               }
 
           </div>
-          @if (!preview && !popUpView && (transactionLine.articleBoundConcatenatedText || transactionLine.configurationText)) {
+
+          @if (!preview && !popUpView && (transactionLine.articleBoundConcatenatedText || transactionLine.configurationText || transactionLine.configurationReadable)) {
               <div
                       class="article-text-wrapper"
                       [screenConfigurationObject]="imageAndDescriptionConfigNames?.articleText"
                       [screenConfigNativeElement]="true">
-                  <div #articleTextExpand [ngClass]="{'article-text-expand': true, 'large-article': !expanded && !customerPortal}" class="co-small-scrollbar">
+                  <div #articleTextExpand
+                       [ngClass]="{'article-text-expand': true, 'large-article': !expanded && !customerPortal}"
+                       class="co-small-scrollbar">
                       @for (text of transactionLine.articleTextAsArray; track text) {
+                        @if (text && text.length > 0) {
                           <div class="article-text">
                               <div [innerHTML]="text | safeHtml" (click)="handleOpenArticleText()"></div>
                           </div>
+                        }
                       }
                       @if (!popUpView && transactionLine.configurationText) {
                           <div class="configuration-text">
                               <div [innerHTML]="transactionLine.configurationText"></div>
                           </div>
                       }
+                      @if (!popUpView && !transactionLine.configurationText && transactionLine.configurationReadable) {
+                            <div class="configuration-text">
+                                <div [innerHTML]="transactionLine.configurationReadable"></div>
+                            </div>
+                      }
                   </div>
                   @if (!customerPortal && showExpandButton) {
                       <div class="expand-wrapper" (click)="expandClicked()">
@@ -49933,13 +49973,16 @@ class TransactionLineActionButtonsComponent {
         const canReopenExternalOrder = this._isReopenableExternalCatalogLine();
         const areAllowedToChangeOrder = (this.transactionKind !== TransactionKind.SalesOrder || !(this._transactionService.invoiceCompleted && !this._transactionService.canChangeSalesOrderWhenFullyInvoiced));
         const conversionUnitsAvailable = await this._getConversionUnitsAvailable();
+        const canCreateService = ((this.transactionKind === TransactionKind.SalesOrder)
+            && (this.transactionLine && this.transactionLine.articleLineStatus
+                && this.transactionLine.articleLineStatus.quantityDelivered && this.transactionLine.articleLineStatus.quantityDelivered > 0));
         this._actionButtonsPopupComponentRef = this._overlayService.createComponent(TransactionLineActionButtonsPopupComponent, {
             parentForOverlay: this.elementRef,
             configNames: this.configNames,
             canReopenExternalOrder: canReopenExternalOrder,
             areAllowedToChangeOrder: areAllowedToChangeOrder,
             conversionUnitsAvailable: conversionUnitsAvailable,
-            canCreateService: (this.transactionKind === TransactionKind.SalesOrder)
+            canCreateService: canCreateService
         }, {
             reopenExternalOrderClick: () => this.reopenExternalOrderClick(),
             addDocumentButtonClick: () => this.handleAddDocumentButtonClick(),
@@ -87301,19 +87344,10 @@ class TransactionInternalComponent {
         this.service.copyTransactionLine(copyRequest);
     }
     handleCreateServiceRequest(lineNr) {
-        if (lineNr && this.transaction) { /*
-          let request:CreateServiceOrderWithSourceTransactionLineRequest = new CreateServiceOrderWithSourceTransactionLineRequest();
-          request.sourceLineNr = line.lineNr;
-          request.sourceTransId = this.transaction.transactionInfo.id;
-          request.customerRelationId = this.transaction.transactionInfo.relation.relationId;
-          request.branchNr = this.transaction.transactionInfo.branch.relationNr;*/
-            /*this._transactionConnectorService.createServiceOrderWithSourceTransactionLine(request).then((result: TransactionInfoResponse) => {
-              if(result) {*/
+        if (lineNr && this.transaction) {
             this._transactionEventService.requestCreateServiceOrderFromTransactionLine.next({ transaction: this.transaction, lineNr: lineNr });
             //added for bundle purposes so we can pass the value along without the event service. Use the event service in all other cases.
             this.serviceRequested.emit({ transactionNr: this.transaction.transactionInfo.transactionNr, transactionId: this.transaction.transactionInfo.id, lineNr: lineNr });
-            /*   }
-             });*/
         }
     }
     handleViewStock(goodId) {