@colijnit/transaction 12.1.6 → 12.1.7

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

@@ -0,0 +1,83 @@
+@import "src/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/app/component/service-order/transaction-order-totals/transaction-order-totals.component.scss

@@ -0,0 +1,24 @@
+@import "src/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;
+    }
+  }
+}

package/app/component/service-order/transaction-relation/transaction-relation-edit.component.scss

@@ -0,0 +1,24 @@
+.button-wrapper {
+  margin-top: 10px;
+  justify-content: center;
+}
+
+co-input-radio-button {
+  margin-left:16px;
+}
+
+.transaction-relation-label-h2 {
+  display: block;
+  margin-top: 1em;
+  margin-bottom: 1em;
+  font-size: 18px;
+  font-weight: bold;
+}
+
+.transaction-relation-label-h3 {
+  display: block;
+  margin-top: 1em;
+  margin-bottom: 1em;
+  font-size: 14px;
+  font-weight: bold;
+}

package/app/component/service-order/transaction-sidebar/transaction-sidebar-right.component.scss

@@ -0,0 +1,17 @@
+:host {
+  display: block;
+  width: 100%;
+}
+
+.e-accordion {
+  border: none;
+}
+
+.e-accordion .e-acrdn-item .e-acrdn-header .e-toggle-icon .e-icons {
+  color: lightblue;
+}
+
+.e-tab .e-toolbar-items {
+  display: flex;
+  justify-content: center;
+}

package/app/component/service-order/warehouse/warehouse.component.scss

@@ -0,0 +1,52 @@
+@import "src/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/app/component/shopping-cart/shopping-cart/shopping-cart.component.scss

@@ -0,0 +1,79 @@
+@import "src/style/variables";
+@import "src/style/styles";
+
+:host {
+  background-color: white;
+  opacity: 1;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  color: $tp-color-dark;
+
+  .shopping-cart-viewport {
+    max-width:60%;
+    margin-left:20%;
+  }
+
+  .shopping-cart-row-end {
+    display: flex;
+    flex-direction: row;
+    column-gap: 10px;
+    justify-content: flex-end;
+  }
+}
+
+.cart-header {
+  display: flex;
+  justify-content: space-between;
+  @extend %margin-vertical-big;
+
+  .cart-header-label {
+    font-weight: bold;
+  }
+
+  .view-mode-buttons {
+    display: flex;
+    flex-direction: row;
+    @extend %margin-left-medium;
+    co-button {
+      padding: 0;
+      ::ng-deep co-button {
+        border-radius: 0;
+      }
+      &:first-child {
+        ::ng-deep co-button {
+          @include border-left-radius(3px);
+          @include border-right-radius(3px);
+        }
+      }
+
+      &:nth-child(2) ::ng-deep co-button {
+        @include border-left-radius(3px);
+      }
+      &:last-child ::ng-deep co-button {
+        @include border-right-radius(3px);
+      }
+    }
+  }
+}
+
+.cart-lines {
+  display: flex;
+  height: 100%;
+  overflow: auto;
+}
+
+.shopping-cart-totals {
+  @extend %padding-vertical-big;
+  align-items: flex-end;
+  > div {
+    width: fit-content;
+    span:last-of-type {
+      min-width: 6em;
+      text-align: right;
+    }
+  }
+  div:last-of-type {
+    font-weight: bold;
+  }
+}

package/app/component/shopping-cart/shopping-cart-line/shopping-cart-line.component.scss

@@ -0,0 +1,107 @@
+@import "src/style/variables";
+@import "src/style/styles";
+
+:host {
+  @extend %padding-vertical-big;
+  display: flex;
+  flex-wrap: wrap;
+  border-bottom: 1px solid #DBE3E8;
+  width: 100%;
+
+  &.overlayed {
+    &.is-text {
+      display: none!important;
+    }
+    &.is-selected {
+      background-color: lightblue;
+    }
+  }
+
+  &.overview {
+    &.is-text {
+      display: none!important;
+    }
+
+    &.is-selected {
+      background-color: lightblue;
+    }
+  }
+}
+
+.horizontal {
+  display: flex;
+  flex-direction: row;
+}
+
+.cart-line-r {
+  display: flex;
+  justify-content: stretch;
+  flex-direction: row;
+
+  @media (max-width: 800px) {
+    flex-direction: column;
+  }
+
+  co-button {
+    border: 0;
+    padding: 0;
+  }
+
+  .cart-line-image {
+    @extend %margin-vertical-big;
+    display: flex;
+    flex: 1 0 auto !important;
+    flex-direction: column;
+    //width: 10em;
+    align-items: center;
+    justify-content: center;
+    image-display {
+      @include square(6em);
+    }
+  }
+  .cart-line-description {
+    @extend %margin-big;
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    .cart-line-description-main {
+      font-weight: bold;
+    }
+    .cart-line-description-artnr {
+      @extend %font-small;
+    }
+  }
+  .cart-line-right {
+    justify-content: flex-end;
+
+    .cart-line-stock {
+      @extend %margin-vertical-big;
+      width: 10em;
+    }
+
+    .cart-line-amount {
+      @extend %margin-big;
+      width: 15em;
+    }
+
+    .cart-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;
+      }
+    }
+  }
+}
+
+.cart-line-t {
+  @extend %margin-horizontal-big;
+  &.article-text {
+    padding-left: 10em;
+  }
+}

package/app/component/shopping-cart/shopping-cart-manager/shopping-cart-manager.component.scss

@@ -0,0 +1,52 @@
+@import "src/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/app/service/ione-connector-adapter.service.d.ts

@@ -20,21 +20,23 @@ import { ArticleFullObject } from "@colijnit/transactionapi/build/model/article-
 import { LineOperationResponse } from "@colijnit/transactionapi/build/model/line-operation-response.bo";
 import { TransactionResponseBase } from "@colijnit/transactionapi/build/model/transaction-response-base.bo";
 import { Transaction } from "@colijnit/transactionapi/build/transaction";
-import { Options } from "@colijnit/ioneconnector/build/model/options";
+import { DataServiceResponseData } from "@colijnit/transactionapi/build/model/data-service-response-data";
 import { StandardText } from "../model/standard-text";
+import { CustomerGroup } from "@colijnit/transactionapi/build/model/customer-group.bo";
 export declare class IOneConnectorAdapterService {
     options: any;
     connector: Transaction;
     private _boFactory;
     private _countryList;
     constructor();
-    connect(options: Options): Promise<void>;
+    connect(options: any): Promise<void>;
     disconnect(): Promise<void>;
     getArticleFullObject(goodId: number): Promise<ArticleFullObject>;
     getGoodIdFromArticleNr(articleNr: string): Promise<number>;
     getSingleImage(nodeId: number | string, publication: number, includeMimetype: boolean, thumb: boolean): Promise<string>;
     getDocumentContent(id: number, thumbnail: boolean): Promise<string>;
     getCountries(): Promise<Country[]>;
+    getCustomerGroups(): Promise<CustomerGroup[]>;
     getCountry(countryCode: string): Country;
     getPrivacySettings(): Promise<PrivacySetting[]>;
     getRelationPrivacySettings(): Promise<RelationPrivacySetting[]>;
@@ -42,6 +44,7 @@ export declare class IOneConnectorAdapterService {
     createTransaction(kind: TransactionKind, branchNr: string): Promise<TransactionInfoResponse>;
     getTransactionByNrAndKind(kind: TransactionKind, transactionNo: number): Promise<TransactionInfoResponse>;
     getTransactionById(transactionId: number): Promise<TransactionInfoResponse>;
+    commit(): Promise<DataServiceResponseData>;
     saveTransaction(uuid: string): Promise<TransactionInfoResponse>;
     getCustomerFullObject(relationNo: number): Promise<CustomerFullObject>;
     getRelationNumber(relationId: number): Promise<string>;

package/app/service/options.service.d.ts

@@ -1,8 +1,7 @@
 import { BehaviorSubject } from "rxjs";
-import { Options } from "@colijnit/ioneconnector/build/model/options";
 export declare class OptionsService {
-    set options(value: Options);
-    get options(): Options;
+    set options(value: any);
+    get options(): any;
     optionsLoaded: BehaviorSubject<boolean>;
     private _options;
     constructor();

package/app/service/transaction.service.d.ts

@@ -23,6 +23,7 @@ import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transa
 import { TransactionInfo } from "@colijnit/transactionapi/build/model/transaction-info.bo";
 import { PromptService } from "@colijnit/corecomponents_v12";
 import { StandardText } from "../model/standard-text";
+import { DataServiceResponseData } from "@colijnit/transactionapi/build/model/data-service-response-data";
 export declare class TransactionService {
     _connector: IOneConnectorAdapterService;
     _prompt: PromptService;
@@ -65,7 +66,8 @@ export declare class TransactionService {
     getTransaction(transactionNo: number): Promise<boolean>;
     openExistingTransaction(kind: TransactionKind, transactionNr: number): Promise<boolean>;
     getTransactionById(transactionId: number): Promise<boolean>;
-    saveTransaction(close?: boolean): Promise<void>;
+    commit(): Promise<DataServiceResponseData>;
+    saveTransaction(close?: boolean): Promise<TransactionInfoResponse>;
     saveTransactionByUuid(transactionUuid: string): Promise<boolean>;
     addRelationToTransaction(relationId: number): Promise<void>;
     getCommissionCodes(languageCode: string): Promise<CoDomainValue[]>;