@colijnit/transaction 12.1.41 → 12.1.42
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.
- package/bundles/colijnit-transaction.umd.js +492 -285
- package/bundles/colijnit-transaction.umd.js.map +1 -1
- package/colijnit-transaction.d.ts +171 -169
- package/colijnit-transaction.metadata.json +1 -1
- package/esm2015/colijnit-transaction.js +172 -170
- package/esm2015/lib/assets/dictionary/text.properties.js +5 -1
- package/esm2015/lib/component/checkout/checkout-overview-relation-edit/checkout-overview-relation-edit.component.js +6 -4
- package/esm2015/lib/component/core/base/transaction-base.component.js +45 -29
- package/esm2015/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-cc/dialog-transaction-line-warehouse-cc.component.js +75 -0
- package/esm2015/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-cc/dialog-transaction-line-warehouse-cc.module.js +31 -0
- package/esm2015/lib/component/relation/relation-address/relation-address.component.js +3 -21
- package/esm2015/lib/component/relation/relation-address-select/relation-address-select.component.js +1 -3
- package/esm2015/lib/component/relation/relation-addresses/relation-addresses.component.js +34 -11
- package/esm2015/lib/component/relation/relation-addresses/relation-addresses.module.js +5 -3
- package/esm2015/lib/component/shopping-cart/shopping-cart.component.js +8 -1
- package/esm2015/lib/component/transaction/transaction.component.js +11 -5
- package/esm2015/lib/component/transaction-header/transaction-header/transaction-header.component.js +5 -3
- package/esm2015/lib/component/transaction-header/transaction-header-relation/transaction-header-relation.component.js +49 -22
- package/esm2015/lib/component/transaction-line/transaction-line.module.js +3 -1
- package/esm2015/lib/component/transaction-line-fields/transaction-line-commission-code.component.js +2 -2
- package/esm2015/lib/component/transaction-search/service/transaction-search.service.js +5 -3
- package/esm2015/lib/component/transaction-search/transaction-search.component.js +35 -23
- package/esm2015/lib/model/relation-any-type.js +3 -0
- package/esm2015/lib/service/dialog.service.js +8 -1
- package/esm2015/lib/service/pending-reason.service.js +71 -12
- package/esm2015/lib/service/transaction-connector-adapter.service.js +14 -1
- package/esm2015/lib/service/transaction-connector.service.js +7 -1
- package/esm2015/lib/service/transaction.service.js +1 -11
- package/fesm2015/colijnit-transaction.js +381 -136
- package/fesm2015/colijnit-transaction.js.map +1 -1
- package/lib/component/checkout/checkout-overview-relation-edit/checkout-overview-relation-edit.component.d.ts +6 -3
- package/lib/component/core/base/transaction-base.component.d.ts +7 -7
- package/lib/component/dialog/transaction-line/dialog-transaction-line-commission-code/style/_layout.scss +5 -2
- package/lib/component/dialog/transaction-line/dialog-transaction-line-commission-code/style/_material-definition.scss +1 -1
- package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-cc/dialog-transaction-line-warehouse-cc.component.d.ts +12 -0
- package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-cc/dialog-transaction-line-warehouse-cc.module.d.ts +2 -0
- package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-cc/style/_layout.scss +27 -0
- package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-cc/style/_material-definition.scss +11 -0
- package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-cc/style/_theme.scss +8 -0
- package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-cc/style/material.scss +4 -0
- package/lib/component/relation/relation-address/relation-address.component.d.ts +1 -4
- package/lib/component/relation/relation-addresses/relation-addresses.component.d.ts +4 -1
- package/lib/component/relation/relation-addresses/style/_layout.scss +8 -0
- package/lib/component/shopping-cart/shopping-cart.component.d.ts +2 -0
- package/lib/component/transaction/style/_material-definition.scss +2 -2
- package/lib/component/transaction/transaction.component.d.ts +2 -0
- package/lib/component/transaction-header/transaction-header/transaction-header.component.d.ts +2 -1
- package/lib/component/transaction-header/transaction-header-relation/style/_layout.scss +2 -2
- package/lib/component/transaction-header/transaction-header-relation/style/_theme.scss +0 -4
- package/lib/component/transaction-header/transaction-header-relation/transaction-header-relation.component.d.ts +9 -0
- package/lib/component/transaction-line/style/_material-definition.scss +1 -1
- package/lib/component/transaction-search/style/_layout.scss +10 -29
- package/lib/model/relation-any-type.d.ts +3 -0
- package/lib/service/dialog.service.d.ts +1 -0
- package/lib/service/pending-reason.service.d.ts +10 -1
- package/lib/service/transaction-connector-adapter.service.d.ts +2 -0
- package/lib/service/transaction-connector.service.d.ts +2 -0
- package/lib/service/transaction.service.d.ts +0 -1
- package/package.json +2 -2
|
@@ -6,14 +6,17 @@ import { FormMasterService } from "@colijnit/corecomponents_v12";
|
|
|
6
6
|
import { Address } from "@colijnit/transactionapi/build/model/address.bo";
|
|
7
7
|
import { BusinessObjectFactory } from "../../../factory/business-object-factory";
|
|
8
8
|
import { Icon } from "../../../enum/icon.enum";
|
|
9
|
+
import { RelationKind } from "@colijnit/transactionapi/build/enum/relation-kind.enum";
|
|
10
|
+
import { CustomerFullObject } from "@colijnit/transactionapi/build/model/customer-full-object.bo";
|
|
9
11
|
export declare class CheckoutOverviewRelationEditComponent implements OnInit {
|
|
10
12
|
private _formMaster;
|
|
11
13
|
private _boFactory;
|
|
12
14
|
service: TransactionService;
|
|
15
|
+
readonly relationKind: typeof RelationKind;
|
|
13
16
|
readonly icons: typeof Icon;
|
|
14
17
|
readonly addressType: typeof AddressType;
|
|
15
|
-
set relation(value:
|
|
16
|
-
get relation():
|
|
18
|
+
set relation(value: CustomerFullObject);
|
|
19
|
+
get relation(): CustomerFullObject;
|
|
17
20
|
set deliveryAddressNawNr(value: number);
|
|
18
21
|
set invoiceAddressNawNr(value: number);
|
|
19
22
|
validSubmit: EventEmitter<void>;
|
|
@@ -33,7 +36,7 @@ export declare class CheckoutOverviewRelationEditComponent implements OnInit {
|
|
|
33
36
|
get applicationUser(): boolean;
|
|
34
37
|
constructor(_formMaster: FormMasterService, _boFactory: BusinessObjectFactory, service: TransactionService);
|
|
35
38
|
ngOnInit(): Promise<void>;
|
|
36
|
-
updateRelation(rel:
|
|
39
|
+
updateRelation(rel: CustomerFullObject): void;
|
|
37
40
|
submit(): boolean;
|
|
38
41
|
setIndexDeliveryAddress(idx: number): void;
|
|
39
42
|
setIndexInvoiceAddress(idx: number): void;
|
|
@@ -1,26 +1,26 @@
|
|
|
1
|
+
import { AfterViewInit } from "@angular/core";
|
|
1
2
|
import { TransactionService } from "../../../service/transaction.service";
|
|
2
3
|
import { TransactionInfoResponse } from "@colijnit/transactionapi/build/model/transaction-info-response.bo";
|
|
3
4
|
import { TransactionInfo } from "@colijnit/transactionapi/build/model/transaction-info.bo";
|
|
4
5
|
import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
|
|
5
6
|
import { TransactionTotal } from "@colijnit/transactionapi/build/model/transaction-total.bo";
|
|
6
7
|
import { LineOperationStatus } from "@colijnit/transactionapi/build/model/line-operation-status.bo";
|
|
7
|
-
import {
|
|
8
|
-
export declare abstract class TransactionBaseComponent {
|
|
8
|
+
import { RelationKind } from "@colijnit/articleapi/build/enum/relation-kind.enum";
|
|
9
|
+
export declare abstract class TransactionBaseComponent implements AfterViewInit {
|
|
9
10
|
protected readonly service: TransactionService;
|
|
11
|
+
readonly relationKind: typeof RelationKind;
|
|
10
12
|
set transaction(value: TransactionInfoResponse);
|
|
11
13
|
get transaction(): TransactionInfoResponse;
|
|
12
|
-
set customerId(value: number);
|
|
13
|
-
get customerId(): number;
|
|
14
|
-
customer: CustomerFullObject;
|
|
15
14
|
expanded: boolean;
|
|
16
15
|
isService: boolean;
|
|
17
16
|
transactionInfo: TransactionInfo;
|
|
18
17
|
lineOperationStatuses: LineOperationStatus[];
|
|
19
18
|
transactionLines: TransactionLineInfo[];
|
|
20
19
|
transactionTotal: TransactionTotal;
|
|
21
|
-
private _customerId;
|
|
22
20
|
private _transaction;
|
|
23
21
|
constructor(service: TransactionService);
|
|
22
|
+
ngAfterViewInit(): void;
|
|
24
23
|
transactionSet(): void;
|
|
25
|
-
|
|
24
|
+
relationSet(): void;
|
|
25
|
+
private _retrieveRelation;
|
|
26
26
|
}
|
|
@@ -7,8 +7,11 @@
|
|
|
7
7
|
display: flex;
|
|
8
8
|
justify-content: flex-end;
|
|
9
9
|
}
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
//.co-dialog .dialog-content {
|
|
11
|
+
// max-height: $tp-dialog-transaction-line-commission-code-height;
|
|
12
|
+
//}
|
|
13
|
+
.co-transaction-line-checkbox-list .virtual-scroll-container {
|
|
14
|
+
height: $tp-dialog-transaction-line-commission-code-height;
|
|
12
15
|
}
|
|
13
16
|
}
|
|
14
17
|
}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
$tp-dialog-transaction-line-commission-code-min-width: 410px !default;
|
|
2
|
-
$tp-dialog-transaction-line-commission-code-height:
|
|
2
|
+
$tp-dialog-transaction-line-commission-code-height: 100px !default;
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { DialogTransactionLineBaseComponent } from "../../../core/base/dialog-transaction-line-base.component";
|
|
2
|
+
export declare class DialogTransactionLineWarehouseCcComponent extends DialogTransactionLineBaseComponent {
|
|
3
|
+
showClass(): boolean;
|
|
4
|
+
amount: number;
|
|
5
|
+
commissionCode: string;
|
|
6
|
+
warehouse: string;
|
|
7
|
+
handleAmountChange(value: any): void;
|
|
8
|
+
handleCommissionCodeChange(value: any): void;
|
|
9
|
+
handleWarehouseChange(value: any): void;
|
|
10
|
+
handleOkClick(): void;
|
|
11
|
+
handleDialogClose(): void;
|
|
12
|
+
}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
@include export-module('co-dialog-transaction-line-warehouse-cc-layout') {
|
|
2
|
+
.co-dialog-transaction-line-warehouse-cc {
|
|
3
|
+
font-family: $tp-dialog-transaction-line-warehouse-cc-font-family;
|
|
4
|
+
font-size: $tp-dialog-transaction-line-warehouse-cc-font-size;
|
|
5
|
+
.co-dialog:not(.is-mobile) .co-dialog-wrapper {
|
|
6
|
+
min-width: $tp-dialog-transaction-line-warehouse-cc-min-width;
|
|
7
|
+
}
|
|
8
|
+
.dialog-footer-button-wrapper {
|
|
9
|
+
display: flex;
|
|
10
|
+
justify-content: flex-end;
|
|
11
|
+
}
|
|
12
|
+
.co-transaction-line-checkbox-list .virtual-scroll-container {
|
|
13
|
+
height: $tp-dialog-transaction-line-warehouse-cc-commission-code-height;
|
|
14
|
+
}
|
|
15
|
+
.transaction-line-warehouse-cc-section {
|
|
16
|
+
margin: $tp-dialog-transaction-line-warehouse-cc-section-margin;
|
|
17
|
+
}
|
|
18
|
+
.amount-number-picker {
|
|
19
|
+
width: $tp-dialog-transaction-line-warehouse-cc-amount-width;
|
|
20
|
+
}
|
|
21
|
+
.transaction-line-warehouse-cc-section-label {
|
|
22
|
+
font-size: $tp-dialog-transaction-line-warehouse-cc-section-label-font-size;
|
|
23
|
+
font-weight: $tp-dialog-transaction-line-warehouse-cc-section-label-font-weight;
|
|
24
|
+
margin: $tp-dialog-transaction-line-warehouse-cc-section-label-margin;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
$tp-dialog-transaction-line-warehouse-cc-font-family: $tp-font-family !default;
|
|
2
|
+
$tp-dialog-transaction-line-warehouse-cc-font-size: $tp-font-size !default;
|
|
3
|
+
$tp-dialog-transaction-line-warehouse-cc-font-color: $tp-color-font !default;
|
|
4
|
+
$tp-dialog-transaction-line-warehouse-cc-min-width: 500px !default;
|
|
5
|
+
$tp-dialog-transaction-line-warehouse-cc-commission-code-height: 100px !default;
|
|
6
|
+
$tp-dialog-transaction-line-warehouse-cc-amount-width: 150px !default;
|
|
7
|
+
$tp-dialog-transaction-line-warehouse-cc-section-margin: 20px 0 !default;
|
|
8
|
+
$tp-dialog-transaction-line-warehouse-cc-section-label-margin: 10px 0 !default;
|
|
9
|
+
$tp-dialog-transaction-line-warehouse-cc-section-label-font-size: $tp-font-size !default;
|
|
10
|
+
$tp-dialog-transaction-line-warehouse-cc-section-label-font-color: $tp-color-font !default;
|
|
11
|
+
$tp-dialog-transaction-line-warehouse-cc-section-label-font-weight: normal !default;
|
package/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-cc/style/_theme.scss
ADDED
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
@include export-module('co-dialog-transaction-line-warehouse-cc-theme') {
|
|
2
|
+
.co-dialog-transaction-line-warehouse-cc {
|
|
3
|
+
color: $tp-dialog-transaction-line-warehouse-cc-font-color;
|
|
4
|
+
.transaction-line-warehouse-cc-section-label {
|
|
5
|
+
color: $tp-dialog-transaction-line-warehouse-cc-section-label-font-color;
|
|
6
|
+
}
|
|
7
|
+
}
|
|
8
|
+
}
|
|
@@ -11,9 +11,7 @@ export declare class RelationAddressComponent extends RelationBaseComponent impl
|
|
|
11
11
|
private _formMasterService;
|
|
12
12
|
address: Address;
|
|
13
13
|
label: string;
|
|
14
|
-
|
|
15
|
-
saveClick: EventEmitter<Address>;
|
|
16
|
-
cancelClick: EventEmitter<void>;
|
|
14
|
+
addressChange: EventEmitter<Address>;
|
|
17
15
|
showClass(): boolean;
|
|
18
16
|
countries: Country[];
|
|
19
17
|
fields: Object;
|
|
@@ -22,7 +20,6 @@ export declare class RelationAddressComponent extends RelationBaseComponent impl
|
|
|
22
20
|
private _prevHouseNoForCheck;
|
|
23
21
|
constructor(_dictionary: DictionaryService, _connector: TransactionConnectorService, _formMasterService: FormMasterService);
|
|
24
22
|
ngOnInit(): Promise<void>;
|
|
25
|
-
submitForm(): void;
|
|
26
23
|
checkForPostalCodeCheckError(): Promise<void>;
|
|
27
24
|
changeHouseNo(): void;
|
|
28
25
|
}
|
|
@@ -4,8 +4,10 @@ import { Icon } from "../../../enum/icon.enum";
|
|
|
4
4
|
import { AddressType } from "@colijnit/transactionapi/build/enum/address-type.enum";
|
|
5
5
|
import { BusinessObjectFactory } from "../../../factory/business-object-factory";
|
|
6
6
|
import { RelationBaseComponent } from "../relation-base.component";
|
|
7
|
+
import { FormMasterService } from "@colijnit/corecomponents_v12";
|
|
7
8
|
export declare class RelationAddressesComponent extends RelationBaseComponent {
|
|
8
9
|
private _boFactory;
|
|
10
|
+
private _formMasterService;
|
|
9
11
|
readonly icons: typeof Icon;
|
|
10
12
|
addresses: Address[];
|
|
11
13
|
type: AddressType;
|
|
@@ -15,7 +17,8 @@ export declare class RelationAddressesComponent extends RelationBaseComponent {
|
|
|
15
17
|
showClass(): boolean;
|
|
16
18
|
showEditAddressDialog: boolean;
|
|
17
19
|
addressToEdit: Address;
|
|
18
|
-
constructor(_boFactory: BusinessObjectFactory);
|
|
20
|
+
constructor(_boFactory: BusinessObjectFactory, _formMasterService: FormMasterService);
|
|
21
|
+
submitForm(): void;
|
|
19
22
|
saveAddress(address: Address): void;
|
|
20
23
|
showNewAddressDialog(): void;
|
|
21
24
|
setIndexAddress(idx: number): void;
|
|
@@ -4,6 +4,10 @@
|
|
|
4
4
|
max-width: $tp-relation-addresses-carousel-max-width;
|
|
5
5
|
height: 175px;
|
|
6
6
|
}
|
|
7
|
+
.default-data-row {
|
|
8
|
+
display: flex;
|
|
9
|
+
overflow: hidden;
|
|
10
|
+
}
|
|
7
11
|
.relation-address-new {
|
|
8
12
|
cursor: pointer;
|
|
9
13
|
display: flex;
|
|
@@ -15,5 +19,9 @@
|
|
|
15
19
|
width: 20px;
|
|
16
20
|
}
|
|
17
21
|
}
|
|
22
|
+
.dialog-footer-button-wrapper {
|
|
23
|
+
display: flex;
|
|
24
|
+
justify-content: flex-end;
|
|
25
|
+
}
|
|
18
26
|
}
|
|
19
27
|
}
|
|
@@ -2,6 +2,7 @@ import { EventEmitter, OnDestroy } from "@angular/core";
|
|
|
2
2
|
import { DictionaryService } from "../../service/dictionary.service";
|
|
3
3
|
import { TransactionInfoResponse } from "@colijnit/transactionapi/build/model/transaction-info-response.bo";
|
|
4
4
|
import { TransactionService } from "../../service/transaction.service";
|
|
5
|
+
import { RelationAnyType } from "../../model/relation-any-type";
|
|
5
6
|
export declare class ShoppingCartComponent implements OnDestroy {
|
|
6
7
|
service: TransactionService;
|
|
7
8
|
private _dictionary;
|
|
@@ -9,6 +10,7 @@ export declare class ShoppingCartComponent implements OnDestroy {
|
|
|
9
10
|
checkout: EventEmitter<void>;
|
|
10
11
|
showClass(): boolean;
|
|
11
12
|
transaction: TransactionInfoResponse;
|
|
13
|
+
relation: RelationAnyType;
|
|
12
14
|
private _subs;
|
|
13
15
|
constructor(service: TransactionService, _dictionary: DictionaryService);
|
|
14
16
|
ngOnDestroy(): void;
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
$tp-transaction-totals-margin: 15px 0 !default;
|
|
2
|
-
$tp-transaction-padding:
|
|
3
|
-
$tp-transaction-transaction-lines-header-padding: 20px
|
|
2
|
+
$tp-transaction-padding: 20px !default;
|
|
3
|
+
$tp-transaction-transaction-lines-header-padding: 20px !default;
|
|
@@ -9,12 +9,14 @@ import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transa
|
|
|
9
9
|
import { TransactionBarButton } from "../../model/transaction-bar-button";
|
|
10
10
|
import { TransactionTypeCategory } from "../../enum/transaction-type-category.enum";
|
|
11
11
|
import { DynamicComponentService } from "../../service/dynamic-component.service";
|
|
12
|
+
import { RelationAnyType } from "../../model/relation-any-type";
|
|
12
13
|
export declare class TransactionComponent implements OnDestroy {
|
|
13
14
|
iconCacheService: IconCacheService;
|
|
14
15
|
private _service;
|
|
15
16
|
private dynamicComponentService;
|
|
16
17
|
readonly viewModes: typeof ContentViewMode;
|
|
17
18
|
readonly icons: typeof Icon;
|
|
19
|
+
relation: RelationAnyType;
|
|
18
20
|
set transaction(value: TransactionInfoResponse);
|
|
19
21
|
get transaction(): TransactionInfoResponse;
|
|
20
22
|
set transactionId(value: number);
|
package/lib/component/transaction-header/transaction-header/transaction-header.component.d.ts
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { Icon } from "../../../enum/icon.enum";
|
|
2
2
|
import { TransactionInfoResponse } from "@colijnit/transactionapi/build/model/transaction-info-response.bo";
|
|
3
|
+
import { RelationAnyType } from "@colijnit/transactionapi/build/model/relation-any-type";
|
|
3
4
|
export declare class TransactionHeaderComponent {
|
|
4
5
|
readonly icons: typeof Icon;
|
|
6
|
+
relation: RelationAnyType;
|
|
5
7
|
set transaction(value: TransactionInfoResponse);
|
|
6
8
|
get transaction(): TransactionInfoResponse;
|
|
7
9
|
showClass(): boolean;
|
|
8
|
-
relationId: number;
|
|
9
10
|
private _transaction;
|
|
10
11
|
}
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
grid-template-columns: 100%;
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
|
-
.section {
|
|
34
|
+
.header-relation-section {
|
|
35
35
|
display: flex;
|
|
36
36
|
flex-direction: column;
|
|
37
37
|
row-gap: $tp-transaction-header-relation-section-row-gap;
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
border-width: $tp-transaction-header-relation-section-border-width;
|
|
42
42
|
border-color: black;
|
|
43
43
|
}
|
|
44
|
-
.label {
|
|
44
|
+
.header-relation-section-label {
|
|
45
45
|
font-family: $tp-transaction-header-relation-section-label-font-family;
|
|
46
46
|
font-size: $tp-transaction-header-relation-section-label-font-size;
|
|
47
47
|
font-weight: $tp-transaction-header-relation-section-label-font-weight;
|
|
@@ -4,6 +4,8 @@ import { AddressType } from "@colijnit/transactionapi/build/enum/address-type.en
|
|
|
4
4
|
import { RelationAnyType } from "@colijnit/transactionapi/build/model/relation-any-type";
|
|
5
5
|
import { DictionaryService } from "../../../service/dictionary.service";
|
|
6
6
|
import { TransactionService } from "../../../service/transaction.service";
|
|
7
|
+
import { RelationKind } from "@colijnit/transactionapi/build/enum/relation-kind.enum";
|
|
8
|
+
import { CustomerGroup } from "@colijnit/transactionapi/build/model/customer-group.bo";
|
|
7
9
|
export declare class TransactionHeaderRelationComponent extends TransactionBaseComponent {
|
|
8
10
|
protected readonly service: TransactionService;
|
|
9
11
|
private _dictionary;
|
|
@@ -11,16 +13,23 @@ export declare class TransactionHeaderRelationComponent extends TransactionBaseC
|
|
|
11
13
|
navigationItems: ElementRef;
|
|
12
14
|
mainItems: ElementRef;
|
|
13
15
|
preferenceItems: ElementRef;
|
|
16
|
+
set relation(value: RelationAnyType);
|
|
17
|
+
get relation(): RelationAnyType;
|
|
14
18
|
showClass(): boolean;
|
|
15
19
|
deliveryAddressIdx: number;
|
|
16
20
|
invoiceAddressIdx: number;
|
|
17
21
|
invoiceAddressSameAsDeliveryAddress: boolean;
|
|
18
22
|
showDialog: boolean;
|
|
19
23
|
categories: string[];
|
|
24
|
+
customerGroup: string;
|
|
25
|
+
relationType: RelationKind;
|
|
26
|
+
private _relation;
|
|
20
27
|
constructor(service: TransactionService, _dictionary: DictionaryService);
|
|
21
28
|
updateRelation(rel: RelationAnyType): void;
|
|
22
29
|
setIndexDeliveryAddress(idx: number): void;
|
|
23
30
|
setIndexInvoiceAddress(idx: number): void;
|
|
24
31
|
checkSameAddress(checked: boolean): void;
|
|
25
32
|
handleNavigationClick(nav: string): void;
|
|
33
|
+
handleChangeCustomGroup(group: CustomerGroup): void;
|
|
34
|
+
relationSet(): void;
|
|
26
35
|
}
|
|
@@ -3,7 +3,7 @@ $tp-transaction-line-font-size: $tp-font-size !default;
|
|
|
3
3
|
$tp-transaction-line-background-color: white !default;
|
|
4
4
|
$tp-transaction-line-min-height: 100px !default;
|
|
5
5
|
$tp-transaction-line-article-text-min-height: 30px !default;
|
|
6
|
-
$tp-transaction-line-padding: 10px !default;
|
|
6
|
+
$tp-transaction-line-padding: 10px 0 !default;
|
|
7
7
|
$tp-transaction-line-inner-padding: 3px !default;
|
|
8
8
|
$tp-transaction-line-border: 1px solid !default;
|
|
9
9
|
$tp-transaction-line-border-width: 0 0 1px 0 !default;
|
|
@@ -4,34 +4,34 @@
|
|
|
4
4
|
.co-transaction-search {
|
|
5
5
|
font-family: $tp-co-transaction-search-font-family;
|
|
6
6
|
font-size: $tp-co-transaction-search-font-size;
|
|
7
|
-
display:
|
|
8
|
-
|
|
7
|
+
display: block;
|
|
8
|
+
.transaction-search-main-wrapper {
|
|
9
|
+
display: flex;
|
|
10
|
+
width: 100%;
|
|
11
|
+
height: 100%;
|
|
12
|
+
}
|
|
9
13
|
.transaction-search-wrapper {
|
|
10
14
|
display: flex;
|
|
11
|
-
|
|
12
15
|
&.fullscreen {
|
|
13
16
|
width: 100%;
|
|
14
17
|
transition: width 0.2s ease-in-out;
|
|
15
18
|
}
|
|
16
|
-
|
|
17
19
|
&.sidebar {
|
|
18
20
|
width: $cc-co-transaction-searchbar-width;
|
|
19
21
|
transition: all 0.2s ease-in-out;
|
|
20
|
-
|
|
21
22
|
&.collapsed {
|
|
22
23
|
transform: translate(-$cc-co-transaction-searchbar-width);
|
|
24
|
+
width: 0;
|
|
25
|
+
height: 0;
|
|
23
26
|
}
|
|
24
|
-
|
|
25
27
|
&.expanded {
|
|
26
28
|
transform: translate(0);
|
|
27
29
|
}
|
|
28
30
|
}
|
|
29
31
|
}
|
|
30
|
-
|
|
31
32
|
.transaction-filter-wrapper {
|
|
32
33
|
display: flex;
|
|
33
34
|
min-width: $tp-co-transaction-filter-wrapper-min-width;
|
|
34
|
-
|
|
35
35
|
&.sidebar {
|
|
36
36
|
position: absolute;
|
|
37
37
|
left: 0;
|
|
@@ -40,14 +40,12 @@
|
|
|
40
40
|
background: #FFF;
|
|
41
41
|
min-width: $tp-co-transaction-filter-wrapper-sidebar-min-width;
|
|
42
42
|
}
|
|
43
|
-
|
|
44
43
|
&.fullscreen {
|
|
45
44
|
position: relative;
|
|
46
45
|
left: 0;
|
|
47
46
|
transition: left 0.2s ease-in-out;
|
|
48
47
|
}
|
|
49
48
|
}
|
|
50
|
-
|
|
51
49
|
.transaction-search-result-wrapper {
|
|
52
50
|
display: flex;
|
|
53
51
|
overflow-y: auto;
|
|
@@ -55,43 +53,26 @@
|
|
|
55
53
|
justify-content: flex-start;
|
|
56
54
|
padding: $tp-co-transaction-search-result-wrapper-padding;
|
|
57
55
|
}
|
|
58
|
-
|
|
59
56
|
.transaction-search-content-wrapper {
|
|
57
|
+
display: block;
|
|
58
|
+
width: 100%;
|
|
60
59
|
&.fullscreen {
|
|
61
60
|
display: none;
|
|
62
61
|
}
|
|
63
|
-
|
|
64
|
-
&.sidebar {
|
|
65
|
-
transition: all 0.2s ease-in-out;
|
|
66
|
-
|
|
67
|
-
&.expanded {
|
|
68
|
-
min-height: 100vh;
|
|
69
|
-
transform: translate(10px);
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
&.collapsed {
|
|
73
|
-
transform: translate(-$cc-co-transaction-searchbar-width + 10px);
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
62
|
}
|
|
77
|
-
|
|
78
63
|
& > co-icon-collapse-handle {
|
|
79
64
|
position: absolute !important;
|
|
80
65
|
flex-shrink: 0;
|
|
81
66
|
top: 50vh;
|
|
82
|
-
|
|
83
67
|
&.fullscreen {
|
|
84
68
|
opacity: 0;
|
|
85
69
|
}
|
|
86
|
-
|
|
87
70
|
&.sidebar {
|
|
88
71
|
transition: all 0.2s ease-in-out;
|
|
89
|
-
|
|
90
72
|
&.collapsed {
|
|
91
73
|
opacity: 0;
|
|
92
74
|
transform: translate(0) rotate(90deg);
|
|
93
75
|
}
|
|
94
|
-
|
|
95
76
|
&.expanded {
|
|
96
77
|
opacity: 1;
|
|
97
78
|
transition-delay: 0.2s;
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import { CustomerFullObject } from "@colijnit/transactionapi/build/model/customer-full-object.bo";
|
|
2
|
+
import { SupplierFullObject } from "@colijnit/transactionapi/build/model/supplier-full-object.bo";
|
|
3
|
+
export declare type RelationAnyType = CustomerFullObject | SupplierFullObject;
|
|
@@ -17,6 +17,7 @@ export declare class DialogService {
|
|
|
17
17
|
showTransactionLineComponent(comp: Type<DialogBaseComponent>, transLine: TransactionLineInfo): Promise<any>;
|
|
18
18
|
showTransactionHeaderComponent(comp: Type<DialogBaseComponent>, transactionInfo: TransactionInfo): Promise<any>;
|
|
19
19
|
showCharacteristics(title: string, choices: TransactionLineCharacteristicChoice[], value: string): Promise<string>;
|
|
20
|
+
showWarehouseCC(): Promise<number>;
|
|
20
21
|
showWarehouse(): Promise<number>;
|
|
21
22
|
showCommissionCode(): Promise<string>;
|
|
22
23
|
showWarehouseLocation(warehouseNr: number): Promise<string>;
|
|
@@ -9,6 +9,8 @@ import { ArticleConnectorService } from "./article-connector.service";
|
|
|
9
9
|
import { ResolveHeaderPendingReasonRequest } from "@colijnit/transactionapi/build/model/resolve-header-pending-reason-request.bo";
|
|
10
10
|
import { PurchasePortalLine } from "@colijnit/transactionapi/build/model/purchase-portal-line.bo";
|
|
11
11
|
import { DocDeliveryBatch } from "@colijnit/transactionapi/build/model/doc-delivery-batch.bo";
|
|
12
|
+
import { RelationAnyType } from "../model/relation-any-type";
|
|
13
|
+
import { SupplierFullObject } from "@colijnit/transactionapi/build/model/supplier-full-object.bo";
|
|
12
14
|
export declare class PendingReasonService {
|
|
13
15
|
protected dialogService: DialogService;
|
|
14
16
|
protected options: OptionsService;
|
|
@@ -16,13 +18,16 @@ export declare class PendingReasonService {
|
|
|
16
18
|
protected articleConnector: ArticleConnectorService;
|
|
17
19
|
logout: Subject<void>;
|
|
18
20
|
transactionUpdated: BehaviorSubject<TransactionInfoResponse>;
|
|
21
|
+
relationUpdated: BehaviorSubject<RelationAnyType>;
|
|
19
22
|
applicationUser: boolean;
|
|
20
23
|
invoiceAddressSameAsDelivery: boolean;
|
|
21
24
|
currentTransaction: TransactionInfoResponse;
|
|
22
|
-
relation:
|
|
25
|
+
set relation(value: RelationAnyType);
|
|
26
|
+
get relation(): RelationAnyType;
|
|
23
27
|
purchasePortalLine: PurchasePortalLine;
|
|
24
28
|
docDeliveryBatch: DocDeliveryBatch;
|
|
25
29
|
articleAmount: number;
|
|
30
|
+
private _relation;
|
|
26
31
|
constructor(dialogService: DialogService, options: OptionsService, connector: TransactionConnectorService, articleConnector: ArticleConnectorService);
|
|
27
32
|
init(options: any): Promise<void>;
|
|
28
33
|
cancelAddTransactionLine(lineUuid: string, remember?: boolean): Promise<TransactionInfoResponse>;
|
|
@@ -34,12 +39,16 @@ export declare class PendingReasonService {
|
|
|
34
39
|
private _handleHeaderOperationStatus;
|
|
35
40
|
resolvePendingLineReason(pendingLineValues: ResolveLinePendingReasonRequest): Promise<void>;
|
|
36
41
|
resolvePendingHeaderReason(pendingHeaderValues: ResolveHeaderPendingReasonRequest): Promise<boolean>;
|
|
42
|
+
getCustomerFullObjectByRelationId(relationId: number): Promise<CustomerFullObject>;
|
|
43
|
+
getSupplierFullObjectByRelationId(relationId: number): Promise<SupplierFullObject>;
|
|
37
44
|
private _confirmAction;
|
|
38
45
|
private _showCharacteristicDialog;
|
|
39
46
|
private _showWarehouseDialog;
|
|
40
47
|
private _showCommissionCodeDialog;
|
|
48
|
+
private _showWarehouseCcDialog;
|
|
41
49
|
private _confirmHeaderAction;
|
|
42
50
|
private _showReasonDialog;
|
|
43
51
|
private _setAmount;
|
|
44
52
|
private _cancelArticle;
|
|
53
|
+
private _getRelation;
|
|
45
54
|
}
|
|
@@ -48,6 +48,7 @@ import { PaymentLinkStatus } from "@colijnit/transactionapi/build/model/payment-
|
|
|
48
48
|
import { SelectMultipleCacheService } from "../cache/service/select-multiple-cache.service";
|
|
49
49
|
import { SelectMultipleParameterizedCacheService } from "../cache/service/select-multiple-parameterized-cache.service";
|
|
50
50
|
import { ErrorService } from "./error.service";
|
|
51
|
+
import { SupplierFullObject } from "@colijnit/transactionapi/build/model/supplier-full-object.bo";
|
|
51
52
|
export declare class TransactionConnectorAdapterService {
|
|
52
53
|
private _optionsService;
|
|
53
54
|
private _selectMultipleCacheService;
|
|
@@ -70,6 +71,7 @@ export declare class TransactionConnectorAdapterService {
|
|
|
70
71
|
getTransactionByNrAndKind(kind: TransactionKind, transactionNo: number): Promise<TransactionInfoResponse>;
|
|
71
72
|
getTransactionById(transactionId: number): Promise<TransactionInfoResponse>;
|
|
72
73
|
getCustomerFullObject(relationNo: number): Promise<CustomerFullObject>;
|
|
74
|
+
getSupplierFullObject(relationNo: number): Promise<SupplierFullObject>;
|
|
73
75
|
getCashRegisters(branch?: string, group?: number): Promise<CashRegister[]>;
|
|
74
76
|
getRelationNumber(relationId: number): Promise<string>;
|
|
75
77
|
getPriceLists(code?: string): Promise<PriceList[]>;
|
|
@@ -47,6 +47,7 @@ import { SelectMultipleCacheService } from "../cache/service/select-multiple-cac
|
|
|
47
47
|
import { SelectMultipleParameterizedCacheService } from "../cache/service/select-multiple-parameterized-cache.service";
|
|
48
48
|
import { TransactionConnectorAdapterService } from "./transaction-connector-adapter.service";
|
|
49
49
|
import { SelectSingleCacheService } from "../cache/service/select-single-cache.service";
|
|
50
|
+
import { SupplierFullObject } from "@colijnit/transactionapi/build/model/supplier-full-object.bo";
|
|
50
51
|
export declare class TransactionConnectorService {
|
|
51
52
|
private _adapterService;
|
|
52
53
|
private _selectSingleCacheService;
|
|
@@ -70,6 +71,7 @@ export declare class TransactionConnectorService {
|
|
|
70
71
|
commit(): Promise<DataServiceResponseData>;
|
|
71
72
|
saveTransaction(uuid: string): Promise<TransactionInfoResponse>;
|
|
72
73
|
getCustomerFullObject(relationNo: number): Promise<CustomerFullObject>;
|
|
74
|
+
getSupplierFullObject(relationNo: number): Promise<SupplierFullObject>;
|
|
73
75
|
getCashRegisters(branch?: string, group?: number): Promise<CashRegister[]>;
|
|
74
76
|
getRelationNumber(relationId: number): Promise<string>;
|
|
75
77
|
getPriceLists(code?: string): Promise<PriceList[]>;
|
|
@@ -97,7 +97,6 @@ export declare class TransactionService extends PendingReasonService {
|
|
|
97
97
|
deleteTransactionLine(transactionUuid: string, TransactionLineUuid: string, remember?: boolean): Promise<TransactionInfoResponse>;
|
|
98
98
|
changeTransactionLineQuantity(lineUuid: string, newQuantity: number, remember?: boolean): Promise<TransactionInfoResponse>;
|
|
99
99
|
setRelationByUser(username: string, password: string): Promise<boolean>;
|
|
100
|
-
getCustomerFullObjectByRelationId(relationId: number): Promise<CustomerFullObject>;
|
|
101
100
|
getGoodsReceiptStatus(transId: number, lineNr: number): Promise<GoodsReceiptStatusWithHistory>;
|
|
102
101
|
getGoodsReceiptStatusWithHistory(transId: number, lineNr: number): Promise<GoodsReceiptStatusWithHistory>;
|
|
103
102
|
receiveGoodsForPurchaseOrder(request: ReceiveGoodsForPurchaseOrderRequest): Promise<TransactionInfoResponse>;
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@colijnit/transaction",
|
|
3
|
-
"version": "12.1.
|
|
3
|
+
"version": "12.1.42",
|
|
4
4
|
"description": "Colijn IT transaction module for Angular 12",
|
|
5
5
|
"private": false,
|
|
6
6
|
"peerDependencies": {
|
|
7
7
|
"@angular/common": "^12.2.0",
|
|
8
8
|
"@angular/core": "^12.2.0",
|
|
9
9
|
"@colijnit/corecomponents_v12": ">=12.0.69",
|
|
10
|
-
"@colijnit/transactionapi": ">=1.1.
|
|
10
|
+
"@colijnit/transactionapi": ">=1.1.40",
|
|
11
11
|
"@fortawesome/angular-fontawesome": "0.9.0",
|
|
12
12
|
"@fortawesome/fontawesome-svg-core": "^6.1.1",
|
|
13
13
|
"@fortawesome/free-solid-svg-icons": "^6.1.1",
|