@colijnit/product 257.1.8 → 257.1.10

package/app/components/product-addtocart/product-addtocart.component.d.ts

@@ -6,11 +6,13 @@ import { ProductEventService } from '../../service/product-event.service';
 import { ArticleFullObject } from '@colijnit/articleapi/build/model/article-full-object';
 import { ProductSettingsService } from '../../service/product-settings.service';
 import { ExternalSource } from '@colijnit/articleapi/build/model/external-source.bo';
+import { ProductConnectorAdapterService } from '../../service/product-connector-adapter.service';
 export declare class ProductAddtocartComponent implements OnInit, OnDestroy {
     iconCache: IconCacheService;
     private _ioneControllerService;
     private _appEventService;
     private _settingsService;
+    private _productConnectorAdapterService;
     readonly icon: typeof IconEnum;
     addToCartButton: ElementRef;
     article: ArticleFullObject;
@@ -29,10 +31,11 @@ export declare class ProductAddtocartComponent implements OnInit, OnDestroy {
     showRelatedPopup: EventEmitter<boolean>;
     showQuoteButton: boolean;
     private _quantity;
-    constructor(iconCache: IconCacheService, _ioneControllerService: ProductConnectorService, _appEventService: ProductEventService, _settingsService: ProductSettingsService);
+    constructor(iconCache: IconCacheService, _ioneControllerService: ProductConnectorService, _appEventService: ProductEventService, _settingsService: ProductSettingsService, _productConnectorAdapterService: ProductConnectorAdapterService);
     ngOnInit(): void;
     ngOnDestroy(): void;
     handleAddToCartClick(quantity: number): Promise<void>;
     handleAddToQuoteClick(quantity: number): Promise<void>;
     private _getJSONFromArticleObject;
+    private _getGeneratedArtDirectly;
 }

package/app/service/product-connector-adapter.service.d.ts

@@ -29,6 +29,7 @@ export declare class ProductConnectorAdapterService implements OnDestroy {
     getDeliveryDate2(goodId: number): Promise<DeliveryPrognosis>;
     getJsonConfiguredArticles(configuratorStatistics?: ConfiguratorStatisticsEnvironment): Promise<string>;
     getJsonArticleFlatTree(goodId: number, goodType: string, quantity: number, externalSource?: boolean, showLoader?: boolean, instanceId?: any, configuratorStatistics?: ConfiguratorStatisticsEnvironment): Promise<string>;
+    getGeneratedArtDirectly(goodId: number, showLoader: boolean): Promise<number>;
     getGoodIdFromArticleNr(sku: string): Promise<number>;
     getArticleFullObject(goodId: number, showLoader?: boolean): Promise<ArticleFullObject>;
     getSuperArticle(id: string, branch?: string): Promise<SuperArticle>;

package/app/service/product-connector.service.d.ts

@@ -33,6 +33,7 @@ export declare class ProductConnectorService implements OnDestroy {
     getDeliveryDate2(goodId: number): Promise<DeliveryPrognosis>;
     getSuperArticle(id: string): Promise<SuperArticle>;
     getJsonArticleFlatTree(goodId: number, goodType: string, quantity: number, externalSource?: boolean, showLoader?: boolean, configuratorStatistics?: ConfiguratorStatisticsEnvironment): Promise<string>;
+    getGeneratedArtDirectly(goodId: number, showLoader?: boolean): Promise<number>;
     addWebSessionTransactionLine(transactionUuid: string, sku: string, quantity: number): Promise<string>;
     onShowLoaderChange(showLoader: boolean): void;
 }

package/bundles/colijnit-product.umd.js

@@ -31,8 +31,8 @@
         function Version() {
             this.name = "@colijnit/product";
             this.description = "Product detail page project for iOne";
-            this.symVer = "257.1.8";
-            this.publishDate = "27-5-2025 10:30:02";
+            this.symVer = "257.1.10";
+            this.publishDate = "20-6-2025 15:30:05";
         }
         return Version;
     }());
@@ -748,6 +748,17 @@
                 });
             });
         };
+        ProductConnectorAdapterService.prototype.getGeneratedArtDirectly = function (goodId, showLoader) {
+            return __awaiter(this, void 0, void 0, function () {
+                var _this = this;
+                return __generator(this, function (_a) {
+                    return [2 /*return*/, this.articleConnector.getGeneratedArtDirectly(goodId, showLoader).catch(function (messages) {
+                            _this._eventService.errorMessage.next(messages);
+                            return null;
+                        })];
+                });
+            });
+        };
         ProductConnectorAdapterService.prototype.getGoodIdFromArticleNr = function (sku) {
             return __awaiter(this, void 0, void 0, function () {
                 var response;
@@ -1302,6 +1313,10 @@
             if (showLoader === void 0) { showLoader = true; }
             return this._adapterService.getJsonArticleFlatTree(goodId, goodType, quantity, externalSource, showLoader, this._instanceId, configuratorStatistics);
         };
+        ProductConnectorService.prototype.getGeneratedArtDirectly = function (goodId, showLoader) {
+            if (showLoader === void 0) { showLoader = true; }
+            return this._adapterService.getGeneratedArtDirectly(goodId, showLoader);
+        };
         ProductConnectorService.prototype.addWebSessionTransactionLine = function (transactionUuid, sku, quantity) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
@@ -1710,7 +1725,7 @@
                                 this._ione.getFullArticle(this._sku).then(function (article) {
                                     _this.article = article;
                                     if (_this.article) {
-                                        _this.configurable = _this.article.goodType === 'B';
+                                        _this.configurable = !(_this.article.goodType === 'B' && !_this.article.isConfigurable);
                                         if (_this.configurable) {
                                             _this.showAddToCart = false;
                                             _this.currentView = SelectorType.TwoD;
@@ -1748,7 +1763,7 @@
     ProductPageComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'app-product-page',
-                    template: "<ng-container *ngIf=\"settingsLoaded\">\r\n  <div class=\"page-wrapper\">\r\n    <div class=\"page-wrapper-content\">\r\n      <div class=\"page-wrapper-left\">\r\n        <div class=\"product-image-container\">\r\n          <div class=\"product-page-block-selector-type\">\r\n            <app-product-selector-type class=\"default-padding\"\r\n              [(currentType)]=\"currentView\"\r\n              [show2D]=\"configurable\"\r\n              [show3D]=\"threeD\"\r\n            ></app-product-selector-type>\r\n          </div>\r\n          <div class=\"product-page-block-image default-padding\" [class.full]=\"fullScreen\">\r\n            <app-image-carousel [@toggleVisibilityByState]=\"show2D ? 'show' : 'hide'\" [images]=\"article?.images\" [showRefresh]=\"configurable && threeD\"></app-image-carousel>\r\n            <ng-container *ngIf=\"settingsLoaded\">\r\n              <threed-configurator #configurator class=\"threed-configurator\"\r\n                                   [class.configurator-full-screen]=\"fullScreen\"\r\n                                   [@toggleVisibilityByState]=\"show3D ? 'show' : 'hide'\"\r\n                                   [@toggleFullScreen]=\"fullScreen ? 'fullscreen' : 'halfscreen'\"\r\n              ></threed-configurator>\r\n            </ng-container>\r\n            <co-icon #fullscreenbutton class=\"fullscreen-button\" *ngIf=\"show3D\"\r\n                     [@toggleTopLeft]=\"fullScreen ? 'fullscreen' : 'halfscreen'\"\r\n                     [iconData]=\"iconCache.getIcon(fullScreenIcon)\"\r\n                     (click)=\"showFullScreen()\"></co-icon>\r\n            <co-icon class=\"threed-watermark\" *ngIf=\"show3D && fullScreen\"\r\n                     [iconData]=\"iconCache.getIcon(icon.Logo)\"></co-icon>\r\n          </div>\r\n        </div>\r\n      </div>\r\n      <div class=\"page-wrapper-right\">\r\n        <div class=\"product-page-block-description\">\r\n          <app-product-description class=\"default-padding\" [article]=\"article\"></app-product-description>\r\n        </div>\r\n        <div class=\"product-page-block-additional\">\r\n          <div class=\"product-page-block-additional-description\">\r\n            <app-product-additional-description class=\"default-padding\" [article]=\"article\"></app-product-additional-description>\r\n          </div>\r\n          <div class=\"product-page-block-price\" [class.full]=\"configuring\">\r\n            <app-product-price class=\"s-padding\" *ngIf=\"!configuring\"\r\n                               [pricing]=\"article?.pricing\"\r\n                               [configurable]=\"configurable\"\r\n            ></app-product-price>\r\n            <ng-container *ngIf=\"settingsLoaded\">\r\n              <threed-selections #selections class=\"threed-selections\" [class.show-selections]=\"configuring\" [@toggleFullScreenRight]=\"fullScreen ? 'fullscreen' : 'halfscreen'\"\r\n                                 [class.default-padding]=\"!fullScreen\"\r\n                                 [class.show-full-screen]=\"fullScreen\"\r\n                                 [class.mini-scrollbar]=\"fullScreen\"\r\n                                 [sku]=\"sku\"\r\n                                 [settings]=\"settings\"\r\n                                 (onUserActionFromThreeD)=\"configuring = true\"\r\n                                 (instanceSet)=\"setInstance($event)\"\r\n                                 (onImageReceived)=\"appEventService.onImageReceived.next($event)\"\r\n                                 (onRenderStarted)=\"appEventService.onRenderStarted.next()\"\r\n                                 (onDraftRenderImageReceived)=\"appEventService.onDraftRenderImageReceived.next($event)\"\r\n                                 (onArticleReceived)=\"appEventService.onArticleReceived.next($event.detail)\"\r\n                                 (onSelectionsReceived)=\"appEventService.onSelectionsReceived.next($event.detail)\"\r\n                                 (onArticleInfoReceived)=\"appEventService.onArticleInfoReceived.next($event.detail)\"\r\n                                 (onAnswersAvailable)=\"appEventService.onAnswersAvailable.next($event.detail)\"\r\n              ></threed-selections>\r\n            </ng-container>\r\n          </div>\r\n          <div class=\"product-page-block-addtocart no-padding product-action-buttons\" *ngIf=\"!configuring\" [@toggleTopRight]=\"fullScreen ? 'fullscreen' : 'halfscreen'\">\r\n            <app-product-addtocart\r\n                                   [configurable]=\"configurable\"\r\n                                   [createFrozenArticle]=\"createFrozenArticle\"\r\n                                   [configuring]=\"configuring\"\r\n                                   [showAddToCart]=\"showAddToCart\"\r\n                                   [article]=\"article\"\r\n                                   [externalSource]=\"externalSource\"\r\n                                   [isReturn]=\"isReturn\"\r\n                                   (startConfiguration)=\"handleStartConfiguration()\"\r\n                                   (showRelatedPopup)=\"handlePopUpChange($event)\"\r\n            ></app-product-addtocart>\r\n          </div>\r\n          <div class=\"addtocart-reserved product-action-buttons\" *ngIf=\"configuring\" [class.full-screen]=\"fullScreen\">\r\n            <app-product-addtocart class=\"default-padding\"\r\n                                   [configurable]=\"false\"\r\n                                   [fullscreen]=\"fullScreen\"\r\n                                   [showAddToCart]=\"showAddToCart\"\r\n                                   [configuring]=\"configuring\"\r\n                                   [article]=\"article\"\r\n                                   [externalSource]=\"externalSource\"\r\n                                   [isReturn]=\"isReturn\"\r\n                                   (startConfiguration)=\"handleStartConfiguration()\"\r\n            ></app-product-addtocart>\r\n          </div>\r\n          <div class=\"product-page-block-variants\">\r\n            <app-product-related class=\"no-padding\" *ngIf=\"article?.relatedArticles && article?.relatedArticles.length > 0\"\r\n                                 [externalSource]=\"externalSource\"\r\n                                 [articles]=\"article?.relatedArticles\" [refType]=\"64\" [label]=\"'VARIANTS' | localize\"></app-product-related>\r\n          </div>\r\n          <div class=\"product-page-block-stock\">\r\n            <app-product-stock class=\"no-padding\" [goodId]=\"article?.goodId\" (openStockEvent)=\"openStock()\"></app-product-stock>\r\n          </div>\r\n          <div class=\"product-page-block-delivery\">\r\n            <app-product-delivery class=\"no-padding\" [stockAndDelivery]=\"stockAndDelivery\"></app-product-delivery>\r\n          </div>\r\n        </div>\r\n      </div>\r\n    </div>\r\n    <div class=\"page-wrapper-content\">\r\n      <div class=\"page-wrapper-left\">\r\n        <app-product-info-tabs class=\"no-padding\" [article]=\"article\"></app-product-info-tabs>\r\n      </div>\r\n      <div class=\"page-wrapper-right\">\r\n        <div class=\"product-page-block-related s-padding\">\r\n            <app-product-related\r\n              *ngIf=\"article?.relatedArticles && article?.relatedArticles.length > 0\"\r\n              [externalSource]=\"externalSource\"\r\n              [articles]=\"article?.relatedArticles\"\r\n              [refType]=\"1\"\r\n              [label]=\"'RELATED_PRODUCTS' | localize\">\r\n            </app-product-related>\r\n        </div>\r\n      </div>\r\n    </div>\r\n    <div class=\"page-wrapper-content no-top-margin\">\r\n      <div class=\"page-wrapper-full\">\r\n        <div class=\"product-page-block-alternatives s-padding\">\r\n          <app-product-related\r\n            *ngIf=\"article?.relatedArticles && article?.relatedArticles.length > 0\"\r\n            [externalSource]=\"externalSource\"\r\n            [articles]=\"article?.relatedArticles\"\r\n            [refType]=\"4\"\r\n            [isSmallModus]=\"false\"\r\n            [label]=\"'ALTERNATIVE_PRODUCTS' | localize\">\r\n          </app-product-related>\r\n        </div>\r\n      </div>\r\n    </div>\r\n\r\n\r\n    <div *ngIf=\"showRelatedProductsPopup\">\r\n      <co-product-dialog\r\n        [mainArticle]=\"article\"\r\n        [articles]=\"article?.relatedArticles\"\r\n        [refType]=\"1\"\r\n        (closeRelatedPopup)=\"handlePopUpChange($event)\"\r\n      >\r\n      </co-product-dialog>\r\n\r\n<!--      <app-product-related class=\"no-padding\" *ngIf=\"article?.relatedArticles && article?.relatedArticles.length > 0\"-->\r\n<!--                           [articles]=\"article?.relatedArticles\" [refType]=\"64\" [label]=\"'VARIANTS' | localize\"></app-product-related>-->\r\n    </div>\r\n\r\n\r\n  </div>\r\n</ng-container>\r\n",
+                    template: "<ng-container *ngIf=\"settingsLoaded\">\r\n  <div class=\"page-wrapper\">\r\n    <div class=\"page-wrapper-content\">\r\n      <div class=\"page-wrapper-left\">\r\n        <div class=\"product-image-container\">\r\n          <div class=\"product-page-block-selector-type\">\r\n            <app-product-selector-type class=\"default-padding\"\r\n              [(currentType)]=\"currentView\"\r\n              [show2D]=\"configurable\"\r\n              [show3D]=\"threeD\"\r\n            ></app-product-selector-type>\r\n          </div>\r\n          <div class=\"product-page-block-image default-padding\" [class.full]=\"fullScreen\">\r\n            <app-image-carousel [@toggleVisibilityByState]=\"show2D ? 'show' : 'hide'\" [images]=\"article?.images\" [showRefresh]=\"configurable && threeD\"></app-image-carousel>\r\n            <ng-container *ngIf=\"settingsLoaded && this.configurable\">\r\n              <threed-configurator #configurator class=\"threed-configurator\"\r\n                                   [class.configurator-full-screen]=\"fullScreen\"\r\n                                   [@toggleVisibilityByState]=\"show3D ? 'show' : 'hide'\"\r\n                                   [@toggleFullScreen]=\"fullScreen ? 'fullscreen' : 'halfscreen'\"\r\n              ></threed-configurator>\r\n            </ng-container>\r\n            <co-icon #fullscreenbutton class=\"fullscreen-button\" *ngIf=\"show3D\"\r\n                     [@toggleTopLeft]=\"fullScreen ? 'fullscreen' : 'halfscreen'\"\r\n                     [iconData]=\"iconCache.getIcon(fullScreenIcon)\"\r\n                     (click)=\"showFullScreen()\"></co-icon>\r\n            <co-icon class=\"threed-watermark\" *ngIf=\"show3D && fullScreen\"\r\n                     [iconData]=\"iconCache.getIcon(icon.Logo)\"></co-icon>\r\n          </div>\r\n        </div>\r\n      </div>\r\n      <div class=\"page-wrapper-right\">\r\n        <div class=\"product-page-block-description\">\r\n          <app-product-description class=\"default-padding\" [article]=\"article\"></app-product-description>\r\n        </div>\r\n        <div class=\"product-page-block-additional\">\r\n          <div class=\"product-page-block-additional-description\">\r\n            <app-product-additional-description class=\"default-padding\" [article]=\"article\"></app-product-additional-description>\r\n          </div>\r\n          <div class=\"product-page-block-price\" [class.full]=\"configuring\">\r\n            <app-product-price class=\"s-padding\" *ngIf=\"!configuring\"\r\n                               [pricing]=\"article?.pricing\"\r\n                               [configurable]=\"configurable\"\r\n            ></app-product-price>\r\n            <ng-container *ngIf=\"settingsLoaded\">\r\n              <threed-selections #selections class=\"threed-selections\" [class.show-selections]=\"configuring\" [@toggleFullScreenRight]=\"fullScreen ? 'fullscreen' : 'halfscreen'\"\r\n                                 [class.default-padding]=\"!fullScreen\"\r\n                                 [class.show-full-screen]=\"fullScreen\"\r\n                                 [class.mini-scrollbar]=\"fullScreen\"\r\n                                 [sku]=\"sku\"\r\n                                 [settings]=\"settings\"\r\n                                 (onUserActionFromThreeD)=\"configuring = true\"\r\n                                 (instanceSet)=\"setInstance($event)\"\r\n                                 (onImageReceived)=\"appEventService.onImageReceived.next($event)\"\r\n                                 (onRenderStarted)=\"appEventService.onRenderStarted.next()\"\r\n                                 (onDraftRenderImageReceived)=\"appEventService.onDraftRenderImageReceived.next($event)\"\r\n                                 (onArticleReceived)=\"appEventService.onArticleReceived.next($event.detail)\"\r\n                                 (onSelectionsReceived)=\"appEventService.onSelectionsReceived.next($event.detail)\"\r\n                                 (onArticleInfoReceived)=\"appEventService.onArticleInfoReceived.next($event.detail)\"\r\n                                 (onAnswersAvailable)=\"appEventService.onAnswersAvailable.next($event.detail)\"\r\n              ></threed-selections>\r\n            </ng-container>\r\n          </div>\r\n          <div class=\"product-page-block-addtocart no-padding product-action-buttons\" *ngIf=\"!configuring\" [@toggleTopRight]=\"fullScreen ? 'fullscreen' : 'halfscreen'\">\r\n            <app-product-addtocart\r\n                                   [configurable]=\"configurable\"\r\n                                   [createFrozenArticle]=\"createFrozenArticle\"\r\n                                   [configuring]=\"configuring\"\r\n                                   [showAddToCart]=\"showAddToCart\"\r\n                                   [article]=\"article\"\r\n                                   [externalSource]=\"externalSource\"\r\n                                   [isReturn]=\"isReturn\"\r\n                                   (startConfiguration)=\"handleStartConfiguration()\"\r\n                                   (showRelatedPopup)=\"handlePopUpChange($event)\"\r\n            ></app-product-addtocart>\r\n          </div>\r\n          <div class=\"addtocart-reserved product-action-buttons\" *ngIf=\"configuring\" [class.full-screen]=\"fullScreen\">\r\n            <app-product-addtocart class=\"default-padding\"\r\n                                   [configurable]=\"false\"\r\n                                   [fullscreen]=\"fullScreen\"\r\n                                   [showAddToCart]=\"showAddToCart\"\r\n                                   [configuring]=\"configuring\"\r\n                                   [article]=\"article\"\r\n                                   [externalSource]=\"externalSource\"\r\n                                   [isReturn]=\"isReturn\"\r\n                                   (startConfiguration)=\"handleStartConfiguration()\"\r\n            ></app-product-addtocart>\r\n          </div>\r\n          <div class=\"product-page-block-variants\">\r\n            <app-product-related class=\"no-padding\" *ngIf=\"article?.relatedArticles && article?.relatedArticles.length > 0\"\r\n                                 [externalSource]=\"externalSource\"\r\n                                 [articles]=\"article?.relatedArticles\" [refType]=\"64\" [label]=\"'VARIANTS' | localize\"></app-product-related>\r\n          </div>\r\n          <div class=\"product-page-block-stock\">\r\n            <app-product-stock class=\"no-padding\" [goodId]=\"article?.goodId\" (openStockEvent)=\"openStock()\"></app-product-stock>\r\n          </div>\r\n          <div class=\"product-page-block-delivery\">\r\n            <app-product-delivery class=\"no-padding\" [stockAndDelivery]=\"stockAndDelivery\"></app-product-delivery>\r\n          </div>\r\n        </div>\r\n      </div>\r\n    </div>\r\n    <div class=\"page-wrapper-content\">\r\n      <div class=\"page-wrapper-left\">\r\n        <app-product-info-tabs class=\"no-padding\" [article]=\"article\"></app-product-info-tabs>\r\n      </div>\r\n      <div class=\"page-wrapper-right\">\r\n        <div class=\"product-page-block-related s-padding\">\r\n            <app-product-related\r\n              *ngIf=\"article?.relatedArticles && article?.relatedArticles.length > 0\"\r\n              [externalSource]=\"externalSource\"\r\n              [articles]=\"article?.relatedArticles\"\r\n              [refType]=\"1\"\r\n              [label]=\"'RELATED_PRODUCTS' | localize\">\r\n            </app-product-related>\r\n        </div>\r\n      </div>\r\n    </div>\r\n    <div class=\"page-wrapper-content no-top-margin\">\r\n      <div class=\"page-wrapper-full\">\r\n        <div class=\"product-page-block-alternatives s-padding\">\r\n          <app-product-related\r\n            *ngIf=\"article?.relatedArticles && article?.relatedArticles.length > 0\"\r\n            [externalSource]=\"externalSource\"\r\n            [articles]=\"article?.relatedArticles\"\r\n            [refType]=\"4\"\r\n            [isSmallModus]=\"false\"\r\n            [label]=\"'ALTERNATIVE_PRODUCTS' | localize\">\r\n          </app-product-related>\r\n        </div>\r\n      </div>\r\n    </div>\r\n\r\n\r\n    <div *ngIf=\"showRelatedProductsPopup\">\r\n      <co-product-dialog\r\n        [mainArticle]=\"article\"\r\n        [articles]=\"article?.relatedArticles\"\r\n        [refType]=\"1\"\r\n        (closeRelatedPopup)=\"handlePopUpChange($event)\"\r\n      >\r\n      </co-product-dialog>\r\n\r\n<!--      <app-product-related class=\"no-padding\" *ngIf=\"article?.relatedArticles && article?.relatedArticles.length > 0\"-->\r\n<!--                           [articles]=\"article?.relatedArticles\" [refType]=\"64\" [label]=\"'VARIANTS' | localize\"></app-product-related>-->\r\n    </div>\r\n\r\n\r\n  </div>\r\n</ng-container>\r\n",
                     animations: [
                         animations.trigger('toggleFullScreen', [
                             animations.state('fullscreen', animations.style({ 'position': 'fixed', 'top': '0', 'left': '0', 'width': '100%', 'height': '100%' })),
@@ -2068,6 +2083,7 @@
             var resizeCanvas = document.createElement('canvas');
             var resizeCanvasContext = resizeCanvas.getContext('2d');
             var resizeImage = document.createElement('img');
+            resizeImage.crossOrigin = 'anonymous';
             resizeImage.onload = function () { return __awaiter(_this, void 0, void 0, function () {
                 var originalWidth, originalHeight, aspectRatio, newWidth, newHeight, imageWidth, resizedSource;
                 return __generator(this, function (_a) {
@@ -2326,12 +2342,15 @@
                     this.fromPrice = this._pricing.retailBasePrice ? this._pricing.retailBasePrice : this._pricing.priceBaseline;
                     this.fromLabel = this._pricing.retailBasePrice ? 'PRICE' : 'FROM';
                     this.toPrice = undefined;
+                    this.toLabel = '';
                 }
                 else {
-                    this.fromPrice = this._pricing.retailSuggestedPrice ? this._pricing.retailSuggestedPrice : this._pricing.retailBasePrice;
-                    this.fromLabel = this._pricing.retailSuggestedPrice ? 'Was' : 'PRICE';
-                    this.toPrice = this._pricing.retailSuggestedPrice ? this._pricing.retailBasePrice : undefined;
-                    this.toLabel = this._pricing.retailSuggestedPrice ? 'IS_NOW' : '';
+                    var hasSuggested = this._pricing.retailSuggestedPrice !== undefined && this._pricing.retailSuggestedPrice !== null;
+                    this.fromPrice = hasSuggested ? this._pricing.retailSuggestedPrice : this._pricing.retailBasePrice;
+                    this.fromLabel = hasSuggested ? 'Was' : 'PRICE';
+                    // Always set toPrice to base price
+                    this.toPrice = this._pricing.retailBasePrice;
+                    this.toLabel = hasSuggested ? 'IS_NOW' : 'PRICE';
                 }
                 this._changeDetector.detectChanges();
             }
@@ -2383,11 +2402,12 @@
     ];
 
     var ProductAddtocartComponent = /** @class */ (function () {
-        function ProductAddtocartComponent(iconCache, _ioneControllerService, _appEventService, _settingsService) {
+        function ProductAddtocartComponent(iconCache, _ioneControllerService, _appEventService, _settingsService, _productConnectorAdapterService) {
             this.iconCache = iconCache;
             this._ioneControllerService = _ioneControllerService;
             this._appEventService = _appEventService;
             this._settingsService = _settingsService;
+            this._productConnectorAdapterService = _productConnectorAdapterService;
             this.icon = IconEnum;
             this.createFrozenArticle = true;
             this.configurable = false;
@@ -2429,40 +2449,52 @@
         };
         ProductAddtocartComponent.prototype.handleAddToCartClick = function (quantity) {
             return __awaiter(this, void 0, void 0, function () {
-                var article, article, article;
+                var article, generatedGoodId, articleFull, article, article, article;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            if (!this.createFrozenArticle) return [3 /*break*/, 7];
-                            if (!(this.article.goodType === 'B')) return [3 /*break*/, 2];
+                            if (!this.createFrozenArticle) return [3 /*break*/, 11];
+                            if (!(this.article.goodType === 'B')) return [3 /*break*/, 6];
+                            if (!this.article.isConfigurable) return [3 /*break*/, 2];
                             return [4 /*yield*/, this._getJSONFromArticleObject({ article: this.article, quantity: quantity })];
                         case 1:
                             article = _a.sent();
                             if (article) {
                                 this._appEventService.onAddToCart.next({ article: article, quantity: quantity });
                             }
-                            return [3 /*break*/, 6];
-                        case 2:
+                            return [3 /*break*/, 5];
+                        case 2: return [4 /*yield*/, this._getGeneratedArtDirectly(this.article.goodId)];
+                        case 3:
+                            generatedGoodId = _a.sent();
+                            if (!generatedGoodId) return [3 /*break*/, 5];
+                            return [4 /*yield*/, this._productConnectorAdapterService.getArticleFullObject(generatedGoodId, true)];
+                        case 4:
+                            articleFull = _a.sent();
+                            article = this._ioneControllerService.convertArticleFullObjectToArticleExtended(articleFull);
+                            this._appEventService.onAddToCart.next({ article: article, quantity: quantity });
+                            _a.label = 5;
+                        case 5: return [3 /*break*/, 10];
+                        case 6:
                             article = void 0;
-                            if (!!!this.externalSource) return [3 /*break*/, 4];
+                            if (!!!this.externalSource) return [3 /*break*/, 8];
                             return [4 /*yield*/, this._getJSONFromArticleObject({ article: this.article, quantity: quantity })];
-                        case 3:
+                        case 7:
                             article = _a.sent();
-                            return [3 /*break*/, 5];
-                        case 4:
+                            return [3 /*break*/, 9];
+                        case 8:
                             article = this._ioneControllerService.convertArticleFullObjectToArticleExtended(this.article);
-                            _a.label = 5;
-                        case 5:
+                            _a.label = 9;
+                        case 9:
                             if (article) {
                                 this._appEventService.onAddToCart.next({ article: article, quantity: quantity });
                             }
-                            _a.label = 6;
-                        case 6: return [3 /*break*/, 8];
-                        case 7:
+                            _a.label = 10;
+                        case 10: return [3 /*break*/, 12];
+                        case 11:
                             article = this._ioneControllerService.convertArticleFullObjectToArticleExtended(this.article);
                             this._appEventService.onAddToCart.next({ article: article, quantity: quantity });
-                            _a.label = 8;
-                        case 8: return [2 /*return*/];
+                            _a.label = 12;
+                        case 12: return [2 /*return*/];
                     }
                 });
             });
@@ -2501,6 +2533,16 @@
                 });
             });
         };
+        ProductAddtocartComponent.prototype._getGeneratedArtDirectly = function (goodId) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this._ioneControllerService.getGeneratedArtDirectly(goodId, true)];
+                        case 1: return [2 /*return*/, _a.sent()];
+                    }
+                });
+            });
+        };
         return ProductAddtocartComponent;
     }());
     ProductAddtocartComponent.decorators = [
@@ -2514,7 +2556,8 @@
         { type: IconCacheService },
         { type: ProductConnectorService },
         { type: ProductEventService },
-        { type: ProductSettingsService }
+        { type: ProductSettingsService },
+        { type: ProductConnectorAdapterService }
     ]; };
     ProductAddtocartComponent.propDecorators = {
         addToCartButton: [{ type: i0.ViewChild, args: ['addtocartbutton', { read: i0.ElementRef },] }],