@colijnit/transaction 12.1.34 → 12.1.35

package/lib/component/transaction-header-fields/transaction-header-marketing.component.d.ts

@@ -2,16 +2,13 @@ import { OnInit } from "@angular/core";
 import { TransactionService } from "../../service/transaction.service";
 import { Marketing } from "@colijnit/transactionapi/build/model/marketing.bo";
 import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
-export declare class TransactionHeaderMarketingComponent extends TransactionHeaderBaseComponent implements OnInit {
+export declare class TransactionHeaderMarketingComponent extends TransactionHeaderBaseComponent<Marketing> implements OnInit {
     private _transactionService;
-    collection: Marketing[];
+    protected codeField: string;
+    protected checkField: string;
+    protected propsForLabel: string[];
     constructor(_transactionService: TransactionService);
     ngOnInit(): void;
-    commitTransactionMarketing(code: string): Promise<boolean>;
-    handleChecked(event: MouseEvent, row: {
-        value: string;
-        text: string;
-        checked: boolean;
-    }): void;
+    commit(code: string): Promise<boolean>;
     protected transactionInfoSet(): void;
 }

package/lib/component/transaction-header-fields/transaction-header-partial-delivery.component.d.ts

@@ -1,6 +1,6 @@
 import { TransactionService } from "../../service/transaction.service";
 import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
-export declare class TransactionHeaderPartialDeliveryComponent extends TransactionHeaderBaseComponent {
+export declare class TransactionHeaderPartialDeliveryComponent extends TransactionHeaderBaseComponent<any> {
     private _transactionService;
     constructor(_transactionService: TransactionService);
     commitPartialDelivery(allow: boolean): Promise<boolean>;

package/lib/component/transaction-header-fields/transaction-header-preferred-delivery-date.component.d.ts

@@ -1,7 +1,7 @@
 import { InputDatePickerComponent } from "@colijnit/corecomponents_v12";
 import { TransactionService } from "../../service/transaction.service";
 import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
-export declare class TransactionHeaderPreferredDeliveryDateComponent extends TransactionHeaderBaseComponent {
+export declare class TransactionHeaderPreferredDeliveryDateComponent extends TransactionHeaderBaseComponent<any> {
     private _transactionService;
     set child(content: any);
     showLabel: boolean;

package/lib/component/transaction-header-fields/transaction-header-reference.component.d.ts

@@ -1,7 +1,7 @@
 import { InputTextComponent } from "@colijnit/corecomponents_v12";
 import { TransactionService } from "../../service/transaction.service";
 import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
-export declare class TransactionHeaderReferenceComponent extends TransactionHeaderBaseComponent {
+export declare class TransactionHeaderReferenceComponent extends TransactionHeaderBaseComponent<any> {
     private _transactionService;
     set child(content: any);
     showLabel: boolean;

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

@@ -1,7 +1,7 @@
 import { InputTextComponent } from "@colijnit/corecomponents_v12";
 import { TransactionService } from "../../service/transaction.service";
 import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
-export declare class TransactionHeaderRelationReferenceComponent extends TransactionHeaderBaseComponent {
+export declare class TransactionHeaderRelationReferenceComponent extends TransactionHeaderBaseComponent<any> {
     private _transactionService;
     set child(content: any);
     showLabel: boolean;

package/lib/component/transaction-header-fields/transaction-header-remarks.component.d.ts

@@ -1,7 +1,7 @@
 import { InputTextareaComponent } from "@colijnit/corecomponents_v12";
 import { TransactionService } from "../../service/transaction.service";
 import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
-export declare class TransactionHeaderRemarksComponent extends TransactionHeaderBaseComponent {
+export declare class TransactionHeaderRemarksComponent extends TransactionHeaderBaseComponent<any> {
     private _transactionService;
     set child(content: any);
     showLabel: boolean;

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

@@ -32,17 +32,22 @@ export declare class TransactionLineComponent {
     stock: StockStatus;
     mouseOver: boolean;
     readonly: boolean;
+    showDialogDeliveryMethod: boolean;
+    showDialogCommissionCode: boolean;
+    showDialogVat: boolean;
+    showDialogWarehouse: boolean;
+    showDialogDiscount: boolean;
     private _line;
     constructor(service: TransactionService, iconCacheService: IconCacheService, _dialogService: DialogService, _dictionaryService: DictionaryService, _imageService: TransactionImageService);
     changeLineAmount(amount: number): void;
     deleteTransactionLineClick(): Promise<void>;
     handleOpenArticleText(text: string): void;
     handleShowSidePanel(): void;
-    openCommissionCodeDialog(): void;
-    openWarehouseDialog(): void;
-    openDeliveryMethodDialog(): void;
+    openTheCommissionCodeDialog(): void;
+    openTheWarehouseDialog(): void;
+    openTheDeliveryMethodDialog(): void;
     openVatDialog(): void;
-    openDiscountDialog(): void;
+    openTheDiscountDialog(): void;
     private _loadLineImage;
     private _loadLineCommissionCode;
     private _loadLineWarehouse;

package/lib/component/transaction-line-checkbox-list/style/_layout.scss

@@ -1,32 +1,34 @@
 @include export-module('co-transaction-line-checkbox-list-layout') {
   .co-transaction-line-checkbox-list {
+    display: block;
+    height: 100%;
     .highlight {
-      font-weight: bold;
-      font-style: italic;
+      font-weight: $tp-transaction-line-checkbox-list-item-hightlight-font-weight;
+      font-style: $tp-transaction-line-checkbox-list-item-hightlight-font-style;
+      text-decoration: $tp-transaction-line-checkbox-list-item-hightlight-text-decoration;
     }
     table {
       width: 100%;
       border-spacing: 0 3px;
       overflow: hidden;
       tr {
-        height: $tp-transaction-line-button-height;
+        height: $tp-transaction-line-checkbox-list-item-height;
       }
       td {
-        border: solid 1px $tp-transaction-line-button-border-color;
-        border-style: solid none;
-        background-color: $tp-transaction-line-button-background-color;
+        border-width: $tp-transaction-line-checkbox-list-item-border-width;
+        border-style: $tp-transaction-line-checkbox-list-item-border-style;
       }
       td:first-child {
         border-left-style: solid;
-        border-top-left-radius: $tp-transaction-line-button-radius;
-        border-bottom-left-radius: $tp-transaction-line-button-radius;
+        border-top-left-radius: $tp-transaction-line-checkbox-list-item-border-radius;
+        border-bottom-left-radius: $tp-transaction-line-checkbox-list-item-border-radius;
         padding-left: 10px;
         width: 40px;
       }
       td:last-child {
         border-right-style: solid;
-        border-bottom-right-radius: $tp-transaction-line-button-radius;
-        border-top-right-radius: $tp-transaction-line-button-radius;
+        border-bottom-right-radius: $tp-transaction-line-checkbox-list-item-border-radius;
+        border-top-right-radius: $tp-transaction-line-checkbox-list-item-border-radius;
       }
     }
   }

package/lib/component/transaction-line-checkbox-list/style/_material-definition.scss

@@ -0,0 +1,10 @@
+$tp-transaction-line-checkbox-list-item-height: $tp-transaction-line-button-height !default;
+$tp-transaction-line-checkbox-list-item-border-style: solid !default;
+$tp-transaction-line-checkbox-list-item-border-width: 0 !default;
+$tp-transaction-line-checkbox-list-item-border-color: $tp-transaction-line-button-border-color !default;
+$tp-transaction-line-checkbox-list-item-background-color: $tp-transaction-line-button-background-color !default;
+$tp-transaction-line-checkbox-list-item-border-radius: $tp-transaction-line-button-radius !default;
+$tp-transaction-line-checkbox-list-item-hightlight-font-weight: bold !default;
+$tp-transaction-line-checkbox-list-item-hightlight-font-style: italic !default;
+$tp-transaction-line-checkbox-list-item-hightlight-font-color: green !default;
+$tp-transaction-line-checkbox-list-item-hightlight-text-decoration: underline !default;

package/lib/component/transaction-line-checkbox-list/style/_theme.scss

@@ -1,4 +1,12 @@
 @include export-module('co-transaction-line-checkbox-list-theme') {
   .co-transaction-line-checkbox-list {
+    .highlight {
+      color: $tp-transaction-line-checkbox-list-item-hightlight-font-color;
+    }
+    table {
+      td {
+        background-color: $tp-transaction-line-checkbox-list-item-background-color;
+      }
+    }
   }
 }

package/lib/component/transaction-line-checkbox-list/transaction-line-checkbox-list.component.d.ts

@@ -1,8 +1,10 @@
 import { EventEmitter } from "@angular/core";
 export declare class TransactionLineCheckboxListComponent {
     collection: any[];
+    readonly: boolean;
     checked: EventEmitter<any>;
     showClass: boolean;
+    smallToolbar: boolean;
     private _observer;
     handleChecked(event: MouseEvent, row: {
         value: string;

package/lib/component/transaction-line-fields/transaction-line-commission-code.component.d.ts

@@ -11,4 +11,5 @@ export declare class TransactionLineCommissionCodeComponent extends TransactionL
     ngOnInit(): void;
     commit(code: string): Promise<boolean>;
     protected transactionLineSet(): void;
+    protected transactionInfoSet(): void;
 }

package/lib/component/transaction-line-fields/transaction-line-delivery-method.component.d.ts

@@ -10,5 +10,5 @@ export declare class TransactionLineDeliveryMethodComponent extends TransactionL
     constructor(_transactionService: TransactionService);
     ngOnInit(): void;
     commit(method: string): Promise<boolean>;
-    protected transactionLineSet(): void;
+    protected transactionInfoSet(): void;
 }

package/lib/component/transaction-line-side-panel-purchase/transaction-line-side-panel-purchase.component.d.ts

@@ -1,11 +1,11 @@
-import { EventEmitter } from "@angular/core";
+import { AfterViewInit, EventEmitter } from "@angular/core";
 import { GoodsReceiptStatusWithHistory } from "@colijnit/transactionapi/build/model/goods-receipt-status-with-history.bo";
 import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
 import { TransactionTypeCategory } from "../../enum/transaction-type-category.enum";
 import { TransactionService } from "../../service/transaction.service";
 import { TransactionEventService } from "../../service/transaction-event.service";
 import { TransactionInfo } from "@colijnit/transactionapi/build/model/transaction-info.bo";
-export declare class TransactionLineSidePanelPurchaseComponent {
+export declare class TransactionLineSidePanelPurchaseComponent implements AfterViewInit {
     private _service;
     private _transactionEventService;
     readonly categories: typeof TransactionTypeCategory;
@@ -18,5 +18,6 @@ export declare class TransactionLineSidePanelPurchaseComponent {
     goodsReceiptStatus: GoodsReceiptStatusWithHistory;
     private _transactionInfo;
     constructor(_service: TransactionService, _transactionEventService: TransactionEventService);
+    ngAfterViewInit(): void;
     getGoodsReceiptStatusWithHistory(): Promise<void>;
 }

package/lib/service/dialog.service.d.ts

@@ -1,8 +1,5 @@
-import { ApplicationRef, ComponentFactoryResolver, Injector, Type } from "@angular/core";
-import { DialogBaseComponent } from "../component/core/base/dialog-base.component";
-import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
+import { ApplicationRef, ComponentFactoryResolver, Injector } from "@angular/core";
 import { TransactionLineCharacteristicChoice } from "@colijnit/transactionapi/build/model/transactionLineCharacteristicChoice.bo";
-import { TransactionInfo } from "@colijnit/transactionapi/build/model/transaction-info.bo";
 export declare class DialogService {
     private _compFactoryResolver;
     private appRef;
@@ -12,8 +9,6 @@ export declare class DialogService {
     showYesNo(title: string, text: string): Promise<any>;
     showError(message: string, details?: string): Promise<any>;
     showInformation(message: string): Promise<any>;
-    showTransactionLineComponent(comp: Type<DialogBaseComponent>, transLine: TransactionLineInfo): Promise<any>;
-    showTransactionHeaderComponent(comp: Type<DialogBaseComponent>, transactionInfo: TransactionInfo): Promise<any>;
     showCharacteristics(title: string, choices: TransactionLineCharacteristicChoice[], value: string): Promise<string>;
     showWarehouse(): Promise<number>;
     showCommissionCode(): Promise<string>;

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

@@ -140,7 +140,7 @@ export declare class TransactionConnectorAdapterService {
     changeHeaderTransactionToDownPay(uuid: string, downPayment: number): Promise<TransactionInfoResponse>;
     changeTransactionLineCollectionCode(uuid: string, lineUuid: string, code: string): Promise<TransactionInfoResponse>;
     createOutstandingEntry(uuid: string, amount: number): Promise<TransactionInfoResponse>;
-    registerSalesOrderPayment(uuid: string, amount: number, currencyId: number, paymentMethod: string, cashRegisterGroupId: number): Promise<TransactionInfoResponse>;
+    registerSalesOrderPayment(uuid: string, amount: number, currencyId: number, paymentMethod: string, cashRegisterGroupId: number): Promise<DataServiceResponseData>;
     createIonePaymentLinkAndQRCode(uuid: string, amount: number, paymentMethodCode: string): Promise<CreatePaymentLinkResult>;
     getPaymentLinkStatus(paymentLinkUUID: string): Promise<PaymentLinkStatus>;
     getGoodsReceiptStatus(transId: number, lineNr: number): Promise<GoodsReceiptStatusWithHistory>;

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

@@ -137,7 +137,6 @@ export declare class TransactionConnectorService {
     changeHeaderTransactionMarketing(uuid: string, code: string): Promise<TransactionInfoResponse>;
     changeHeaderTransactionToDownPay(uuid: string, downPayment: number): Promise<TransactionInfoResponse>;
     createOutstandingEntry(uuid: string, amount: number): Promise<TransactionInfoResponse>;
-    registerSalesOrderPayment(uuid: string, amount: number, currencyId: number, paymentMethod: string, cashRegisterGroupId: number): Promise<TransactionInfoResponse>;
     createIonePaymentLinkAndQRCode(uuid: string, amount: number, paymentMethodCode: string): Promise<CreatePaymentLinkResult>;
     getPaymentLinkStatus(paymentLinkUUID: string): Promise<PaymentLinkStatus>;
     getGoodsReceiptStatus(transId: number, lineNr: number): Promise<GoodsReceiptStatusWithHistory>;

package/lib/style/transaction-globals.scss

@@ -4,6 +4,38 @@
 
 @import "./variables";
 
+$thumbColor: #484f60;
+$trackColor: #e8eceb;
+$stopPoint: 10%;
+
+.co-transaction-small-toolbar {
+  overflow: auto;
+  &::-webkit-scrollbar {
+    -webkit-appearance: none;
+  }
+
+  &::-webkit-scrollbar:vertical {
+    width: 15px;
+  }
+
+  &::-webkit-scrollbar:horizontal {
+    height: 15px;
+  }
+
+  &::-webkit-scrollbar-thumb:vertical {
+    background: linear-gradient(to left, $thumbColor, $thumbColor $stopPoint, transparent $stopPoint, transparent);
+  }
+  &::-webkit-scrollbar-track:vertical {
+    background: linear-gradient(to left, $trackColor, $trackColor $stopPoint, transparent $stopPoint, transparent);
+  }
+  &::-webkit-scrollbar-thumb:horizontal {
+    background: linear-gradient(to top, $thumbColor, $thumbColor $stopPoint, transparent $stopPoint, transparent);
+  }
+  &::-webkit-scrollbar-track:horizontal {
+    background: linear-gradient(to top, $trackColor, $trackColor $stopPoint, transparent $stopPoint, transparent);
+  }
+}
+
 .co-transaction-default-popup-row {
   display: flex;
   flex-direction: row;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/transaction",
-  "version": "12.1.34",
+  "version": "12.1.35",
   "description": "Colijn IT transaction module for Angular 12",
   "private": false,
   "peerDependencies": {