@colijnit/transaction 12.1.78 → 12.1.79

package/projects/transaction/src/lib/service/transaction-mapping.service.ts

@@ -37,12 +37,6 @@ import {TransactionQuickAccessGoodsAllocationComponent} from "../component/trans
 import {
   TransactionQuickAccessPurchaseOrderOverviewComponent
 } from "../component/transaction-quick-access/transaction-quick-access-purchase-order-overview/transaction-quick-access-purchase-order-overview.component";
-import {
-  TransactionCardSalesOverviewComponent
-} from "../component/transaction-card/transaction-card-sales-overview/transaction-card-sales-overview.component";
-import {
-  TransactionCardPurchaseOverviewComponent
-} from "../component/transaction-card/transaction-card-purchase-overview/transaction-card-purchase-overview.component";
 
 @Injectable({
   providedIn: "root"
@@ -98,12 +92,6 @@ export class TransactionMappingService {
       [{type: TransactionKind.PurchaseOrder, category: TransactionTypeCategory.PurchaseOrderReceivedGoods}, TransactionReceiveGoodsLineComponent],
     ]);
 
-  private readonly _transactionCardComponent: Map<{type: TransactionKind, category: TransactionTypeCategory}, Type<TransactionLinesLineBaseComponent>> =
-    new Map<{type: TransactionKind; category: TransactionTypeCategory}, Type<TransactionLinesLineBaseComponent>>([
-      [{type: TransactionKind.SalesOrder, category: TransactionTypeCategory.SalesOrderOverview}, TransactionCardSalesOverviewComponent],
-      [{type: TransactionKind.PurchaseOrder, category: TransactionTypeCategory.PurchaseOrderOverview}, TransactionCardPurchaseOverviewComponent],
-    ]);
-
   private readonly _transactionFilterComponent: Map<{type: TransactionKind}, Type<TransactionFilterBaseComponent>> =
     new Map<{type: TransactionKind}, Type<TransactionFilterBaseComponent>>([
       [{type: TransactionKind.SalesOrder}, TransactionSalesOrderFilterComponent],
@@ -174,21 +162,6 @@ export class TransactionMappingService {
     return entry;
   }
 
-  public getTransactionCardComponent(type: TransactionKind, category: TransactionTypeCategory): Type<TransactionLinesLineBaseComponent> {
-    const key: {type: TransactionKind, category: TransactionTypeCategory} = {
-      type: type,
-      category: category
-    }
-    let entry: Type<TransactionLinesLineBaseComponent>;
-    this._transactionCardComponent.forEach((v, t) => {
-      if (t.type === key.type && t.category === key.category) {
-        entry = v;
-        return;
-      }
-    })
-    return entry;
-  }
-
   public getTransactionFilterComponent(type: TransactionKind): Type<TransactionFilterBaseComponent> {
     const key: {type: TransactionKind} = {
       type: type}

package/projects/transaction/src/lib/service/transaction.service.ts

@@ -65,9 +65,6 @@ import {CreateTransactionRequest} from "@colijnit/transactionapi/build/model/cre
 import {RelationKind} from "@colijnit/articleapi/build/enum/relation-kind.enum";
 import {PurchaseAdviceLine} from "@colijnit/transactionapi/build/model/purchase-advice-line.bo";
 import {PurchaseAdviceFilters} from "@colijnit/transactionapi/build/model/purchase-advice-filters";
-import {EmailDeliveryNoteRequest} from "@colijnit/transactionapi/build/model/email-delivery-note-request";
-import {PdfDeliveryNoteRequest} from "@colijnit/transactionapi/build/model/pdf-delivery-note-request";
-import {PrintDeliveryNoteRequest} from "@colijnit/transactionapi/build/model/print-delivery-note-request";
 import {TransactionTypeCategory} from "../enum/transaction-type-category.enum";
 
 type CreateTransactionFn = (request: CreateSalesOrderRequest | CreatePurchaseOrderRequest) => Promise<boolean>;
@@ -803,36 +800,6 @@ export class TransactionService extends PendingReasonService {
   private _lockTransaction(transId: number, version: number): Promise<TransactionLockResult> {
     return this.connector.lockTransactionById(transId, version);
   }
-  public async emailDeliveryNote(emailDeliveryNoteRequest: EmailDeliveryNoteRequest): Promise<boolean> {
-    return await this.connector.emailDeliveryNote(emailDeliveryNoteRequest);
-  }
-
-  public async pdfDeliveryNote(pdfDeliveryNoteRequest: PdfDeliveryNoteRequest): Promise<boolean> {
-    return await this.connector.pdfDeliveryNote(pdfDeliveryNoteRequest);
-  }
-
-  public async printDeliveryNote(printDeliveryNoteRequest: PrintDeliveryNoteRequest): Promise<boolean> {
-    return await this.connector.printDeliveryNote(printDeliveryNoteRequest);
-  }
-
-  public async getDeliveryNoteDefaultSendMethod(relationId: number): Promise<number> {
-    return await this.connector.getDeliveryNoteDefaultSendMethod(relationId);
-  }
-
-  public async getDeliveryNoteEmailLayouts(transactionUUID: string): Promise<ReportLayoutSelectionEmail[]> {
-    return await this.connector.getDeliveryNoteEmailLayouts(transactionUUID);
-  }
-
-  public async getDeliveryNotePrintLayouts(transactionUUID: string): Promise<ReportLayoutSelectionPrint[]> {
-    return await this.connector.getDeliveryNotePrintLayouts(transactionUUID);
-  }
-
-
-// private _cleanRelationBeforeSave(): void {
-  //   ArrayUtils.RemoveElementsByFilter(this.currentTransaction.transactionInfo.relation.contactOptions, ((item: ContactOption) => {
-  //     return isNill(item.value);
-  //   }));
-  // }
 
   private async _checkAndCreateTransaction(): Promise<void> {
     if (!this.currentTransaction || !this.currentTransaction.transactionInfo || !this.currentTransaction.transactionInfo.transactionNr) {

package/src/app/app.component.ts

@@ -18,6 +18,7 @@ import {TransactionInfoResponse} from "@colijnit/transactionapi/build/model/tran
       <button (click)="openCheckoutClick()">Open checkout</button>
       <button (click)="closeCheckoutClick()">Close checkout</button>
       <button (click)="addIPadAirClick()">Add ipadair</button>
+      <button (click)="addIPad3Click()">Add ipad3</button>
       <button (click)="addWhiskeyClick()">Add whiskey</button>
       <button (click)="addArticleClick()">Add Article</button>
       <button (click)="addArticle2Click()">Add Article2</button>
@@ -66,7 +67,7 @@ import {TransactionInfoResponse} from "@colijnit/transactionapi/build/model/tran
             111666 // empty created order
             111667 // empty created order
       -->
-      <app-transaction [transactionId]="99439">
+      <app-transaction [transactionId]="103850">
       </app-transaction>
     </div>
 
@@ -76,7 +77,7 @@ import {TransactionInfoResponse} from "@colijnit/transactionapi/build/model/tran
       110004
       111677 empty created purchase order
 -->
-      <co-transaction [transactionId]="110004">
+      <co-transaction [transactionId]="111542">
       </co-transaction>
     </div>
 
@@ -189,6 +190,10 @@ export class AppComponent {
     this._service.addArticle('ipadair');
   }
 
+  public addIPad3Click(): void {
+    this._service.addArticle('1000113870');
+  }
+
   public addWhiskeyClick(): void {
     this._service.addArticle('1000567766');
   }

package/projects/transaction/src/lib/component/transaction-card/transaction-card/style/_layout.scss

@@ -1,12 +0,0 @@
-@include export-module('cc-transaction-card-layout') {
-  .co-transaction-card {
-    font-size: $tp-font-size;
-
-    .transaction-card-date {
-      font-weight: bold;
-      color: #5fdbb2;
-      min-width: 75px;
-      text-align: center;
-    }
-  }
-}

package/projects/transaction/src/lib/component/transaction-card/transaction-card/style/_theme.scss

@@ -1,4 +0,0 @@
-@include export-module('cc-transaction-card-theme') {
-  .co-transaction-card {
-  }
-}

package/projects/transaction/src/lib/component/transaction-card/transaction-card/style/material.scss

@@ -1,7 +0,0 @@
-@import "./_material-definition";
-@import "./_layout";
-@import "./_theme";
-@import "../../transaction-card-footer/style/material";
-@import "../../transaction-card-header/style/material";
-@import "../../transaction-card-purchase-overview/style/material";
-@import "../../transaction-card-sales-overview/style/material";

package/projects/transaction/src/lib/component/transaction-card/transaction-card/transaction-card.component.ts

@@ -1,125 +0,0 @@
-import {
-  ApplicationRef,
-  Component, ComponentFactoryResolver,
-  ElementRef, EmbeddedViewRef, EventEmitter,
-  HostBinding, Injector,
-  Input,
-  OnChanges,
-  Output, SimpleChanges, Type,
-  ViewChild,
-  ViewEncapsulation
-} from "@angular/core";
-import {TransactionKind} from "@colijnit/transactionapi/build/enum/transaction-kind.enum";
-import {TransactionTypeCategory} from "../../../enum/transaction-type-category.enum";
-import {TransactionLineInfo} from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
-import {ExtendedTransactionLineViewModel} from "../../../model/extended-transaction-line-view-model";
-import {TransactionMappingService} from "../../../service/transaction-mapping.service";
-import {TransactionLinesLineBaseComponent} from "../../core/base/transaction-lines-line-base.component";
-
-
-@Component({
-  selector: "co-transaction-card",
-  template: `
-    <div #transactionCard observeVisibility (visible)="lineVisible.next()"></div>
-  `,
-  encapsulation: ViewEncapsulation.None
-})
-export class TransactionCardComponent implements OnChanges {
-  @ViewChild('transactionCard', { read: ElementRef }) set container(content) {
-    if (content) {
-      this._transactionCardContainer = content;
-      this._prepareContent();
-    }
-  }
-
-  @Input()
-  public set transactionType(value: TransactionKind) {
-    this._transactionType = value;
-    this._prepareContent();
-  }
-
-  public get transactionType(): TransactionKind {
-    return this._transactionType;
-  }
-
-  @Input()
-  public set activeCategory(value: TransactionTypeCategory) {
-    this._activeCategory = value;
-    this._prepareContent();
-  }
-
-  public get activeCategory(): TransactionTypeCategory {
-    return this._activeCategory;
-  }
-
-  @Input()
-  public selected: boolean;
-
-  @Input()
-  public line: TransactionLineInfo | ExtendedTransactionLineViewModel;
-
-  @Output()
-  public lineVisible: EventEmitter<void> = new EventEmitter<void>();
-
-  @HostBinding("class.co-transaction-card")
-  public showClass() {
-    return true;
-  }
-
-  private _transactionCardContainer: ElementRef;
-  private _transactionType: TransactionKind;
-  private _activeCategory: TransactionTypeCategory;
-  private _componentRef: any;
-
-  constructor(
-    private _mappingService: TransactionMappingService,
-    private _compFactoryResolver: ComponentFactoryResolver,
-    private appRef: ApplicationRef,
-    private injector: Injector
-  ) { }
-
-  ngOnChanges(changes: SimpleChanges) {
-    this._prepareProps();
-  }
-
-  private _prepareContent(): void {
-    if (!this._transactionType || !this._activeCategory || !this._transactionCardContainer) {
-      return;
-    }
-    const componentClass: Type<TransactionLinesLineBaseComponent> = this._mappingService.getTransactionCardComponent(this._transactionType, this._activeCategory);
-
-    if (this._componentRef) {
-      this._componentRef.destroy();
-    }
-    if (!componentClass) {
-      return;
-    }
-
-    this._componentRef = this._compFactoryResolver
-      .resolveComponentFactory(componentClass)
-      .create(this.injector);
-
-    this.appRef.attachView(this._componentRef.hostView);
-
-    this._prepareProps();
-
-    const domElem = (this._componentRef.hostView as EmbeddedViewRef<any>)
-      .rootNodes[0] as HTMLElement;
-
-    this._transactionCardContainer.nativeElement.appendChild(domElem);
-    this._componentRef.onDestroy(() => {
-      this.appRef.detachView(this._componentRef.hostView);
-    });
-  }
-
-  private _prepareProps(): void {
-    if (this._componentRef) {
-      this._componentRef.instance.selected = this.selected;
-      this._componentRef.instance.line = this.line;
-      this._componentRef.instance.activeCategory = this.activeCategory;
-      this._componentRef.instance.lineVisible = this.lineVisible;
-    }
-  }
-
-
-}

package/projects/transaction/src/lib/component/transaction-card/transaction-card/transaction-card.module.ts

@@ -1,28 +0,0 @@
-import {NgModule} from "@angular/core";
-import {CommonModule} from "@angular/common";
-import {TransactionCardComponent} from "./transaction-card.component";
-import {ObserveVisibilityModule} from "@colijnit/corecomponents_v12";
-import {
-  TransactionCardPurchaseOverviewModule
-} from "../transaction-card-purchase-overview/transaction-card-purchase-overview.module";
-import {
-  TransactionCardSalesOverviewModule
-} from "../transaction-card-sales-overview/transaction-card-sales-overview.module";
-
-
-@NgModule({
-  imports: [
-    CommonModule,
-    ObserveVisibilityModule,
-    TransactionCardPurchaseOverviewModule,
-    TransactionCardSalesOverviewModule
-  ],
-  declarations: [
-    TransactionCardComponent
-  ],
-  exports: [
-    TransactionCardComponent
-  ]
-})
-export class TransactionCardModule {
-}

package/projects/transaction/src/lib/component/transaction-card/transaction-card-footer/style/_layout.scss

@@ -1,25 +0,0 @@
-@include export-module('cc-transaction-card-footer-layout') {
-  .co-transaction-card-footer {
-
-    .transaction-card-footer-wrapper {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      margin-top: 5px;
-
-      .expand-wrapper {
-        display: flex;
-        align-items: center;
-        co-icon {
-          width: 18px;
-          height: 18px;
-          margin-right: 15px;
-        }
-      }
-
-      .co-transaction-line-statusbar co-statusbar .co-statusbar-wrapper {
-        justify-content: center;
-      }
-    }
-  }
-}

package/projects/transaction/src/lib/component/transaction-card/transaction-card-footer/style/_theme.scss

@@ -1,4 +0,0 @@
-@include export-module('cc-transaction-card-footer-theme') {
-  .co-transaction-card-footer {
-  }
-}

package/projects/transaction/src/lib/component/transaction-card/transaction-card-footer/style/material.scss

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

package/projects/transaction/src/lib/component/transaction-card/transaction-card-footer/transaction-card-footer.component.ts

@@ -1,59 +0,0 @@
-import {Component, EventEmitter, HostBinding, Input, Output, ViewEncapsulation} from "@angular/core";
-import {TransactionLineInfo} from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
-import {TransactionService} from "../../../service/transaction.service";
-import {TransactionTypeCategory} from "../../../enum/transaction-type-category.enum";
-import {Icon} from "../../../enum/icon.enum";
-import {IconCacheService} from "../../../service/icon-cache.service";
-
-
-@Component({
-  selector: "co-transaction-card-footer",
-  template: `
-        <div class="transaction-card-footer-wrapper">
-          <div class="expand-wrapper" (click)="expandClicked.next()">
-            <co-icon [iconData]="expanded ? iconCacheService.getIcon(icons.TriangleUp) : iconCacheService.getIcon(icons.TriangleDown) "></co-icon>
-            <span class="expand-text" [textContent]="!expanded ? ('SHOW_MORE' | localize) : ('SHOW_LESS' | localize)"></span>
-          </div>
-          <div class="date-or-delivery-method-container">
-            <span class="transaction-card-date" *ngIf="expanded" [textContent]="transactionLine.deliveryDate | date : 'd-MM-yyyy'"></span>
-            <div *ngIf="!expanded" class="delivery-method-preview">
-              <span [textContent]="transactionLine.deliveryMethodDescription"></span>
-            </div>
-          </div>
-          <co-transaction-line-statusbar
-            class="status-bar-wrapper"
-            [transaction]="transactionLine"
-            [transactionKind]="transactionService.currentTransaction.transactionInfo.transactionKind"
-            [transactionTypeCategory]="transactionTypeCategory"
-          ></co-transaction-line-statusbar>
-        </div>
-    `,
-  encapsulation: ViewEncapsulation.None
-})
-export class TransactionCardFooterComponent {
-  public readonly icons: typeof Icon = Icon;
-
-  @Input()
-  public transactionLine: TransactionLineInfo;
-
-  @Input()
-  public transactionTypeCategory: TransactionTypeCategory;
-
-  @Input()
-  public expanded: boolean = false;
-
-  @Output()
-  public expandClicked: EventEmitter<void> = new EventEmitter<void>();
-
-  @HostBinding("class.co-transaction-card-footer")
-  public showClass() {
-    return true;
-  }
-
-  constructor(
-    public iconCacheService: IconCacheService,
-    public transactionService: TransactionService
-  ) { }
-
-
-}

package/projects/transaction/src/lib/component/transaction-card/transaction-card-footer/transaction-card-footer.module.ts

@@ -1,24 +0,0 @@
-import {NgModule} from "@angular/core";
-import {CommonModule} from "@angular/common";
-import {TransactionCardFooterComponent} from "./transaction-card-footer.component";
-import {IconModule} from "@colijnit/corecomponents_v12";
-import {PipeModule} from "../../../pipe/pipe.module";
-import {TransactionLineStatusbarModule} from "../../transaction-line-statusbar/transaction-line-statusbar.module";
-
-
-@NgModule({
-    imports: [
-        CommonModule,
-        IconModule,
-        PipeModule,
-        TransactionLineStatusbarModule
-    ],
-  declarations: [
-    TransactionCardFooterComponent
-  ],
-  exports: [
-    TransactionCardFooterComponent
-  ]
-})
-export class TransactionCardFooterModule {
-}

package/projects/transaction/src/lib/component/transaction-card/transaction-card-header/style/_layout.scss

@@ -1,66 +0,0 @@
-@include export-module('cc-transaction-card-header-layout') {
-  .co-transaction-card-header {
-    display: flex;
-    justify-content: space-between;
-    flex-direction: column;
-
-    .transaction-card-header-wrapper {
-      display: flex;
-      height: 30px;
-      column-gap: 10px;
-      justify-content: space-between;
-      align-items: center;
-      margin-bottom: 5px;
-
-      .card-header-start-wrapper {
-        display: flex;
-        height: inherit;
-        width: auto;
-      }
-
-      .card-header-end-wrapper {
-        display: flex;
-        height: inherit;
-        grid-column-gap: 10px;
-        column-gap: 10px;
-        justify-content: space-between;
-        align-items: center;
-      }
-
-      .co-image-display {
-        width: inherit;
-        height: inherit;
-        max-width: 70px;
-      }
-
-      .transaction-card-header-title-wrapper {
-        display: flex;
-        align-items: center;
-        column-gap: 10px;
-
-        co-icon {
-          width: 18px;
-          height: 18px;
-        }
-      }
-
-      .transaction-card-description {
-        font-weight: bold;
-        co-input-text {
-          height: auto;
-          input {
-            margin-top: 0;
-          }
-        }
-      }
-    }
-
-    .transaction-card-expanded-wrapper {
-
-      .article-text {
-        margin-bottom: 12px;
-        max-width: 70%;
-      }
-    }
-  }
-}

package/projects/transaction/src/lib/component/transaction-card/transaction-card-header/style/_theme.scss

@@ -1,4 +0,0 @@
-@include export-module('cc-transaction-card-header-theme') {
-  .co-transaction-card-header {
-  }
-}

package/projects/transaction/src/lib/component/transaction-card/transaction-card-header/style/material.scss

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

package/projects/transaction/src/lib/component/transaction-card/transaction-card-header/transaction-card-header.component.ts

@@ -1,68 +0,0 @@
-import {Component, EventEmitter, HostBinding, Input, ViewEncapsulation} from "@angular/core";
-import {TransactionLineInfo} from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
-import {IconCacheService} from "../../../service/icon-cache.service";
-import {Icon} from "../../../enum/icon.enum";
-
-
-@Component({
-  selector: "co-transaction-card-header",
-  template: `
-    <div class="transaction-card-header-wrapper">
-      <div class="card-header-start-wrapper">
-        <co-input-checkbox *ngIf="showCheckbox"></co-input-checkbox>
-        <co-image-display *ngIf="!showCheckbox && !expanded"></co-image-display>
-        <div class="transaction-card-header-title-wrapper">
-          <co-transaction-line-description class="transaction-card-description"
-                                           [transactionLine]="transactionLine"
-                                           [defaultEditMode]="false"
-                                           [showLabel]="false"
-          ></co-transaction-line-description>
-          <co-icon class="delete-icon" [iconData]="iconCacheService.getIcon(icons.TrashCanLight)"
-                   (click)="deleteTransactionLineClick()"></co-icon>
-        </div>
-      </div>
-      <div class="card-header-end-wrapper">
-        <co-image-display *ngIf="expanded"></co-image-display>
-        <span class="transaction-card-date" *ngIf="!expanded" [textContent]="transactionLine.deliveryDate | date : 'd-MM-yyyy'"></span>
-        <ng-content></ng-content>
-        <co-transaction-line-action-buttons *ngIf="showActionButtons"></co-transaction-line-action-buttons>
-      </div>
-    </div>
-
-    <div class="transaction-card-expanded-wrapper" *ngIf="expanded">
-      <div class="article-text" *ngFor="let text of transactionLine.articleTestAsArray">
-        <span [innerHTML]="text | safeHtml"></span>
-      </div>
-    </div>
-  `,
-  encapsulation: ViewEncapsulation.None
-})
-export class TransactionCardHeaderComponent {
-  public readonly icons: typeof Icon = Icon;
-
-  @Input()
-  public transactionLine: TransactionLineInfo
-
-  @Input()
-  public showCheckbox: boolean = false;
-
-  @Input()
-  public showActionButtons: boolean = false;
-
-  @Input()
-  public expanded: boolean = false;
-
-  @HostBinding("class.co-transaction-card-header")
-  public showClass() {
-    return true;
-  }
-
-  constructor(
-    public iconCacheService: IconCacheService,
-  ) { }
-
-
-  public deleteTransactionLineClick(): void {
-
-  }
-}

package/projects/transaction/src/lib/component/transaction-card/transaction-card-header/transaction-card-header.module.ts

@@ -1,31 +0,0 @@
-import {NgModule} from "@angular/core";
-import {CommonModule} from "@angular/common";
-import {TransactionCardHeaderComponent} from "./transaction-card-header.component";
-import {
-  TransactionLineActionButtonsModule
-} from "../../transaction-line-action-buttons/transaction-line-action-buttons.module";
-import {CoreModule} from "../../core/core.module";
-import {TransactionLineDescriptionModule} from "../../transaction-line-fields/transaction-line-description.module";
-import {IconModule, InputCheckboxModule} from "@colijnit/corecomponents_v12";
-import {PipeModule} from "../../../pipe/pipe.module";
-
-
-@NgModule({
-  imports: [
-    CommonModule,
-    TransactionLineActionButtonsModule,
-    CoreModule,
-    TransactionLineDescriptionModule,
-    IconModule,
-    PipeModule,
-    InputCheckboxModule
-  ],
-  declarations: [
-    TransactionCardHeaderComponent
-  ],
-  exports: [
-    TransactionCardHeaderComponent
-  ]
-})
-export class TransactionCardHeaderModule {
-}