@colijnit/transaction 255.1.36 → 255.1.38

package/lib/component/save-cancel-buttons/save-cancel-buttons.component.d.ts

@@ -0,0 +1,28 @@
+import { ElementRef, OnDestroy } from '@angular/core';
+import { SafeHtml } from '@angular/platform-browser';
+import { IconCacheService } from '../../service/icon-cache.service';
+import { Icon } from '../../enum/icon.enum';
+import { TransactionEventService } from '../../service/transaction-event.service';
+export declare class SaveCancelButtonsComponent implements OnDestroy {
+    iconCacheService: IconCacheService;
+    private _transactionEventService;
+    readonly icons: typeof Icon;
+    saveCancelButtonsWrapper: ElementRef;
+    saveIconData: SafeHtml;
+    cancelIconData: SafeHtml;
+    showLabels: boolean;
+    movable: boolean;
+    showClass(): boolean;
+    show: boolean;
+    private _mouseDown;
+    private _top;
+    private _left;
+    private _subs;
+    constructor(iconCacheService: IconCacheService, _transactionEventService: TransactionEventService);
+    ngOnDestroy(): void;
+    handleMouseDown(event: MouseEvent): void;
+    handleMouseUp(event: MouseEvent): void;
+    handleMouseMove(event: MouseEvent): void;
+    handleSaveClick(event: MouseEvent): void;
+    handleCancelClick(event: MouseEvent): void;
+}

package/lib/component/save-cancel-buttons/save-cancel-buttons.module.d.ts

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

package/lib/component/save-cancel-buttons/style/_layout.scss

@@ -0,0 +1,41 @@
+@include export-module('co-save-cancel-buttons-layout') {
+  .co-save-cancel-buttons {
+    font-family: $tp-save-cancel-buttons-font-family;
+    font-size: $tp-save-cancel-buttons-font-size;
+    position: fixed;
+    bottom: 0;
+    left: 50%;
+    transform: translateX(-50%);
+    pointer-events: none;
+    z-index: $tp-save-cancel-buttons-z-index;
+    .icon-wrapper {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      height: $tp-save-cancel-buttons-button-size;
+      width: $tp-save-cancel-buttons-button-size;
+      .co-icon {
+        pointer-events: all;
+        cursor: pointer;
+        height: $tp-save-cancel-buttons-icon-size;
+        width: $tp-save-cancel-buttons-icon-size;
+      }
+    }
+    .co-button {
+      height: $tp-save-cancel-buttons-button-size;
+      pointer-events: all;
+      cursor: pointer;
+      font-size: $tp-save-cancel-buttons-font-size;
+    }
+    .save-cancel-buttons-wrapper {
+      display: flex;
+      border-radius: $tp-save-cancel-buttons-radius;
+      background: $tp-save-cancel-buttons-background;
+      column-gap: $tp-save-cancel-buttons-column-gap;
+      padding: $tp-save-cancel-buttons-padding;
+      &.movable {
+        pointer-events: all;
+      }
+    }
+  }
+}

package/lib/component/save-cancel-buttons/style/_material-definition.scss

@@ -0,0 +1,15 @@
+$tp-save-cancel-buttons-font-family: $tp-font-family !default;
+$tp-save-cancel-buttons-font-size: $tp-font-size !default;
+$tp-save-cancel-buttons-z-index: 99 !default;
+$tp-save-cancel-buttons-column-gap: 5px !default;
+$tp-save-cancel-buttons-padding: 10px !default;
+$tp-save-cancel-buttons-radius: 5px !default;
+$tp-save-cancel-buttons-background: rgba(0, 0, 0, 0.1) !default;
+$tp-save-cancel-buttons-button-size: 30px !default;
+$tp-save-cancel-buttons-icon-size: 25px !default;
+$tp-save-cancel-buttons-save-button-color: $tp-color-action !default;
+$tp-save-cancel-buttons-save-icon-color: white !default;
+$tp-save-cancel-buttons-save-label-color: white !default;
+$tp-save-cancel-buttons-cancel-button-color: $tp-color-dark !default;
+$tp-save-cancel-buttons-cancel-icon-color: white !default;
+$tp-save-cancel-buttons-cancel-label-color: white !default;

package/lib/component/save-cancel-buttons/style/_theme.scss

@@ -0,0 +1,42 @@
+@include export-module('co-save-cancel-buttons-theme') {
+  .co-save-cancel-buttons {
+    .save-button {
+      color: $tp-save-cancel-buttons-save-label-color;
+      background: $tp-save-cancel-buttons-save-button-color;
+      svg {
+        fill: $tp-save-cancel-buttons-save-icon-color;
+      }
+      [fill] {
+        fill: $tp-save-cancel-buttons-save-icon-color;
+      }
+    }
+    .cancel-button {
+      color: $tp-save-cancel-buttons-cancel-label-color;
+      background: $tp-save-cancel-buttons-cancel-button-color;
+      svg {
+        fill: $tp-save-cancel-buttons-cancel-icon-color;
+      }
+      [fill] {
+        fill: $tp-save-cancel-buttons-cancel-icon-color;
+      }
+    }
+    .save-icon {
+      background: $tp-save-cancel-buttons-save-button-color;
+      svg {
+        fill: $tp-save-cancel-buttons-save-icon-color;
+      }
+      [fill] {
+        fill: $tp-save-cancel-buttons-save-icon-color;
+      }
+    }
+    .cancel-icon {
+      background: $tp-save-cancel-buttons-cancel-button-color;
+      svg {
+        fill: $tp-save-cancel-buttons-cancel-icon-color;
+      }
+      [fill] {
+        fill: $tp-save-cancel-buttons-cancel-icon-color;
+      }
+    }
+  }
+}

package/lib/component/save-cancel-buttons/style/material.scss

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

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

@@ -4,16 +4,20 @@ import { TransactionKind } from '@colijnit/transactionapi/build/enum/transaction
 import { TransactionScreenConfigurationService } from '../../service/transaction-screen-configuration.service';
 import { TransactionService } from '../../service/transaction.service';
 import { TransactionCfgName } from '../../enum/transaction-cfg-name.enum';
-import { ExternalCatalogAddArticleRequest } from '@colijnit/transactionapi/build/model/external-catalog-add-article-request';
 import { TransactionConnectorService } from '../../service/transaction-connector.service';
 import { PosOrderData } from '../../model/pos-order-data';
 import { PurchaseConfirmationService } from '../../service/purchase-confirmation.service';
+import { SafeHtml } from '@angular/platform-browser';
+import { DialogService } from '../../service/dialog.service';
+import { DictionaryService } from '../../service/dictionary.service';
 export declare class TransactionComponent implements OnChanges {
     service: TransactionService;
     private _transactionConnectorService;
     private _screenConfigurationService;
     private _changeDetector;
     private _purchaseConfirmationService;
+    private _dictionaryService;
+    private _dialogService;
     readonly cfgNames: typeof TransactionCfgName;
     relation: RelationAnyType;
     set confirmationAnalysisId(value: number);
@@ -27,14 +31,20 @@ export declare class TransactionComponent implements OnChanges {
     showViewModeButtons: boolean;
     showQuickAccess: boolean;
     showButtonBar: boolean;
+    saveIconData: SafeHtml;
+    cancelIconData: SafeHtml;
+    showSaveCancelLabels: boolean;
+    saveCancelMovable: boolean;
     showClass(): boolean;
+    checkTransaction(): any;
+    checkRollBack(): void;
     screenConfigLoaded: boolean;
     private _confirmationAnalysisId;
     private _transactionKind;
     private _transactionNr;
-    constructor(service: TransactionService, _transactionConnectorService: TransactionConnectorService, _screenConfigurationService: TransactionScreenConfigurationService, _changeDetector: ChangeDetectorRef, _purchaseConfirmationService: PurchaseConfirmationService);
+    constructor(service: TransactionService, _transactionConnectorService: TransactionConnectorService, _screenConfigurationService: TransactionScreenConfigurationService, _changeDetector: ChangeDetectorRef, _purchaseConfirmationService: PurchaseConfirmationService, _dictionaryService: DictionaryService, _dialogService: DialogService);
     ngOnChanges(changes: SimpleChanges): void;
-    addExternalOrderLines(request: ExternalCatalogAddArticleRequest): void;
+    private _checkTransactionDirty;
     private _getTransaction;
     private _prepareHeader;
 }

package/lib/component/transaction-lines-side-panel/transaction-lines-side-panel-service-order/style/_layout.scss

@@ -15,9 +15,18 @@
           flex-direction: row;
           justify-content: space-between;
           align-items: center;
+          &.clickable {
+            cursor: pointer;
+          }
           .co-icon {
             width: $tp-transaction-lines-side-panel-service-order-label-icon-size;
             height: $tp-transaction-lines-side-panel-service-order-label-icon-size;
+            transform: rotate(0deg);
+            transition: transform 0.3s ease-in-out;
+            &.active {
+              transform: rotate(180deg);
+              transition: transform 0.3s ease-in-out;
+            }
           }
         }
         .detail-label {
@@ -54,6 +63,8 @@
           }
           &.supplier {
             flex-direction: column;
+            border-bottom: none;
+            padding-bottom: 0;
             .top-details {
               display: flex;
               flex-direction: row;
@@ -104,5 +115,10 @@
         }
       }
     }
+    .show-details-wrapper {
+      margin-top: 10px;
+      padding-top: 15px;
+      border-top: 5px solid #F4F4F9;
+    }
   }
 }

package/lib/component/transaction-lines-side-panel/transaction-lines-side-panel-service-order/transaction-lines-side-panel-service-order.component.d.ts

@@ -17,7 +17,9 @@ export declare class TransactionLinesSidePanelServiceOrderComponent extends Tran
     protected changeDetector: ChangeDetectorRef;
     readonly Icon: typeof Icon;
     showClass(): boolean;
+    showDetails: boolean;
     image: string;
     constructor(transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef);
+    showDetailsClick(): void;
     ngOnInit(): Promise<void>;
 }

package/lib/component/transaction-service-overview/style/_layout.scss

@@ -150,6 +150,10 @@
               font-weight: 500;
               color: #8083A3;
             }
+            span {
+              font-size: 12px;
+              white-space: break-spaces;
+            }
           }
 
           .co-files-upload {

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

@@ -62,6 +62,8 @@ export declare enum Icon {
     IndustrySolid = "industry_solid",
     Invoice = "invoice",
     LessThanSolid = "less_than_solid",
+    LightCreditCardCheck = "light_credit_card_check",
+    LightEuroSignMinus = "light_euro_sign_minus",
     LinkRegular = "link_regular",
     LinkSimpleSolid = "link_simple_solid",
     ListRegular = "list_regular",

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

@@ -45,6 +45,7 @@ export declare class TransactionBaseService extends BaseModuleService {
     transactionKindSet: BehaviorSubject<boolean>;
     currentBranch: string;
     autoSave: boolean;
+    manualSaveParam: boolean;
     applicationUser: boolean;
     invoiceAddressSameAsDelivery: boolean;
     set activeRubric(value: TransactionTypeCategory);
@@ -105,6 +106,7 @@ export declare class TransactionBaseService extends BaseModuleService {
     private _alreadyLocked;
     private _transactionDirty;
     private _salesOrderConfirmationSent;
+    private _subs;
     constructor(optionsService: TransactionSettingsService, dialogService: DialogService, connector: TransactionConnectorService, articleConnector: ArticleConnectorService, dictionaryService: DictionaryService, transactionEventService: TransactionEventService, transactionRelationService: TransactionRelationService, screenConfigService: TransactionScreenConfigurationService, relationService: RelationService, sharedService: SharedService);
     init(options: any, resetCurrentTransaction?: boolean): Promise<void>;
     createNewRelation(): void;
@@ -112,7 +114,8 @@ export declare class TransactionBaseService extends BaseModuleService {
     resetCurrentTransaction(): void;
     saveTransaction(rememberTransaction?: boolean): Promise<TransactionInfoResponse>;
     commit(): Promise<boolean>;
-    rollback(refresh?: boolean): Promise<boolean>;
+    rollback(refresh?: boolean, force?: boolean): Promise<boolean>;
+    rollbackBeacon(): Promise<void>;
     searchTransactions(request: TransactionSearchViewRequest): Promise<TransactionSearchResult>;
     getTransactionById(transactionId: number): Promise<void>;
     getTransactionByNrAndKind(transactionNr: number, transactionKind: TransactionKind): Promise<TransactionInfoResponse>;

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

@@ -254,6 +254,7 @@ export declare class TransactionConnectorAdapterService {
     getMaxConfirmedDeliveryDateForPurchaseOrder(transId: number): Promise<Date>;
     commit(): Promise<boolean>;
     rollback(): Promise<boolean>;
+    rollbackBeacon(): Promise<void>;
     createTransaction(kind: TransactionKind, branchNr: string): Promise<TransactionInfoResponse>;
     createSalesOrder(request: CreateSalesOrderRequest): Promise<TransactionInfoResponse>;
     createCashRegisterOrder(request: CreateCashRegisterOrderRequest): Promise<TransactionInfoResponse>;

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

@@ -219,6 +219,7 @@ export declare class TransactionConnectorService {
     lockTransactionById(transId: number, version: number): Promise<TransactionLockResult>;
     commit(): Promise<boolean>;
     rollback(): Promise<boolean>;
+    rollbackBeacon(): Promise<void>;
     saveTransaction(uuid: string, showLoader?: boolean): Promise<TransactionInfoResponse>;
     getCashRegisters(branch?: string, group?: number): Promise<CashRegister[]>;
     getCashDrawers(cashDrawersRequest: CashDrawersRequest): Promise<CashDrawer[]>;

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

@@ -58,7 +58,7 @@ export declare class TransactionEventService {
     readonly rightSidebarClose: Subject<void>;
     readonly scrollContent: Subject<Scroll>;
     readonly selectAllLines: Subject<boolean>;
-    readonly transactionHeaderDirty: Subject<boolean>;
+    readonly transactionDirty: Subject<boolean>;
     readonly transactionLineChanged: Subject<TransactionLineInfo>;
     readonly transactionLineCheckboxChanged: Subject<{
         line: TransactionLineInfo;
@@ -157,4 +157,6 @@ export declare class TransactionEventService {
         lineNr: number;
     }>;
     readonly blockScreen: BehaviorSubject<boolean>;
+    readonly saveTransactionClick: Subject<void>;
+    readonly cancelTransactionClick: Subject<void>;
 }

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

@@ -2,7 +2,7 @@ import { DiscountType } from '@colijnit/transactionapi/build/enum/discount-type.
 import { ArticleFullObject } from '@colijnit/transactionapi/build/model/article-full-object';
 import { CashRegister } from '@colijnit/transactionapi/build/model/cash-register';
 import { CashOnDeliveryData } from '@colijnit/transactionapi/build/model/cash-on-delivery-data';
-import { ChangeHeaderCashOnDeliveryAmountRequest } from "@colijnit/transactionapi/build/model/change-header-cash-on-delivery-amount-request";
+import { ChangeHeaderCashOnDeliveryAmountRequest } from '@colijnit/transactionapi/build/model/change-header-cash-on-delivery-amount-request';
 import { CodeDescription } from '@colijnit/transactionapi/build/model/code-description';
 import { Country } from '@colijnit/transactionapi/build/model/country.bo';
 import { CustomerGroup } from '@colijnit/transactionapi/build/model/customer-group.bo';
@@ -110,30 +110,30 @@ import { OrderLineSetDTO } from '@colijnit/transactionapi/build/model/order-line
 import { TransactionAddOrderLineSetTextLineRequest } from '@colijnit/transactionapi/build/model/transaction-add-order-line-set-text-line-request';
 import { TransactionSearchViewRequest } from '@colijnit/transactionapi/build/model/transaction-search-view-request';
 import { ArticleExtended } from '@colijnit/articleapi/build/model/article-extended.bo';
-import { CauseCode } from "@colijnit/transactionapi/build/model/cause-code.bo";
+import { CauseCode } from '@colijnit/transactionapi/build/model/cause-code.bo';
 import { PdfPosReceiptRequest } from '@colijnit/transactionapi/build/model/pdf-pos-receipt-request';
 import { PdfPosReceiptResponse } from '@colijnit/transactionapi/build/model/pdf-pos-receipt-response.bo';
 import { ProjectCode } from '@colijnit/transactionapi/build/model/project-code.bo';
 import { CashType } from '@colijnit/transactionapi/build/model/cash-type.bo';
 import { PosGroup } from '@colijnit/transactionapi/build/model/pos-group.bo';
 import { TransactionAddPaymentLineRequest } from '@colijnit/transactionapi/build/model/transaction-add-payment-line-request';
-import { PdfTransactionSearchOverviewResponse } from "@colijnit/transactionapi/build/model/pdf-transaction-search-overview-response";
-import { PrintPurchaseOrderForSalesOrderRequest } from "@colijnit/transactionapi/build/model/print-purchase-order-for-sales-order-request";
-import { Activity } from "@colijnit/mainapi/build/model/activity.bo";
-import { TransactionMarginInfo } from "@colijnit/transactionapi/build/model/transaction-margin-info.bo";
-import { DataServiceResponseData } from "@colijnit/ioneconnector/build/model/data-service-response-data";
-import { OrderLinesPlannedRequest } from "@colijnit/transactionapi/build/model/order-lines-planned-request.bo";
-import { PlanOrderLine } from "@colijnit/transactionapi/build/model/plan-order-line.bo";
-import { PlanOrder } from "@colijnit/transactionapi/build/model/plan-order.bo";
-import { SupplierArticleStockForecast } from "@colijnit/transactionapi/build/model/supplier-article-stock-forecast";
-import { ChangeLineDirectSellRequest } from "@colijnit/transactionapi/build/model/change-line-direct-sell-request";
-import { ServiceWizard } from "@colijnit/transactionapi/build/model/service-wizard";
-import { ServiceType } from "@colijnit/transactionapi/build/model/service-type";
-import { OrderReservationSalesOrderLinesRequest } from "@colijnit/transactionapi/build/model/order-reservation-sales-order-lines-request.bo";
-import { PurchaseReservation } from "@colijnit/transactionapi/build/model/purchase-reservation.bo";
-import { ProcessOrderReservationRequest } from "@colijnit/transactionapi/build/model/process-order-reservation-request.bo";
-import { RelationSmallObject } from "@colijnit/mainapi/build/model/relation-small-object.bo";
-import { TransactionLineSearchIndex } from "@colijnit/transactionapi/build/model/transaction-line-search-index.bo";
+import { PdfTransactionSearchOverviewResponse } from '@colijnit/transactionapi/build/model/pdf-transaction-search-overview-response';
+import { PrintPurchaseOrderForSalesOrderRequest } from '@colijnit/transactionapi/build/model/print-purchase-order-for-sales-order-request';
+import { Activity } from '@colijnit/mainapi/build/model/activity.bo';
+import { TransactionMarginInfo } from '@colijnit/transactionapi/build/model/transaction-margin-info.bo';
+import { DataServiceResponseData } from '@colijnit/ioneconnector/build/model/data-service-response-data';
+import { OrderLinesPlannedRequest } from '@colijnit/transactionapi/build/model/order-lines-planned-request.bo';
+import { PlanOrderLine } from '@colijnit/transactionapi/build/model/plan-order-line.bo';
+import { PlanOrder } from '@colijnit/transactionapi/build/model/plan-order.bo';
+import { SupplierArticleStockForecast } from '@colijnit/transactionapi/build/model/supplier-article-stock-forecast';
+import { ChangeLineDirectSellRequest } from '@colijnit/transactionapi/build/model/change-line-direct-sell-request';
+import { ServiceWizard } from '@colijnit/transactionapi/build/model/service-wizard';
+import { ServiceType } from '@colijnit/transactionapi/build/model/service-type';
+import { OrderReservationSalesOrderLinesRequest } from '@colijnit/transactionapi/build/model/order-reservation-sales-order-lines-request.bo';
+import { PurchaseReservation } from '@colijnit/transactionapi/build/model/purchase-reservation.bo';
+import { ProcessOrderReservationRequest } from '@colijnit/transactionapi/build/model/process-order-reservation-request.bo';
+import { RelationSmallObject } from '@colijnit/mainapi/build/model/relation-small-object.bo';
+import { TransactionLineSearchIndex } from '@colijnit/transactionapi/build/model/transaction-line-search-index.bo';
 export declare class TransactionService extends PendingReasonService {
     remainingAmount: number;
     private readonly _createTransactionMethods;
@@ -153,6 +153,7 @@ export declare class TransactionService extends PendingReasonService {
     prepareMLocatInternalParam(): void;
     preparePakBinnenInternalParam(): void;
     prepareJsPickingListInternalParam(): Promise<void>;
+    prepareManualSaveInternalParam(): Promise<void>;
     logisticsButtonVisible: () => Promise<boolean>;
     prepareDropShipmentInternalParam(): void;
     prepareReceiveGoodsWithDataTerminalInternalParam(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/transaction",
-  "version": "255.1.36",
+  "version": "255.1.38",
   "description": "Colijn IT transaction module for Angular 12",
   "repository": "npm/npm",
   "author": "Colijn IT",
@@ -12,15 +12,15 @@
     "@colijnit/articleapi": ">=255.1.1",
     "@colijnit/catalog": ">=255.1.1",
     "@colijnit/corecomponents": ">=1.12.0",
-    "@colijnit/corecomponents_v12": ">=255.1.8",
-    "@colijnit/ioneconnector": ">=255.1.1",
-    "@colijnit/mainapi": ">=255.1.6",
+    "@colijnit/corecomponents_v12": ">=255.1.10",
+    "@colijnit/ioneconnector": ">=255.1.2",
+    "@colijnit/mainapi": ">=255.1.7",
     "@colijnit/product": ">=255.1.1",
     "@colijnit/relation": ">=255.1.2",
     "@colijnit/relationapi": ">=255.1.3",
     "@colijnit/sharedapi": ">=1.0.20",
     "@colijnit/sharedcomponents": ">=255.1.19",
-    "@colijnit/transactionapi": ">=255.1.13",
+    "@colijnit/transactionapi": ">=255.1.14",
     "@types/three": ">=0.125.0",
     "@tweenjs/tween.js": ">=17.2.0",
     "three": ">=0.125.0",