@colijnit/transaction 12.1.185 → 12.1.186
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 +22 -15
- package/bundles/colijnit-transaction.umd.js.map +1 -1
- package/colijnit-transaction.metadata.json +1 -1
- package/esm2015/lib/component/add-product/add-product.component.js +7 -2
- package/esm2015/lib/component/avatar/avatar.component.js +2 -2
- package/esm2015/lib/component/core/base/transaction-payment-base.component.js +1 -1
- package/esm2015/lib/component/dialog/catalog/dialog-catalog/dialog-catalog.component.js +3 -3
- package/esm2015/lib/component/payment-qr-code/payment-qr-code.component.js +1 -1
- package/esm2015/lib/component/payment-qr-code/payment-qr-code.module.js +6 -6
- package/esm2015/lib/component/payment-to-pay/payment-to-pay.component.js +2 -2
- package/esm2015/lib/component/shared/transaction-article-text/transaction-article-text.component.js +3 -2
- package/esm2015/lib/component/transaction/transaction.component.js +1 -1
- package/esm2015/lib/component/transaction-button-bar/transaction-button-bar-button/transaction-sales-picking-button-bar-button.component.js +3 -1
- package/esm2015/lib/component/transaction-card/transaction-card-header/transaction-card-header.component.js +1 -1
- package/esm2015/lib/component/transaction-card/transaction-card-order-delivery/transaction-card-order-delivery.component.js +1 -1
- package/esm2015/lib/component/transaction-cash-register-dialog/transaction-cash-register-dialog.component.js +3 -3
- package/esm2015/lib/component/transaction-cash-register-dialog/transaction-cash-register-dialog.module.js +5 -5
- package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-buttons.component.js +2 -2
- package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-buttons.module.js +5 -5
- package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-cash.module.js +8 -8
- package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-done.component.js +4 -4
- package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-method.component.js +5 -5
- package/esm2015/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-pin.component.js +1 -1
- package/esm2015/lib/component/transaction-copy-order/transaction-copy-order.component.js +13 -13
- package/esm2015/lib/component/transaction-internal/transaction-internal.component.js +8 -5
- package/esm2015/lib/component/transaction-lines-side-panel/transaction-lines-side-panel/transaction-lines-side-panel.component.js +1 -1
- package/esm2015/lib/component/transaction-quick-access/transaction-quick-access-sales-quotation/transaction-quick-access-sales-quotation.component.js +22 -22
- package/esm2015/lib/component/transaction-search/transaction-filter-content/sales-quotation-filter-content/transaction-sales-quotation-filter-content-order/transaction-sales-quotation-filter-content-order.component.js +1 -1
- package/esm2015/lib/service/transaction-base.service.js +2 -5
- package/esm2015/lib/service/transaction-connector-adapter.service.js +2 -2
- package/esm2015/lib/service/transaction-connector.service.js +1 -1
- package/esm2015/lib/service/transaction.service.js +1 -1
- package/esm2015/lib/transaction-version.js +3 -3
- package/fesm2015/colijnit-transaction.js +21 -15
- package/fesm2015/colijnit-transaction.js.map +1 -1
- package/lib/component/add-product/add-product.component.d.ts +1 -0
- package/lib/component/dialog/catalog/dialog-catalog/dialog-catalog.component.d.ts +5 -1
- package/lib/component/transaction-card/transaction-card-header/transaction-card-header.component.d.ts +1 -1
- package/lib/component/transaction-cash-register-dialog/transaction-cash-register-dialog.component.d.ts +6 -6
- package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-buttons.component.d.ts +1 -1
- package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-done.component.d.ts +2 -2
- package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/components/transaction-cash-register-payment-method.component.d.ts +5 -5
- package/lib/component/transaction-copy-order/transaction-copy-order.component.d.ts +14 -14
- package/lib/component/transaction-lines-side-panel/transaction-lines-side-panel/style/_layout.scss +2 -1
- package/lib/component/transaction-lines-side-panel/transaction-lines-side-panel/style/_material-definition.scss +1 -1
- package/lib/component/transaction-quick-access/transaction-quick-access-sales-quotation/transaction-quick-access-sales-quotation.component.d.ts +16 -16
- package/lib/service/transaction-base.service.d.ts +0 -2
- package/lib/service/transaction-connector-adapter.service.d.ts +2 -2
- package/lib/service/transaction-connector.service.d.ts +2 -2
- package/package.json +2 -2
- package/esm2015/lib/model/payment-transaction-view-model.js +0 -3
- package/lib/model/payment-transaction-view-model.d.ts +0 -12
|
@@ -31,8 +31,8 @@
|
|
|
31
31
|
function Version() {
|
|
32
32
|
this.name = "@colijnit/transaction";
|
|
33
33
|
this.description = "Colijn IT transaction package";
|
|
34
|
-
this.symVer = "12.1.
|
|
35
|
-
this.publishDate = "
|
|
34
|
+
this.symVer = "12.1.186";
|
|
35
|
+
this.publishDate = "22-1-2024 12:01:59";
|
|
36
36
|
}
|
|
37
37
|
return Version;
|
|
38
38
|
}());
|
|
@@ -10267,7 +10267,6 @@
|
|
|
10267
10267
|
// not being used at the moment, so it should be false
|
|
10268
10268
|
_this._readonly = false;
|
|
10269
10269
|
_this._activeRubric = TransactionTypeCategory.SalesOrderOverview;
|
|
10270
|
-
_this._transactionKind = transactionKind_enum.TransactionKind.SalesOrder;
|
|
10271
10270
|
_this._relation = new relation_bo.Relation();
|
|
10272
10271
|
_this._purchaseOrdersCompleted = false;
|
|
10273
10272
|
_this._receiveGoodsCompleted = false;
|
|
@@ -10281,8 +10280,6 @@
|
|
|
10281
10280
|
_this._alreadyLocked = false;
|
|
10282
10281
|
_this._transactionDirty = false;
|
|
10283
10282
|
_this._salesOrderConfirmationSent = false;
|
|
10284
|
-
_this._answerRecalculationDeposit = false;
|
|
10285
|
-
_this._dontAskForRecalculationDeposit = false;
|
|
10286
10283
|
return _this;
|
|
10287
10284
|
}
|
|
10288
10285
|
Object.defineProperty(TransactionBaseService.prototype, "activeRubric", {
|
|
@@ -10325,8 +10322,8 @@
|
|
|
10325
10322
|
if (this._transactionKind !== value) {
|
|
10326
10323
|
this._transactionKind = value;
|
|
10327
10324
|
this.activeRubric = this._defaultActiveRubricFromTransactionKind.get(value);
|
|
10325
|
+
this.transactionKindSet.next(true);
|
|
10328
10326
|
}
|
|
10329
|
-
this.transactionKindSet.next(true);
|
|
10330
10327
|
},
|
|
10331
10328
|
enumerable: false,
|
|
10332
10329
|
configurable: true
|
|
@@ -17505,7 +17502,7 @@
|
|
|
17505
17502
|
set: function (value) {
|
|
17506
17503
|
if (value) {
|
|
17507
17504
|
this._transactionLine = value;
|
|
17508
|
-
this.transactionAddTextLineRequest.text = value.text;
|
|
17505
|
+
this.transactionAddTextLineRequest.text = this.orderLineSetDTO ? this.orderLineSetDTO.text : value.text;
|
|
17509
17506
|
this.showOrderLineFields = (this.orderLineSetDTO && this.orderLineSetDTO.orderLineSetCode !== null && this.transactionLine && !this.transactionLine.articleBound);
|
|
17510
17507
|
}
|
|
17511
17508
|
},
|
|
@@ -17523,6 +17520,7 @@
|
|
|
17523
17520
|
this.color = this.orderLineSetDTO.color;
|
|
17524
17521
|
this.amount = this.orderLineSetDTO.amount;
|
|
17525
17522
|
this.title = this.orderLineSetDTO.title;
|
|
17523
|
+
this.transactionAddTextLineRequest.text = this.orderLineSetDTO.text;
|
|
17526
17524
|
},
|
|
17527
17525
|
enumerable: false,
|
|
17528
17526
|
configurable: true
|
|
@@ -21042,6 +21040,8 @@
|
|
|
21042
21040
|
}), _this._transactionEventService.salesOrderToBePickedCompletedChanged.subscribe(function (completed) {
|
|
21043
21041
|
_this.toBePickedChecked = completed;
|
|
21044
21042
|
_this._checkAdditional();
|
|
21043
|
+
}), _this._transactionEventService.activeRubricChange.subscribe(function (rubric) {
|
|
21044
|
+
_this.showCategories = false;
|
|
21045
21045
|
}));
|
|
21046
21046
|
return _this;
|
|
21047
21047
|
}
|
|
@@ -27907,7 +27907,7 @@
|
|
|
27907
27907
|
case 0: return [4 /*yield*/, this._transactionConnectorService.getDocumentContent(docId)];
|
|
27908
27908
|
case 1:
|
|
27909
27909
|
content = _a.sent();
|
|
27910
|
-
if (content) {
|
|
27910
|
+
if (content && this._image) {
|
|
27911
27911
|
this._image.thumbnailBody = content;
|
|
27912
27912
|
this.imageSrc = this.image.thumbnailBodyAsDataUri;
|
|
27913
27913
|
this._changeDetector.detectChanges();
|
|
@@ -33585,13 +33585,13 @@
|
|
|
33585
33585
|
return [3 /*break*/, 5];
|
|
33586
33586
|
case 3:
|
|
33587
33587
|
newRequest = new transactionAddOrderLineSetTextLineRequest.TransactionAddOrderLineSetTextLineRequest();
|
|
33588
|
-
newRequest.
|
|
33588
|
+
newRequest.orderLineSetText = data.request.text;
|
|
33589
33589
|
newRequest.amount = data.request.amount;
|
|
33590
33590
|
newRequest.categoryId = data.request.categoryId;
|
|
33591
33591
|
newRequest.color = data.request.color;
|
|
33592
33592
|
newRequest.transactionUuid = data.request.transactionUuid;
|
|
33593
33593
|
newRequest.showOnDocuments = data.request.showOnDocuments;
|
|
33594
|
-
newRequest.text = data.request.
|
|
33594
|
+
newRequest.text = data.request.title;
|
|
33595
33595
|
return [4 /*yield*/, this.service.addOrderLineSet(newRequest)];
|
|
33596
33596
|
case 4:
|
|
33597
33597
|
_a.sent();
|
|
@@ -33626,8 +33626,10 @@
|
|
|
33626
33626
|
};
|
|
33627
33627
|
TransactionInternalComponent.prototype.handleEditTransactionText = function (line) {
|
|
33628
33628
|
this.transactionLine = line;
|
|
33629
|
-
this.textToEdit = line.text;
|
|
33630
33629
|
this.selectedOrderLineSetDTO = this._getOrderLineSetIfExists(line);
|
|
33630
|
+
if (isNill_function.isNill(this.selectedOrderLineSetDTO)) {
|
|
33631
|
+
this.textToEdit = line.text;
|
|
33632
|
+
}
|
|
33631
33633
|
if (line.isText) {
|
|
33632
33634
|
this.showTransactionTextDialog();
|
|
33633
33635
|
}
|
|
@@ -33713,7 +33715,7 @@
|
|
|
33713
33715
|
TransactionInternalComponent.decorators = [
|
|
33714
33716
|
{ type: i0.Component, args: [{
|
|
33715
33717
|
selector: 'co-transaction-internal',
|
|
33716
|
-
template: "\n <ng-container *ngIf=\"loaded\">\n <div cdkDropListGroup class=\"drop-list-group\">\n <co-transaction-header *ngIf=\"showHeader\" [transaction]=\"transaction\" [relation]=\"relation\"\n (relationChange)=\"handleRelationChange($event)\"></co-transaction-header>\n\n <div class=\"transaction-lines-header\">\n <co-transaction-quick-access *ngIf=\"showQuickAccess\" class=\"transaction-lines-header-item\"\n [
|
|
33718
|
+
template: "\n <ng-container *ngIf=\"loaded\">\n <div cdkDropListGroup class=\"drop-list-group\">\n <co-transaction-header *ngIf=\"showHeader\" [transaction]=\"transaction\" [relation]=\"relation\"\n (relationChange)=\"handleRelationChange($event)\"></co-transaction-header>\n\n <div class=\"transaction-lines-header\">\n <co-transaction-quick-access *ngIf=\"showQuickAccess\" class=\"transaction-lines-header-item\"\n [transaction]=\"transaction\"\n [relation]=\"relation\"\n [activeCategory]=\"activeCategory\"\n ></co-transaction-quick-access>\n <co-transaction-button-bar *ngIf=\"showButtonBar\" class=\"transaction-lines-header-item\"\n [selectedCategory]=\"activeCategory\"\n (buttonClicked)=\"handleButtonBarButtonClicked($event)\"\n ></co-transaction-button-bar>\n <div class=\"transaction-lines-header-item right\">\n <co-avatar class=\"transaction-sales-avatar\" [relationId]=\"transaction.transactionInfo.handledBy\"></co-avatar>\n <co-avatar class=\"transaction-sales-avatar\"\n [relationId]=\"transaction.transactionInfo.branch?.relationId\"></co-avatar>\n <co-view-mode-buttons *ngIf=\"!shouldShowTiles()\" [showViewModes]=\"[viewModes.List, viewModes.Tiles]\"\n (viewModeChange)=\"activeViewMode = $event\"></co-view-mode-buttons>\n </div>\n </div>\n\n\n <!--<co-transaction-document-button-bar [transaction]=\"transaction\"></co-transaction-document-button-bar>-->\n\n <div class=\"transaction-tiles-wrapper\" *ngIf=\"activeViewMode === viewModes.Tiles || shouldShowTiles()\">\n <co-transaction-card\n *ngFor=\"let line of (historicTransactionLines ? historicTransactionLines : transaction.transactionLines)\"\n [statusBarConfigNames]=\"statusBarConfigNames\"\n [transaction]=\"transaction\"\n [transactionLine]=\"line\"\n [readonly]=\"historicTransactionLines !== null\"\n [activeCategory]=\"activeCategory\"\n ></co-transaction-card>\n </div>\n <div class=\"transaction-lines-wrapper\" *ngIf=\"activeViewMode === viewModes.List && !shouldShowTiles()\">\n <co-transaction-lines\n [transaction]=\"transaction\"\n [activeCategory]=\"activeCategory\"\n (saveTransactionLine)=\"saveTransactionLineText($event)\"\n ></co-transaction-lines>\n </div>\n <div class=\"transaction-footer-wrapper\">\n <co-add-product\n *ngIf=\"activeCategory === categories.SalesOrderCashRegister || activeCategory === categories.SalesOrderOverview || activeCategory === categories.PurchaseOrderOverview || activeCategory === categories.SalesOrderQuotation\"></co-add-product>\n <co-transaction-totals\n [transactionInfo]=\"transaction.transactionInfo\"\n [transactionTotal]=\"transaction.transactionTotal\"\n [showDiscount]=\"true\"\n ></co-transaction-totals>\n </div>\n <co-transaction-line-side-panel *ngIf=\"showSidePanel\"\n [transaction]=\"transaction\"\n [transactionInfo]=\"transaction.transactionInfo\"\n [transactionLine]=\"sidePanelTransactionLine\"\n [activeCategory]=\"activeCategory\"\n (cancelClick)=\"showSidePanel = false\"\n ></co-transaction-line-side-panel>\n\n <!--Popup voor wijzigen volgorde van tekstregels-->\n <co-transaction-article-text-overview *ngIf=\"showArticleTextOverview\"\n [transactionInfo]=\"transaction.transactionInfo\"\n [transactionLine]=\"transactionLine\"\n (closeClick)=\"closeArticleTextOverview()\"\n (cancelClick)=\"closeArticleTextOverview()\"\n ></co-transaction-article-text-overview>\n\n <!--Popup voor aanmaken en updaten transactietekstregels-->\n <co-transaction-article-text *ngIf=\"showTransactionText\"\n [header]=\"'ORDER_TEXT_LINE' | localize\"\n [transactionUuid]=\"transaction.transactionInfo.uuid\"\n [editText]=\"textToEdit\"\n [orderLineSetDTO]=\"selectedOrderLineSetDTO\"\n [transactionLine]=\"transactionLine\"\n (saveClick)=\"saveTransactionLineText($event)\"\n (closeClick)=\"closeTransactionText()\"\n (cancelClick)=\"closeTransactionText()\"\n (saveOrderLineSetClick)=\"saveOrderLineSet($event)\"\n\n ></co-transaction-article-text>\n\n <!--Popup voor aanmaken en updaten artikeltekstregels-->\n <co-transaction-article-text *ngIf=\"showArticleText\"\n [header]=\"'PRODUCT_DESCRIPTION_AND_TEXTS' | localize\"\n [transactionUuid]=\"transaction.transactionInfo.uuid\"\n [showArticleImageDescription]=\"transactionLine.articleBound\"\n [showImage]=\"false\"\n [articleLineNr]=\"transactionLine.lineNr\"\n [articleRef]=\"transactionLine.articleNumber\"\n [transactionLine]=\"transactionLine\"\n [editText]=\"textToEdit\"\n (saveClick)=\"saveArticleLineText($event)\"\n (closeClick)=\"closeArticleText()\"\n (cancelClick)=\"closeArticleText()\"\n ></co-transaction-article-text>\n\n <co-transaction-copy-order *ngIf=\"showCopyOrderDialog\"\n [transaction]=\"transaction\"\n (closeDialog)=\"showCopyOrderDialog = false\"\n ></co-transaction-copy-order>\n </div>\n <co-transaction-lines-side-panel\n [posOrderData]=\"posOrderData\"\n [transaction]=\"transaction\"\n ></co-transaction-lines-side-panel>\n </ng-container>\n ",
|
|
33717
33719
|
encapsulation: i0.ViewEncapsulation.None
|
|
33718
33720
|
},] }
|
|
33719
33721
|
];
|
|
@@ -34651,8 +34653,8 @@
|
|
|
34651
34653
|
this.catArtName = data.article.name;
|
|
34652
34654
|
this.showProduct = true;
|
|
34653
34655
|
};
|
|
34654
|
-
DialogCatalogComponent.prototype.handleAddCatFarmArticleClicked = function (
|
|
34655
|
-
this.addCatFarmArticleClicked.emit({ jsonString:
|
|
34656
|
+
DialogCatalogComponent.prototype.handleAddCatFarmArticleClicked = function (data) {
|
|
34657
|
+
this.addCatFarmArticleClicked.emit({ quantity: data.quantity, jsonString: data.article, catalog: this.catalogDefinition.getId() });
|
|
34656
34658
|
};
|
|
34657
34659
|
DialogCatalogComponent.prototype.checkIfOpeningIsAllowed = function () {
|
|
34658
34660
|
var _this = this;
|
|
@@ -36170,11 +36172,16 @@
|
|
|
36170
36172
|
};
|
|
36171
36173
|
AddProductComponent.prototype.handleAddCatFarmArticleClick = function (data) {
|
|
36172
36174
|
return __awaiter(this, void 0, void 0, function () {
|
|
36175
|
+
var request;
|
|
36173
36176
|
return __generator(this, function (_a) {
|
|
36174
36177
|
switch (_a.label) {
|
|
36175
36178
|
case 0:
|
|
36176
36179
|
this.showCatalog = false;
|
|
36177
|
-
|
|
36180
|
+
request = new externalCatalogAddArticleRequest.ExternalCatalogAddArticleRequest();
|
|
36181
|
+
request.catalogId = data.catalog;
|
|
36182
|
+
request.catalogType = externalCatalogTypes_enum.ExternalCatalogTypes.CatalogFarm;
|
|
36183
|
+
request.articleJson = data.jsonString;
|
|
36184
|
+
return [4 /*yield*/, this.transactionService.addExternalCatalogArticle(request)];
|
|
36178
36185
|
case 1:
|
|
36179
36186
|
_a.sent();
|
|
36180
36187
|
return [2 /*return*/];
|