@colijnit/transaction 12.1.158 → 12.1.160

package/lib/component/checkout/style/_layout.scss

@@ -7,7 +7,7 @@
     .co-stepper-content-wrapper {
       display: flex;
       flex-direction: row;
-      flex-wrap: wrap;
+      flex-wrap: nowrap;
       column-gap: $tp-checkout-column-gap;
       padding: $tp-checkout-padding;
     }
@@ -24,7 +24,8 @@
       flex-basis: $tp-checkout-right-panel-width;
       flex-grow: 1;
       flex-shrink: 1;
-      max-width: $tp-checkout-max-width;
+      max-width: $tp-checkout-right-panel-max-width;
+      width: 100%;
       .cart-header-label {
         display: none;
       }
@@ -103,6 +104,34 @@
         flex: 1;
         width: 100%;
       }
+      co-transaction-header-delivery-method {
+        max-width: $tp-checkout-transaction-delivery-method-carousel-max-width;
+        .co-carousel {
+          .carousel-navigate-button {
+            &.right {
+              right: $tp-checkout-transaction-delivery-method-carousel-button-right;
+            }
+            .carousel-navigate-button-wrapper {
+              width: $tp-checkout-transaction-delivery-method-carousel-button-size;
+              height: $tp-checkout-transaction-delivery-method-carousel-button-size;
+              box-shadow: $tp-checkout-transaction-delivery-method-carousel-button-shadow;
+              svg {
+                width: $tp-checkout-transaction-delivery-method-carousel-button-svg-size;
+                height: $tp-checkout-transaction-delivery-method-carousel-button-svg-size;
+              }
+            }
+          }
+        }
+      }
+      .collapsible-header-start, .collapsible-header-end {
+        align-items: center;
+      }
+      .co-transaction-header-definitive {
+        margin: $tp-checkout-transaction-header-definitive-margin;
+      }
+      .co-radio-button {
+        border-width: $cc-radio-button-border-width;
+      }
     }
     .collapseable {
       overflow: hidden;

package/lib/component/checkout/style/_material-definition.scss

@@ -4,6 +4,7 @@ $tp-checkout-column-gap: 30px !default;
 $tp-checkout-row-gap: 10px !default;
 $tp-checkout-default-width: 55% !default;
 $tp-checkout-max-width: calc(100% - 450px) !default;
+$tp-checkout-right-panel-max-width: 450px !default;
 $tp-checkout-wrapper-max-width: 1340px !default;
 $tp-checkout-right-panel-row-gap: 15px !default;
 $tp-checkout-right-panel-width: 400px !default;

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

@@ -15,15 +15,14 @@ import { TransactionEventService } from '../../../service/transaction-event.serv
 import { IconCacheService } from '../../../service/icon-cache.service';
 import { TransactionImageService } from '../../../service/transaction-image.service';
 import { RelationKind } from '@colijnit/relationapi/build/enum/relation-kind.enum';
-import { TransactionScreenConfigurationService } from '../../../service/transaction-screen-configuration.service';
 import { TransactionDeliveryCostLineInfo } from '@colijnit/transactionapi/build/model/transaction-delivery-cost-line-info.bo';
-import { OrderLineSetInfo } from "@colijnit/transactionapi/build/model/order-line-set-info.bo";
-import { ScreenConfigAdapterComponent } from '@colijnit/corecomponents_v12';
+import { OrderLineSetInfo } from '@colijnit/transactionapi/build/model/order-line-set-info.bo';
+import { BaseModuleScreenConfigService, ScreenConfigAdapterComponent } from '@colijnit/corecomponents_v12';
 import { TransactionCfgName } from '../../../enum/transaction-cfg-name.enum';
 export declare abstract class TransactionBaseComponent implements OnInit, OnDestroy, ScreenConfigAdapterComponent {
     transactionEventService: TransactionEventService;
     iconCacheService: IconCacheService;
-    screenConfigService: TransactionScreenConfigurationService;
+    screenConfigService: BaseModuleScreenConfigService;
     protected imageService: TransactionImageService;
     protected dictionaryService: DictionaryService;
     protected transactionService: TransactionService;
@@ -117,7 +116,7 @@ export declare abstract class TransactionBaseComponent implements OnInit, OnDest
     private _selected;
     private _baseSubs;
     private _cfgName;
-    constructor(transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef);
+    constructor(transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: BaseModuleScreenConfigService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef);
     ngOnInit(): void;
     ngOnDestroy(): void;
     handleCommit(value: any): Promise<boolean>;

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

@@ -110,7 +110,7 @@ export declare class TransactionBaseService extends BaseModuleService {
     searchTransactions(request: TransactionSearchViewRequest): Promise<TransactionSearchResult>;
     getTransactionById(transactionId: number): Promise<void>;
     getTransactionByNrAndKind(transactionNr: number, transactionKind: TransactionKind): Promise<void>;
-    getWebSessionSalesOrder(): Promise<void>;
+    getWebSessionSalesOrder(transactionUuid: string): Promise<boolean>;
     tryToLockTransaction(id: number, version: number, secondAttempt?: boolean): Promise<boolean>;
     getTransactionInfo(transId: number, lineId: number): Promise<TransactionInfoHistory[]>;
     getRefTransactions(transId: number): Promise<RefTransaction[]>;

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

@@ -154,7 +154,7 @@ export declare class TransactionConnectorAdapterService {
     getArticleBoundTextLinesOfArticleLine(articleLineUuid: string): Promise<TransactionLineInfo[]>;
     getTransactionByNrAndKind(kind: TransactionKind, transactionNo: number): Promise<TransactionInfoResponse>;
     getTransactionById(transactionId: number): Promise<TransactionInfoResponse>;
-    getWebSessionSalesOrder(): Promise<TransactionInfoResponse>;
+    getWebSessionSalesOrder(transactionUuid: string): Promise<TransactionInfoResponse>;
     deleteTransactionByUuId(uuid: string): Promise<TransactionInfoResponse>;
     lockTransactionById(transactionId: number, version: number): Promise<TransactionLockResult>;
     getCashRegisters(branch?: string, group?: number): Promise<CashRegister[]>;
@@ -195,7 +195,7 @@ export declare class TransactionConnectorAdapterService {
     setRelationByUser(uuid: string, username: string, password: string): Promise<boolean>;
     resolvePendingHeaderReason(pendingHeaderValues: ResolveHeaderPendingReasonRequest): Promise<TransactionInfoResponse>;
     resolvePendingLineReason(pendingLineValues: ResolveLinePendingReasonRequest): Promise<TransactionInfoResponse>;
-    addWebSessionTransactionLine(articleNumber: string, quantity: number): Promise<TransactionInfoResponse>;
+    addWebSessionTransactionLine(transactionUuid: string, articleNumber: string, quantity: number): Promise<TransactionInfoResponse>;
     addTransactionLine(uuid: string, articleNo: string, quantity: number, aboveLineNr: number, belowLineNr: number): Promise<TransactionInfoResponse>;
     addTextLineToTransaction(uuid: string, showOnDocuments: number, text: string, amount: number, articleBound: boolean, refArticleLineNr: number, aboveLineNr?: number, belowLineNr?: number): Promise<TransactionInfoResponse>;
     updateTextLine(uuid: string, lineUuid: string, showOnDocuments: number, text: string): Promise<TransactionInfoResponse>;

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

@@ -143,7 +143,7 @@ export declare class TransactionConnectorService {
     getArticleBoundTextLinesOfArticleLine(articleLineUuid: string): Promise<TransactionLineInfo[]>;
     getTransactionByNrAndKind(kind: TransactionKind, transactionNo: number): Promise<TransactionInfoResponse>;
     getTransactionById(transactionId: number): Promise<TransactionInfoResponse>;
-    getWebSessionSalesOrder(): Promise<TransactionInfoResponse>;
+    getWebSessionSalesOrder(transactionUuid: string): Promise<TransactionInfoResponse>;
     deleteTransactionByUuId(uuid: string): Promise<TransactionInfoResponse>;
     lockTransactionById(transId: number, version: number): Promise<TransactionLockResult>;
     commit(): Promise<boolean>;
@@ -160,7 +160,7 @@ export declare class TransactionConnectorService {
     getDeliveryOptions(): Promise<DeliveryOption[]>;
     addRelationToTransaction(uuid: string, relationId: number): Promise<TransactionInfoResponse>;
     getPostalCodeRetrieval(postcalCode: string, houseNo: string): Promise<GetPostalCodeRetrievalOutputParams>;
-    addWebSessionTransactionLine(articleNumber: string, quantity: number): Promise<TransactionInfoResponse>;
+    addWebSessionTransactionLine(transactionUuid: string, articleNumber: string, quantity: number): Promise<TransactionInfoResponse>;
     addTransactionLine(uuid: string, articleNo: string, quantity: number, aboveLineNr: number, belowLineNr: number): Promise<TransactionInfoResponse>;
     addTextLineToTransaction(uuid: string, showOnDocuments: number, text: string, amount: number, articleBound: boolean, refArticleLineNr: number, aboveLineNr?: number, belowLineNr?: number): Promise<TransactionInfoResponse>;
     updateTextLine(uuid: string, lineUuid: string, showOnDocuments: number, text: string): Promise<TransactionInfoResponse>;

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

@@ -183,7 +183,7 @@ export declare class TransactionService extends PendingReasonService {
     getDeliveryOptions(): Promise<DeliveryOption[]>;
     getSalesPersons(date?: Date): Promise<SalesPerson[]>;
     getRetailStadiums(): Promise<RetailStadium[]>;
-    addWebSessionTransactionLine(articleNumber: string, quantity: number): Promise<void>;
+    addWebSessionTransactionLine(transactionUuid: string, articleNumber: string, quantity: number): Promise<void>;
     addArticle(articleNo: string, quantity?: number, aboveLineNr?: number, belowLineNr?: number, saveTransaction?: boolean): Promise<boolean>;
     addTransactionLine(articleNo: string, quantity?: number, aboveLineNr?: number, belowLineNr?: number): Promise<TransactionInfoResponse>;
     addCatFarmArticle(catalogId: number, jsonArticleString: string): Promise<void>;

package/lib/style/_variables.scss

@@ -57,7 +57,7 @@ $tp-item-size-very-small: 20px !default;
 $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-radio-button-width: auto !default;
 $tp-header-button-min-width: 130px !default;
 $tp-checkout-default-padding: 5px !default;
 $tp-checkout-step-color: $tp-color-action !default;
@@ -165,6 +165,7 @@ $cc-co-calendar-day-number-font-weight: normal !default;
 $cc-co-calendar-weekday-font-size: 13px !default;
 $cc-co-calendar-weekday-color: #0000008a !default;
 $cc-co-calendar-day-margin: 0 !default;
+$cc-radio-button-border-width: 0 !default;
 
 $tp-checkout-co-carousel-tile-width: 160px !default;
 $tp-checkout-co-carousel-tile-height: 100% !default;
@@ -175,4 +176,10 @@ $tp-checkout-co-payment-padding: 30px !default;
 $tp-checkout-co-payment-background: #f8f8fa !default;
 $tp-checkout-checkout-data-column-background: #f8f8fa !default;
 $tp-checkout-co-shopping-cart-preview-background: #f8f8fa !default;
+$tp-checkout-transaction-delivery-method-carousel-max-width: 620px !default;
+$tp-checkout-transaction-delivery-method-carousel-button-right: -80px !default;
+$tp-checkout-transaction-delivery-method-carousel-button-size: 40px !default;
+$tp-checkout-transaction-delivery-method-carousel-button-shadow: 0px 0px 3px 2px rgba(0, 0, 0, 0.2) !default;
+$tp-checkout-transaction-delivery-method-carousel-button-svg-size: 30px !default;
+$tp-checkout-transaction-header-definitive-margin: 10px 0 !default;
 /****************************/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/transaction",
-  "version": "12.1.158",
+  "version": "12.1.160",
   "description": "Colijn IT transaction module for Angular 12",
   "repository": "npm/npm",
   "author": "Colijn IT",
@@ -19,7 +19,7 @@
     "@colijnit/relationapi": ">=1.0.8",
     "@colijnit/sharedapi": ">=1.0.16",
     "@colijnit/sharedcomponents": ">=1.0.46",
-    "@colijnit/transactionapi": ">=1.1.111",
+    "@colijnit/transactionapi": ">=1.1.113",
     "@types/three": ">=0.125.0",
     "@tweenjs/tween.js": ">=17.2.0",
     "three": ">=0.125.0"