@colijnit/transaction 12.1.32 → 12.1.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (123) hide show
  1. package/bundles/colijnit-transaction.umd.js +3585 -2224
  2. package/bundles/colijnit-transaction.umd.js.map +1 -1
  3. package/colijnit-transaction.d.ts +246 -238
  4. package/colijnit-transaction.metadata.json +1 -1
  5. package/esm2015/colijnit-transaction.js +247 -239
  6. package/esm2015/lib/assets/dictionary/text.properties.js +18 -4
  7. package/esm2015/lib/cache/cache-field.js +75 -0
  8. package/esm2015/lib/cache/parameter-cache-field.js +54 -0
  9. package/esm2015/lib/cache/service/business-object-cache-manager.service.js +150 -0
  10. package/esm2015/lib/cache/service/select-multiple-cache.service.js +38 -0
  11. package/esm2015/lib/cache/service/select-multiple-parameterized-cache.service.js +47 -0
  12. package/esm2015/lib/cache/service/select-single-cache.service.js +30 -0
  13. package/esm2015/lib/component/checkout/checkout-overview-delivery-edit/checkout-overview-delivery-edit.component.js +2 -2
  14. package/esm2015/lib/component/confirmation-dialog/confirmation-dialog.component.js +3 -3
  15. package/esm2015/lib/component/core/base/transaction-header-base.component.js +58 -0
  16. package/esm2015/lib/component/core/base/transaction-line-base.component.js +1 -1
  17. package/esm2015/lib/component/dialog/transaction-line/dialog-transaction-line-vat/dialog-transaction-line-vat.component.js +35 -0
  18. package/esm2015/lib/component/dialog/transaction-line/dialog-transaction-line-vat/dialog-transaction-line-vat.module.js +28 -0
  19. package/esm2015/lib/component/payment/payment.component.js +2 -2
  20. package/esm2015/lib/component/relation/relation-contact-details/relation-contact-details.component.js +2 -2
  21. package/esm2015/lib/component/relation/relation-general/relation-general.component.js +2 -2
  22. package/esm2015/lib/component/transaction-grid/transaction-lines-grid/transaction-lines-grid.module.js +4 -2
  23. package/esm2015/lib/component/transaction-header/transaction-header-delivery/transaction-header-delivery.component.js +17 -5
  24. package/esm2015/lib/component/transaction-header/transaction-header-payment/transaction-header-payment.component.js +17 -8
  25. package/esm2015/lib/component/transaction-header/transaction-header-relation/transaction-header-relation.component.js +7 -1
  26. package/esm2015/lib/component/transaction-header-fields/transaction-header-administrative-relation.component.js +3 -3
  27. package/esm2015/lib/component/transaction-header-fields/transaction-header-branch.component.js +30 -16
  28. package/esm2015/lib/component/transaction-header-fields/transaction-header-definitive.component.js +3 -3
  29. package/esm2015/lib/component/transaction-header-fields/transaction-header-delivery-date.component.js +3 -3
  30. package/esm2015/lib/component/transaction-header-fields/transaction-header-delivery-method.component.js +3 -3
  31. package/esm2015/lib/component/transaction-header-fields/transaction-header-delivery-options.component.js +3 -3
  32. package/esm2015/lib/component/transaction-header-fields/transaction-header-downpayment-amount.component.js +3 -3
  33. package/esm2015/lib/component/transaction-header-fields/transaction-header-downpayment-percentage.component.js +3 -3
  34. package/esm2015/lib/component/transaction-header-fields/transaction-header-marketing.component.js +19 -10
  35. package/esm2015/lib/component/transaction-header-fields/transaction-header-partial-delivery.component.js +3 -3
  36. package/esm2015/lib/component/transaction-header-fields/transaction-header-preferred-delivery-date.component.js +3 -3
  37. package/esm2015/lib/component/transaction-header-fields/transaction-header-reference.component.js +3 -3
  38. package/esm2015/lib/component/transaction-header-fields/transaction-header-relation-reference.component.js +3 -3
  39. package/esm2015/lib/component/transaction-header-fields/transaction-header-remarks.component.js +3 -3
  40. package/esm2015/lib/component/transaction-line/transaction-line.component.js +29 -11
  41. package/esm2015/lib/component/transaction-line/transaction-line.module.js +4 -2
  42. package/esm2015/lib/component/transaction-line-fields/transaction-line-commission-code.component.js +8 -3
  43. package/esm2015/lib/component/transaction-line-fields/transaction-line-delivery-method.component.js +9 -4
  44. package/esm2015/lib/component/transaction-line-fields/transaction-line-vat.component.js +35 -12
  45. package/esm2015/lib/component/transaction-line-fields/transaction-line-vat.module.js +4 -3
  46. package/esm2015/lib/component/transaction-line-fields/transaction-line-warehouse.component.js +12 -7
  47. package/esm2015/lib/component/transaction-lines/transaction-lines.component.js +4 -1
  48. package/esm2015/lib/component/transaction-lines/transaction-lines.module.js +4 -3
  49. package/esm2015/lib/enum/icon.enum.js +6 -2
  50. package/esm2015/lib/model/icon-svg.js +6 -2
  51. package/esm2015/lib/service/article-connector.service.js +24 -29
  52. package/esm2015/lib/service/article.service.js +8 -4
  53. package/esm2015/lib/service/error.service.js +33 -0
  54. package/esm2015/lib/service/payment.service.js +20 -13
  55. package/esm2015/lib/service/pending-reason.service.js +3 -2
  56. package/esm2015/lib/service/transaction-connector-adapter.service.js +1388 -0
  57. package/esm2015/lib/service/transaction-connector.service.js +163 -1067
  58. package/esm2015/lib/service/transaction-mapping.service.js +2 -2
  59. package/esm2015/lib/service/transaction.service.js +8 -4
  60. package/fesm2015/colijnit-transaction.js +2202 -1162
  61. package/fesm2015/colijnit-transaction.js.map +1 -1
  62. package/lib/cache/cache-field.d.ts +25 -0
  63. package/lib/cache/parameter-cache-field.d.ts +11 -0
  64. package/lib/cache/service/business-object-cache-manager.service.d.ts +57 -0
  65. package/lib/cache/service/select-multiple-cache.service.d.ts +15 -0
  66. package/lib/cache/service/select-multiple-parameterized-cache.service.d.ts +19 -0
  67. package/lib/cache/service/select-single-cache.service.d.ts +11 -0
  68. package/lib/component/core/base/transaction-header-base.component.d.ts +28 -0
  69. package/lib/component/core/base/transaction-line-base.component.d.ts +2 -0
  70. package/lib/component/dialog/transaction-line/dialog-transaction-line-vat/dialog-transaction-line-vat.component.d.ts +4 -0
  71. package/lib/component/dialog/transaction-line/dialog-transaction-line-vat/dialog-transaction-line-vat.module.d.ts +2 -0
  72. package/lib/component/dialog/transaction-line/dialog-transaction-line-vat/style/_layout.scss +19 -0
  73. package/lib/component/dialog/transaction-line/dialog-transaction-line-vat/style/_material-definition.scss +0 -0
  74. package/lib/component/dialog/transaction-line/dialog-transaction-line-vat/style/_theme.scss +4 -0
  75. package/lib/component/dialog/transaction-line/dialog-transaction-line-vat/style/material.scss +5 -0
  76. package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-location/style/_layout.scss +19 -0
  77. package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-location/style/_material-definition.scss +0 -0
  78. package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-location/style/_theme.scss +4 -0
  79. package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-location/style/material.scss +5 -0
  80. package/lib/component/relation/relation-contact-details/style/_layout.scss +11 -0
  81. package/lib/component/relation/relation-contact-details/style/_material-definition.scss +2 -0
  82. package/lib/component/transaction-header/transaction-header-delivery/style/_layout.scss +3 -2
  83. package/lib/component/transaction-header/transaction-header-delivery/style/_material-definition.scss +4 -2
  84. package/lib/component/transaction-header/transaction-header-delivery/style/_theme.scss +3 -1
  85. package/lib/component/transaction-header/transaction-header-relation/style/_layout.scss +3 -0
  86. package/lib/component/transaction-header/transaction-header-relation/style/material.scss +1 -0
  87. package/lib/component/transaction-header-fields/transaction-header-administrative-relation.component.d.ts +2 -2
  88. package/lib/component/transaction-header-fields/transaction-header-branch.component.d.ts +4 -9
  89. package/lib/component/transaction-header-fields/transaction-header-definitive.component.d.ts +2 -2
  90. package/lib/component/transaction-header-fields/transaction-header-delivery-date.component.d.ts +2 -2
  91. package/lib/component/transaction-header-fields/transaction-header-delivery-method.component.d.ts +2 -2
  92. package/lib/component/transaction-header-fields/transaction-header-delivery-options.component.d.ts +2 -2
  93. package/lib/component/transaction-header-fields/transaction-header-downpayment-amount.component.d.ts +2 -2
  94. package/lib/component/transaction-header-fields/transaction-header-downpayment-percentage.component.d.ts +2 -2
  95. package/lib/component/transaction-header-fields/transaction-header-marketing.component.d.ts +2 -8
  96. package/lib/component/transaction-header-fields/transaction-header-partial-delivery.component.d.ts +2 -2
  97. package/lib/component/transaction-header-fields/transaction-header-preferred-delivery-date.component.d.ts +2 -2
  98. package/lib/component/transaction-header-fields/transaction-header-reference.component.d.ts +2 -2
  99. package/lib/component/transaction-header-fields/transaction-header-relation-reference.component.d.ts +2 -2
  100. package/lib/component/transaction-header-fields/transaction-header-remarks.component.d.ts +2 -2
  101. package/lib/component/transaction-line/style/_layout.scss +20 -5
  102. package/lib/component/transaction-line/style/_material-definition.scss +8 -0
  103. package/lib/component/transaction-line/style/_theme.scss +2 -1
  104. package/lib/component/transaction-line/style/material.scss +1 -0
  105. package/lib/component/transaction-line/transaction-line.component.d.ts +2 -0
  106. package/lib/component/transaction-line-fields/transaction-line-vat.component.d.ts +6 -2
  107. package/lib/component/transaction-line-fields/transaction-line-warehouse.component.d.ts +1 -1
  108. package/lib/component/transaction-lines/style/_layout.scss +16 -3
  109. package/lib/enum/icon.enum.d.ts +5 -1
  110. package/lib/service/article-connector.service.d.ts +1 -3
  111. package/lib/service/article.service.d.ts +3 -1
  112. package/lib/service/error.service.d.ts +8 -0
  113. package/lib/service/payment.service.d.ts +5 -3
  114. package/lib/service/pending-reason.service.d.ts +2 -1
  115. package/lib/service/transaction-connector-adapter.service.d.ts +152 -0
  116. package/lib/service/transaction-connector.service.d.ts +13 -13
  117. package/lib/style/_variables.scss +3 -1
  118. package/lib/style/transaction-globals.scss +6 -0
  119. package/package.json +1 -1
  120. package/esm2015/lib/component/transaction-header-fields/transaction-header-fields-base.component.js +0 -27
  121. package/esm2015/lib/service/collection-cache.service.js +0 -40
  122. package/lib/component/transaction-header-fields/transaction-header-fields-base.component.d.ts +0 -8
  123. package/lib/service/collection-cache.service.d.ts +0 -6
@@ -0,0 +1,25 @@
1
+ import { EventEmitter } from "@angular/core";
2
+ export declare class CacheField<T> {
3
+ readonly onLoad: EventEmitter<any>;
4
+ get value(): T;
5
+ set value(value: T);
6
+ get isLoaded(): boolean;
7
+ get isLoading(): boolean;
8
+ get loadNeverCalled(): boolean;
9
+ loadFunction: (params?: any) => Promise<T>;
10
+ private _promiseValue;
11
+ private _value;
12
+ private _isLoaded;
13
+ constructor();
14
+ getValue(forceReload?: boolean): Promise<T>;
15
+ setValue(value: any): void;
16
+ /**
17
+ * POSTCONDITION: The .value of this cache field contains the loaded value as fetched by the resolve data of its .loadFunction.
18
+ * Will load only once, consecutive calls will resolve immediately or wait until the first original database fetch was finished.
19
+ * @returns {Promise<any>} Postcondition holds after resolve
20
+ */
21
+ ensureLoaded(forceReload?: boolean): Promise<T>;
22
+ reload(): Promise<T>;
23
+ reset(): void;
24
+ private _load;
25
+ }
@@ -0,0 +1,11 @@
1
+ export declare class ParameterCacheField<T> {
2
+ loadFunction: (...params: any[]) => Promise<T>;
3
+ private _paramsToCacheItems;
4
+ constructor();
5
+ getValue(...params: any[]): Promise<T>;
6
+ setValue(value: any, ...params: any[]): void;
7
+ reload(...params: any[]): Promise<T>;
8
+ reset(...params: any[]): void;
9
+ private _getCacheField;
10
+ private _makeNewCacheField;
11
+ }
@@ -0,0 +1,57 @@
1
+ import { OnDestroy } from "@angular/core";
2
+ import { Subject } from "rxjs";
3
+ import { BusinessObject, BusinessObjectIDType } from "@colijnit/transactionapi/build/model/business-object";
4
+ import { CacheField } from "../cache-field";
5
+ import { ParameterCacheField } from "../parameter-cache-field";
6
+ /**
7
+ * App-wide, top-level, 'dumb' BO cache manager service. It stores and returns simple and parameterized business object cache items.
8
+ *
9
+ * Several other services register cache items onto this manager, such as repositories or the more generic SelectMultipleSimpleCacheService.
10
+ *
11
+ * This is a dumb cache manager. It just functions as a point to add and retrieve generic cache items, but does not know how to actually
12
+ * LOAD these cache items from the database, or what exact types the items are.
13
+ *
14
+ * All caches are reset when the user logs out.
15
+ */
16
+ export declare class BusinessObjectCacheManagerService implements OnDestroy {
17
+ readonly reset: Subject<void>;
18
+ private static _NullBoId;
19
+ private _selectMultipleCache;
20
+ private _selectMultipleParameterizedCache;
21
+ private _selectSingleCache;
22
+ private _selectSingleParameterizedCache;
23
+ private _logoutSub;
24
+ ngOnDestroy(): void;
25
+ /**
26
+ * Creates and adds a new simple cache item for the given key with the given load function.
27
+ * @param key
28
+ * @param loadFunction e.g. () => { return this._dataService.selectMultiple(Color); }
29
+ * @param overrideOld Whether to allow an old cache item with the same key to become override by this newly created cache item.
30
+ * @returns The newly created cache item.
31
+ */
32
+ addNewSelectMultipleCacheItem<T extends BusinessObject>(key: any, loadFunction: () => Promise<T[]>, overrideOld?: boolean): CacheField<T[]>;
33
+ addNewSelectSingleCacheItem<T extends BusinessObject>(key: {
34
+ new (): T;
35
+ }, id: BusinessObjectIDType, loadFunction: () => Promise<T>, overrideOld?: boolean): CacheField<T>;
36
+ addNewSelectSingleParameterizedCacheItem<T extends BusinessObject>(key: any, loadFunction: (params?: any) => Promise<T>, overrideOld?: boolean): ParameterCacheField<T>;
37
+ /**
38
+ * Creates and adds a new parameterized cache item for the given key with the given load function.
39
+ * @param key
40
+ * @param loadFunction e.g. (category: ArticleCategory) => { return this._dataService.selectMultiple(TurnoverGroupImage, category); }
41
+ * @param overrideOld Whether to allow an old cache item with the same key to become override by this newly created cache item.
42
+ */
43
+ addNewSelectMultipleParameterizedCacheItem<T extends BusinessObject>(key: any, loadFunction: (params?: any) => Promise<T[]>, overrideOld?: boolean): ParameterCacheField<T[]>;
44
+ hasSelectMultipleCacheItem(key: any): boolean;
45
+ hasSingleCacheItem<T extends BusinessObject>(key: {
46
+ new (): T;
47
+ }, id?: BusinessObjectIDType): boolean;
48
+ hasSelectMultipleParameterizedCacheItem(key: any): boolean;
49
+ hasSelectSingleParameterizedCacheItem(key: any): boolean;
50
+ getSelectMultipleCacheItem<T extends BusinessObject>(key: any): CacheField<T[]>;
51
+ getSingleCacheItem<T extends BusinessObject>(key: {
52
+ new (): T;
53
+ }, id?: BusinessObjectIDType): CacheField<T>;
54
+ getSelectMultipleParameterCacheItem<T extends BusinessObject>(key: any): ParameterCacheField<T[]>;
55
+ getSelectSingleParameterCacheItem<T extends BusinessObject>(key: any): ParameterCacheField<T>;
56
+ private _reset;
57
+ }
@@ -0,0 +1,15 @@
1
+ import { BusinessObjectCacheManagerService } from "./business-object-cache-manager.service";
2
+ import { CacheField } from "../cache-field";
3
+ import { BusinessObject } from "@colijnit/transactionapi/build/model/business-object";
4
+ export declare class SelectMultipleCacheService {
5
+ private _boCacheManager;
6
+ private static _NullCache;
7
+ constructor(_boCacheManager: BusinessObjectCacheManagerService);
8
+ /**
9
+ * Returns the global cache item for the select multiple of the given business object class. Creates a new cache item if not yet exists.
10
+ * @param clazz The BO class, e.g. CustomerFullObject
11
+ * @returns {CacheField<T[]>}
12
+ */
13
+ requestCache<T extends BusinessObject>(clazz: typeof BusinessObject, loadFunction: () => Promise<T[]>): CacheField<T[]>;
14
+ private _createCacheItem;
15
+ }
@@ -0,0 +1,19 @@
1
+ import { OnDestroy } from "@angular/core";
2
+ import { Subject } from "rxjs";
3
+ import { BusinessObjectCacheManagerService } from "./business-object-cache-manager.service";
4
+ import { BusinessObject } from "@colijnit/transactionapi/build/model/business-object";
5
+ import { ParameterCacheField } from "../parameter-cache-field";
6
+ export declare class SelectMultipleParameterizedCacheService implements OnDestroy {
7
+ private _boCacheManager;
8
+ readonly reset: Subject<void>;
9
+ private _subs;
10
+ constructor(_boCacheManager: BusinessObjectCacheManagerService);
11
+ ngOnDestroy(): void;
12
+ /**
13
+ * Returns the global cache item for the parameterized select multiple of the given business object class. Creates a new cache item if not yet exists.
14
+ * @param clazz The BO class, used for undeflying dataService.selectMultiple(clazz) call.
15
+ * @returns {CacheField<T[]>}
16
+ */
17
+ requestCache<T extends BusinessObject>(clazz: typeof BusinessObject, loadFunction: (...params: any) => Promise<T[]>): ParameterCacheField<T[]>;
18
+ private _createParameterizedCacheItem;
19
+ }
@@ -0,0 +1,11 @@
1
+ import { BusinessObjectCacheManagerService } from "./business-object-cache-manager.service";
2
+ import { BusinessObject, BusinessObjectIDType } from "@colijnit/transactionapi/build/model/business-object";
3
+ import { CacheField } from "../cache-field";
4
+ export declare class SelectSingleCacheService {
5
+ private _boCacheManager;
6
+ constructor(_boCacheManager: BusinessObjectCacheManagerService);
7
+ requestCache<T extends BusinessObject>(clazz: {
8
+ new (): T;
9
+ }, sourceId: BusinessObjectIDType, loadFunction: () => Promise<T>): CacheField<T>;
10
+ private _createCacheItem;
11
+ }
@@ -0,0 +1,28 @@
1
+ import { EventEmitter, OnInit } from "@angular/core";
2
+ import { TransactionInfo } from "@colijnit/transactionapi/build/model/transaction-info.bo";
3
+ export declare abstract class TransactionHeaderBaseComponent implements OnInit {
4
+ useTransaction: boolean;
5
+ set searchText(value: string);
6
+ get searchText(): string;
7
+ set transactionInfo(value: TransactionInfo);
8
+ get transactionInfo(): TransactionInfo;
9
+ valueChange: EventEmitter<any>;
10
+ readonly: boolean;
11
+ viewModels: {
12
+ value: any;
13
+ text: string;
14
+ label: string;
15
+ checked: boolean;
16
+ }[];
17
+ viewModelsFiltered: {
18
+ value: any;
19
+ text: string;
20
+ label: string;
21
+ checked: boolean;
22
+ }[];
23
+ private _searchText;
24
+ private _transactionInfo;
25
+ ngOnInit(): void;
26
+ protected transactionInfoSet(): void;
27
+ private _doSearch;
28
+ }
@@ -17,11 +17,13 @@ export declare abstract class TransactionLineBaseComponent implements OnInit {
17
17
  viewModels: {
18
18
  value: any;
19
19
  text: string;
20
+ label: string;
20
21
  checked: boolean;
21
22
  }[];
22
23
  viewModelsFiltered: {
23
24
  value: any;
24
25
  text: string;
26
+ label: string;
25
27
  checked: boolean;
26
28
  }[];
27
29
  private _searchText;
@@ -0,0 +1,4 @@
1
+ import { DialogTransactionLineBaseComponent } from "../../../core/base/dialog-transaction-line-base.component";
2
+ export declare class DialogTransactionLineVatComponent extends DialogTransactionLineBaseComponent {
3
+ showClass(): boolean;
4
+ }
@@ -0,0 +1,2 @@
1
+ export declare class DialogTransactionLineVatModule {
2
+ }
@@ -0,0 +1,19 @@
1
+ @include export-module('cc-dialog-transaction-line-vat-layout') {
2
+ .co-dialog-transaction-line-vat {
3
+ .co-dialog:not(.is-mobile) .co-dialog-wrapper {
4
+ min-width: 500px;
5
+ }
6
+ .co-transaction-default-flex-row {
7
+ user-select: none;
8
+ border-radius: $tp-default-border-radius;
9
+ background-color: $tp-default-background-accent;
10
+ }
11
+ .dialog-footer-button-wrapper {
12
+ display: flex;
13
+ justify-content: flex-end;
14
+ }
15
+ .co-dialog .dialog-content {
16
+ max-height: 400px;
17
+ }
18
+ }
19
+ }
@@ -0,0 +1,4 @@
1
+ @include export-module('cc-dialog-transaction-line-vat-theme') {
2
+ .co-dialog-transaction-line-vat {
3
+ }
4
+ }
@@ -0,0 +1,5 @@
1
+ @import "../../../../../style/mixin";
2
+ @import "./_material-definition";
3
+ @import "./_layout";
4
+ @import "./_theme";
5
+ @import "../../../dialog-header-search/style/material";
@@ -0,0 +1,19 @@
1
+ @include export-module('co-dialog-transaction-line-warehouse-location-layout') {
2
+ .co-dialog-transaction-line-warehouse-location {
3
+ .co-dialog:not(.is-mobile) .co-dialog-wrapper {
4
+ min-width: 500px;
5
+ }
6
+ .co-transaction-default-flex-row {
7
+ user-select: none;
8
+ border-radius: $tp-default-border-radius;
9
+ background-color: $tp-default-background-accent;
10
+ }
11
+ .dialog-footer-button-wrapper {
12
+ display: flex;
13
+ justify-content: flex-end;
14
+ }
15
+ .co-dialog .dialog-content {
16
+ max-height: 400px;
17
+ }
18
+ }
19
+ }
@@ -0,0 +1,4 @@
1
+ @include export-module('co-dialog-transaction-line-warehouse-location-theme') {
2
+ .co-dialog-transaction-line-warehouse-location {
3
+ }
4
+ }
@@ -0,0 +1,5 @@
1
+ @import "../../../../../style/mixin";
2
+ @import "./_material-definition";
3
+ @import "./_layout";
4
+ @import "./_theme";
5
+ @import "../../../dialog-header-search/style/material";
@@ -1,4 +1,15 @@
1
1
  @include export-module('cc-relation-contact-details-layout') {
2
2
  .co-relation-contact-details {
3
+ display: flex;
4
+ flex-direction: column;
5
+ column-gap: $tp-relation-contact-details-column-gap;
6
+ row-gap: $tp-relation-contact-details-row-gap;
7
+ .default-data-row {
8
+ display: flex;
9
+ column-gap: $tp-relation-contact-details-column-gap;
10
+ .form-input:not(.default-width) {
11
+ width: 100%;
12
+ }
13
+ }
3
14
  }
4
15
  }
@@ -0,0 +1,2 @@
1
+ $tp-relation-contact-details-row-gap: 10px !default;
2
+ $tp-relation-contact-details-column-gap: 10px !default;
@@ -22,11 +22,12 @@
22
22
  width: 100%;
23
23
  border: $tp-transaction-header-delivery-delivery-method-border;
24
24
  border-radius: $tp-transaction-header-delivery-delivery-method-border-radius;
25
+ padding: $tp-transaction-header-delivery-delivery-method-padding;
25
26
  }
26
- .planning-request-button {
27
+ .header-planning-request-button {
27
28
  border: $tp-transaction-header-delivery-planning-request-button-border;
28
29
  border-radius: $tp-transaction-header-delivery-planning-request-button-border-radius;
29
-
30
+ padding: $tp-transaction-header-delivery-planning-request-button-padding;
30
31
  }
31
32
  .header-delivery-deliverydate-wrapper {
32
33
  display: flex;
@@ -1,11 +1,13 @@
1
- $tp-transaction-header-delivery-button-width: 40px !default;
1
+ $tp-transaction-header-delivery-button-width: 20px !default;
2
2
  $tp-transaction-header-delivery-planning-request-button-color: $tp-color-active !default;
3
3
  $tp-transaction-header-delivery-planning-request-button-border: 1px solid !default;
4
4
  $tp-transaction-header-delivery-planning-request-button-border-color: $tp-color-border !default;
5
- $tp-transaction-header-delivery-planning-request-button-border-radius: 5px !default;
5
+ $tp-transaction-header-delivery-planning-request-button-border-radius: 10px !default;
6
+ $tp-transaction-header-delivery-planning-request-button-padding: 5px !default;
6
7
  $tp-transaction-header-delivery-definitive-button-color: $tp-color-active-light !default;
7
8
  $tp-transaction-header-delivery-delivery-method-background-color: $tp-default-background-accent !default;
8
9
  $tp-transaction-header-delivery-delivery-method-border: 1px solid !default;
9
10
  $tp-transaction-header-delivery-delivery-method-border-color: $tp-color-border !default;
10
11
  $tp-transaction-header-delivery-delivery-method-border-radius: 10px !default;
11
12
  $tp-transaction-header-delivery-delivery-truck-color: $tp-color-font !default;
13
+ $tp-transaction-header-delivery-delivery-method-padding: 5px 10px !default;
@@ -2,8 +2,10 @@
2
2
 
3
3
  @include export-module('co-transaction-header-delivery-theme') {
4
4
  .co-transaction-header-delivery {
5
- .planning-request-button {
5
+ .header-planning-request-button {
6
6
  border-color: $tp-transaction-header-delivery-planning-request-button-border-color;
7
+ }
8
+ .planning-request-button {
7
9
  & [fill] {
8
10
  fill: $tp-transaction-header-delivery-planning-request-button-color;
9
11
  }
@@ -46,5 +46,8 @@
46
46
  width: 100%;
47
47
  flex-shrink: 0;
48
48
  }
49
+ .co-dialog:not(.is-mobile) .co-dialog-wrapper {
50
+ max-height: 80vh;
51
+ }
49
52
  }
50
53
  }
@@ -9,6 +9,7 @@ $cc-co-carousel-3d-navigate-button-width: 40px;
9
9
  @import "../../../relation/relation-address-tile/style/material";
10
10
  @import "../../../relation/relation-address-select/style/material";
11
11
  @import "../../../relation/relation-general/style/material";
12
+ @import "../../../relation/relation-contact-details/style/material";
12
13
  @import "../../../relation/relation-preferences/style/material";
13
14
  @import "~@colijnit/corecomponents_v12/lib/components/carousel-3d/style/material";
14
15
  @import "~@colijnit/corecomponents_v12/lib/components/drop-down-list/style/material";
@@ -1,8 +1,8 @@
1
1
  import { OnInit } from "@angular/core";
2
2
  import { TransactionService } from "../../service/transaction.service";
3
- import { TransactionHeaderFieldsBaseComponent } from "./transaction-header-fields-base.component";
4
3
  import { RelationListObject } from "@colijnit/transactionapi/build/model/relation-list-object.bo";
5
- export declare class TransactionHeaderAdministrativeRelationComponent extends TransactionHeaderFieldsBaseComponent implements OnInit {
4
+ import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
5
+ export declare class TransactionHeaderAdministrativeRelationComponent extends TransactionHeaderBaseComponent implements OnInit {
6
6
  private _transactionService;
7
7
  collection: RelationListObject[];
8
8
  fields: Object;
@@ -1,21 +1,16 @@
1
1
  import { OnInit } from "@angular/core";
2
2
  import { TransactionService } from "../../service/transaction.service";
3
- import { TransactionHeaderFieldsBaseComponent } from "./transaction-header-fields-base.component";
4
3
  import { BranchLov } from "@colijnit/transactionapi/build/model/branch-lov.bo";
5
- export declare class TransactionHeaderBranchComponent extends TransactionHeaderFieldsBaseComponent implements OnInit {
4
+ import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
5
+ export declare class TransactionHeaderBranchComponent extends TransactionHeaderBaseComponent implements OnInit {
6
6
  private _transactionService;
7
- showExtended: boolean;
7
+ simple: boolean;
8
8
  collection: BranchLov[];
9
9
  fields: Object;
10
- viewModels: {
11
- value: number;
12
- text: string;
13
- checked: boolean;
14
- }[];
15
10
  constructor(_transactionService: TransactionService);
16
11
  ngOnInit(): void;
17
12
  commitTransactionBranch(branch: number): Promise<boolean>;
18
- handleChecked(row: {
13
+ handleChecked(event: MouseEvent, row: {
19
14
  value: number;
20
15
  text: string;
21
16
  checked: boolean;
@@ -1,6 +1,6 @@
1
1
  import { TransactionService } from "../../service/transaction.service";
2
- import { TransactionHeaderFieldsBaseComponent } from "./transaction-header-fields-base.component";
3
- export declare class TransactionHeaderDefinitiveComponent extends TransactionHeaderFieldsBaseComponent {
2
+ import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
3
+ export declare class TransactionHeaderDefinitiveComponent extends TransactionHeaderBaseComponent {
4
4
  private _transactionService;
5
5
  constructor(_transactionService: TransactionService);
6
6
  commitTransactionDefinitive(definitive: boolean): Promise<boolean>;
@@ -1,7 +1,7 @@
1
1
  import { InputDatePickerComponent } from "@colijnit/corecomponents_v12";
2
2
  import { TransactionService } from "../../service/transaction.service";
3
- import { TransactionHeaderFieldsBaseComponent } from "./transaction-header-fields-base.component";
4
- export declare class TransactionHeaderDeliveryDateComponent extends TransactionHeaderFieldsBaseComponent {
3
+ import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
4
+ export declare class TransactionHeaderDeliveryDateComponent extends TransactionHeaderBaseComponent {
5
5
  private _transactionService;
6
6
  set child(content: any);
7
7
  showLabel: boolean;
@@ -1,8 +1,8 @@
1
1
  import { EventEmitter, OnInit } from "@angular/core";
2
2
  import { TransactionService } from "../../service/transaction.service";
3
- import { TransactionHeaderFieldsBaseComponent } from "./transaction-header-fields-base.component";
4
3
  import { DeliveryMethod } from "@colijnit/transactionapi/build/model/delivery-method.bo";
5
- export declare class TransactionHeaderDeliveryMethodComponent extends TransactionHeaderFieldsBaseComponent implements OnInit {
4
+ import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
5
+ export declare class TransactionHeaderDeliveryMethodComponent extends TransactionHeaderBaseComponent implements OnInit {
6
6
  private _transactionService;
7
7
  deliveryMethodChange: EventEmitter<DeliveryMethod>;
8
8
  deliveryMethods: DeliveryMethod[];
@@ -1,10 +1,10 @@
1
1
  import { OnInit } from "@angular/core";
2
2
  import { TransactionService } from "../../service/transaction.service";
3
- import { TransactionHeaderFieldsBaseComponent } from "./transaction-header-fields-base.component";
4
3
  import { DeliveryMethod } from "@colijnit/transactionapi/build/model/delivery-method.bo";
5
4
  import { TextValueContainer } from "../../model/text-value-container";
6
5
  import { DeliveryOption } from "@colijnit/transactionapi/build/model/delivery-option.bo";
7
- export declare class TransactionHeaderDeliveryOptionsComponent extends TransactionHeaderFieldsBaseComponent implements OnInit {
6
+ import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
7
+ export declare class TransactionHeaderDeliveryOptionsComponent extends TransactionHeaderBaseComponent implements OnInit {
8
8
  private _transactionService;
9
9
  set deliveryMethod(value: DeliveryMethod);
10
10
  get deliveryMethod(): DeliveryMethod;
@@ -1,7 +1,7 @@
1
1
  import { InputTextComponent } from "@colijnit/corecomponents_v12";
2
2
  import { TransactionService } from "../../service/transaction.service";
3
- import { TransactionHeaderFieldsBaseComponent } from "./transaction-header-fields-base.component";
4
- export declare class TransactionHeaderDownpaymentAmountComponent extends TransactionHeaderFieldsBaseComponent {
3
+ import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
4
+ export declare class TransactionHeaderDownpaymentAmountComponent extends TransactionHeaderBaseComponent {
5
5
  private _transactionService;
6
6
  set child(content: any);
7
7
  showLabel: boolean;
@@ -1,7 +1,7 @@
1
1
  import { InputTextComponent } from "@colijnit/corecomponents_v12";
2
2
  import { TransactionService } from "../../service/transaction.service";
3
- import { TransactionHeaderFieldsBaseComponent } from "./transaction-header-fields-base.component";
4
- export declare class TransactionHeaderDownpaymentPercentageComponent extends TransactionHeaderFieldsBaseComponent {
3
+ import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
4
+ export declare class TransactionHeaderDownpaymentPercentageComponent extends TransactionHeaderBaseComponent {
5
5
  private _transactionService;
6
6
  set child(content: any);
7
7
  showLabel: boolean;
@@ -1,16 +1,10 @@
1
1
  import { OnInit } from "@angular/core";
2
2
  import { TransactionService } from "../../service/transaction.service";
3
- import { TransactionHeaderFieldsBaseComponent } from "./transaction-header-fields-base.component";
4
3
  import { Marketing } from "@colijnit/transactionapi/build/model/marketing.bo";
5
- export declare class TransactionHeaderMarketingComponent extends TransactionHeaderFieldsBaseComponent implements OnInit {
4
+ import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
5
+ export declare class TransactionHeaderMarketingComponent extends TransactionHeaderBaseComponent implements OnInit {
6
6
  private _transactionService;
7
7
  collection: Marketing[];
8
- fields: Object;
9
- viewModels: {
10
- value: string;
11
- text: string;
12
- checked: boolean;
13
- }[];
14
8
  constructor(_transactionService: TransactionService);
15
9
  ngOnInit(): void;
16
10
  commitTransactionMarketing(code: string): Promise<boolean>;
@@ -1,6 +1,6 @@
1
1
  import { TransactionService } from "../../service/transaction.service";
2
- import { TransactionHeaderFieldsBaseComponent } from "./transaction-header-fields-base.component";
3
- export declare class TransactionHeaderPartialDeliveryComponent extends TransactionHeaderFieldsBaseComponent {
2
+ import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
3
+ export declare class TransactionHeaderPartialDeliveryComponent extends TransactionHeaderBaseComponent {
4
4
  private _transactionService;
5
5
  constructor(_transactionService: TransactionService);
6
6
  commitPartialDelivery(allow: boolean): Promise<boolean>;
@@ -1,7 +1,7 @@
1
1
  import { InputDatePickerComponent } from "@colijnit/corecomponents_v12";
2
2
  import { TransactionService } from "../../service/transaction.service";
3
- import { TransactionHeaderFieldsBaseComponent } from "./transaction-header-fields-base.component";
4
- export declare class TransactionHeaderPreferredDeliveryDateComponent extends TransactionHeaderFieldsBaseComponent {
3
+ import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
4
+ export declare class TransactionHeaderPreferredDeliveryDateComponent extends TransactionHeaderBaseComponent {
5
5
  private _transactionService;
6
6
  set child(content: any);
7
7
  showLabel: boolean;
@@ -1,7 +1,7 @@
1
1
  import { InputTextComponent } from "@colijnit/corecomponents_v12";
2
2
  import { TransactionService } from "../../service/transaction.service";
3
- import { TransactionHeaderFieldsBaseComponent } from "./transaction-header-fields-base.component";
4
- export declare class TransactionHeaderReferenceComponent extends TransactionHeaderFieldsBaseComponent {
3
+ import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
4
+ export declare class TransactionHeaderReferenceComponent extends TransactionHeaderBaseComponent {
5
5
  private _transactionService;
6
6
  set child(content: any);
7
7
  showLabel: boolean;
@@ -1,7 +1,7 @@
1
1
  import { InputTextComponent } from "@colijnit/corecomponents_v12";
2
2
  import { TransactionService } from "../../service/transaction.service";
3
- import { TransactionHeaderFieldsBaseComponent } from "./transaction-header-fields-base.component";
4
- export declare class TransactionHeaderRelationReferenceComponent extends TransactionHeaderFieldsBaseComponent {
3
+ import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
4
+ export declare class TransactionHeaderRelationReferenceComponent extends TransactionHeaderBaseComponent {
5
5
  private _transactionService;
6
6
  set child(content: any);
7
7
  showLabel: boolean;
@@ -1,7 +1,7 @@
1
1
  import { InputTextareaComponent } from "@colijnit/corecomponents_v12";
2
2
  import { TransactionService } from "../../service/transaction.service";
3
- import { TransactionHeaderFieldsBaseComponent } from "./transaction-header-fields-base.component";
4
- export declare class TransactionHeaderRemarksComponent extends TransactionHeaderFieldsBaseComponent {
3
+ import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
4
+ export declare class TransactionHeaderRemarksComponent extends TransactionHeaderBaseComponent {
5
5
  private _transactionService;
6
6
  set child(content: any);
7
7
  showLabel: boolean;
@@ -24,18 +24,33 @@
24
24
  }
25
25
  .transaction-line-extended-wrapper {
26
26
  display: grid;
27
- grid-template-columns: 200px 200px 200px;
28
- grid-template-rows: 30px 30px;
27
+ grid-template-columns: $tp-transaction-line-button-width $tp-transaction-line-button-width auto $tp-transaction-line-button-delivery-method-width;
28
+ grid-template-rows: $tp-transaction-line-button-height $tp-transaction-line-button-height;
29
29
  grid-column-gap: $tp-transaction-line-column-gap;
30
30
  grid-row-gap: $tp-transaction-line-row-gap;
31
+ .last-two-columns {
32
+ grid-column: 3 / 5;
33
+ }
34
+ .two-column {
35
+ grid-column: 1 / 3;
36
+ column-gap: 5px;
37
+ padding: 0;
38
+ }
31
39
  }
32
40
  .transaction-line-extended-row-wrapper {
33
41
  cursor: pointer;
34
42
  display: flex;
35
43
  align-items: center;
36
44
  justify-content: center;
37
- border: 1px solid $tp-transaction-line-border-color;
38
- border-radius: 10px;
45
+ column-gap: $tp-transaction-line-column-gap;
46
+ padding: $tp-transaction-line-button-padding;
47
+ &:not(.no-border) {
48
+ border: $tp-transaction-line-button-border;
49
+ border-radius: $tp-transaction-line-button-radius;
50
+ }
51
+ }
52
+ .transaction-line-extended-button {
53
+ height: $tp-transaction-line-button-height;
39
54
  }
40
55
  &.preview {
41
56
  .transaction-line-wrapper {
@@ -106,7 +121,7 @@
106
121
  .transaction-line-totals {
107
122
  display: grid;
108
123
  grid-template-columns: 100px 100px 100px;
109
- grid-template-rows: 30px 30px;
124
+ grid-template-rows: $tp-transaction-line-button-height $tp-transaction-line-button-height;
110
125
  grid-column-gap: $tp-transaction-line-column-gap;
111
126
  grid-row-gap: $tp-transaction-line-row-gap;
112
127
 
@@ -23,6 +23,14 @@ $tp-transaction-line-totals-font-weight: bold !default;
23
23
  $tp-transaction-line-delete-color: $tp-color-action !default;
24
24
  $tp-transaction-line-article-text-background-color: $tp-color-light-accent !default;
25
25
  $tp-transaction-line-article-text-color: $tp-color-dark !default;
26
+ $tp-transaction-line-button-width: 78px !default;
27
+ $tp-transaction-line-button-padding: 0 5px !default;
28
+ $tp-transaction-line-button-height: 26px !default;
29
+ $tp-transaction-line-button-radius: 10px !default;
30
+ $tp-transaction-line-button-border: 1px solid !default;
31
+ $tp-transaction-line-button-border-color: $tp-color-border !default;
32
+ $tp-transaction-line-button-delivery-method-width: 250px !default;
33
+ $tp-transaction-line-button-background-color: $tp-color-active-light !default;
26
34
  $tp-transaction-line-buttons-overview-background-color: $tp-color-active-light !default;
27
35
  $tp-transaction-line-buttons-overview-text-color: $tp-color-light !default;
28
36
  $tp-transaction-line-buttons-add-text-background-color: $tp-color-action !default;
@@ -28,8 +28,9 @@
28
28
  .discount {
29
29
  background-color: $tp-transaction-line-discount-background-color;
30
30
  }
31
- .transaction-line-extended-row-wrapper {
31
+ .transaction-line-extended-row-wrapper:not(.no-border) {
32
32
  background-color: $tp-transaction-line-discount-background-color;
33
+ border-color: $tp-transaction-line-button-border-color;
33
34
  }
34
35
  }
35
36
  }