@colijnit/transaction 12.1.217 → 12.1.218
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 +448 -69
- package/bundles/colijnit-transaction.umd.js.map +1 -1
- package/colijnit-transaction.d.ts +3 -1
- package/colijnit-transaction.metadata.json +1 -1
- package/esm2015/colijnit-transaction.js +4 -2
- package/esm2015/lib/component/add-product/add-product.component.js +38 -31
- package/esm2015/lib/component/dialog/transaction-line/dialog-transaction-line-warehouse-location/dialog-transaction-line-warehouse-location.module.js +5 -5
- package/esm2015/lib/component/transaction/transaction.module.js +4 -2
- package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-order-expense-dialog/transaction-cash-register-order-expense-dialog.component.js +4 -2
- package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-order-receipt-dialog/transaction-cash-register-order-receipt-dialog.component.js +285 -0
- package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-order-receipt-dialog/transaction-cash-register-order-receipt-dialog.module.js +25 -0
- package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/transaction-cash-register-payment-dialog.component.js +40 -37
- package/esm2015/lib/component/transaction-line/transaction-cash-register-order-line/transaction-cash-register-order-line.component.js +37 -26
- package/esm2015/lib/component/transaction-line/transaction-cash-register-order-line/transaction-cash-register-order-line.module.js +4 -2
- package/esm2015/lib/component/transaction-line/transaction-invoice-line/transaction-invoice-line.component.js +2 -2
- package/esm2015/lib/component/transaction-line/transaction-order-delivery-line/transaction-order-delivery-line.component.js +2 -2
- package/esm2015/lib/component/transaction-line/transaction-overview-line/transaction-overview-line.component.js +2 -2
- package/esm2015/lib/component/transaction-line/transaction-planning-line/transaction-planning-line.component.js +2 -2
- package/esm2015/lib/component/transaction-line/transaction-purchase-order-line/transaction-purchase-order-line.component.js +3 -3
- package/esm2015/lib/component/transaction-line/transaction-purchase-overview-line/transaction-purchase-overview-line.component.js +2 -2
- package/esm2015/lib/component/transaction-line/transaction-sales-order-quotation-line/transaction-sales-order-quotation-line.component.js +2 -2
- package/esm2015/lib/component/transaction-line-checkbox-list/transaction-line-checkbox-list.component.js +4 -4
- package/esm2015/lib/component/transaction-line-fields/transaction-line-confirmed-price/transaction-line-confirmed-price.component.js +2 -2
- package/esm2015/lib/component/transaction-line-fields/transaction-line-discount-button.component.js +2 -2
- package/esm2015/lib/component/transaction-line-fields/transaction-line-price/transaction-line-price.component.js +3 -2
- package/esm2015/lib/component/transaction-line-fields/transaction-line-warehouse-location-button.component.js +21 -14
- package/esm2015/lib/component/transaction-line-fields/transaction-line-warehouse-location-button.module.js +4 -2
- package/esm2015/lib/component/transaction-lines-popup/transaction-lines-popup.component.js +2 -2
- package/esm2015/lib/component/transaction-margin/transaction-margin.component.js +2 -2
- package/esm2015/lib/component/transaction-quick-access/transaction-quick-access/transaction-quick-access.component.js +1 -21
- package/esm2015/lib/service/dialog.service.js +12 -1
- package/esm2015/lib/service/transaction.service.js +15 -5
- package/esm2015/lib/transaction-version.js +3 -3
- package/fesm2015/colijnit-transaction.js +488 -155
- package/fesm2015/colijnit-transaction.js.map +1 -1
- package/lib/component/add-product/add-product.component.d.ts +3 -1
- package/lib/component/transaction-cash-register-order/transaction-cash-register-order-receipt-dialog/style/_layout.scss +3 -0
- package/lib/component/transaction-cash-register-order/transaction-cash-register-order-receipt-dialog/transaction-cash-register-order-receipt-dialog.component.d.ts +48 -0
- package/lib/component/transaction-cash-register-order/transaction-cash-register-order-receipt-dialog/transaction-cash-register-order-receipt-dialog.module.d.ts +2 -0
- package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/style/_layout.scss +39 -0
- package/lib/component/transaction-line/transaction-cash-register-order-line/style/_layout.scss +22 -7
- package/lib/component/transaction-line-fields/transaction-line-warehouse-location-button.component.d.ts +1 -2
- package/lib/component/transaction-quick-access/transaction-quick-access/transaction-quick-access.component.d.ts +0 -2
- package/lib/service/dialog.service.d.ts +1 -0
- package/lib/service/transaction.service.d.ts +2 -1
- package/package.json +1 -1
|
@@ -4,6 +4,7 @@ import { Icon } from '../../enum/icon.enum';
|
|
|
4
4
|
import { IconCacheService } from '../../service/icon-cache.service';
|
|
5
5
|
import { TransactionService } from '../../service/transaction.service';
|
|
6
6
|
import { SafeHtml } from '@angular/platform-browser';
|
|
7
|
+
import { InputScannerComponent } from "@colijnit/corecomponents_v12";
|
|
7
8
|
export interface AddArticleInterface {
|
|
8
9
|
article: ArticleExtended;
|
|
9
10
|
quantity: number;
|
|
@@ -18,6 +19,7 @@ export declare class AddProductComponent {
|
|
|
18
19
|
readonly icons: typeof Icon;
|
|
19
20
|
handleAddArticleInternally: boolean;
|
|
20
21
|
addArticle: EventEmitter<AddArticleInterface>;
|
|
22
|
+
inputSearchText: InputScannerComponent;
|
|
21
23
|
showClass(): boolean;
|
|
22
24
|
return: boolean;
|
|
23
25
|
catalogOptions: any;
|
|
@@ -38,7 +40,7 @@ export declare class AddProductComponent {
|
|
|
38
40
|
handleCatalogArticleClick(article: ArticleExtended): Promise<void>;
|
|
39
41
|
showCatalogDialog(): void;
|
|
40
42
|
handleCartIconClick(event: MouseEvent): void;
|
|
41
|
-
handleSearchIconClick(
|
|
43
|
+
handleSearchIconClick(): void;
|
|
42
44
|
handleIFrameFeedback(iFrameFeedbackObject: {
|
|
43
45
|
jsonString: string;
|
|
44
46
|
catalog: number;
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
display: flex;
|
|
12
12
|
column-gap: 10px;
|
|
13
13
|
align-items: center;
|
|
14
|
+
|
|
14
15
|
span {
|
|
15
16
|
margin: 0;
|
|
16
17
|
}
|
|
@@ -41,9 +42,11 @@
|
|
|
41
42
|
.co-icon {
|
|
42
43
|
width: 20px;
|
|
43
44
|
height: 20px;
|
|
45
|
+
|
|
44
46
|
svg { // for fontawesome icons
|
|
45
47
|
fill: #1a73e8;
|
|
46
48
|
}
|
|
49
|
+
|
|
47
50
|
& [fill] { // for own icons
|
|
48
51
|
fill: #1a73e8;
|
|
49
52
|
}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { EventEmitter, OnInit } from "@angular/core";
|
|
2
|
+
import { TransactionBaseComponent } from "../../core/base/transaction-base.component";
|
|
3
|
+
import { SafeHtml } from "@angular/platform-browser";
|
|
4
|
+
import { PaymentTransactionViewModel } from "../../../model/payment-transaction-view-model";
|
|
5
|
+
import { Printer } from "@colijnit/mainapi/build/model/printer.bo";
|
|
6
|
+
import { ReportLayoutSelectionPrint } from "@colijnit/mainapi/build/model/report-layout-selection-print.bo";
|
|
7
|
+
import { ReportLayoutSelectionEmail } from "@colijnit/mainapi/build/model/report-layout-selection-email.bo";
|
|
8
|
+
import { TransactionInfoResponse } from "@colijnit/transactionapi/build/model/transaction-info-response.bo";
|
|
9
|
+
import { AppPopupButtonType } from "../../core/enum/app-popup-button-type.enum";
|
|
10
|
+
export declare class TransactionCashRegisterOrderReceiptDialogComponent extends TransactionBaseComponent implements OnInit {
|
|
11
|
+
readonly buttonType: typeof AppPopupButtonType;
|
|
12
|
+
cashRegisterPaymentDetails: PaymentTransactionViewModel;
|
|
13
|
+
isReprint: boolean;
|
|
14
|
+
currentTransaction: TransactionInfoResponse;
|
|
15
|
+
showClose: boolean;
|
|
16
|
+
handleReceiptOptionSelected: EventEmitter<void>;
|
|
17
|
+
close: EventEmitter<MouseEvent>;
|
|
18
|
+
disableInput: boolean;
|
|
19
|
+
emailAddressList: string[];
|
|
20
|
+
printerList: Printer[];
|
|
21
|
+
activePrinter: Printer;
|
|
22
|
+
printerLayouts: ReportLayoutSelectionPrint[];
|
|
23
|
+
emailLayouts: ReportLayoutSelectionEmail[];
|
|
24
|
+
selectedPrinterLayout: ReportLayoutSelectionPrint;
|
|
25
|
+
selectedEmailLayout: ReportLayoutSelectionEmail;
|
|
26
|
+
receiptOptions: {
|
|
27
|
+
title: string;
|
|
28
|
+
iconData: SafeHtml;
|
|
29
|
+
}[];
|
|
30
|
+
showEmailLayoutOption: boolean;
|
|
31
|
+
showClass(): boolean;
|
|
32
|
+
ngOnInit(): void;
|
|
33
|
+
emailReceipt(): void;
|
|
34
|
+
printReceipt(): void;
|
|
35
|
+
noPrintReceipt(): void;
|
|
36
|
+
handleClickReceipt(title: string): void;
|
|
37
|
+
handlePrinterChanged(printer: Printer): void;
|
|
38
|
+
handleCloseDialog(event: MouseEvent, type: AppPopupButtonType): void;
|
|
39
|
+
handleClose(type: AppPopupButtonType): void;
|
|
40
|
+
onClose(eventType: AppPopupButtonType, output?: any): void;
|
|
41
|
+
private _getDefaultEmailAddressListForPosReceipt;
|
|
42
|
+
private _getDefaultEmailAddressListForPosReprintReceipt;
|
|
43
|
+
private _prepareDialogData;
|
|
44
|
+
private _getPrinters;
|
|
45
|
+
private _getPrinterLayouts;
|
|
46
|
+
private _getEmailLayouts;
|
|
47
|
+
private _prepareReceiptOptions;
|
|
48
|
+
}
|
|
@@ -248,3 +248,42 @@
|
|
|
248
248
|
}
|
|
249
249
|
}
|
|
250
250
|
}
|
|
251
|
+
|
|
252
|
+
.receipt-option-wrapper {
|
|
253
|
+
margin: 15px 0 0 0;
|
|
254
|
+
.receipt-option {
|
|
255
|
+
display: flex;
|
|
256
|
+
align-items: center;
|
|
257
|
+
grid-column-gap: 10px;
|
|
258
|
+
column-gap: 10px;
|
|
259
|
+
border: 1px solid #1a73e8;
|
|
260
|
+
color: #1a73e8;
|
|
261
|
+
padding: 10px;
|
|
262
|
+
border-radius: 8px;
|
|
263
|
+
min-width: 140px;
|
|
264
|
+
justify-content: center;
|
|
265
|
+
cursor: pointer;
|
|
266
|
+
|
|
267
|
+
&:hover {
|
|
268
|
+
background-color: rgba(26, 115, 232, 0.21);
|
|
269
|
+
}
|
|
270
|
+
|
|
271
|
+
&.disabled {
|
|
272
|
+
cursor: default;
|
|
273
|
+
filter: grayscale(1);
|
|
274
|
+
}
|
|
275
|
+
|
|
276
|
+
.co-icon {
|
|
277
|
+
width: 20px;
|
|
278
|
+
height: 20px;
|
|
279
|
+
|
|
280
|
+
svg { // for fontawesome icons
|
|
281
|
+
fill: #1a73e8;
|
|
282
|
+
}
|
|
283
|
+
|
|
284
|
+
& [fill] { // for own icons
|
|
285
|
+
fill: #1a73e8;
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
}
|
|
289
|
+
}
|
package/lib/component/transaction-line/transaction-cash-register-order-line/style/_layout.scss
CHANGED
|
@@ -2,21 +2,36 @@
|
|
|
2
2
|
.co-transaction-cash-register-order-line {
|
|
3
3
|
|
|
4
4
|
.line-content-wrapper {
|
|
5
|
+
display: grid;
|
|
6
|
+
grid-template-columns:
|
|
7
|
+
210px
|
|
8
|
+
420px;
|
|
9
|
+
grid-template-rows: $tp-transaction-default-button-height;
|
|
10
|
+
gap: 0 10px;
|
|
11
|
+
grid-template-areas: ". .";
|
|
12
|
+
padding: 8px;
|
|
13
|
+
}
|
|
14
|
+
.line-content-wrapper-col-1 {
|
|
15
|
+
display: grid;
|
|
16
|
+
grid-template-columns:
|
|
17
|
+
$tp-transaction-default-button-width
|
|
18
|
+
$tp-transaction-default-button-width;
|
|
19
|
+
grid-template-rows: $tp-transaction-default-button-height;
|
|
20
|
+
gap: 0 10px;
|
|
21
|
+
grid-template-areas:". .";
|
|
22
|
+
}
|
|
23
|
+
.line-content-wrapper-col-2 {
|
|
5
24
|
display: grid;
|
|
6
25
|
grid-template-columns:
|
|
7
26
|
$tp-transaction-default-button-width
|
|
8
27
|
$tp-transaction-default-button-width
|
|
9
|
-
100px
|
|
10
28
|
$tp-transaction-default-button-width
|
|
11
|
-
|
|
12
|
-
100px
|
|
13
|
-
100px;
|
|
29
|
+
$tp-transaction-default-button-width;
|
|
14
30
|
grid-template-rows: $tp-transaction-default-button-height;
|
|
15
31
|
gap: 0 10px;
|
|
16
|
-
grid-template-areas:
|
|
17
|
-
". . . . . . .";
|
|
18
|
-
padding: 8px;
|
|
32
|
+
grid-template-areas:". . . .";
|
|
19
33
|
}
|
|
34
|
+
|
|
20
35
|
.payment-line {
|
|
21
36
|
display: flex;
|
|
22
37
|
flex-direction: row;
|
|
@@ -21,11 +21,10 @@ export declare class TransactionLineWarehouseLocationButtonComponent extends Tra
|
|
|
21
21
|
private _articleService;
|
|
22
22
|
readonly icons: typeof Icon;
|
|
23
23
|
readonly: boolean;
|
|
24
|
-
|
|
24
|
+
showDialogLocation: boolean;
|
|
25
25
|
showClass(): boolean;
|
|
26
26
|
constructor(transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, transactionScreenConfigurationService: TransactionScreenConfigurationService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, _dialogService: DialogService, _articleService: ArticleService);
|
|
27
27
|
openWarehouseLocationDialog(event: MouseEvent): Promise<void>;
|
|
28
|
-
closeDialog(): void;
|
|
29
28
|
protected transactionLineSet(): void;
|
|
30
29
|
private _checkLocationValidity;
|
|
31
30
|
private _setDefaultLocationIfExistInWarehouse;
|
|
@@ -18,7 +18,6 @@ export declare class TransactionQuickAccessComponent implements OnInit, OnDestro
|
|
|
18
18
|
private _transactionEventService;
|
|
19
19
|
readonly icons: typeof Icon;
|
|
20
20
|
quickAccessContainer: ElementRef;
|
|
21
|
-
showCreateOrderFromCashRegisterOrder: boolean;
|
|
22
21
|
showLoader: boolean;
|
|
23
22
|
set transaction(value: TransactionInfoResponse);
|
|
24
23
|
get transaction(): TransactionInfoResponse;
|
|
@@ -35,6 +34,5 @@ export declare class TransactionQuickAccessComponent implements OnInit, OnDestro
|
|
|
35
34
|
constructor(iconCacheService: IconCacheService, _mappingService: TransactionMappingService, _compFactoryResolver: ComponentFactoryResolver, appRef: ApplicationRef, injector: Injector, _transactionService: TransactionService, _transactionEventService: TransactionEventService);
|
|
36
35
|
ngOnInit(): void;
|
|
37
36
|
ngOnDestroy(): void;
|
|
38
|
-
createSalesOrderFromCashRegisterOrder(): void;
|
|
39
37
|
private _prepareContent;
|
|
40
38
|
}
|
|
@@ -25,4 +25,5 @@ export declare class DialogService {
|
|
|
25
25
|
showWarehouseLocation(warehouseNr: number, useModel?: boolean, autoClose?: boolean, showClose?: boolean, transactionLine?: TransactionLineInfo): Promise<DialogResponseInterface>;
|
|
26
26
|
showToast(text: string, localize: boolean): Promise<void>;
|
|
27
27
|
hideToastAfterMs(ms?: number): void;
|
|
28
|
+
showReprintCashRegisterReceiptPopup(currentTransaction: TransactionInfoResponse): Promise<DialogResponseInterface>;
|
|
28
29
|
}
|
|
@@ -349,7 +349,8 @@ export declare class TransactionService extends PendingReasonService {
|
|
|
349
349
|
mergeDocumentOnTransaction(key: string, document: CoDocument): Promise<CoDocument>;
|
|
350
350
|
deleteDocument(documentId: number): Promise<ValidationResult>;
|
|
351
351
|
getActivitiesForTransaction(transactionId: number): Promise<Activity[]>;
|
|
352
|
-
convertCashRegisterOrderToSalesOrder(
|
|
352
|
+
convertCashRegisterOrderToSalesOrder(): Promise<void>;
|
|
353
|
+
reprintCashRegisterReceipt(): Promise<void>;
|
|
353
354
|
protected _handleBeforeRememberCurrentTransaction(transactionInfoResponse: TransactionInfoResponse): Promise<void>;
|
|
354
355
|
protected _handleAfterRememberCurrentTransaction(): Promise<void>;
|
|
355
356
|
private _checkAndSaveLinesForAIConfirmation;
|