@colijnit/catalog 255.1.19 → 255.1.21
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-catalog.umd.js +49 -21
- package/bundles/colijnit-catalog.umd.js.map +1 -1
- package/colijnit-catalog-255.1.21.tgz +0 -0
- package/colijnit-catalog.metadata.json +1 -1
- package/esm2015/lib/catalog-version.js +3 -3
- package/esm2015/lib/component/base/article-base.component.js +12 -5
- package/esm2015/lib/component/catalog-article-list/catalog-article-list.component.js +8 -3
- package/esm2015/lib/component/catalog-article-tile/catalog-article-tile.component.js +8 -3
- package/esm2015/lib/component/catalog-search/catalog-search.component.js +5 -1
- package/esm2015/lib/component/catalog-search-result-list/catalog-search-result-list.component.js +9 -3
- package/esm2015/lib/component/catalog-search-result-tile/catalog-search-result-tile.component.js +6 -3
- package/esm2015/lib/service/catalog-settings.service.js +9 -2
- package/fesm2015/colijnit-catalog.js +47 -11
- package/fesm2015/colijnit-catalog.js.map +1 -1
- package/lib/component/base/article-base.component.d.ts +1 -1
- package/lib/component/catalog-article-list/catalog-article-list.component.d.ts +1 -0
- package/lib/component/catalog-article-tile/catalog-article-tile.component.d.ts +1 -0
- package/lib/component/catalog-search/catalog-search.component.d.ts +1 -0
- package/lib/component/catalog-search-result-list/catalog-search-result-list.component.d.ts +1 -0
- package/lib/component/catalog-search-result-tile/catalog-search-result-tile.component.d.ts +1 -0
- package/package.json +1 -1
|
@@ -5,6 +5,7 @@ import { CatalogSettings } from '../model/settings';
|
|
|
5
5
|
import { CatalogDictionaryService } from './catalog-dictionary.service';
|
|
6
6
|
import { SettingsOptions } from '../model/settings-options';
|
|
7
7
|
import { JsonUtils } from '../utils/json.utils';
|
|
8
|
+
import { LanguageCode } from "@colijnit/ioneconnector/build/enum/language-code.enum";
|
|
8
9
|
import * as i0 from "@angular/core";
|
|
9
10
|
import * as i1 from "./catalog-dictionary.service";
|
|
10
11
|
export class CatalogSettingsService {
|
|
@@ -59,7 +60,13 @@ export class CatalogSettingsService {
|
|
|
59
60
|
this._dictionaryService.rootUrl = this.settings.url.replace('/ajaxservice', '');
|
|
60
61
|
if (!this.settings.additionalTranslationFile) {
|
|
61
62
|
// const languageCode: string = this._dictionaryService.getLanguageCode(this.settings.languageCode);
|
|
62
|
-
|
|
63
|
+
if (this.settings.languageCode !== undefined) {
|
|
64
|
+
yield this._dictionaryService.setDictionary(this.settings.languageCode);
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
// Fall back
|
|
68
|
+
yield this._dictionaryService.setDictionary(LanguageCode.Dutch);
|
|
69
|
+
}
|
|
63
70
|
}
|
|
64
71
|
this.settingsLoaded.next(true);
|
|
65
72
|
});
|
|
@@ -74,4 +81,4 @@ CatalogSettingsService.decorators = [
|
|
|
74
81
|
CatalogSettingsService.ctorParameters = () => [
|
|
75
82
|
{ type: CatalogDictionaryService }
|
|
76
83
|
];
|
|
77
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
84
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2F0YWxvZy1zZXR0aW5ncy5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvY2F0YWxvZy9zcmMvbGliL3NlcnZpY2UvY2F0YWxvZy1zZXR0aW5ncy5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxPQUFPLEVBQUMsVUFBVSxFQUFDLE1BQU0sZUFBZSxDQUFDO0FBQ3pDLE9BQU8sRUFBQyxlQUFlLEVBQUMsTUFBTSxNQUFNLENBQUM7QUFDckMsT0FBTyxFQUFDLGVBQWUsRUFBQyxNQUFNLG1CQUFtQixDQUFDO0FBQ2xELE9BQU8sRUFBQyx3QkFBd0IsRUFBQyxNQUFNLDhCQUE4QixDQUFDO0FBQ3RFLE9BQU8sRUFBQyxlQUFlLEVBQUMsTUFBTSwyQkFBMkIsQ0FBQztBQUMxRCxPQUFPLEVBQUMsU0FBUyxFQUFDLE1BQU0scUJBQXFCLENBQUM7QUFDOUMsT0FBTyxFQUFDLFlBQVksRUFBQyxNQUFNLHVEQUF1RCxDQUFDOzs7QUFPbkYsTUFBTSxPQUFPLHNCQUFzQjtJQWNqQyxZQUNZLGtCQUE0QztRQUE1Qyx1QkFBa0IsR0FBbEIsa0JBQWtCLENBQTBCO1FBTGpELG1CQUFjLEdBQTZCLElBQUksZUFBZSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRXJFLGNBQVMsR0FBb0IsSUFBSSxlQUFlLEVBQUUsQ0FBQztJQUszRCxDQUFDO0lBZkQsSUFBVyxRQUFRLENBQUMsS0FBc0I7UUFDeEMsSUFBSSxDQUFDLFNBQVMsR0FBRyxLQUFLLENBQUM7SUFDekIsQ0FBQztJQUVELElBQVcsUUFBUTtRQUNqQixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUM7SUFDeEIsQ0FBQztJQVdZLGtCQUFrQjs7WUFDN0Isc0RBQXNEO1lBQ3RELElBQUksT0FBTyxRQUFRLEtBQUssV0FBVyxFQUFFO2dCQUNuQyxNQUFNLFlBQVksR0FBRyxNQUFNLFNBQVMsQ0FBQyxZQUFZLENBQUMsdUJBQXVCLENBQUMs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amVjdGFibGV9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQge0JlaGF2aW9yU3ViamVjdH0gZnJvbSAncnhqcyc7XHJcbmltcG9ydCB7Q2F0YWxvZ1NldHRpbmdzfSBmcm9tICcuLi9tb2RlbC9zZXR0aW5ncyc7XHJcbmltcG9ydCB7Q2F0YWxvZ0RpY3Rpb25hcnlTZXJ2aWNlfSBmcm9tICcuL2NhdGFsb2ctZGljdGlvbmFyeS5zZXJ2aWNlJztcclxuaW1wb3J0IHtTZXR0aW5nc09wdGlvbnN9IGZyb20gJy4uL21vZGVsL3NldHRpbmdzLW9wdGlvbnMnO1xyXG5pbXBvcnQge0pzb25VdGlsc30gZnJvbSAnLi4vdXRpbHMvanNvbi51dGlscyc7XHJcbmltcG9ydCB7TGFuZ3VhZ2VDb2RlfSBmcm9tIFwiQGNvbGlqbml0L2lvbmVjb25uZWN0b3IvYnVpbGQvZW51bS9sYW5ndWFnZS1jb2RlLmVudW1cIjtcclxuXHJcbmRlY2xhcmUgbGV0IHNldHRpbmdzOiBhbnk7XHJcblxyXG5ASW5qZWN0YWJsZSh7XHJcbiAgcHJvdmlkZWRJbjogJ3Jvb3QnXHJcbn0pXHJcbmV4cG9ydCBjbGFzcyBDYXRhbG9nU2V0dGluZ3NTZXJ2aWNlIHtcclxuXHJcbiAgcHVibGljIHNldCBzZXR0aW5ncyh2YWx1ZTogQ2F0YWxvZ1NldHRpbmdzKSB7XHJcbiAgICB0aGlzLl9zZXR0aW5ncyA9IHZhbHVlO1xyXG4gIH1cclxuXHJcbiAgcHVibGljIGdldCBzZXR0aW5ncygpOiBDYXRhbG9nU2V0dGluZ3Mge1xyXG4gICAgcmV0dXJuIHRoaXMuX3NldHRpbmdzO1xyXG4gIH1cclxuXHJcbiAgcHVibGljIHNldHRpbmdzTG9hZGVkOiBCZWhhdmlvclN1YmplY3Q8Ym9vbGVhbj4gPSBuZXcgQmVoYXZpb3JTdWJqZWN0KGZhbHNlKTtcclxuXHJcbiAgcHJpdmF0ZSBfc2V0dGluZ3M6IENhdGFsb2dTZXR0aW5ncyA9IG5ldyBDYXRhbG9nU2V0dGluZ3MoKTtcclxuXHJcbiAgY29uc3RydWN0b3IoXHJcbiAgICAgIHByaXZhdGUgX2RpY3Rpb25hcnlTZXJ2aWNlOiBDYXRhbG9nRGljdGlvbmFyeVNlcnZpY2VcclxuICApIHtcclxuICB9XHJcblxyXG4gIHB1YmxpYyBhc3luYyBpbml0aWFsaXplU2V0dGluZ3MoKTogUHJvbWlzZTx2b2lkPiB7XHJcbiAgICAvLyBzZWUgaWYgdGhlcmUncyBhIGpzb24gZmlsZSBmb3IgYXBwbGljYXRpb24gc2V0dGluZ3NcclxuICAgIGlmICh0eXBlb2Ygc2V0dGluZ3MgPT09ICd1bmRlZmluZWQnKSB7XHJcbiAgICAgIGNvbnN0IGpzb25TZXR0aW5ncyA9IGF3YWl0IEpzb25VdGlscy5SZWFkSnNvbkZpbGUoJ2NhdGFsb2ctc2V0dGluZ3MuanNvbicpO1xyXG4gICAgICBpZiAoanNvblNldHRpbmdzKSB7XHJcbiAgICAgICAgdGhpcy5zZXR0aW5ncyA9IE9iamVjdC5hc3NpZ24obmV3IENhdGFsb2dTZXR0aW5ncygpLCBqc29uU2V0dGluZ3MpO1xyXG4gICAgICAgIHRoaXMuc2V0dGluZ3Mub3B0aW9ucyA9IE9iamVjdC5hc3NpZ24obmV3IFNldHRpbmdzT3B0aW9ucygpLCB0aGlzLnNldHRpbmdzLm9wdGlvbnMpO1xyXG4gICAgICAgIHRoaXMuc2V0dGluZ3NGaW5pc2hlZCgpO1xyXG4gICAgICB9XHJcbiAgICB9IGVsc2Uge1xyXG4gICAgICB0aGlzLnNldHRpbmdzID0gT2JqZWN0LmFzc2lnbihuZXcgQ2F0YWxvZ1NldHRpbmdzKCksIHNldHRpbmdzKTtcclxuICAgICAgdGhpcy5zZXR0aW5ncy5vcHRpb25zID0gT2JqZWN0LmFzc2lnbihuZXcgU2V0dGluZ3NPcHRpb25zKCksIHRoaXMuc2V0dGluZ3Mub3B0aW9ucyk7XHJcbiAgICAgIHRoaXMuc2V0dGluZ3NGaW5pc2hlZCgpO1xyXG4gICAgfVxyXG4gIH1cclxuXHJcbiAgcHVibGljIGFzeW5jIGNyZWF0ZVNldHRpbmdzRnJvbU9iamVjdChvYmo6IGFueSk6IFByb21pc2U8dm9pZD4ge1xyXG4gICAgaWYgKCF0aGlzLnNldHRpbmdzKSB7XHJcbiAgICAgIHRoaXMuc2V0dGluZ3MgPSBuZXcgQ2F0YWxvZ1NldHRpbmdzKCk7XHJcbiAgICB9XHJcbiAgICBsZXQgb3duT3B0aW9ucyA9IE9iamVjdC5hc3NpZ24oe30sIHRoaXMuc2V0dGluZ3Mub3B0aW9ucyk7XHJcbiAgICBsZXQgb3duQ2F0YWxvZ1BhcmFtZXRlcnMgPSBPYmplY3QuYXNzaWduKHt9LCB0aGlzLnNldHRpbmdzLmNhdGFsb2dQYXJhbWV0ZXJzKTtcclxuICAgIHRoaXMuc2V0dGluZ3MgPSBPYmplY3QuYXNzaWduKHt9LCB0aGlzLnNldHRpbmdzLCBvYmopO1xyXG4gICAgaWYgKG9iai5jYXRhbG9nUGFyYW1ldGVycykge1xyXG4gICAgICB0aGlzLnNldHRpbmdzLmNhdGFsb2dQYXJhbWV0ZXJzID0gT2JqZWN0LmFzc2lnbih7fSwgb3duQ2F0YWxvZ1BhcmFtZXRlcnMsIG9iai5jYXRhbG9nUGFyYW1ldGVycyk7XHJcbiAgICB9XHJcbiAgICBpZiAob2JqLm9wdGlvbnMpIHtcclxuICAgICAgdGhpcy5zZXR0aW5ncy5vcHRpb25zID0gT2JqZWN0LmFzc2lnbih7fSwgb3duT3B0aW9ucywgb2JqLm9wdGlvbnMpO1xyXG4gICAgfVxyXG4gICAgdGhpcy5zZXR0aW5nc0ZpbmlzaGVkKCk7XHJcbiAgfVxyXG5cclxuICBwdWJsaWMgYXN5bmMgc2V0dGluZ3NGaW5pc2hlZCgpOiBQcm9taXNlPHZvaWQ+IHtcclxuICAgIHRoaXMuX2RpY3Rpb25hcnlTZXJ2aWNlLnJvb3RVcmwgPSB0aGlzLnNldHRpbmdzLnVybC5yZXBsYWNlKCcvYWpheHNlcnZpY2UnLCAnJyk7XHJcbiAgICBpZiAoIXRoaXMuc2V0dGluZ3MuYWRkaXRpb25hbFRyYW5zbGF0aW9uRmlsZSkge1xyXG4gICAgICAvLyBjb25zdCBsYW5ndWFnZUNvZGU6IHN0cmluZyA9IHRoaXMuX2RpY3Rpb25hcnlTZXJ2aWNlLmdldExhbmd1YWdlQ29kZSh0aGlzLnNldHRpbmdzLmxhbmd1YWdlQ29kZSk7XHJcbiAgICAgIGlmICh0aGlzLnNldHRpbmdzLmxhbmd1YWdlQ29kZSAhPT0gdW5kZWZpbmVkKSB7XHJcbiAgICAgICAgYXdhaXQgdGhpcy5fZGljdGlvbmFyeVNlcnZpY2Uuc2V0RGljdGlvbmFyeSh0aGlzLnNldHRpbmdzLmxhbmd1YWdlQ29kZSk7XHJcbiAgICAgIH0gZWxzZSB7XHJcbiAgICAgICAgLy8gRmFsbCBiYWNrXHJcbiAgICAgICAgYXdhaXQgdGhpcy5fZGljdGlvbmFyeVNlcnZpY2Uuc2V0RGljdGlvbmFyeShMYW5ndWFnZUNvZGUuRHV0Y2gpO1xyXG4gICAgICB9XHJcblxyXG4gICAgfVxyXG4gICAgdGhpcy5zZXR0aW5nc0xvYWRlZC5uZXh0KHRydWUpO1xyXG4gIH1cclxufVxyXG5cclxuIl19
|
|
@@ -55,8 +55,8 @@ class Version {
|
|
|
55
55
|
constructor() {
|
|
56
56
|
this.name = "@colijnit/catalog";
|
|
57
57
|
this.description = "iOne Catalog module based on Angular 12";
|
|
58
|
-
this.symVer = "255.1.
|
|
59
|
-
this.publishDate = "
|
|
58
|
+
this.symVer = "255.1.21";
|
|
59
|
+
this.publishDate = "30-12-2024 11:00:44";
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
|
|
@@ -269,7 +269,13 @@ class CatalogSettingsService {
|
|
|
269
269
|
this._dictionaryService.rootUrl = this.settings.url.replace('/ajaxservice', '');
|
|
270
270
|
if (!this.settings.additionalTranslationFile) {
|
|
271
271
|
// const languageCode: string = this._dictionaryService.getLanguageCode(this.settings.languageCode);
|
|
272
|
-
|
|
272
|
+
if (this.settings.languageCode !== undefined) {
|
|
273
|
+
yield this._dictionaryService.setDictionary(this.settings.languageCode);
|
|
274
|
+
}
|
|
275
|
+
else {
|
|
276
|
+
// Fall back
|
|
277
|
+
yield this._dictionaryService.setDictionary(LanguageCode.Dutch);
|
|
278
|
+
}
|
|
273
279
|
}
|
|
274
280
|
this.settingsLoaded.next(true);
|
|
275
281
|
});
|
|
@@ -4472,6 +4478,7 @@ class CatalogSearchComponent {
|
|
|
4472
4478
|
this.showFilter = false;
|
|
4473
4479
|
this.tempFilter = false;
|
|
4474
4480
|
this.showViewModes = true;
|
|
4481
|
+
this.isReturn = false;
|
|
4475
4482
|
/**
|
|
4476
4483
|
* Defaults
|
|
4477
4484
|
* {name: 'CATEGORY', order: 1},
|
|
@@ -4645,11 +4652,13 @@ CatalogSearchComponent.decorators = [
|
|
|
4645
4652
|
<ng-container *ngIf="mode === 'tile'">
|
|
4646
4653
|
<co-catalog-search-result-tile
|
|
4647
4654
|
[createFrozenArticle]="createFrozenArticle"
|
|
4655
|
+
[isReturn]="isReturn"
|
|
4648
4656
|
></co-catalog-search-result-tile>
|
|
4649
4657
|
</ng-container>
|
|
4650
4658
|
<ng-container *ngIf="mode === 'list'">
|
|
4651
4659
|
<co-catalog-search-result-list
|
|
4652
4660
|
[createFrozenArticle]="createFrozenArticle"
|
|
4661
|
+
[isReturn]="isReturn"
|
|
4653
4662
|
></co-catalog-search-result-list>
|
|
4654
4663
|
</ng-container>
|
|
4655
4664
|
<ng-container *ngIf="mode === 'grid'">
|
|
@@ -4716,6 +4725,7 @@ CatalogSearchComponent.propDecorators = {
|
|
|
4716
4725
|
showFilter: [{ type: Input }],
|
|
4717
4726
|
tempFilter: [{ type: Input }],
|
|
4718
4727
|
showViewModes: [{ type: Input }],
|
|
4728
|
+
isReturn: [{ type: Input }],
|
|
4719
4729
|
generalFilterOrders: [{ type: Input }],
|
|
4720
4730
|
purchaseFilterOrders: [{ type: Input }],
|
|
4721
4731
|
logisticsFilterOrders: [{ type: Input }],
|
|
@@ -4901,11 +4911,11 @@ class ArticleBaseComponent {
|
|
|
4901
4911
|
this._appEventService.lookAtArticleButtonClick.next(this.article);
|
|
4902
4912
|
this.onLookAtArticleButtonClick.emit(this.article);
|
|
4903
4913
|
}
|
|
4904
|
-
handleAddArticleButtonClick(event) {
|
|
4914
|
+
handleAddArticleButtonClick(event, isRetour = false) {
|
|
4905
4915
|
return __awaiter(this, void 0, void 0, function* () {
|
|
4906
4916
|
event.stopPropagation();
|
|
4907
4917
|
if (this.createFrozenArticle) {
|
|
4908
|
-
const json = yield this._getJSONFromArticleObject(this.article);
|
|
4918
|
+
const json = yield this._getJSONFromArticleObject(this.article, isRetour);
|
|
4909
4919
|
this._appEventService.addArticleButtonClick.next(json);
|
|
4910
4920
|
this.onAddArticleButtonClick.emit(json);
|
|
4911
4921
|
}
|
|
@@ -4932,12 +4942,19 @@ class ArticleBaseComponent {
|
|
|
4932
4942
|
desc = desc.replace(/\r?\n|\r/, '');
|
|
4933
4943
|
return desc;
|
|
4934
4944
|
}
|
|
4935
|
-
_getJSONFromArticleObject(article) {
|
|
4945
|
+
_getJSONFromArticleObject(article, isRetour = false) {
|
|
4936
4946
|
return __awaiter(this, void 0, void 0, function* () {
|
|
4937
4947
|
if (!article) {
|
|
4938
4948
|
return "";
|
|
4939
4949
|
}
|
|
4940
|
-
|
|
4950
|
+
let quantity;
|
|
4951
|
+
if (isRetour) {
|
|
4952
|
+
quantity = -1;
|
|
4953
|
+
}
|
|
4954
|
+
else {
|
|
4955
|
+
quantity = 1;
|
|
4956
|
+
}
|
|
4957
|
+
return yield this._iOne.getJsonArticleFlatTree(article.goodId, article.goodType, quantity);
|
|
4941
4958
|
});
|
|
4942
4959
|
}
|
|
4943
4960
|
_detectChanges() {
|
|
@@ -5024,6 +5041,10 @@ ArticleBaseComponent.propDecorators = {
|
|
|
5024
5041
|
};
|
|
5025
5042
|
|
|
5026
5043
|
class CatalogArticleTileComponent extends ArticleBaseComponent {
|
|
5044
|
+
constructor() {
|
|
5045
|
+
super(...arguments);
|
|
5046
|
+
this.isReturn = false;
|
|
5047
|
+
}
|
|
5027
5048
|
showClass() {
|
|
5028
5049
|
return true;
|
|
5029
5050
|
}
|
|
@@ -5081,7 +5102,7 @@ CatalogArticleTileComponent.decorators = [
|
|
|
5081
5102
|
<co-button *ngIf="!configurable"
|
|
5082
5103
|
[label]="options.addArticleButtonText"
|
|
5083
5104
|
class="open-icon action pointer"
|
|
5084
|
-
(onClick)="handleAddArticleButtonClick($event)"
|
|
5105
|
+
(onClick)="handleAddArticleButtonClick($event, isReturn)"
|
|
5085
5106
|
[iconData]="iconCache.getIcon(icons.AddToCartDrop)">
|
|
5086
5107
|
</co-button>
|
|
5087
5108
|
<co-button *ngIf="configurable"
|
|
@@ -5105,6 +5126,7 @@ CatalogArticleTileComponent.decorators = [
|
|
|
5105
5126
|
},] }
|
|
5106
5127
|
];
|
|
5107
5128
|
CatalogArticleTileComponent.propDecorators = {
|
|
5129
|
+
isReturn: [{ type: Input }],
|
|
5108
5130
|
showClass: [{ type: HostBinding, args: ['class.co-catalog-article-tile',] }]
|
|
5109
5131
|
};
|
|
5110
5132
|
|
|
@@ -5113,6 +5135,7 @@ class CatalogSearchResultTileComponent extends CatalogSearchBaseComponent {
|
|
|
5113
5135
|
super(...arguments);
|
|
5114
5136
|
this.showClass = true;
|
|
5115
5137
|
this.smallScrollbar = true;
|
|
5138
|
+
this.isReturn = false;
|
|
5116
5139
|
}
|
|
5117
5140
|
set viewChildren(children) {
|
|
5118
5141
|
if (children) {
|
|
@@ -5133,6 +5156,7 @@ CatalogSearchResultTileComponent.decorators = [
|
|
|
5133
5156
|
[createFrozenArticle]="createFrozenArticle"
|
|
5134
5157
|
[showing]="intersection.isIntersecting"
|
|
5135
5158
|
[article]="article"
|
|
5159
|
+
[isReturn]="isReturn"
|
|
5136
5160
|
(onArticleClick)="onArticleClick.emit($event)"
|
|
5137
5161
|
(onAddArticleButtonClick)="onAddArticleButtonClick.emit($event)"
|
|
5138
5162
|
(onArButtonClick)="onArButtonClick.emit($event)"
|
|
@@ -5162,7 +5186,8 @@ CatalogSearchResultTileComponent.decorators = [
|
|
|
5162
5186
|
CatalogSearchResultTileComponent.propDecorators = {
|
|
5163
5187
|
viewChildren: [{ type: ViewChildren, args: [CatalogArticleTileComponent, { read: ElementRef },] }],
|
|
5164
5188
|
showClass: [{ type: HostBinding, args: ['class.co-catalog-search-result-tile',] }],
|
|
5165
|
-
smallScrollbar: [{ type: HostBinding, args: ['class.co-small-scrollbar',] }]
|
|
5189
|
+
smallScrollbar: [{ type: HostBinding, args: ['class.co-small-scrollbar',] }],
|
|
5190
|
+
isReturn: [{ type: Input }]
|
|
5166
5191
|
};
|
|
5167
5192
|
|
|
5168
5193
|
class CatalogArticleTileModule {
|
|
@@ -5325,6 +5350,10 @@ CatalogSearchResultTileModule.decorators = [
|
|
|
5325
5350
|
];
|
|
5326
5351
|
|
|
5327
5352
|
class CatalogArticleListComponent extends ArticleBaseComponent {
|
|
5353
|
+
constructor() {
|
|
5354
|
+
super(...arguments);
|
|
5355
|
+
this.isReturn = false;
|
|
5356
|
+
}
|
|
5328
5357
|
showClass() {
|
|
5329
5358
|
return true;
|
|
5330
5359
|
}
|
|
@@ -5379,7 +5408,7 @@ CatalogArticleListComponent.decorators = [
|
|
|
5379
5408
|
<co-button *ngIf="!configurable"
|
|
5380
5409
|
[label]="options.addArticleButtonText"
|
|
5381
5410
|
class="open-icon action pointer"
|
|
5382
|
-
(onClick)="handleAddArticleButtonClick($event)"
|
|
5411
|
+
(onClick)="handleAddArticleButtonClick($event, isReturn)"
|
|
5383
5412
|
[iconData]="iconCache.getIcon(icons.AddToCartDrop)">
|
|
5384
5413
|
</co-button>
|
|
5385
5414
|
<co-button *ngIf="configurable"
|
|
@@ -5403,10 +5432,15 @@ CatalogArticleListComponent.decorators = [
|
|
|
5403
5432
|
},] }
|
|
5404
5433
|
];
|
|
5405
5434
|
CatalogArticleListComponent.propDecorators = {
|
|
5435
|
+
isReturn: [{ type: Input }],
|
|
5406
5436
|
showClass: [{ type: HostBinding, args: ['class.co-catalog-article-list',] }]
|
|
5407
5437
|
};
|
|
5408
5438
|
|
|
5409
5439
|
class CatalogSearchResultListComponent extends CatalogSearchBaseComponent {
|
|
5440
|
+
constructor() {
|
|
5441
|
+
super(...arguments);
|
|
5442
|
+
this.isReturn = false;
|
|
5443
|
+
}
|
|
5410
5444
|
set viewChildren(children) {
|
|
5411
5445
|
if (children) {
|
|
5412
5446
|
this.elements = children.toArray();
|
|
@@ -5429,6 +5463,7 @@ CatalogSearchResultListComponent.decorators = [
|
|
|
5429
5463
|
[createFrozenArticle]="createFrozenArticle"
|
|
5430
5464
|
[showing]="intersection.isIntersecting"
|
|
5431
5465
|
[article]="article"
|
|
5466
|
+
[isReturn]="isReturn"
|
|
5432
5467
|
(onArticleClick)="onArticleClick.emit($event)"
|
|
5433
5468
|
(onAddArticleButtonClick)="onAddArticleButtonClick.emit($event)"
|
|
5434
5469
|
(onArButtonClick)="onArButtonClick.emit($event)"
|
|
@@ -5457,7 +5492,8 @@ CatalogSearchResultListComponent.decorators = [
|
|
|
5457
5492
|
];
|
|
5458
5493
|
CatalogSearchResultListComponent.propDecorators = {
|
|
5459
5494
|
viewChildren: [{ type: ViewChildren, args: [CatalogArticleListComponent, { read: ElementRef },] }],
|
|
5460
|
-
showClass: [{ type: HostBinding, args: ['class.co-catalog-search-result-list',] }]
|
|
5495
|
+
showClass: [{ type: HostBinding, args: ['class.co-catalog-search-result-list',] }],
|
|
5496
|
+
isReturn: [{ type: Input }]
|
|
5461
5497
|
};
|
|
5462
5498
|
|
|
5463
5499
|
class CatalogArticleListModule {
|