@colijnit/transaction 12.1.55 → 12.1.57

package/lib/component/transaction-line-action-buttons/style/_layout.scss

@@ -4,26 +4,37 @@
   .co-transaction-line-action-buttons {
 
     .transaction-line-action-buttons-wrapper {
-      padding: $tp-transaction-line-show-hide-button-padding;
-      border-radius: 14px;
+      padding: $tp-transaction-line-action-buttons-padding;
       display: flex;
       justify-content: center;
       align-items: center;
     }
 
-    .circle {
-      height: 25px;
-      width: 25px;
-      margin: 2px;
+    .action-menu-button {
+      height: $tp-transaction-line-action-buttons-action-menu-button-size;
+      width: $tp-transaction-line-action-buttons-action-menu-button-size;
       cursor: pointer;
-      border-radius: 20px;
+      border-radius: $tp-transaction-line-action-buttons-action-menu-button-border-radius;
       display: flex;
       align-items: center;
       justify-content: center;
-
       co-icon {
-        height: 15px;
-        width: 15px;
+        height: $tp-transaction-line-action-buttons-action-menu-button-icon-size;
+        width: $tp-transaction-line-action-buttons-action-menu-button-icon-size;
+      }
+    }
+    .action-button {
+      height: $tp-transaction-line-action-buttons-action-button-size;
+      width: $tp-transaction-line-action-buttons-action-button-size;
+      cursor: pointer;
+      border-radius: $tp-transaction-line-action-buttons-action-button-border-radius;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin: $tp-transaction-line-action-buttons-action-button-margin;
+      co-icon {
+        height: $tp-transaction-line-action-buttons-action-button-icon-size;
+        width: $tp-transaction-line-action-buttons-action-button-icon-size;
       }
     }
 
@@ -73,25 +84,25 @@
       }
 
       &.bottom {
-        transform: translate(0, calc(50% + (#{$tp-transaction-line-show-hide-button-size} / 2) +
-        #{$tp-transaction-line-show-hide-button-padding}));
+        transform: translate(0, calc(50% + (#{$tp-transaction-line-action-buttons-action-button-size} / 2) +
+        #{$tp-transaction-line-action-buttons-action-button-margin}));
       }
 
       &.top {
-        transform: translate(0, calc(-50% - (#{$tp-transaction-line-show-hide-button-size} / 2) -
-        #{$tp-transaction-line-show-hide-button-padding}));
+        transform: translate(0, calc(-50% - (#{$tp-transaction-line-action-buttons-action-button-size} / 2) -
+        #{$tp-transaction-line-action-buttons-action-button-margin}));
         flex-direction: column-reverse;
       }
 
       &.left {
-        transform: translate(calc(-50% - (#{$tp-transaction-line-show-hide-button-size} / 2) -
-        #{$tp-transaction-line-show-hide-button-padding}));
+        transform: translate(calc(-50% - (#{$tp-transaction-line-action-buttons-action-button-size} / 2) -
+        #{$tp-transaction-line-action-buttons-action-button-margin}));
         flex-direction: row-reverse;
       }
 
       &.right {
-        transform: translate(calc(50% + (#{$tp-transaction-line-show-hide-button-size} / 2) +
-        #{$tp-transaction-line-show-hide-button-padding}));
+        transform: translate(calc(50% + (#{$tp-transaction-line-action-buttons-action-button-size} / 2) +
+        #{$tp-transaction-line-action-buttons-action-button-margin}));
         flex-direction: row;
       }
     }

package/lib/component/transaction-line-action-buttons/style/_material-definition.scss

@@ -1,8 +1,14 @@
-$tp-transaction-line-buttons-background-color: #030D3C !default;
-$tp-transaction-line-buttons-overview-background-color: #030D3C !default;
-$tp-transaction-line-buttons-overview-text-color: $tp-color-light !default;
-$tp-transaction-line-buttons-add-text-background-color: $tp-color-action !default;
-$tp-transaction-line-buttons-add-text-text-color: $tp-color-light !default;
-$tp-transaction-line-show-hide-button-size: 25px !default;
-$tp-transaction-line-show-hide-button-padding: 4px !default;
-
+$tp-transaction-line-action-buttons-background-color: $tp-default-background-accent !default;
+$tp-transaction-line-action-buttons-padding: 0 !default;
+$tp-transaction-line-action-buttons-add-text-background-color: $tp-color-action !default;
+$tp-transaction-line-action-buttons-add-text-text-color: $tp-color-light !default;
+$tp-transaction-line-action-buttons-action-menu-button-size: 26px !default;
+$tp-transaction-line-action-buttons-action-menu-button-border-radius: 10px !default;
+$tp-transaction-line-action-buttons-action-menu-button-icon-size: 18px !default;
+$tp-transaction-line-action-buttons-action-button-size: 30px !default;
+$tp-transaction-line-action-buttons-action-button-border-radius: 50% !default;
+$tp-transaction-line-action-buttons-action-button-icon-size: 15px !default;
+$tp-transaction-line-action-buttons-action-button-margin: 2px !default;
+$tp-transaction-line-action-buttons-action-button-icon-color: $tp-color-dark !default;
+$tp-transaction-line-action-buttons-action-button-background-color: #030D3C !default;
+$tp-transaction-line-action-buttons-action-button-color: $tp-color-light !default;

package/lib/component/transaction-line-action-buttons/style/_theme.scss

@@ -4,15 +4,15 @@
   .co-transaction-line-action-buttons {
 
     .action-menu-button {
-      background-color: $tp-transaction-line-button-background-color;
+      background-color: $tp-transaction-line-action-buttons-background-color;
       co-icon [fill] {
-        fill: $tp-transaction-line-article-menu-icon-color;
+        fill: $tp-transaction-line-action-buttons-action-button-icon-color;
       }
     }
 
     .action-button {
-      background-color: $tp-transaction-line-buttons-overview-background-color;
-      fill: $tp-transaction-line-buttons-overview-text-color;
+      background-color: $tp-transaction-line-action-buttons-action-button-background-color;
+      fill: $tp-transaction-line-action-buttons-action-button-color;
     }
   }
 }

package/lib/component/transaction-line-fields/transaction-line-warehouse-button.component.d.ts

@@ -6,8 +6,10 @@ export declare class TransactionLineWarehouseButtonComponent extends Transaction
     iconCacheService: IconCacheService;
     service: TransactionService;
     readonly icons: typeof Icon;
+    readonly: boolean;
     showClass(): boolean;
     showDialogWarehouse: boolean;
     constructor(iconCacheService: IconCacheService, service: TransactionService);
     transactionLineSet(): Promise<void>;
+    handleClick(event: PointerEvent): void;
 }

package/lib/component/transaction-line-image-and-description/style/_layout.scss

@@ -43,6 +43,7 @@
     .article-text-wrapper {
       display: flex;
       flex-direction: column;
+      width: fit-content;
     }
     .article-text {
       font-family: $tp-transaction-line-font-family;

package/lib/component/transaction-line-image-and-description/style/_material-definition.scss

@@ -0,0 +1 @@
+$tp-transaction-line-article-text-font-color: $tp-color-label !default;

package/lib/component/transaction-line-image-and-description/style/_theme.scss

@@ -1,4 +1,7 @@
 @include export-module('co-transaction-line-image-and-description-theme') {
   .co-transaction-line-image-and-description {
+    .article-text {
+      color: $tp-transaction-line-article-text-font-color;
+    }
   }
 }

package/lib/component/transaction-quick-access/transaction-quick-access-received-goods/style/_layout.scss

@@ -13,10 +13,7 @@
         display: flex;
         flex-direction: column;
         margin-right: 10px;
-
-        .button-icon {
-          margin-bottom: 5px;
-        }
+        position: relative;
       }
 
       .print {
@@ -28,6 +25,10 @@
           margin-left: 3px;
         }
       }
+
+      .hidden {
+        visibility: hidden;
+      }
     }
 
     .dots-wrapper {
@@ -53,6 +54,7 @@
       justify-content: center;
       cursor: pointer;
       width: 65px;
+      height: 40px;
 
       .button-icon {
         height: 20px;

package/lib/component/transaction-quick-access/transaction-quick-access-received-goods/transaction-quick-access-received-goods.component.d.ts

@@ -4,26 +4,31 @@ import { TransactionEventService } from "../../../service/transaction-event.serv
 import { TransactionService } from "../../../service/transaction.service";
 import { IconCacheService } from "../../../service/icon-cache.service";
 import { Icon } from "../../../enum/icon.enum";
+import { TransactionReceiveGoodsService } from "../../transaction-line/transaction-receive-goods-line/service/transaction-receive-goods.service";
 export declare class TransactionQuickAccessReceivedGoodsComponent extends TransactionBaseComponent implements OnInit {
     iconService: IconCacheService;
     private _transactionService;
     private _transactionEventService;
+    private _receiveGoodsService;
     readonly icons: typeof Icon;
     commitDate: Date;
     commitReferenceId: string;
     packingSlipId: string;
     localCheckboxState: boolean;
+    awaitingResult: boolean;
+    resultSuccessful: boolean;
+    iconVisible: boolean;
     checkboxValueChanged: EventEmitter<{
         checkboxValue: boolean;
         date: Date;
         id: string;
     }>;
     showClass(): boolean;
-    constructor(iconService: IconCacheService, _transactionService: TransactionService, _transactionEventService: TransactionEventService);
+    constructor(iconService: IconCacheService, _transactionService: TransactionService, _transactionEventService: TransactionEventService, _receiveGoodsService: TransactionReceiveGoodsService);
     ngOnInit(): void;
     handleCommitEvent(value: {
         date: Date;
         id: string;
-    }): void;
+    }): Promise<void>;
     handleSelectAllLines(value: boolean): void;
 }

package/lib/component/transaction-receiving-goods-details/style/_layout.scss

@@ -9,9 +9,9 @@
 
     .details-header {
       font-size: $tp-co-transaction-receiving-goods-details-title-font-size;
-      font-weight: bold;
+      //font-weight: bold;
       margin: $tp-co-transaction-receiving-goods-details-title-margin;
-      color: #6E7694;
+      color: #8083A3;
     }
 
     .columns-wrapper {
@@ -26,6 +26,7 @@
       display: flex;
       width: 10%;
       justify-content: center;
+      visibility: hidden;
 
       .divider {
         border-left: 1px solid #dce4ea;
@@ -42,12 +43,12 @@
       cursor: pointer;
       display: flex;
       align-items: center;
-      border: 1px solid $tp-transaction-line-border-color;
+      //border: 1px solid $tp-transaction-line-border-color;
       border-radius: 10px;
-      height: 40px;
+      height: 28px;
       background-color: $tp-transaction-line-discount-background-color;
       padding-left: 6px;
-      margin-bottom: 20px;
+      margin-bottom: 13px;
 
       co-icon {
         margin-right: 15px;
@@ -64,13 +65,15 @@
     .receive-button-wrapper {
       width: 100%;
       display: flex;
+      margin-top: 20px;
+      margin-bottom: 40px;
       justify-content: center;
 
       .receive-button {
         display: flex;
         width: 125px;
         height: 35px;
-        background: #f5f5fa;
+        background: #3E7EFF;
         align-items: center;
         justify-content: center;
         border-radius: 11px;
@@ -78,7 +81,7 @@
         .receive-text {
           font-size: 12px;
           font-weight: bold;
-          color: #7d81a1;
+          color: white;
         }
       }
     }

package/lib/component/transaction-receiving-goods-details/style/_material-definition.scss

@@ -1,3 +1,3 @@
-$tp-co-transaction-receiving-goods-details-title-font-size: 14px !default;
-$tp-co-transaction-receiving-goods-details-title-margin: 0 0 10px 0 !default;
-$tp-co-transaction-receiving-goods-details-input-margin: 0 0 25px 0 !default;
+$tp-co-transaction-receiving-goods-details-title-font-size: 15px !default;
+$tp-co-transaction-receiving-goods-details-title-margin: 10px 0 20px 0 !default;
+$tp-co-transaction-receiving-goods-details-input-margin: 0 0 18px 0 !default;

package/lib/component/transaction-receiving-goods-history/style/_layout.scss

@@ -8,7 +8,7 @@
       flex-direction: column;
 
       .row {
-
+        color: #8083A3;
       }
 
       .correction {

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

@@ -21,6 +21,7 @@ export declare enum Icon {
     EllipsisLight = "ellipsis_light",
     FileCircleInfoSolid = "file_circle_info_solid",
     FilePdfSolid = "file_pdf_solid",
+    GearSolid = "gear_solid",
     GripDotsVerticalSolid = "grip_dots_vertical_solid",
     IdealLogo = "ideal_logo",
     InboxInSolid = "inbox_in_solid",

package/lib/model/down-payment-view-model.d.ts

@@ -0,0 +1,7 @@
+import { PaymentViewmodel } from "./payment.viewmodel";
+import { DownPayment } from "@colijnit/transactionapi/build/model/down-payment.bo";
+export declare class DownPaymentViewModel {
+    downPayment: DownPayment;
+    paymentMethod: PaymentViewmodel;
+    constructor(downPayment: DownPayment, paymentMethodViewmodel: PaymentViewmodel);
+}

package/lib/service/dynamic-component.service.d.ts

@@ -1,4 +1,4 @@
-import { ApplicationRef, ComponentFactoryResolver, Injector, StaticProvider } from "@angular/core";
+import { ApplicationRef, ComponentFactoryResolver, ComponentRef, Injector, StaticProvider } from "@angular/core";
 import { DialogResponseInterface } from "../interface/dialog-response.interface";
 export declare class DynamicComponentService {
     private _compFactoryResolver;
@@ -6,5 +6,6 @@ export declare class DynamicComponentService {
     private injector;
     private _componentRefs;
     constructor(_compFactoryResolver: ComponentFactoryResolver, appRef: ApplicationRef, injector: Injector);
+    getComponentRefs(): ComponentRef<any>[];
     createComponent(componentClass: any, inputs?: any, outputs?: any, providers?: StaticProvider[]): Promise<DialogResponseInterface>;
 }

package/lib/service/payment.service.d.ts

@@ -4,14 +4,20 @@ import { TransactionService } from "./transaction.service";
 import { PaymentLinkStatus } from "@colijnit/transactionapi/build/model/payment-link-status.bo";
 import { TransactionConnectorAdapterService } from "./transaction-connector-adapter.service";
 import { SelectMultipleCacheService } from "../cache/service/select-multiple-cache.service";
+import { TransactionDownPaymentInfo } from "@colijnit/transactionapi/build/model/transaction-down-payment-info.bo";
+import { PaymentViewmodel } from "../model/payment.viewmodel";
+import { SharedService } from "./shared.service";
 export declare class PaymentService {
     private _adapterService;
     private _selectMultipleCacheService;
     private _transactionService;
-    constructor(_adapterService: TransactionConnectorAdapterService, _selectMultipleCacheService: SelectMultipleCacheService, _transactionService: TransactionService);
+    private _sharedService;
+    constructor(_adapterService: TransactionConnectorAdapterService, _selectMultipleCacheService: SelectMultipleCacheService, _transactionService: TransactionService, _sharedService: SharedService);
     updateHeaderTransactionToDownPay(uuid: string, downPayment: number): Promise<boolean>;
     registerSalesOrderPayment(uuid: string, amount: number, currencyId: number, paymentMethod: string, cashRegisterGroupId: number): Promise<boolean>;
     createIonePaymentLinkAndQRCode(uuid: string, amount: number, paymentMethodCode: string): Promise<CreatePaymentLinkResult>;
     getPaymentLinkStatus(paymentLinkUUID: string): Promise<PaymentLinkStatus>;
+    getDownPaymentInfo(uuid: string): Promise<TransactionDownPaymentInfo>;
     getPaymentMethods(): Promise<PaymentMethod[]>;
+    getPaymentMethodsViewModels(): Promise<PaymentViewmodel[]>;
 }

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

@@ -50,6 +50,7 @@ import { SelectMultipleParameterizedCacheService } from "../cache/service/select
 import { ErrorService } from "./error.service";
 import { SupplierFullObject } from "@colijnit/transactionapi/build/model/supplier-full-object.bo";
 import { GetPurchaseOrderConfirmation } from "@colijnit/transactionapi/build/model/get-purchase-order-confirmation";
+import { TransactionDownPaymentInfo } from "@colijnit/transactionapi/build/model/transaction-down-payment-info.bo";
 export declare class TransactionConnectorAdapterService {
     private _optionsService;
     private _selectMultipleCacheService;
@@ -147,6 +148,7 @@ export declare class TransactionConnectorAdapterService {
     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>;
+    getDownPaymentInfo(uuid: string): Promise<TransactionDownPaymentInfo>;
     getGoodsReceiptStatus(transId: number, lineNr: number): Promise<GoodsReceiptStatusWithHistory>;
     getGoodsReceiptStatusWithHistory(transId: number, lineNr: number): Promise<GoodsReceiptStatusWithHistory>;
     receiveGoodsForPurchaseOrder(request: ReceiveGoodsForPurchaseOrderRequest): Promise<TransactionInfoResponse>;

package/lib/style/_variables.scss

@@ -1,7 +1,7 @@
 $tp-font-family: 'Public sans' !default;
 
 $tp-color-less-light: #F7FAFA !default;
-$tp-color-action: #0084de !default;
+$tp-color-action: #3e7eff !default;
 $tp-color-action-light: #DCE4EA !default;
 $tp-color-text-light: $tp-color-less-light !default;
 
@@ -72,11 +72,14 @@ $tp-lg-width: 1920px !default;
 // transaction line buttons
 $tp-transaction-line-button-width: 78px !default;
 $tp-transaction-line-button-big-width: 250px !default;
+$tp-transaction-line-button-font-size: 11px !default;
+$tp-transaction-line-button-font-weight: bold !default;
+$tp-transaction-line-button-icon-size: 13px !default;
 $tp-transaction-line-button-height: 26px !default;
 $tp-transaction-line-button-background-color: $tp-default-background-accent !default;
 $tp-transaction-line-button-border-color: $tp-color-border !default;
 $tp-transaction-line-button-column-gap: 15px !default;
-$tp-transaction-line-button-padding: 0 5px !default;
+$tp-transaction-line-button-padding: 0 10px !default;
 $tp-transaction-line-button-radius: 10px !default;
 $tp-transaction-line-button-border: 1px solid !default;
 
@@ -87,6 +90,7 @@ $tp-transaction-header-font-color: $tp-color-dark !default;
 $tp-transaction-dialog-header-title-font-size: $tp-font-size-big !default;
 $tp-transaction-dialog-header-title-margin: 0 0 10px 0 !default;
 $tp-transaction-dialog-header-title-font-weight: bold !default;
+$tp-transaction-dialog-footer-justify-content: center !default;
 
 /* core components override */
 $cc-color-action: $tp-color-font;
@@ -96,13 +100,25 @@ $cc-checkbox-check-background-color: white;
 $cc-checkbox-check-border-color: #5FDCB3;
 $cc-checkbox-check-color: #5FDCB3;
 $cc-radio-button-height: 32px;
+$cc-item-size: 40px;
 
 $cc-co-dialog-header-text-color: $tp-color-font;
 $cc-co-dialog-header-padding: 0 0 20px 0;
 $cc-co-dialog-header-margin: 0 0 20px 0;
 $cc-co-dialog-padding: 30px 30px 60px 30px;
 
+$cc-btn-border-radius: 5px;
+$cc-btn-height: 36px;
+
+$cc-co-dialog-header-close-button-background-color: $tp-color-action;
+
 $cc-collapsible-content-padding: 10px 0px 0px 0px;
 
 $cc-co-commit-buttons-button-background: none;
+
+$cc-simple-grid-header-border-color: white;
+$cc-simple-grid-header-font-size: 11px;
+$cc-simple-grid-cell-padding: 0 5px;
+$cc-simple-grid-row-selected-background-color: #f0f5ff;
+$cc-simple-grid-row-height: 60px;
 /****************************/

package/lib/style/transaction-globals.scss

@@ -95,15 +95,16 @@ $stopPoint: 10%;
 }
 
 .transaction-line-button {
-  font-size: $tp-font-size;
+  font-size: $tp-transaction-line-button-font-size;
+  font-weight: $tp-transaction-line-button-font-weight;
   display: flex;
   align-items: center;
   height: $tp-transaction-line-button-height;
   column-gap: $tp-transaction-line-button-column-gap;
   padding: $tp-transaction-line-button-padding;
   .co-icon {
-    height: 17px;
-    width: 17px;
+    height: $tp-transaction-line-button-icon-size;
+    width: $tp-transaction-line-button-icon-size;
   }
   &:not(.no-border) {
     border: $tp-transaction-line-button-border;

package/package.json

@@ -1,16 +1,13 @@
 {
   "name": "@colijnit/transaction",
-  "version": "12.1.55",
+  "version": "12.1.57",
   "description": "Colijn IT transaction module for Angular 12",
   "private": false,
   "peerDependencies": {
     "@angular/common": "^12.2.0",
     "@angular/core": "^12.2.0",
-    "@colijnit/corecomponents_v12": ">=12.0.69",
-    "@colijnit/transactionapi": ">=1.1.40",
-    "@fortawesome/angular-fontawesome": "0.9.0",
-    "@fortawesome/fontawesome-svg-core": "^6.1.1",
-    "@fortawesome/free-solid-svg-icons": "^6.1.1",
+    "@colijnit/corecomponents_v12": ">=12.0.77",
+    "@colijnit/transactionapi": ">=1.1.48",
     "@syncfusion/ej2-angular-buttons": ">=19.3.44",
     "@syncfusion/ej2-angular-calendars": ">=19.3.44",
     "@syncfusion/ej2-angular-dropdowns": ">=19.3.45",