@colijnit/transaction 12.1.121 → 12.1.122

package/lib/component/core/base/components/transaction-header-block/transaction-header-block.component.d.ts

@@ -1,10 +1,10 @@
-import { EventEmitter, TemplateRef } from "@angular/core";
+import { EventEmitter, TemplateRef } from '@angular/core';
 export declare class TransactionHeaderBlockComponent {
     headerBlockTemplate: TemplateRef<any>;
     firstBlockTemplate: TemplateRef<any>;
     secondBlockTemplate: TemplateRef<any>;
     thirdBlockTemplate: TemplateRef<any>;
-    hasDetails: boolean;
     headerClick: EventEmitter<MouseEvent>;
     showClass(): boolean;
+    handleHostClick(event: MouseEvent): void;
 }

package/lib/component/core/base/transaction-base.component.d.ts

@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectorRef, EventEmitter, OnDestroy, OnInit } from '@angular/core';
 import { TransactionService } from '../../../service/transaction.service';
 import { TransactionInfoResponse } from '@colijnit/transactionapi/build/model/transaction-info-response.bo';
 import { TransactionInfo } from '@colijnit/transactionapi/build/model/transaction-info.bo';
@@ -42,6 +42,7 @@ export declare abstract class TransactionBaseComponent implements OnInit, OnDest
     set selected(value: boolean);
     get selected(): boolean;
     readonly: boolean;
+    relationChange: EventEmitter<RelationAnyType>;
     isText: boolean;
     isArticle: boolean;
     get model(): TransactionLineInfo | TransactionInfo;

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

@@ -5,6 +5,7 @@ import { PaymentService } from '../../service/payment.service';
 export declare class DepositPaymentComponent implements OnInit {
     private _paymentService;
     branch: string;
+    showTitle: boolean;
     transactionUuid: string;
     showClass(): boolean;
     paymentMethods: PaymentViewmodel[];

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

@@ -15,6 +15,7 @@ export declare class PaymentComponent implements OnInit, OnDestroy {
     transId: number;
     transactionUuid: string;
     branch: string;
+    updateDepositAmount: boolean;
     set amount(value: number);
     get amount(): number;
     currencyId: number;
@@ -40,7 +41,7 @@ export declare class PaymentComponent implements OnInit, OnDestroy {
     private _paymentStatusPollIntervalCount;
     private _paymentResult;
     constructor(_transactionService: TransactionService, _sharedService: SharedService, _paymentService: PaymentService);
-    ngOnInit(): void;
+    ngOnInit(): Promise<void>;
     ngOnDestroy(): void;
     paymentMethodSelected(method: PaymentMethod, index: number): void;
     cashRegisterSelected(cashRegister: CashRegister, index: number): void;

package/lib/component/transaction-header/transaction-header-delivery/style/_layout.scss

@@ -22,22 +22,8 @@
       }
     }
     .header-delivery-method .transaction-line-button {
-      //cursor: pointer;
-      //display: flex;
-      //column-gap: 10px;
-      //align-items: center;
       width: 100%;
-      //height: $tp-transaction-header-delivery-delivery-method-height;
-      //font-size: $tp-transaction-header-delivery-delivery-method-font-size;
-      //border: $tp-transaction-header-delivery-delivery-method-border;
-      //border-radius: $tp-transaction-header-delivery-delivery-method-border-radius;
-      //padding: $tp-transaction-header-delivery-delivery-method-padding;
     }
-    //.header-planning-request-button {
-    //  border: $tp-transaction-header-delivery-planning-request-button-border;
-    //  border-radius: $tp-transaction-header-delivery-planning-request-button-border-radius;
-    //  padding: $tp-transaction-header-delivery-planning-request-button-padding;
-    //}
     .header-delivery-deliverydate-wrapper {
       display: flex;
       column-gap: 10px;
@@ -54,14 +40,12 @@
       flex-direction: column;
       align-items: center;
     }
-    //.co-dialog:not(.is-mobile) {
-    //  .co-dialog-wrapper {
-    //    min-width: 500px;
-    //    .dialog-content {
-    //      overflow-x: hidden;
-    //    }
-    //  }
-    //}
+    .transaction-header-partial-delivery {
+      .co-input-checkbox {
+        font-size: $tp-font-size-small;
+        flex-direction: column-reverse;
+      }
+    }
     .co-transaction-header-delivery-wrapper {
       display: flex;
       flex-direction: column;

package/lib/component/transaction-header/transaction-header-payment/style/_layout.scss

@@ -7,7 +7,7 @@
       .co-transaction-header-block {
         padding: 4px 0;
       }
-      .header-block-balance {
+      .co-transaction-header-payment-button {
         flex-basis: 50%;
       }
       .transaction-header-block-content {
@@ -16,33 +16,6 @@
         }
       }
     }
-    .header-block-balance {
-      display: flex;
-      cursor: pointer;
-      column-gap: 10px;
-      align-items: center;
-      justify-content: space-between;
-      height: $tp-transaction-header-block-payment-balance-height;
-      font-size: 12px;
-      border-style: $tp-transaction-header-block-payment-balance-border-style;
-      border-width: $tp-transaction-header-block-payment-balance-border-width;
-      border-radius: $tp-transaction-header-block-payment-balance-border-radius;
-      padding: $tp-transaction-header-block-payment-balance-padding;
-      co-icon {
-        position: relative;
-        height: $tp-transaction-header-block-payment-balance-icon-width;
-        width: $tp-transaction-header-block-payment-balance-icon-width;
-      }
-      .payment-payed-wrapper {
-        display: flex;
-        column-gap: 10px;
-        .payment-icon {
-          margin-right: 10px;
-          height: $tp-transaction-header-block-payment-balance-icon-size;
-          width: $tp-transaction-header-block-payment-balance-icon-size;
-        }
-      }
-    }
     .transaction-header-deposit  {
       .co-input-text {
         height: auto;

package/lib/component/transaction-header/transaction-header-payment/style/_material-definition.scss

@@ -1,11 +0,0 @@
-$tp-transaction-header-block-payment-balance-background: $tp-default-background-accent !default;
-$tp-transaction-header-block-payment-balance-icon-width: 17px !default;
-$tp-transaction-header-block-payment-balance-padding: 5px 10px !default;
-$tp-transaction-header-block-payment-balance-border-style: solid !default;
-$tp-transaction-header-block-payment-balance-border-color: $tp-color-border !default;
-$tp-transaction-header-block-payment-balance-border-width: 1px !default;
-$tp-transaction-header-block-payment-balance-border-radius: $tp-default-border-radius !default;
-$tp-transaction-header-block-payment-balance-paid-color: #FF4141 !default;
-$tp-transaction-header-block-payment-balance-paid-color-success: $tp-color-active-light !default;
-$tp-transaction-header-block-payment-balance-icon-size: 17px !default;
-$tp-transaction-header-block-payment-balance-height: $tp-default-button-height !default;

package/lib/component/transaction-header/transaction-header-payment/style/_theme.scss

@@ -2,15 +2,5 @@
 
 @include export-module('cc-transaction-header-payment-theme') {
   .co-transaction-header-payment {
-    .header-block-balance {
-      background: $tp-transaction-header-block-payment-balance-background;
-      border-color: $tp-transaction-header-block-payment-balance-border-color;
-      .payment-paid {
-        color: $tp-transaction-header-block-payment-balance-paid-color;
-        &.success {
-          color: $tp-transaction-header-block-payment-balance-paid-color-success;
-        }
-      }
-    }
   }
 }

package/lib/component/transaction-header/transaction-header-popup/style/_layout.scss

@@ -2,10 +2,10 @@
   .co-transaction-header-popup {
     font-family: $tp-transaction-header-popup-font-family;
     font-size: $tp-transaction-header-popup-font-size;
-    .co-dialog:not(.is-mobile) .co-dialog-wrapper {
+    .co-dialog:not(.is-mobile) .co-dialog-wrapper.transaction-header-dialog {
       width: $tp-transaction-header-popup-width;
       height: $tp-transaction-header-popup-height;
-      .dialog-content {
+      .dialog-content.transaction-header-dialog {
         display: flex;
         flex-direction: column;
         overflow: hidden;
@@ -55,6 +55,16 @@
         flex-direction: row;
       }
     }
+    .transaction-header-popup-dialog-header-wrapper {
+      display: flex;
+      align-items: center;
+      column-gap: 10px;
+      .co-icon {
+        height: $tp-transaction-header-popup-dialog-header-icon-size;
+        width: $tp-transaction-header-popup-dialog-header-icon-size;
+        margin: $tp-transaction-header-popup-dialog-header-icon-margin;
+      }
+    }
     .transaction-header-popup-section {
       display: flex;
       flex-direction: column;

package/lib/component/transaction-header/transaction-header-popup/style/_material-definition.scss

@@ -3,6 +3,9 @@ $tp-transaction-header-popup-font-size: $tp-font-size !default;
 $tp-transaction-header-popup-width: 650px !default;
 $tp-transaction-header-popup-height: 800px !default;
 
+$tp-transaction-header-popup-dialog-header-icon-size: 20px !default;
+$tp-transaction-header-popup-dialog-header-icon-margin: 0 0 20px 0 !default;
+
 $tp-transaction-header-popup-category-font-family: $tp-font-family !default;
 $tp-transaction-header-popup-category-font-size: $tp-font-size !default;
 

package/lib/component/transaction-header/transaction-header-popup/transaction-header-popup-base.component.d.ts

@@ -7,6 +7,7 @@ import { DictionaryService } from '../../../service/dictionary.service';
 import { TransactionImageService } from '../../../service/transaction-image.service';
 import { FormComponent, FormMasterService } from '@colijnit/corecomponents_v12';
 import { DialogService } from '../../../service/dialog.service';
+import { RelationService } from '../../../service/relation.service';
 export declare abstract class TransactionHeaderPopupBaseComponent extends TransactionBaseComponent implements OnInit, OnDestroy {
     transactionEventService: TransactionEventService;
     service: TransactionService;
@@ -16,15 +17,19 @@ export declare abstract class TransactionHeaderPopupBaseComponent extends Transa
     protected changeDetector: ChangeDetectorRef;
     protected dialogService: DialogService;
     protected formMasterService: FormMasterService;
+    protected relationService: RelationService;
     set content(form: FormComponent);
     readonly: boolean;
     dirty: boolean;
     form: FormComponent;
     private _subs;
-    constructor(transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, dialogService: DialogService, formMasterService: FormMasterService);
+    constructor(transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, dialogService: DialogService, formMasterService: FormMasterService, relationService: RelationService);
     ngOnInit(): Promise<void>;
     ngOnDestroy(): Promise<void>;
-    abstract saveObject(): any;
+    protected transactionInfoSet(): Promise<void>;
+    saveObjects(): Promise<void>;
+    saveRelation(): Promise<void>;
+    saveTransaction(): Promise<void>;
     protected setFormPristine(): void;
     private _setFormDirty;
     private _askForSave;

package/lib/component/transaction-header/transaction-header-popup/transaction-header-popup-delivery.component.d.ts

@@ -1,6 +1,4 @@
 import { TransactionHeaderPopupBaseComponent } from './transaction-header-popup-base.component';
 export declare class TransactionHeaderPopupDeliveryComponent extends TransactionHeaderPopupBaseComponent {
     showClass(): boolean;
-    protected transactionInfoSet(): Promise<void>;
-    saveObject(): void;
 }

package/lib/component/transaction-header/transaction-header-popup/transaction-header-popup-order.component.d.ts

@@ -1,6 +1,4 @@
 import { TransactionHeaderPopupBaseComponent } from './transaction-header-popup-base.component';
 export declare class TransactionHeaderPopupOrderComponent extends TransactionHeaderPopupBaseComponent {
     showClass(): boolean;
-    protected transactionInfoSet(): Promise<void>;
-    saveObject(): void;
 }

package/lib/component/transaction-header/transaction-header-popup/transaction-header-popup-payment.component.d.ts

@@ -1,4 +1,4 @@
-import { TransactionBaseComponent } from '../../core/base/transaction-base.component';
-export declare class TransactionHeaderPopupPaymentComponent extends TransactionBaseComponent {
+import { TransactionHeaderPopupBaseComponent } from './transaction-header-popup-base.component';
+export declare class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseComponent {
     showClass(): boolean;
 }

package/lib/component/transaction-header/transaction-header-popup/transaction-header-popup-relation.component.d.ts

@@ -1,25 +1,7 @@
-import { ChangeDetectorRef, ElementRef } from '@angular/core';
-import { TransactionEventService } from '../../../service/transaction-event.service';
-import { TransactionService } from '../../../service/transaction.service';
-import { IconCacheService } from '../../../service/icon-cache.service';
-import { DictionaryService } from '../../../service/dictionary.service';
-import { TransactionImageService } from '../../../service/transaction-image.service';
-import { RelationService } from '../../../service/relation.service';
-import { FormMasterService } from '@colijnit/corecomponents_v12';
-import { DialogService } from '../../../service/dialog.service';
+import { ElementRef } from '@angular/core';
 import { AddressType } from '@colijnit/relationapi/build/enum/address-type.enum';
-import { RelationAnyType } from '@colijnit/relationapi/build/model/relation-any-type';
 import { TransactionHeaderPopupBaseComponent } from './transaction-header-popup-base.component';
 export declare class TransactionHeaderPopupRelationComponent extends TransactionHeaderPopupBaseComponent {
-    transactionEventService: TransactionEventService;
-    service: TransactionService;
-    iconCacheService: IconCacheService;
-    protected dictionaryService: DictionaryService;
-    protected imageService: TransactionImageService;
-    protected changeDetector: ChangeDetectorRef;
-    protected dialogService: DialogService;
-    protected formMasterService: FormMasterService;
-    private _relationService;
     readonly addressType: typeof AddressType;
     navigationItems: ElementRef;
     mainItems: ElementRef;
@@ -30,14 +12,11 @@ export declare class TransactionHeaderPopupRelationComponent extends Transaction
     invoiceAddressSameAsDeliveryAddress: boolean;
     categories: string[];
     customerGroup: string;
-    cloneRelation: RelationAnyType;
-    constructor(transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, dialogService: DialogService, formMasterService: FormMasterService, _relationService: RelationService);
     relationSet(): Promise<void>;
     setIndexDeliveryAddress(nawNr: number): void;
     setIndexInvoiceAddress(nawNr: number): void;
     checkSameAddress(checked: boolean): void;
     handleNavigationClick(nav: string): void;
     handleChangeCustomGroup(group: string): void;
-    saveObject(): void;
     private _lockRelation;
 }

package/lib/component/transaction-header/transaction-header-popup/transaction-header-popup.component.d.ts

@@ -1,19 +1,42 @@
-import { EventEmitter, OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectorRef, EventEmitter, OnDestroy, OnInit } from '@angular/core';
 import { TransactionBaseComponent } from '../../core/base/transaction-base.component';
+import { Icon } from '../../../enum/icon.enum';
+import { TransactionEventService } from '../../../service/transaction-event.service';
+import { TransactionService } from '../../../service/transaction.service';
+import { IconCacheService } from '../../../service/icon-cache.service';
+import { DictionaryService } from '../../../service/dictionary.service';
+import { TransactionImageService } from '../../../service/transaction-image.service';
+import { DialogService } from '../../../service/dialog.service';
+import { FormMasterService } from '@colijnit/corecomponents_v12';
+import { RelationService } from '../../../service/relation.service';
+import { RelationAnyType } from '@colijnit/relationapi/build/model/relation-any-type';
 export interface PopupCategory {
     index: number;
+    icon: Icon;
     description: string;
 }
 export declare class TransactionHeaderPopupComponent extends TransactionBaseComponent implements OnInit, OnDestroy {
+    transactionEventService: TransactionEventService;
+    service: TransactionService;
+    iconCacheService: IconCacheService;
+    protected dictionaryService: DictionaryService;
+    protected imageService: TransactionImageService;
+    protected changeDetector: ChangeDetectorRef;
+    protected dialogService: DialogService;
+    protected formMasterService: FormMasterService;
+    protected relationService: RelationService;
     set activeCategoryIndex(value: number);
     closeClick: EventEmitter<MouseEvent>;
     showClass(): boolean;
     categories: PopupCategory[];
     okButtonEnabled: boolean;
     activeCategory: PopupCategory;
+    cloneRelation: RelationAnyType;
     private _subs;
+    constructor(transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, dialogService: DialogService, formMasterService: FormMasterService, relationService: RelationService);
     ngOnInit(): void;
     ngOnDestroy(): void;
+    relationSet(): Promise<void>;
     handleCloseClick(event: MouseEvent): void;
     handleCategoryClick(cat: PopupCategory): void;
     handleOkButtonClick(event: MouseEvent): void;

package/lib/component/transaction-header-fields/transaction-header-payment-button/style/_layout.scss

@@ -0,0 +1,18 @@
+@include export-module('co-transaction-header-payment-button-layout') {
+  .co-transaction-header-payment-button {
+    .co-dialog:not(.is-mobile) .co-dialog-wrapper.payment-dialog {
+      width: 900px;
+      height: 600px;
+      //.dialog-content {
+      //  display: flex;
+      //  flex-direction: column;
+      //  overflow: hidden;
+      //  height: 100%;
+      //}
+    }
+    .payment-payed-wrapper {
+      display: flex;
+      column-gap: 10px;
+    }
+  }
+}

package/lib/component/transaction-header-fields/transaction-header-payment-button/style/_material-definition.scss

@@ -0,0 +1,9 @@
+//$tp-transaction-header-payment-button-background: $tp-default-background-accent !default;
+//$tp-transaction-header-payment-button-icon-width: 17px !default;
+//$tp-transaction-header-payment-button-padding: 5px 10px !default;
+//$tp-transaction-header-payment-button-border-style: solid !default;
+//$tp-transaction-header-payment-button-border-color: $tp-color-border !default;
+//$tp-transaction-header-payment-button-border-width: 1px !default;
+//$tp-transaction-header-payment-button-border-radius: $tp-default-border-radius !default;
+$tp-transaction-header-payment-button-paid-color: #FF4141 !default;
+$tp-transaction-header-payment-button-paid-color-success: $tp-color-active-light !default;

package/lib/component/transaction-header-fields/transaction-header-payment-button/style/_theme.scss

@@ -0,0 +1,13 @@
+@include export-module('co-transaction-header-payment-button-theme') {
+  .co-transaction-header-payment-button {
+      //background: $tp-transaction-header-block-payment-balance-background;
+      //border-color: $tp-transaction-header-block-payment-balance-border-color;
+      .payment-paid {
+        color: $tp-transaction-header-payment-button-paid-color;
+        &.success {
+          color: $tp-transaction-header-payment-button-paid-color-success;
+        }
+      }
+    //}
+  }
+}

package/lib/component/transaction-header-fields/transaction-header-payment-button/style/material.scss

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

package/lib/component/transaction-header-fields/transaction-header-payment-button/transaction-header-payment-button.component.d.ts

@@ -0,0 +1,28 @@
+import { ChangeDetectorRef } from '@angular/core';
+import { TransactionBaseComponent } from '../../core/base/transaction-base.component';
+import { DepositPaymentViewModel } from '../../../model/deposit-payment-view-model';
+import { TransactionEventService } from '../../../service/transaction-event.service';
+import { TransactionService } from '../../../service/transaction.service';
+import { IconCacheService } from '../../../service/icon-cache.service';
+import { DictionaryService } from '../../../service/dictionary.service';
+import { TransactionImageService } from '../../../service/transaction-image.service';
+import { PaymentService } from '../../../service/payment.service';
+export declare class TransactionHeaderPaymentButtonComponent extends TransactionBaseComponent {
+    transactionEventService: TransactionEventService;
+    service: TransactionService;
+    iconCacheService: IconCacheService;
+    protected dictionaryService: DictionaryService;
+    protected imageService: TransactionImageService;
+    protected changeDetector: ChangeDetectorRef;
+    private _paymentService;
+    showClass(): boolean;
+    paid: number;
+    toPay: number;
+    depositPayments: DepositPaymentViewModel[];
+    showPaymentDialog: boolean;
+    constructor(transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, _paymentService: PaymentService);
+    openPayment(event: MouseEvent): Promise<void>;
+    handleCloseDialogClick(event: MouseEvent): void;
+    transactionInfoSet(): Promise<void>;
+    private _getDepositPaymentInfo;
+}

package/lib/component/transaction-header-fields/transaction-header-payment-button/transaction-header-payment-button.module.d.ts

@@ -0,0 +1,2 @@
+export declare class TransactionHeaderPaymentButtonModule {
+}

package/lib/enum/icon.enum.d.ts

@@ -22,6 +22,7 @@ export declare enum Icon {
     CartShoppingSolid = "cart_shopping_solid",
     CashRegister = "cash_register",
     CheckDuotone = "check_duotone",
+    CreditCardRegular = "credit_card_regular",
     CreditCardSolid = "credit_card_solid",
     DeliveryTruck = "delivery_truck",
     DetailView = "detail_view",
@@ -100,6 +101,7 @@ export declare enum Icon {
     TruckMovingSolid = "truck_moving_solid",
     Txt = "txt",
     Unlock = "unlock",
+    UserRegular = "user_regular",
     Warehouse = "warehouse",
     XSolid = "x_solid"
 }

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

@@ -41,6 +41,7 @@ export declare class TransactionBaseService {
     applicationUser: boolean;
     invoiceAddressSameAsDelivery: boolean;
     activeRubric: TransactionTypeCategory;
+    getRelationOnRememberCurrentTransaction: boolean;
     get titleForCheckout(): string;
     get iconForCheckout(): Icon;
     get paymentStepTitleForCheckout(): string;
@@ -91,12 +92,12 @@ export declare class TransactionBaseService {
     getTransactionInfo(transId: number, lineId: number): Promise<TransactionInfoHistory[]>;
     getRefTransactions(transId: number): Promise<RefTransaction[]>;
     getPurchasePortalLines(request: GetPurchasePortalLine): Promise<PurchasePortalLine[]>;
+    saveTransactionAndCommit(response?: TransactionInfoResponse): Promise<boolean>;
     rememberCurrentTransaction(value: TransactionInfoResponse): Promise<void>;
     protected _checkHeaderStatus(): void;
     protected _checkRefTransaction(): Promise<void>;
     protected _handleAfterRememberCurrentTransaction(transactionInfoResponse: TransactionInfoResponse): Promise<void>;
     protected initializeTransaction(): void;
-    protected _saveTransactionAndCommit(response?: TransactionInfoResponse): Promise<boolean>;
     protected _isValidTransaction(): boolean;
     private _lockTransaction;
     private _getRelationClass;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/transaction",
-  "version": "12.1.121",
+  "version": "12.1.122",
   "description": "Colijn IT transaction module for Angular 12",
   "repository": "npm/npm",
   "author": "Colijn IT",
@@ -12,7 +12,7 @@
     "@colijnit/articleapi": ">=1.0.16",
     "@colijnit/catalog": ">=12.1.29",
     "@colijnit/corecomponents": ">=1.12.0",
-    "@colijnit/corecomponents_v12": ">=12.0.117",
+    "@colijnit/corecomponents_v12": ">=12.0.118",
     "@colijnit/ioneconnector": ">=2.1.11",
     "@colijnit/mainapi": ">=1.0.10",
     "@colijnit/relationapi": ">=1.0.6",