@colijnit/transaction 12.1.134 → 12.1.136

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

@@ -71,5 +71,52 @@
     .co-dialog:not(.is-mobile) .co-dialog-wrapper {
       max-height: 80vh;
     }
+    .relation-header {
+      .transaction-header-block-content {
+        align-items: flex-start;
+        gap: $tp-co-transaction-header-relation-content-gap;
+        padding: $tp-co-transaction-header-relation-content-padding;
+        position: relative;
+      }
+      .transaction-relation-icon {
+        position: absolute;
+        left: $tp-co-transaction-header-relation-content-icon-left;
+        top: $tp-co-transaction-header-relation-content-icon-top;
+        cursor: pointer;
+        .transaction-relation-avatar {
+          width: $tp-co-transaction-header-relation-content-icon-avatar-size;
+          height: $tp-co-transaction-header-relation-content-icon-avatar-size;
+          background-color:  $tp-co-transaction-header-relation-content-icon-avatar-background !important;
+          svg {
+            text {
+              fill: $tp-co-transaction-header-relation-content-icon-avatar-text-color;
+              font-weight: 600;
+            }
+          }
+        }
+      }
+      .header-relation-content {
+        line-height: $tp-co-transaction-header-relation-content-line-height;
+        margin-top: $tp-co-transaction-header-relation-content-margin;
+        max-width: $tp-co-transaction-header-relation-content-max-width;
+        overflow: hidden;
+        .header-relation-name {
+          margin: $tp-co-transaction-header-relation-content-name-margin;
+        }
+        .header-relation-email {
+          margin: $tp-co-transaction-header-relation-content-email-margin;
+        }
+        .text-overflow {
+          max-height: $tp-co-transaction-header-relation-content-line-height;
+          text-overflow: ellipsis;
+          overflow: hidden;
+          white-space: nowrap;
+        }
+        .header-block-label {
+          margin: $tp-co-transaction-header-relation-label-margin;
+          display: block;
+        }
+      }
+    }
   }
 }

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

@@ -1,5 +1,7 @@
 import { TransactionBaseComponent } from '../../core/base/transaction-base.component';
+import { Icon } from '../../../enum/icon.enum';
 export declare class TransactionHeaderRelationComponent extends TransactionBaseComponent {
+    readonly icons: typeof Icon;
     showClass(): boolean;
     showDialog: boolean;
     firstAddress: string;

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

@@ -6,10 +6,26 @@
     border-style: $tp-transaction-header-deliverydate-definitive-button-border-style;
     border-width: $tp-transaction-header-deliverydate-definitive-button-border-width;
     border-color: $tp-transaction-header-deliverydate-definitive-button-border-color;
+    border-radius: $tp-transaction-header-deliverydate-definitive-button-border-radius;
+    display: flex;
+    align-items: center;
+    justify-content: center;
     co-icon {
-      height: 100%;
-      width: auto;
-      aspect-ratio: 1;
+      height: $tp-transaction-header-deliverydate-definitive-button-icon-size;
+      width: $tp-transaction-header-deliverydate-definitive-button-icon-size;
+
+    }
+    &.closed {
+      background: $tp-transaction-header-deliverydate-definitive-closed-button-background;
+      border-color: $tp-transaction-header-deliverydate-definitive-closed-button-border-color;
+      co-icon {
+        svg { // for fontawesome icons
+          fill: $tp-transaction-header-deliverydate-definitive-closed-button-fill;
+        }
+        & [fill] { // for own icons
+          fill: $tp-transaction-header-deliverydate-definitive-closed-button-fill;
+        }
+      }
     }
     &.big {
       width: $tp-transaction-header-deliverydate-definitive-button-size-big;

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

@@ -1,9 +1,14 @@
-$tp-transaction-header-deliverydate-definitive-button-size: 15px !default;
+$tp-transaction-header-deliverydate-definitive-button-size: 30px !default;
 $tp-transaction-header-deliverydate-definitive-button-padding: 0 !default;
-$tp-transaction-header-deliverydate-definitive-button-border-radius: 0 !default;
 $tp-transaction-header-deliverydate-definitive-button-border-style: solid !default;
-$tp-transaction-header-deliverydate-definitive-button-border-width: 0 !default;
+$tp-transaction-header-deliverydate-definitive-button-border-width: 1px !default;
 $tp-transaction-header-deliverydate-definitive-button-border-color: $tp-color-border !default;
+$tp-transaction-header-deliverydate-definitive-button-border-radius: 5px !default;
+$tp-transaction-header-deliverydate-definitive-button-icon-size: 16px !default;
+
+$tp-transaction-header-deliverydate-definitive-closed-button-background: $tp-color-action !default;
+$tp-transaction-header-deliverydate-definitive-closed-button-border-color: $tp-color-action !default;
+$tp-transaction-header-deliverydate-definitive-closed-button-fill: $tp-color-light !default;
 
 $tp-transaction-header-deliverydate-definitive-button-size-big: $tp-item-size !default;
 $tp-transaction-header-deliverydate-definitive-button-big-padding: 8px !default;

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

@@ -5,5 +5,5 @@
 //$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: $tp-color-payed-value !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

@@ -5,7 +5,7 @@
       .payment-paid {
         color: $tp-transaction-header-payment-button-paid-color;
         &.success {
-          color: $tp-transaction-header-payment-button-paid-color-success;
+          color: $tp-transaction-header-payment-button-paid-color;
         }
       }
     //}

package/lib/component/transaction-search/transaction-filter-content/purchase-order-filter-content/transaction-purchase-order-filter-content-article/transaction-purchase-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 TransactionPurchaseOrderFilterContentArticleComponent exten
     filterRequestService: FilterRequestService;
     transactionService: TransactionService;
     private _relationService;
+    readonly modes: typeof FilterItemMode;
     showClass(): boolean;
     exceedanceCodes: FilterItemViewmodel[];
     exceedanceCodeFields: {

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

@@ -1,4 +1,5 @@
-import { FilterItemViewmodel } from '@colijnit/corecomponents_v12';
+import { ChangeDetectorRef } from '@angular/core';
+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 +8,8 @@ export declare class TransactionPurchaseOrderFilterContentLogisticsComponent ext
     searchService: TransactionSearchService;
     filterRequestService: FilterRequestService;
     transactionService: TransactionService;
+    private _changeDet;
+    readonly modes: typeof FilterItemMode;
     showClass(): boolean;
     deliveryMethods: any[];
     deliveryMethodFields: {
@@ -27,8 +30,9 @@ export declare class TransactionPurchaseOrderFilterContentLogisticsComponent ext
     confirmedDeliveryEndDate: Date;
     arrivalStartDate: Date;
     arrivalEndDate: Date;
-    constructor(searchService: TransactionSearchService, filterRequestService: FilterRequestService, transactionService: TransactionService);
+    constructor(searchService: TransactionSearchService, filterRequestService: FilterRequestService, transactionService: TransactionService, _changeDet: ChangeDetectorRef);
     ngOnInit(): void;
+    modelChange(any: any): void;
     private _setRangeDates;
     private _setDeliveryMethods;
     private _setWarehouses;

package/lib/component/transaction-search/transaction-filter-content/purchase-order-filter-content/transaction-purchase-order-filter-content-order/transaction-purchase-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 TransactionPurchaseOrderFilterContentOrderComponent extends
     filterRequestService: FilterRequestService;
     transactionService: TransactionService;
     relationService: RelationService;
+    readonly modes: typeof FilterItemMode;
     showClass(): boolean;
     purchasePersons: FilterItemViewmodel[];
     purchasePersonsFields: {

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,9 +1,9 @@
-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";
-import { TransactionSearchService } from "../../../service/transaction-search.service";
-import { RelationService } from "../../../../../service/relation.service";
+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';
+import { TransactionSearchService } from '../../../service/transaction-search.service';
+import { RelationService } from '../../../../../service/relation.service';
 export declare class TransactionSalesOrderFilterContentArticleComponent extends TransactionFilterContentBaseComponent {
     searchService: TransactionSearchService;
     filterRequestService: FilterRequestService;

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

@@ -29,6 +29,7 @@ export declare enum Icon {
     CircleExclamationRegular = "circle_exclamation_regular",
     CloseDialog = "close_dialog",
     CreditCardRegular = "credit_card_regular",
+    CreditCardRegularCheck = "credit_card_regular_check",
     CreditCardSolid = "credit_card_solid",
     Crossskinny = "crossskinny",
     DeliveryTruck = "delivery_truck",

package/lib/model/Settings.d.ts

@@ -0,0 +1,3 @@
+import { Options } from '@colijnit/ioneconnector/build/model/options';
+export declare class TransactionSettings extends Options {
+}

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

@@ -3659,6 +3659,7 @@ export declare class Dictionaries {
         DOWNLOAD_EDI_ORDERS: string;
         DOWNPAYMENT: string;
         DOWNPAYMENT_AMOUNT: string;
+        DOWNPAYMENT_DONE: string;
         DOWNPAYMENT_BY_BR: string;
         DOWNPAYMENT_ON_DELIVERY: string;
         DOWNPAYMENT_PERCENTAGE: string;
@@ -11209,6 +11210,7 @@ export declare class Dictionaries {
         CONTINUATION: string;
         CONTINUE: string;
         CONTINUED_PAYMENT: string;
+        CONTINUED_PAYMENT_PERCENTAGE: string;
         CONTINUE_APPROVED_ORDERS: string;
         CONTINUE_AS_POS_ORDER_FAILED: string;
         CONTINUE_AS_QUOTATION_NOT_POSSIBLE_PAYMETNS_PRESENT: string;
@@ -11900,6 +11902,7 @@ export declare class Dictionaries {
         DOWNLOAD_QR_CODE: string;
         DOWNPAYMENT: string;
         DOWNPAYMENT_AMOUNT: string;
+        DOWNPAYMENT_DONE: string;
         DOWNPAYMENT_BY_BR: string;
         DOWNPAYMENT_ON_DELIVERY: string;
         DOWNPAYMENT_PERCENTAGE: string;
@@ -13619,6 +13622,7 @@ export declare class Dictionaries {
         MESSAGE_USE_EMAIL_AS_USERNAME: string;
         MESSAGE_VAT_NUMBER_INVALID: string;
         MESSAGE_WRONG_CLIENT: string;
+        MESSAGE_WRONG_RELATION_TYPE: string;
         MESSAGE_WRONG_WAREHOUSE_POS_LINE: string;
         METRIC: string;
         METRICS: string;

package/lib/service/options.service.d.ts

@@ -1,5 +1,5 @@
-import { BehaviorSubject } from "rxjs";
-import { DictionaryService } from "./dictionary.service";
+import { BehaviorSubject } from 'rxjs';
+import { DictionaryService } from './dictionary.service';
 export declare class OptionsService {
     private _dictionary;
     optionsInitialized: BehaviorSubject<boolean>;

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

@@ -99,16 +99,16 @@ import { CoDocument } from '@colijnit/mainapi/build/model/co-document';
 import { GoodsPickedRequest } from '@colijnit/transactionapi/build/model/goods-picked-request';
 import { DeleteGoodsPickedForOrderRequest } from '@colijnit/transactionapi/build/model/delete-goods-picked-for-order-request';
 import { DeleteGoodsToBePickedForOrderRequest } from '@colijnit/transactionapi/build/model/delete-goods-to-be-picked-for-order-request';
-import { CashDrawersRequest } from "@colijnit/transactionapi/build/model/cash-drawers-request";
-import { CashDrawer } from "@colijnit/transactionapi/build/model/cash-drawer.bo";
-import { PrintPosReceiptRequest } from "@colijnit/transactionapi/build/model/print-pos-receipt-request";
-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 { 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";
+import { CashDrawersRequest } from '@colijnit/transactionapi/build/model/cash-drawers-request';
+import { CashDrawer } from '@colijnit/transactionapi/build/model/cash-drawer.bo';
+import { PrintPosReceiptRequest } from '@colijnit/transactionapi/build/model/print-pos-receipt-request';
+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 { 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;

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

@@ -93,13 +93,13 @@ import { CoDocument } from '@colijnit/mainapi/build/model/co-document';
 import { GoodsPickedRequest } from '@colijnit/transactionapi/build/model/goods-picked-request';
 import { DeleteGoodsPickedForOrderRequest } from '@colijnit/transactionapi/build/model/delete-goods-picked-for-order-request';
 import { DeleteGoodsToBePickedForOrderRequest } from '@colijnit/transactionapi/build/model/delete-goods-to-be-picked-for-order-request';
-import { CashDrawersRequest } from "@colijnit/transactionapi/build/model/cash-drawers-request";
-import { CashDrawer } from "@colijnit/transactionapi/build/model/cash-drawer.bo";
-import { PrintPosReceiptRequest } from "@colijnit/transactionapi/build/model/print-pos-receipt-request";
-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";
+import { CashDrawersRequest } from '@colijnit/transactionapi/build/model/cash-drawers-request';
+import { CashDrawer } from '@colijnit/transactionapi/build/model/cash-drawer.bo';
+import { PrintPosReceiptRequest } from '@colijnit/transactionapi/build/model/print-pos-receipt-request';
+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;

package/lib/style/_variables.scss

@@ -18,6 +18,8 @@ $tp-color-label: #8083A3 !default;
 $tp-color-font: #171721 !default;
 $tp-color-text-grey: #747b87 !default;
 $tp-color-negative-value: #C1002A !default;
+$tp-color-discount-value: #FF4141 !default;
+$tp-color-payed-value: #FF4141 !default;
 
 $tp-color-border: #DCE4EA !default;
 $tp-color-background-selected: #f1fcff !default;
@@ -55,6 +57,7 @@ $tp-item-size-medium: 60px !default;
 $tp-item-size-large: 70px !default;
 $tp-item-size-massive: 100px !default;
 $tp-radio-button-width: 100px !default;
+$tp-header-button-min-width: 130px !default;
 $tp-checkout-default-padding: 5px !default;
 $tp-checkout-step-color: $tp-color-action !default;
 
@@ -71,7 +74,7 @@ $tp-size-header-height: 60px !default;
 $tp-default-background: white !default;
 $tp-default-background-accent: #f5f5fc !default;
 $tp-default-border-radius: 5px !default;
-$tp-default-button-height: 26px;
+$tp-default-button-height: 30px;
 
 $tp-xs-width: 600px !default;
 $tp-sm-width: 960px !default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/transaction",
-  "version": "12.1.134",
+  "version": "12.1.136",
   "description": "Colijn IT transaction module for Angular 12",
   "repository": "npm/npm",
   "author": "Colijn IT",
@@ -10,15 +10,15 @@
     "@angular/common": ">=12.2.0",
     "@angular/core": ">=12.2.0",
     "@colijnit/articleapi": ">=1.0.26",
-    "@colijnit/catalog": ">=12.1.37",
+    "@colijnit/catalog": ">=12.1.39",
     "@colijnit/corecomponents": ">=1.12.0",
     "@colijnit/corecomponents_v12": ">=12.1.8",
-    "@colijnit/ioneconnector": ">=3.1.0",
+    "@colijnit/ioneconnector": ">=3.1.1",
     "@colijnit/mainapi": ">=1.0.21",
     "@colijnit/relationapi": ">=1.0.7",
     "@colijnit/sharedapi": ">=1.0.16",
     "@colijnit/sharedcomponents": ">=1.0.46",
-    "@colijnit/transactionapi": ">=1.1.93",
+    "@colijnit/transactionapi": ">=1.1.94",
     "@types/three": ">=0.125.0",
     "@tweenjs/tween.js": ">=17.2.0",
     "three": ">=0.125.0"

package/public_api.d.ts

@@ -59,6 +59,11 @@ export * from "./lib/component/transaction-search/service/transaction-search.ser
 export * from "./lib/component/transaction-search/service/filter-request.service";
 export * from "./lib/component/transaction-cash-register-order/transaction-cash-register-order.component";
 export * from "./lib/component/transaction-cash-register-order/transaction-cash-register-order.module";
+export * from "./lib/service/options.service";
+export * from "./lib/service/transaction-connector.service";
+export * from "./lib/service/transaction-connector-adapter.service";
+export * from "./lib/service/relation-connector.service";
+export * from "./lib/service/shared-connector.service";
 export * from "./lib/service/transaction.service";
 export * from "./lib/service/relation.service";
 export * from "./lib/service/transaction-event.service";