@colijnit/transaction 261.20.30 → 261.20.32

package/index.d.ts

@@ -2319,7 +2319,7 @@ declare class TransactionBaseService extends BaseModuleService implements OnDest
     constructor(optionsService: TransactionSettingsService, dialogService: TransactionDialogService, connector: TransactionConnectorService, articleConnector: ArticleConnectorService, dictionaryService: DictionaryService, transactionEventService: TransactionEventService, transactionRelationService: TransactionRelationService, screenConfigService: TransactionScreenConfigurationService, relationService: RelationService, sharedService: SharedService);
     init(options: any, resetCurrentTransaction?: boolean): Promise<void>;
     ngOnDestroy(): void;
-    prepareMLocatInternalParam(): void;
+    prepareMLocatInternalParam(): Promise<void>;
     preparePakBinnenInternalParam(): void;
     prepareDirectSellInternalParam(): Promise<void>;
     prepareJsPickingListInternalParam(): Promise<void>;
@@ -2332,6 +2332,7 @@ declare class TransactionBaseService extends BaseModuleService implements OnDest
     prepareReceiveGoodsWithDataTerminalInternalParam(): void;
     preparePrintColliStickerDefault(): void;
     getInternalParameter(param: InternalParam): Promise<boolean>;
+    getCashLimitValue(param: InternalParam): Promise<number>;
     getInternalDefault(param: InternalDefault): Promise<string>;
     checkTransactionValidity(): Promise<boolean>;
     createNewRelation(): void;
@@ -4642,6 +4643,8 @@ declare class TransactionLineService {
     lineQuantityPurchaseConfirmed: number;
     lineQuantityTransportNotification: number;
     lineQuantityInvoiceControl: number;
+    lineQuantitySignedOff: number;
+    lineQuantityReturnRequested: number;
     decimals: number;
     isText: boolean;
     isArticle: boolean;
@@ -7241,6 +7244,7 @@ declare class QuestionAnswerComponent {
     onChangeAnswer(changedAnswer: ServiceWizardAnswer): void;
     onQaResultChange(newVResult: QaResult): void;
     onWizardFinished(wizardFinished: boolean): void;
+    resetResult(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<QuestionAnswerComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<QuestionAnswerComponent, "co-question-answer-item", never, { "question": { "alias": "question"; "required": false; }; "answers": { "alias": "answers"; "required": false; }; }, { "qaResultChange": "qaResultChange"; "wizardFinished": "wizardFinished"; }, never, never, false, never>;
 }
@@ -7254,6 +7258,7 @@ interface QaResult {
 
 declare class ServiceWizardQaComponent implements OnInit {
     transactionService: TransactionService;
+    qaComponent: QuestionAnswerComponent;
     wizardFinished: EventEmitter<string>;
     skipWizard: EventEmitter<void>;
     serviceWizardQuestion: ServiceWizardQuestion;
@@ -7262,7 +7267,9 @@ declare class ServiceWizardQaComponent implements OnInit {
     ngOnInit(): Promise<void>;
     onQaResultChange(newVResult: QaResult): void;
     onWizardFinished(wizardFinished: boolean): void;
-    buildQAString(): string;
+    resetWizard(): void;
+    private getServiceWizard;
+    private buildQAString;
     static ɵfac: i0.ɵɵFactoryDeclaration<ServiceWizardQaComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<ServiceWizardQaComponent, "co-service-wizard-qa", never, {}, { "wizardFinished": "wizardFinished"; "skipWizard": "skipWizard"; }, never, never, false, never>;
 }
@@ -8858,6 +8865,7 @@ declare abstract class TransactionReceiveGoodsLineBaseComponent extends Transact
     showCheckboxForLine: boolean;
     returnStockMode: boolean;
     calculatedStickerAmount: number;
+    showLocation: boolean;
     private _subscriptions;
     ngOnInit(): Promise<void>;
     ngOnDestroy(): void;
@@ -9019,6 +9027,7 @@ declare abstract class TransactionInterbranchReceiveGoodsLineBaseComponent exten
     showCheckboxForLine: boolean;
     returnStockMode: boolean;
     calculatedStickerAmount: number;
+    showLocation: boolean;
     private _subscriptions;
     ngOnInit(): Promise<void>;
     ngOnDestroy(): void;
@@ -9822,7 +9831,7 @@ declare class TransactionSalesOverviewButtonBarButtonComponent extends Transacti
     showCategories: boolean;
     constructor(iconCacheService: IconCacheService, changeDetector: ChangeDetectorRef, _transactionEventService: TransactionEventService, _mappingService: TransactionMappingService, _dictionaryService: DictionaryService, _screenConfigService: TransactionScreenConfigurationService, _transactionService: TransactionService, _elementRef: ElementRef, _renderer: Renderer2, _transactionBaseService: TransactionService);
     currentIcon(): Icon.CartShoppingRegular | Icon.ChartPieSimpleRegular;
-    currentTitle(): "MARGINS" | "OVERVIEW";
+    currentTitle(): "OVERVIEW" | "MARGINS";
     ngOnDestroy(): void;
     handleClickWrapper(event: MouseEvent): void;
     handleMarginClicked(event: MouseEvent, category: TransactionTypeCategory): void;
@@ -9848,7 +9857,7 @@ declare class TransactionPurchaseOverviewButtonBarButtonComponent extends Transa
     constructor(iconCacheService: IconCacheService, transactionHeaderService: TransactionHeaderService, transactionEventService: TransactionEventService, changeDetector: ChangeDetectorRef, _mappingService: TransactionMappingService, _transactionService: TransactionService, _elementRef: ElementRef);
     ngOnDestroy(): void;
     currentIcon(): Icon.CartShoppingRegular | Icon.ChartPieSimpleRegular;
-    currentTitle(): "MARGINS" | "OVERVIEW";
+    currentTitle(): "OVERVIEW" | "MARGINS";
     handleClickWrapper(event: MouseEvent): void;
     handleMarginClicked(event: MouseEvent, category: TransactionTypeCategory): Promise<void>;
     private handleDocumentClick;
@@ -9900,7 +9909,7 @@ declare class TransactionSalesQuotationButtonBarButtonComponent extends Transact
     showCategories: boolean;
     constructor(iconCacheService: IconCacheService, changeDetector: ChangeDetectorRef, _transactionEventService: TransactionEventService, _mappingService: TransactionMappingService, _dictionaryService: DictionaryService, _screenConfigService: TransactionScreenConfigurationService, _transactionService: TransactionService, _elementRef: ElementRef, _renderer: Renderer2, _transactionBaseService: TransactionService);
     currentIcon(): Icon.CartShoppingRegular | Icon.ChartPieSimpleRegular;
-    currentTitle(): "MARGINS" | "OVERVIEW";
+    currentTitle(): "OVERVIEW" | "MARGINS";
     ngOnDestroy(): void;
     handleClickWrapper(event: MouseEvent): void;
     handleMarginClicked(event: MouseEvent, category: TransactionTypeCategory): void;
@@ -10020,6 +10029,7 @@ declare class TransactionLinePurchaseReceiveGoodsComponent extends TransactionLi
     warehouseLocationButtonDisabled: boolean;
     quantityToReceive: number;
     calculatedStickerAmount: number;
+    showLocation: boolean;
     private _subs;
     private _defaultReportId;
     constructor(transactionHeaderService: TransactionHeaderService, transactionLineService: TransactionLineService, transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, transactionScreenConfigurationService: TransactionScreenConfigurationService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, _formMaster: FormMasterService);
@@ -10826,6 +10836,7 @@ declare class DeliveryPlanningOverviewComponent implements OnInit, OnDestroy {
     getSequenceOrderValue(order: PlanOrder): Promise<void>;
     handlePopupPlanEvent(event: [PlanOrder, PlanningTransportWeekDay, PlanningTransportWeekDay[]]): Promise<void>;
     handleSettingsReset(): void;
+    handleSettingsSaved(): Promise<void>;
     openSettingsDialog(transportDay: PlanningTransportWeekDay): void;
     handleCalendarPlanEvent(data: {
         currentHour: string;
@@ -13251,6 +13262,7 @@ declare class TransactionLineInterbranchReceiveGoodsComponent extends Transactio
     warehouseLocationButtonDisabled: boolean;
     quantityToReceive: number;
     calculatedStickerAmount: number;
+    showLocation: boolean;
     private _subs;
     private _defaultReportId;
     constructor(transactionHeaderService: TransactionHeaderService, transactionLineService: TransactionLineService, transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, transactionScreenConfigurationService: TransactionScreenConfigurationService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, _formMaster: FormMasterService);
@@ -13992,6 +14004,7 @@ declare class TransactionHeaderPaymentComponent extends TransactionHeaderBaseCom
     toPay: number;
     remainingToPay: number;
     showRemainingPayment: boolean;
+    needRefreshTransaction: boolean;
     private _subs;
     constructor(transactionHeaderService: TransactionHeaderService, transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, transactionScreenConfigurationService: TransactionScreenConfigurationService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, _paymentConnectorService: TransactionPaymentConnectorService);
     ngOnInit(): void;

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

@@ -2,13 +2,21 @@
   .co-checkout {
     display: block;
     width: 100%;
+    .co-stepper {
+      &.no-cart {
+        .co-stepper-content-wrapper {
+          justify-content: center;
+        }
+      }
+    }
     .co-stepper-content-wrapper {
       display: flex;
       flex-direction: row;
       flex-wrap: nowrap;
       column-gap: $tp-checkout-column-gap;
       padding: $tp-checkout-padding;
-      max-width: $tp-checkout-wrapper-max-width;
+      width: $tp-checkout-wrapper-max-width;
+      max-width: 100%;
       margin: 0 auto;
     }
     .co-stepper-step {

package/lib/component/returns/return-wizard/return-lines-wizard/style/_layout.scss

@@ -6,6 +6,7 @@
       row-gap: 10px;
 
       .lines-wizard-sub-title {
+        margin-top: 30px;
         font-weight: bold;
       }
 
@@ -17,7 +18,10 @@
           min-height: 150px;
           overflow-x: auto;
 
-          .co-drag-drop-container {
+          co-drag-drop-container {
+            display: flex;
+            flex-direction: row;
+            column-gap: 20px;
             padding-top: 30px;
             position: relative;
             margin-top: 0;

package/lib/component/transaction-line/transaction-receive-goods-line/style/_layout.scss

@@ -1,6 +1,21 @@
 @include export-module('cc-transaction-receive-goods-line-layout') {
   .co-transaction-receive-goods-line {
 
+    .column {
+      display: flex;
+      flex-direction: column;
+      flex-grow: 1;
+      align-items: flex-start;
+      justify-content: center;
+      padding: 2rem 0 0 0;
+      width: 100%;
+
+    }
+
+    .center {
+      text-align: center;
+      width: 100%;
+    }
   }
 
   .co-input-number-picker .icon-wrapper {

package/lib/component/transaction-line-interbranch-receive-goods/style/_layout.scss

@@ -1,78 +1,78 @@
-@include export-module('co-transaction-line-interbranch-receive-goods-layout') {
-  .co-transaction-line-interbranch-receive-goods {
-    .columns-wrapper {
-      display: flex;
-    }
-
-    .co-input-number-picker {
-      width: 140px;
-    }
-
-    .details-column {
-      width: 45%;
-      display: flex;
-      flex-direction: column;
-
-      .transaction-line-totals-amount {
-        margin: 5px;
-      }
-
-      //.amount-number-picker {
-      //  height: 40px;
-      //  margin: 5px;
-      //}
-    }
-
-    .header-wrapper {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      margin: $tp-co-transaction-line-receive-goods-title-margin;
-
-      .details-header {
-        font-size: $tp-co-transaction-line-receive-goods-title-font-size;
-        font-weight: bold;
-      }
-    }
-
-    .divider-wrapper {
-      display: flex;
-      width: 10%;
-      justify-content: center;
-      visibility: hidden;
-
-      .divider {
-        border-left: 1px solid;
-        border-color: $tp-color-border;
-        margin: 5px; // $tp-co-transaction-request-details-input-margin;
-      }
-    }
-
-    .details-input {
-      margin: 5px; // $tp-co-transaction-request-details-input-margin;
-    }
-
-    .location-wrapper {
-      position: relative;
-
-      .co-transaction-button {
-        width: auto;
-        margin: 5px;
-      }
-    }
-    .disabled {
-      cursor: default;
-      opacity: 0.6;
-    }
-    .clickable {
-      cursor: pointer;
-    }
-
-    .warehouse-buttons {
-      width: 100%;
-      .co-transaction-button {
-        width: 100%;
-      }
-    }
-  }
-}
+@include export-module('co-transaction-line-interbranch-receive-goods-layout') {
+  .co-transaction-line-interbranch-receive-goods {
+    .columns-wrapper {
+      display: flex;
+    }
+
+    .co-input-number-picker {
+      width: 140px;
+    }
+
+    .details-column {
+      width: 45%;
+      display: flex;
+      flex-direction: column;
+
+      .transaction-line-totals-amount {
+        margin: 5px;
+      }
+
+      //.amount-number-picker {
+      //  height: 40px;
+      //  margin: 5px;
+      //}
+    }
+
+    .header-wrapper {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin: $tp-co-transaction-line-receive-goods-title-margin;
+
+      .details-header {
+        font-size: $tp-co-transaction-line-receive-goods-title-font-size;
+        font-weight: bold;
+      }
+    }
+
+    .divider-wrapper {
+      display: flex;
+      width: 10%;
+      justify-content: center;
+      visibility: hidden;
+
+      .divider {
+        border-left: 1px solid;
+        border-color: $tp-color-border;
+        margin: 5px; // $tp-co-transaction-request-details-input-margin;
+      }
+    }
+
+    .details-input {
+      margin: 5px; // $tp-co-transaction-request-details-input-margin;
+    }
+
+    .location-wrapper {
+      position: relative;
+
+      .co-transaction-button {
+        width: auto;
+        margin: 5px;
+      }
+    }
+    .disabled {
+      cursor: default;
+      opacity: 0.6;
+    }
+    .clickable {
+      cursor: pointer;
+    }
+
+    .warehouse-buttons {
+      width: 100%;
+      .co-transaction-button {
+        width: 100%;
+      }
+    }
+  }
+}

package/lib/component/transaction-line-interbranch-receive-goods/style/_material-definition.scss

@@ -1,2 +1,2 @@
-$tp-co-transaction-line-receive-goods-title-font-size: 12px !default;
-$tp-co-transaction-line-receive-goods-title-margin: 0 0 10px 5px !default;
+$tp-co-transaction-line-receive-goods-title-font-size: 12px !default;
+$tp-co-transaction-line-receive-goods-title-margin: 0 0 10px 5px !default;

package/lib/component/transaction-line-interbranch-receive-goods/style/_theme.scss

@@ -1,4 +1,4 @@
-@include export-module('co-transaction-line-interbranch-receive-goods-theme') {
-  .co-transaction-line-interbranch-receive-goods {
-  }
-}
+@include export-module('co-transaction-line-interbranch-receive-goods-theme') {
+  .co-transaction-line-interbranch-receive-goods {
+  }
+}

package/lib/component/transaction-line-interbranch-receive-goods/style/material.scss

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

package/lib/component/transaction-line-side-panel/style/_layout.scss

@@ -78,6 +78,9 @@
       border-width: $tp-transaction-line-side-panel-panel-nav-bar-border-width;
       .co-transaction-button-bar {
         padding: 0;
+        .button-bar-wrapper {
+          gap: 0;
+        }
         .button-title {
           font-size: 9px;
         }

package/lib/component/transaction-quick-access/transaction-quick-access-interbranch-order-purchase/style/_layout.scss

@@ -1,27 +1,27 @@
-@use "sass:math";
-@import "../../../../style/mixin";
-
-@include export-module('co-transaction-quick-access-interbranch-order-purchase-layout') {
-  .co-transaction-quick-access-interbranch-order-purchase {
-    .select-all-wrapper {
-      display: flex;
-      align-items: center;
-    }
-    .button {
-      padding: 0.25em;
-      background-color: white;
-      border: 1px solid $tp-transaction-quick-access-planning-lsp-mode-button;
-      cursor: pointer;
-      co-icon {
-        fill: $tp-transaction-quick-access-planning-lsp-mode-button;
-      }
-      &.selected {
-        background-color: $tp-transaction-quick-access-planning-lsp-mode-button;
-        co-icon {
-          fill: white;
-        }
-      }
-    }
-
-  }
-}
+@use "sass:math";
+@import "../../../../style/mixin";
+
+@include export-module('co-transaction-quick-access-interbranch-order-purchase-layout') {
+  .co-transaction-quick-access-interbranch-order-purchase {
+    .select-all-wrapper {
+      display: flex;
+      align-items: center;
+    }
+    .button {
+      padding: 0.25em;
+      background-color: white;
+      border: 1px solid $tp-transaction-quick-access-planning-lsp-mode-button;
+      cursor: pointer;
+      co-icon {
+        fill: $tp-transaction-quick-access-planning-lsp-mode-button;
+      }
+      &.selected {
+        background-color: $tp-transaction-quick-access-planning-lsp-mode-button;
+        co-icon {
+          fill: white;
+        }
+      }
+    }
+
+  }
+}

package/lib/component/transaction-quick-access/transaction-quick-access-interbranch-order-purchase/style/_material-definition.scss

@@ -1 +1 @@
-$tp-transaction-quick-access-planning-lsp-mode-button: #1A73E8;
+$tp-transaction-quick-access-planning-lsp-mode-button: #1A73E8;

package/lib/component/transaction-quick-access/transaction-quick-access-interbranch-order-purchase/style/_theme.scss

@@ -1,4 +1,4 @@
-@include export-module('co-transaction-quick-access-interbranch-order-purchase-theme') {
-  .co-transaction-quick-access-interbranch-order-purchase {
-  }
-}
+@include export-module('co-transaction-quick-access-interbranch-order-purchase-theme') {
+  .co-transaction-quick-access-interbranch-order-purchase {
+  }
+}

package/lib/component/transaction-quick-access/transaction-quick-access-interbranch-order-purchase/style/material.scss

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

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

@@ -1,73 +1,73 @@
-@import "../../../../style/mixin";
-
-@include export-module('cc-transaction-quick-access-received-goods-layout') {
-  .co-transaction-quick-access-received-goods {
-
-    .quick-access-wrapper {
-      display: flex;
-      flex-direction: row;
-      column-gap: 10px;
-      align-items: start;
-
-      .sub-section-input {
-        display: flex;
-        flex-direction: column;
-        gap: 10px;
-      }
-
-      .sub-section {
-        display: flex;
-        flex-direction: row;
-        column-gap: 10px;
-        .checkbox-wrapper {
-          display: flex;
-          flex-direction: row;
-        }
-
-        .dots-wrapper {
-          display: flex;
-          transform: scale(0.7);
-
-          .dot {
-            width: 8px;
-            height: 8px;
-            background-color: black;
-            border-radius: 16px;
-            transform: scale(0.3);
-          }
-        }
-
-        .co-input-date {
-          min-width: 170px;
-        }
-
-        .co-input-text {
-          min-width: 100px;
-        }
-
-        .button-wrapper {
-          background: $tp-default-background-accent;
-          border-radius: $tp-default-border-radius;
-          padding: 5px;
-          display: flex;
-          flex-direction: column;
-          align-items: center;
-          justify-content: center;
-          cursor: pointer;
-          width: 68px;
-          height: 46px;
-
-          .button-icon {
-            height: 20px;
-            width: 20px;
-          }
-
-          span {
-            font-size: 10px;
-            margin-top: 3px;
-          }
-        }
-      }
-    }
-  }
-}
+@import "../../../../style/mixin";
+
+@include export-module('cc-transaction-quick-access-received-goods-layout') {
+  .co-transaction-quick-access-received-goods {
+
+    .quick-access-wrapper {
+      display: flex;
+      flex-direction: row;
+      column-gap: 10px;
+      align-items: start;
+
+      .sub-section-input {
+        display: flex;
+        flex-direction: column;
+        gap: 10px;
+      }
+
+      .sub-section {
+        display: flex;
+        flex-direction: row;
+        column-gap: 10px;
+        .checkbox-wrapper {
+          display: flex;
+          flex-direction: row;
+        }
+
+        .dots-wrapper {
+          display: flex;
+          transform: scale(0.7);
+
+          .dot {
+            width: 8px;
+            height: 8px;
+            background-color: black;
+            border-radius: 16px;
+            transform: scale(0.3);
+          }
+        }
+
+        .co-input-date {
+          min-width: 170px;
+        }
+
+        .co-input-text {
+          min-width: 100px;
+        }
+
+        .button-wrapper {
+          background: $tp-default-background-accent;
+          border-radius: $tp-default-border-radius;
+          padding: 5px;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          cursor: pointer;
+          width: 68px;
+          height: 46px;
+
+          .button-icon {
+            height: 20px;
+            width: 20px;
+          }
+
+          span {
+            font-size: 10px;
+            margin-top: 3px;
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -1,6 +1,6 @@
-@import "../../../../style/mixin";
-
-@include export-module('cc-transaction-quick-access-received-goods-theme') {
-  .co-transaction-quick-access-received-goods {
-  }
-}
+@import "../../../../style/mixin";
+
+@include export-module('cc-transaction-quick-access-received-goods-theme') {
+  .co-transaction-quick-access-received-goods {
+  }
+}

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

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

package/lib/component/transaction-search/transaction-filter/transaction-filter/style/_layout.scss

@@ -5,7 +5,7 @@
     .transaction-filter-wrapper {
       display: flex;
     }
-    .co-transaction-sales-order-filter, .co-transaction-purchase-order-filter, .co-transaction-sales-quotation-filter, co-transaction-cash-desk-filter {
+    .co-transaction-sales-order-filter, .co-transaction-purchase-order-filter, .co-transaction-sales-quotation-filter, co-transaction-cash-desk-filter, co-transaction-service-order-filter {
       font-family: $tp-co-transaction-filter-font-family;
       font-size: $tp-co-transaction-filter-font-size;
       width: $cc-co-transaction-filter-width;

package/lib/component/transaction-search/transaction-search-result/style/_layout.scss

@@ -39,7 +39,7 @@
     }
 
     .pagination {
-      padding: 0 25px;
+      padding: 0 10px;
     }
 
     .empty-state-wrapper {