@colijnit/transaction 12.1.8 → 12.1.11

package/lib/service/pending-reason.service.d.ts

@@ -1,11 +1,11 @@
 import { TransactionInfoResponse } from "@colijnit/transactionapi/build/model/transaction-info-response.bo";
-import { ResolvePendingLineReasonRequest } from "@colijnit/transactionapi/build/model/resolve-pending-reason-request.bo";
 import { OptionsService } from "./options.service";
 import { IOneConnectorAdapterService } from "./ione-connector-adapter.service";
 import { BehaviorSubject } from "rxjs";
 import { CustomerFullObject } from "@colijnit/transactionapi/build/model/customer-full-object.bo";
 import { SetTransactionDeliveryOptionsRequest } from "@colijnit/transactionapi/build/model/set-transaction-delivery-options-request.bo";
 import { DialogService } from "./dialog.service";
+import { ResolveLinePendingReasonRequest } from "@colijnit/transactionapi/build/model/resolve-pending-reason-request.bo";
 export declare class PendingReasonService {
     protected dialogService: DialogService;
     protected options: OptionsService;
@@ -22,8 +22,9 @@ export declare class PendingReasonService {
     protected handleLineOperationStatuses(response: TransactionInfoResponse): Promise<boolean>;
     protected _rememberCurrentTransaction(value: TransactionInfoResponse): Promise<void>;
     private _handleLineOperationStatus;
-    resolvePendingLineReason(pendingLineValues: ResolvePendingLineReasonRequest): Promise<void>;
+    resolvePendingLineReason(pendingLineValues: ResolveLinePendingReasonRequest): Promise<void>;
     private _confirmAction;
+    private _showReasonDialog;
     private _setTransactionDeliveryOptions;
     private _setAmount;
     private _initializeTransaction;

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

@@ -13,19 +13,37 @@ import { CoDomainValue } from "@colijnit/transactionapi/build/model/co-domain-va
 import { TransactionArticleWarehouse } from "@colijnit/transactionapi/build/model/transaction-article-warehouse.bo";
 import { ArticleFullObject } from "@colijnit/transactionapi/build/model/article-full-object";
 import { LineOperationStatus } from "@colijnit/transactionapi/build/model/line-operation-status.bo";
-import { LineOperationResponse } from "@colijnit/transactionapi/build/model/line-operation-response.bo";
 import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
 import { StandardText } from "../model/standard-text";
 import { DataServiceResponseData } from "@colijnit/transactionapi/build/model/data-service-response-data";
 import { Address } from "@colijnit/transactionapi/build/model/address.bo";
 import { RelationAnyType } from "@colijnit/transactionapi/build/model/relation-any-type";
 import { PendingReasonService } from "./pending-reason.service";
+import { CashRegister } from "@colijnit/transactionapi/build/model/cash-register";
+import { PriceList } from "@colijnit/transactionapi/build/model/price-list";
+import { Vat } from "@colijnit/transactionapi/build/model/vat";
+import { DiscountType } from "@colijnit/transactionapi/build/enum/discount-type.enum";
 export declare class TransactionService extends PendingReasonService {
+    private _imageCache;
     pendingLineOperationStatus(lineOperationStatuses: LineOperationStatus[]): LineOperationStatus | undefined;
+    updatePriceTransactionLine(uuid: string, lineUuid: string, price: number): Promise<boolean>;
+    updateReferenceTransactionLine(uuid: string, lineUuid: string, reference: string): Promise<boolean>;
+    updateQuantityTransactionLine(uuid: string, lineUuid: string, quantity: number): Promise<boolean>;
+    updateDeliveryDateTransactionLine(uuid: string, lineUuid: string, date: Date): Promise<boolean>;
+    updatePriceListTransactionLine(uuid: string, lineUuid: string, priceList: string): Promise<boolean>;
+    updateVatTransactionLine(uuid: string, lineUuid: string, id: number): Promise<boolean>;
+    updateCommissionCodeTransactionLine(uuid: string, lineUuid: string, code: string): Promise<boolean>;
+    updateWarehouseTransactionLine(uuid: string, lineUuid: string, warehouseNumber: number): Promise<boolean>;
+    updateDeliveryMethodTransactionLine(uuid: string, lineUuid: string, method: string): Promise<boolean>;
+    updateDiscountTransactionLine(uuid: string, lineUuid: string, type: DiscountType, discount: number, reason?: string, code?: string): Promise<boolean>;
     getArticleFullObject(goodId: number): Promise<ArticleFullObject>;
+    getDocumentContent(id: number): Promise<string>;
     getGoodIdFromArticleNr(sku: string): Promise<number>;
     getCountry(countryCode: string): Promise<Country>;
+    getCashRegisters(): Promise<CashRegister[]>;
     getRelationNumber(relationId: number): Promise<string>;
+    getPriceLists(): Promise<PriceList[]>;
+    getVatLists(): Promise<Vat[]>;
     saveRelation(): Promise<boolean>;
     getSequenceValue(): Promise<number>;
     getRelationPrivacySettings(): Promise<RelationPrivacySetting[]>;
@@ -52,18 +70,16 @@ export declare class TransactionService extends PendingReasonService {
     getArticleImageByArticleNumber(articleNumber: string): Promise<string>;
     getArticleImageByGoodId(goodId: number): Promise<string>;
     addArticle(articleNo: string, amount?: number, warehouseNo?: number, commissionCode?: string, isReturn?: boolean, aboveLineNr?: number, belowLineNr?: number): Promise<boolean>;
-    addTransactionLine(lineType: TransactionLineType, articleNo: string, amount: number, warehouseNo?: number, commissionCode?: string, isReturn?: boolean, aboveLineNr?: number, belowLineNr?: number, remember?: boolean): Promise<LineOperationResponse>;
-    addTextLine(showOnDocuments: number, text: string, amount: number, articleBound: boolean, refArticleLineNr: number, aboveLineNr?: number, belowLineNr?: number, remember?: boolean): Promise<LineOperationResponse>;
-    addTextLineToTransaction(transactionUuid: string, showOnDocuments: number, text: string, amount: number, articleBound: boolean, refArticleLineNr: number, aboveLineNr?: number, belowLineNr?: number): Promise<LineOperationResponse>;
-    changeLineSequence(lineUuid: string, aboveLineNr?: number, belowLineNr?: number, remember?: boolean): Promise<LineOperationResponse>;
-    deleteTransactionLine(transactionUuid: string, TransactionLineUuid: string, remember?: boolean): Promise<LineOperationResponse>;
-    changeTransactionLineQuantity(lineUuid: string, newQuantity: number, remember?: boolean): Promise<LineOperationResponse>;
+    addTransactionLine(lineType: TransactionLineType, articleNo: string, amount: number, warehouseNo?: number, commissionCode?: string, isReturn?: boolean, aboveLineNr?: number, belowLineNr?: number, remember?: boolean): Promise<TransactionInfoResponse>;
+    addTextLine(showOnDocuments: number, text: string, amount: number, articleBound: boolean, refArticleLineNr: number, aboveLineNr?: number, belowLineNr?: number, remember?: boolean): Promise<TransactionInfoResponse>;
+    addTextLineToTransaction(transactionUuid: string, showOnDocuments: number, text: string, amount: number, articleBound: boolean, refArticleLineNr: number, aboveLineNr?: number, belowLineNr?: number): Promise<TransactionInfoResponse>;
+    changeLineSequence(lineUuid: string, aboveLineNr?: number, belowLineNr?: number, remember?: boolean): Promise<TransactionInfoResponse>;
+    deleteTransactionLine(transactionUuid: string, TransactionLineUuid: string, remember?: boolean): Promise<TransactionInfoResponse>;
+    changeTransactionLineQuantity(lineUuid: string, newQuantity: number, remember?: boolean): Promise<TransactionInfoResponse>;
     setRelationByUser(username: string, password: string): Promise<boolean>;
     getCustomerFullObjectByRelationId(relationId: number): Promise<CustomerFullObject>;
     getTextTypes(languageCode: string): Promise<CoDomainValue[]>;
     getStandardTexts(languageCode: string): Promise<StandardText[]>;
     getFirstAddress(relation: RelationAnyType): Address;
     private _checkAndCreateTransaction;
-    private _rememberCurrentTransactionLineStatus;
-    private _rememberResponse;
 }

package/lib/style/_variables.scss

@@ -33,13 +33,14 @@ $tp-color-label: #5B6875 !default;
 
 $tp-color-text-grey: #747b87 !default;
 
-$tp-color-active-light: #74B77F !default;
+$tp-color-active-light: #5FDCB3 !default;
 $tp-color-dark-accent: #475060 !default;
 
 $tp-color-stock-low: $tp-color-error !default;
 $tp-color-stock-medium: $tp-color-warning !default;
 $tp-color-stock-high: $tp-color-active !default;
 $tp-color-stock-empty: $tp-color-grey !default;
+$tp-color-colijn-orange: #fe4400 !default;
 
 $tp-color-text-main: #22313C !default;
 
@@ -58,7 +59,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: 200px !default;
+$tp-radio-button-width: 150px !default;
 $tp-checkout-default-padding: 5px !default;
 $tp-checkout-step-color: $tp-color-action !default;
 
@@ -91,3 +92,10 @@ $tp-transaction-header-first-section-font-family: $tp-font-family !default;
 $tp-transaction-header-first-section-font-size: $tp-font-size !default;
 $tp-transaction-header-first-section-font-color: $tp-color-dark !default;
 $tp-transaction-header-first-section-font-weight: bold !default;
+
+/* core components override */
+$cc-checkbox-border-radius: 7px;
+$cc-checkbox-check-background-color: white;
+$cc-checkbox-check-border-color: #5FDCB3;
+$cc-checkbox-check-color: #5FDCB3;
+/****************************/

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@colijnit/transaction",
-  "version": "12.1.8",
+  "version": "12.1.11",
   "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.18",
-    "@colijnit/transactionapi": ">=1.1.10",
+    "@colijnit/transactionapi": ">=1.1.12",
     "@syncfusion/ej2-angular-buttons": ">=19.3.44",
     "@syncfusion/ej2-angular-calendars": ">=19.3.44",
     "@syncfusion/ej2-angular-dropdowns": ">=19.3.45",

package/lib/component/service-order/service-order.component.scss

@@ -1,154 +0,0 @@
-@import "../../style/variables";
-//@import "src/style/styles";
-/*
-
-:host {
-  %transaction-tab {
-    @extend %flex-column;
-    @extend %full-width;
-    @extend %overflow-hidden;
-    padding-bottom: 60px;
-  }
-
-  @extend %transaction-tab;
-  .page-wrapper & {
-    padding: 20px;
-    margin-bottom: 60px;
-  }
-  transaction-order-totals {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-end;
-  }
-
-  .transaction-totals-show {
-    padding: 20px;
-  }
-
-  .transaction-totals-hide {
-    position: relative;
-    bottom: 0;
-    right: 0;
-  }
-}
-
-::ng-deep #transaction_planning_agenda {
-  //transform: scale(1) translate(-50%, 0) !important;
-  top: 160px !important;
-  width: calc(100vw - 80px) !important;
-  .popup-card-title {
-    padding: 10px 20px;
-    background: $tp-color-active-light;
-    color: white;
-    .header-wrapper {
-      align-items: center !important;
-    }
-    .separator {
-      border-color: white !important;
-    }
-    .header {
-      font-size: 15px;
-      font-weight: normal;
-    }
-    .sub-header {
-      font-size: 18px;
-      color: white !important;
-      font-weight: bold !important;
-    }
-    button-select {
-      icon {
-        [fill] {
-          fill: white;
-        }
-      }
-    }
-  }
-  .popup-card-content {
-    overflow: hidden;
-  }
-  @include screen-xs() {
-    width: 100vw !important;
-    .popup-card-content {
-      padding: 0;
-    }
-  }
-
-}
-
-$block_content_height: 60px;
-$color-border: #dedede;
-.column-separator {
-  padding-right: 25px;
-  border-right: 1px solid #0000001c;
-}
-
-.floating-icon-wrapper {
-  position: fixed;
-  bottom: 50px;
-  right: 50px;
-  display: flex;
-  flex-shrink: 0;
-  align-items: center;
-  justify-content: center;
-  background: $tp-color-dark-accent;
-  height: 50px;
-  width: 50px;
-  opacity: 0.5;
-  transition: opacity 0.4s ease-in-out;
-  border-radius: 50%;
-  overflow: hidden;
-  box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.6);
-  -webkit-box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.6);
-  -moz-box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.6);
-  cursor: pointer;
-  &:hover {
-    opacity: 1;
-    transition: opacity 0.4s ease-in-out;
-  }
-  ::ng-deep icon {
-    height: 44px !important;
-    width: 44px !important;
-    color: white !important;
-    flex-shrink: 0;
-  }
-}
-.transaction-wrapper {
-  padding: 0 20px;
-}
-
-.view-mode-buttons co-button {
-  padding: 0;
-}
-
-.transaction-view {
-  display: flex;
-  margin-top: 10px;
-  justify-content: stretch;
-
-  .view-mode-buttons {
-    display: flex;
-    flex-direction: row;
-    @extend %margin-left-medium;
-    button-select {
-      ::ng-deep button-colijn {
-        border-radius: 0;
-      }
-      &:first-child {
-        margin-right: 5px;
-        ::ng-deep button-colijn {
-          @include border-left-radius(3px);
-          @include border-right-radius(3px);
-        }
-      }
-
-      &:nth-child(2) ::ng-deep button-colijn {
-        @include border-left-radius(3px);
-      }
-      &:last-child ::ng-deep button-colijn {
-        @include border-right-radius(3px);
-      }
-    }
-  }
-
-}
-*/

package/lib/component/service-order/summary/transaction-delivery-summary.component.scss

@@ -1,22 +0,0 @@
-@import "../../../style/variables";
-/*
-@import "src/style/styles";
-
-:host {
-  .planning-wrapper {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    flex-direction: row;
-    color: $tp-color-action;
-    margin-top: -10px;
-    font-size: 13px;
-    ::ng-deep icon {
-      cursor: pointer;
-      [fill] {
-        fill: $tp-color-action;
-      }
-    }
-  }
-}
-*/

package/lib/component/service-order/summary/transaction-summary-block.component.scss

@@ -1,109 +0,0 @@
-@import "../../../style/variables";
-/*
-@import "src/style/styles";
-
-$block_content_height: 60px;
-$summary-block-width: 368px;
-$summary-block-min-height: 130px;
-
-:host {
-  width: $summary-block-width;
-  min-height: $summary-block-min-height;
-  height: auto;
-  display: flex;
-  flex-direction: column;
-  //  border: 1px solid $color_border;
-  //  outline: 1px solid $color-border;
-  margin-top: 1px;
-  margin-left: 1px;
-  padding: 30px 20px;
-  .content-wrapper {
-    .value-block {
-      margin-bottom: 10px;
-      ::ng-deep .planning-wrapper {
-        justify-content: flex-start;
-        arrow-link {
-          margin-right: 10px;
-        }
-      }
-    }
-  }
-  .disabled-indicator {
-    position: absolute;
-    top: 0;
-    left: 0;
-    display: none;
-  }
-  &.disabled {
-    .disabled-indicator {
-      display: block;
-    }
-  }
-  ::ng-deep image-display {
-    height: $block_content_height;
-    width: $block_content_height;
-    flex-shrink: 0;
-    span {
-      display: none;
-    }
-  }
-
-  .icon-wrapper {
-    display: flex;
-    flex-shrink: 0;
-    align-items: center;
-    justify-content: center;
-    background: #F8FBFA;
-    height: $block_content_height;
-    width: $block_content_height;
-    border-radius: 50%;
-    border: 1px solid $tp-color-border;
-    overflow: hidden;
-    ::ng-deep icon {
-      height: 60px !important;
-      width: 60px !important;
-      flex-shrink: 0;
-    }
-  }
-
-  .title {
-    font-size: 13px;
-    color: $tp-color-dark;
-  }
-
-  .block-wrapper {
-    position: relative;
-    display: flex;
-    align-items: center;
-  }
-
-  .border {
-    border-radius: 3px;
-    padding: 15px;
-    background: white;
-    border: 1px solid $tp-color-border;
-  }
-
-  .content-wrapper {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    margin-left: 10px;
-    min-height: $block_content_height;
-    height: auto;
-    width: 100%;
-  }
-
-  .header-label, .subheader-label {
-    font-size: 11px;
-    line-height: 13px;
-    color: $tp-color-label;
-  }
-
-  .header, .subheader {
-    font-size: 13px;
-    font-weight: bold;
-    color: $tp-color-dark;
-  }
-}
-*/

package/lib/component/service-order/transaction-manager/transaction-manager.component.scss

@@ -1,54 +0,0 @@
-@import "../../../style/variables";
-/*
-@import "src/style/styles";
-
-::ng-deep #warehouseDialog {
-  align-items: center;
-  max-height: 100%;
-
-  ::ng-deep co-form {
-    height: 100%;
-    width: 500px;
-  }
-
-  ::ng-deep .form-content {
-    height: calc(100% - 80px);
-    width: 100%;
-
-    .message-field {
-      @extend %margin-left-medium;
-      height: 20px;
-      word-wrap: break-word;
-      white-space: normal;
-    }
-  }
-
-}
-
-co-button:not(:last-child) {
-  margin-right: 10px;
-}
-
-.commission-fields {
-  @extend %margin-left-medium;
-  justify-content: space-between;
-  margin: 10px 0 10px;
-}
-
-.warehouse-line-container {
-  @extend %flex;
-  @extend %flex-row;
-}
-
-.warehouse-description-item {
-  width: 15rem;
-}
-
-.warehouse-nr-item {
-  width: 5rem;
-}
-
-co-input-number-picker co-button {
-  max-width: 20px;
-}
-*/

package/lib/component/service-order/transaction-order-line-view/transaction-order-line-view.component.scss

@@ -1,90 +0,0 @@
-@import "../../../style/variables";
-/*
-@import "src/style/styles";
-
-:host {
-  display: block;
-  padding: 20px;
-
-  ::ng-deep collapseable {
-    width: 100% !important;
-  }
-}
-
-.horizontal {
-  display: flex;
-  flex-direction: row;
-}
-
-.service-request-button-wrapper {
-  display: flex;
-  justify-content: center;
-  margin-top: 20px;
-}
-
-.transaction-order-line-r {
-  display: flex;
-  justify-content: stretch;
-  flex-direction: row;
-
-  @media (max-width: 800px) {
-    flex-direction: column;
-  }
-
-  .transaction-order-line-image {
-    @extend %margin-vertical-big;
-    display: flex;
-    flex: 1 0 auto !important;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    padding-right: 10px;
-    image-display {
-      @include square(6em);
-    }
-    ::ng-deep no-image-display {
-      display: none;
-    }
-  }
-  .transaction-order-line-description {
-    @extend %margin-big;
-    display: flex;
-    flex-direction: column;
-    width: auto;
-    max-width: 355px;
-    margin-left: 10px;
-    .cart-line-description-main {
-      font-weight: bold;
-    }
-    .cart-line-description-artnr {
-      @extend %font-small;
-    }
-  }
-  .transaction-order-line-right {
-    justify-content: flex-end;
-    align-items: center;
-    .transaction-order-line-stock {
-      @extend %margin-vertical-big;
-      width: 10em;
-    }
-
-    .transaction-order-line-amount {
-      @extend %margin-big;
-      width: 15em;
-    }
-
-    .transaction-order-line-totals {
-      display: flex;
-      @extend %margin-vertical-big;
-      @extend %margin-left-big;
-      justify-content: flex-end;
-      min-width: 100px;
-      font-weight: bold;
-
-      span {
-        text-align: right;
-      }
-    }
-  }
-}
-*/

package/lib/component/service-order/transaction-order-lines/transaction-order-lines.component.scss

@@ -1,85 +0,0 @@
-@import "../../../style/variables";
-/*
-@import "src/style/styles";
-
-:host {
-  display: block;
-  padding: 20px;
-
-  ::ng-deep collapseable {
-    width: 100% !important;
-  }
-}
-
-.service-request-button-wrapper {
-  display: flex;
-  justify-content: center;
-  margin-top: 20px;
-}
-
-.transaction-order-line-r {
-  display: flex;
-  justify-content: stretch;
-  flex-direction: row;
-
-  @media (max-width: 800px) {
-    flex-direction: column;
-  }
-
-  .transaction-order-line-image {
-    @extend %margin-vertical-big;
-    display: flex;
-    flex: 1 0 auto !important;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    padding-right: 10px;
-    image-display {
-      @include square(6em);
-    }
-    ::ng-deep no-image-display {
-      display: none;
-    }
-  }
-  .transaction-order-line-description {
-    @extend %margin-big;
-    display: flex;
-    flex-direction: column;
-    width: auto;
-    max-width: 355px;
-    margin-left: 10px;
-    .cart-line-description-main {
-      font-weight: bold;
-    }
-    .cart-line-description-artnr {
-      @extend %font-small;
-    }
-  }
-  .transaction-order-line-right {
-    justify-content: flex-end;
-    align-items: center;
-    .transaction-order-line-stock {
-      @extend %margin-vertical-big;
-      width: 10em;
-    }
-
-    .transaction-order-line-amount {
-      @extend %margin-big;
-      width: 15em;
-    }
-
-    .transaction-order-line-totals {
-      display: flex;
-      @extend %margin-vertical-big;
-      @extend %margin-left-big;
-      justify-content: flex-end;
-      min-width: 100px;
-      font-weight: bold;
-
-      span {
-        text-align: right;
-      }
-    }
-  }
-}
-*/

package/lib/component/service-order/transaction-order-totals/transaction-order-totals.component.scss

@@ -1,26 +0,0 @@
-@import "../../../style/variables";
-/*
-@import "src/style/styles";
-
-:host {
-  .totals-wrapper {
-    width: 310px;
-    font-size: 13px;
-  }
-  .totals-item {
-    display: flex;
-    flex-direction: row;
-    height: 25px;
-    align-items: center;
-    > div {
-      text-align: end;
-      width: 50%;
-    }
-    &.total {
-      font-weight: bold;
-      height: 30px;
-      border-top: 1px solid $tp-color-border;
-    }
-  }
-}
-*/