ng-easycommerce 0.0.478 → 0.0.480

package/README.md

@@ -1,3 +1,11 @@
+# version 0.0.480
+- Se cambia eventos GTM para enviar la informacion correcta.
+- Se modifica el addToCart para que contemple las variantes y las pueda agregar al carrito.
+- Se modifica la directiva ecProductStock para que contemple el stock de la variante en caso de tener. 
+- Se agrega en las constantes la variable paramsProductsWithUniqueVariant para poder configurar la muestra de las variantes en el collection. 
+- Se modifica y corrige en la funcion getProductsWithUniqueVariant del servicio de producto, el caso defaultFirstOption == true. 
+# version 0.0.479 (para prueba)
+- Se cambia una función de analytics para probar GTM.
 # version 0.0.478
 - Se agrega y configura el filtro por fecha de creación, para que se agregue en los filtros_top.
 # version 0.0.477

package/bundles/ng-easycommerce.umd.js

@@ -497,6 +497,31 @@
              */
             this.setCountries = function (countries) { return _this.countries = countries; };
             this.getCountries = function () { return _this.countries; };
+            /**
+             * @description esta variable se utiliza para configurar los parametros cuando se desea mostrar
+             * variantes el listado de productos.
+             * @param {string}type tipo de options
+             * @param {string}code codigo de options
+             * @param {boolean}defaultFirstOption `true` toma el primer option del producto en general
+             * @param {boolean}checkIfStock `true` se realiza un chequeo de si la variante tiene stock para mostrarla
+             * @example  ```javascript
+             * {
+                type: 'color',
+                code: 'color',
+                defaultFirstOption: false ,
+                checkIfStock:true
+                } ```
+             */
+            this.paramsProductsWithUniqueVariant = {
+                type: 'color',
+                code: 'color',
+                defaultFirstOption: false,
+                checkIfStock: true
+            };
+            this.setParamsProductsWithUniqueVariant = function (value) {
+                _this.paramsProductsWithUniqueVariant = __assign(__assign({}, _this.paramsProductsWithUniqueVariant), value);
+            };
+            this.getParamsProductsWithUniqueVariant = function () { return _this.paramsProductsWithUniqueVariant; };
         }
         /**
          *
@@ -1639,18 +1664,27 @@
                         });
                     }
                     else {
+                        /**
+                         * se modifica el caso para cuando se toma el primer `option` del producto para
+                         * armar la lista de productos con variantes.
+                         */
                         if (withOption.defaultFirstOption && ((_b = product.options) === null || _b === void 0 ? void 0 : _b.length)) {
                             var firstOptions_1 = product.options[0];
                             product.options[0].values.forEach(function (optionValue) {
                                 var modified_product = JSON.parse(JSON.stringify(product));
-                                modified_product.options.find(function (option) { return option.type == firstOptions_1.type; }).values = [{ code: firstOptions_1.code, name: firstOptions_1.name }];
+                                modified_product.options.find(function (option) { return option.type == firstOptions_1.type; }).values = [{ code: optionValue.code, name: optionValue.name }];
                                 var variantAux = variants.find(function (variant) {
-                                    return ((withOption.checkIfStock && variant.stock > 0) || withOption.checkIfStock == false)
-                                        && variant.options.length
-                                        && variant.options.some(function (op) { return (op.hasOwnProperty(firstOptions_1.code.toLowerCase()) || op.hasOwnProperty(firstOptions_1.code.toUpperCase()))
-                                            && (op[firstOptions_1.code.toLowerCase()] || op[firstOptions_1.code.toUpperCase()]) === optionValue.code; });
+                                    return variant.options.find(function (elem) { return elem[firstOptions_1.code] == optionValue.code; });
                                 });
-                                variantAux && productsUniqueVariant.push(_this.productWithVariantValues(modified_product, variantAux, optionValue));
+                                if (variantAux && variantAux.images.length == 0) {
+                                    variantAux.images = product.picturesdefault;
+                                }
+                                if (withOption.checkIfStock) {
+                                    (variantAux && variantAux.stock > 0) ? productsUniqueVariant.push(_this.productWithVariantValues(modified_product, variantAux, optionValue)) : null;
+                                }
+                                else {
+                                    variantAux && productsUniqueVariant.push(_this.productWithVariantValues(modified_product, variantAux, optionValue));
+                                }
                             });
                         }
                         else {
@@ -2033,11 +2067,14 @@
             this.document = document;
             this.enabled = false;
             this.initialize = function (pixel_id) {
-                var new_analityc_script = _this.renderer.createElement('script');
-                new_analityc_script.type = 'text/javascript';
-                new_analityc_script.text = "!function(f,b,e,v,n,t,s) {if(f.fbq)return;n=f.fbq=function(){n.callMethod? n.callMethod.apply(n,arguments):n.queue.push(arguments)}; if(!f._fbq)f._fbq=n;n.push=n;n.loaded=!0;n.version='2.0'; n.queue=[];t=b.createElement(e);t.async=!0; t.src=v;s=b.getElementsByTagName(e)[0]; s.parentNode.insertBefore(t,s)}(window, document,'script', 'https://connect.facebook.net/en_US/fbevents.js'); fbq('init', " + pixel_id + ");";
-                _this.renderer.appendChild(_this.document.body, new_analityc_script);
-                _this.enabled = true;
+                if (!_this.document.getElementById('facebook_pixel')) {
+                    var new_analityc_script = _this.renderer.createElement('script');
+                    new_analityc_script.id = "facebook_pixel";
+                    new_analityc_script.type = 'text/javascript';
+                    new_analityc_script.text = "!function(f,b,e,v,n,t,s) {if(f.fbq)return;n=f.fbq=function(){n.callMethod? n.callMethod.apply(n,arguments):n.queue.push(arguments)}; if(!f._fbq)f._fbq=n;n.push=n;n.loaded=!0;n.version='2.0'; n.queue=[];t=b.createElement(e);t.async=!0; t.src=v;s=b.getElementsByTagName(e)[0]; s.parentNode.insertBefore(t,s)}(window, document,'script', 'https://connect.facebook.net/en_US/fbevents.js'); fbq('init', " + pixel_id + ");";
+                    _this.renderer.appendChild(_this.document.body, new_analityc_script);
+                    _this.enabled = true;
+                }
                 setTimeout(function () { return _this.callEvent('initialize'); }, 1000);
             };
             this.callEvent = function (event_name, data) {
@@ -2396,14 +2433,18 @@
         }
         GoogleAnalyticsService.prototype.initialize = function (gtm_id) {
             var _this = this;
-            var declaration = this.renderer.createElement('script');
-            declaration.async = true;
-            declaration.src = "https://www.googletagmanager.com/gtag/js?id=" + gtm_id;
-            var initialization = this.renderer.createElement('script');
-            initialization.text = "window.dataLayer = window.dataLayer || []; function gtag(){dataLayer.push(arguments);} gtag('js', new Date()); gtag('config', '" + gtm_id + "')";
-            this.renderer.appendChild(this.document.head, initialization);
-            this.renderer.appendChild(this.document.head, declaration);
-            this.enabled = true;
+            if (!document.getElementById('google_tag_manager')) {
+                console.log('hay elemento');
+                var declaration = this.renderer.createElement('script');
+                declaration.async = true;
+                declaration.id = 'google_tag_manager';
+                declaration.src = "https://www.googletagmanager.com/gtag/js?id=" + gtm_id;
+                var initialization = this.renderer.createElement('script');
+                initialization.text = "window.dataLayer = window.dataLayer || []; function gtag(){dataLayer.push(arguments);} gtag('js', new Date()); gtag('config', '" + gtm_id + "')";
+                this.renderer.appendChild(this.document.head, initialization);
+                this.renderer.appendChild(this.document.head, declaration);
+                this.enabled = true;
+            }
             setTimeout(function () { return _this.startListeningPageViews(gtm_id); }, 1000);
         };
         GoogleAnalyticsService.ctorParameters = function () { return [
@@ -2477,29 +2518,31 @@
             };
             this.translateEventName = function (event_name) {
                 switch (event_name) {
-                    case 'view_item': return 'view_item_gtm';
-                    case 'view_item_list': return 'view_item_list_gtm';
-                    case 'checkout_init': return 'begin_checkout_gtm';
-                    case 'shipping_info': return 'add_shipping_info_gtm';
-                    case 'add_payment_info': return 'add_payment_info_gtm';
-                    case 'purchase': return 'purchase_gtm';
-                    case 'add_to_cart': return 'add_to_cart_gtm';
-                    case 'remove_from_cart': return 'remove_from_cart_gtm';
-                    case 'sign_up': return 'sign_up_gtm';
+                    case 'view_item': return 'view_item';
+                    case 'view_item_list': return 'view_item_list';
+                    case 'checkout_init': return 'begin_checkout';
+                    case 'shipping_info': return 'add_shipping_info';
+                    case 'add_payment_info': return 'add_payment_info';
+                    case 'purchase': return 'purchase';
+                    case 'add_to_cart': return 'add_to_cart';
+                    case 'remove_from_cart': return 'remove_from_cart';
+                    case 'sign_up': return 'sign_up';
+                    case 'select_promotion': return 'select_promotion';
                     default: return null;
                 }
             };
             this.evalEvent = function (event_name, data) {
                 switch (event_name) {
-                    case 'view_item_gtm': return _this.toViewItem(data);
-                    case 'view_item_list_gtm': return _this.toViewItemList(data);
-                    case 'checkout_init_gtm': return _this.toCheckoutInit(data);
-                    case 'shipping_info_gtm': return _this.toShippingInfo(data);
-                    case 'add_payment_info_gtm': return _this.toPaymentInfo(data);
-                    case 'purchase_gtm': return _this.toPurchase(data);
-                    case 'add_to_cart_gtm': return _this.toAddToCart(data);
-                    case 'remove_from_cart_gtm': return _this.toRemoveToCart(data);
-                    case 'sign_up_gtm': return _this.toSignUp(data);
+                    case 'view_item': return _this.toViewItem(data);
+                    case 'view_item_list': return _this.toViewItemList(data);
+                    case 'checkout_init': return _this.toCheckoutInit(data);
+                    case 'shipping_info': return _this.toShippingInfo(data);
+                    case 'add_payment_info': return _this.toPaymentInfo(data);
+                    case 'purchase': return _this.toPurchase(data);
+                    case 'add_to_cart': return _this.toAddToCart(data);
+                    case 'remove_from_cart': return _this.toRemoveToCart(data);
+                    case 'sign_up': return _this.toSignUp(data);
+                    case 'select_promotion': return _this.toSelectPromotion(data);
                     default: return data;
                 }
             };
@@ -2513,13 +2556,28 @@
                     value: data.totals.total,
                     transaction_id: data.number,
                     countItems: ((_a = data.items) === null || _a === void 0 ? void 0 : _a.length) || 0,
-                    items: data.items.map(function (item) { return ({
-                        id: item.product.id,
-                        name: item.product.name,
-                        category: item.product.category,
-                        price: item.total,
-                        quantity: item.quantity
-                    }); })
+                    items: data.items.map(function (item) {
+                        var _a, _b, _c, _d;
+                        return ({
+                            item_id: item.product.id,
+                            item_name: item.product.name,
+                            //coupon:'',
+                            discount: item.product.discount || 0,
+                            //index:'',
+                            item_brand: ((_a = item.product.attributes) === null || _a === void 0 ? void 0 : _a.length) ? item.product.attributes[0].name : '',
+                            item_category: item.product.category,
+                            // item_category2: product.category,
+                            // item_category3: product.category,
+                            // item_category4: product.category,
+                            // item_category5: product.category,
+                            //item_list_id: '',
+                            //item_list_name: '',
+                            item_variant: ((_b = item.product.variants[0]) === null || _b === void 0 ? void 0 : _b.code) || '',
+                            //location_id: '',
+                            price: ((_c = item.product.variants[0]) === null || _c === void 0 ? void 0 : _c.saleprice) || ((_d = item.product.variants[0]) === null || _d === void 0 ? void 0 : _d.price),
+                            quantity: item.product.quantity || 1,
+                        });
+                    })
                 };
             };
             this.toCheckoutInit = function (data) {
@@ -2527,13 +2585,28 @@
                 return {
                     coupon: _this.toCartDiscount(data),
                     currency: data.currency || "USD",
-                    items: data.items.map(function (item) { return ({
-                        id: item.product.id,
-                        name: item.product.name,
-                        category: item.product.category,
-                        price: item.total,
-                        quantity: item.quantity
-                    }); }),
+                    items: data.items.map(function (item) {
+                        var _a, _b, _c, _d;
+                        return ({
+                            item_id: item.product.id,
+                            item_name: item.product.name,
+                            //coupon:'',
+                            discount: item.product.discount || 0,
+                            //index:'',
+                            item_brand: ((_a = item.product.attributes) === null || _a === void 0 ? void 0 : _a.length) ? item.product.attributes[0].name : '',
+                            item_category: item.product.category,
+                            // item_category2: product.category,
+                            // item_category3: product.category,
+                            // item_category4: product.category,
+                            // item_category5: product.category,
+                            //item_list_id: '',
+                            //item_list_name: '',
+                            item_variant: ((_b = item.product.variants[0]) === null || _b === void 0 ? void 0 : _b.code) || '',
+                            //location_id: '',
+                            price: ((_c = item.product.variants[0]) === null || _c === void 0 ? void 0 : _c.saleprice) || ((_d = item.product.variants[0]) === null || _d === void 0 ? void 0 : _d.price),
+                            quantity: item.product.quantity || 1,
+                        });
+                    }),
                     value: ((_a = data.totals) === null || _a === void 0 ? void 0 : _a.total) || 0,
                 };
             };
@@ -2553,11 +2626,9 @@
             };
             this.disable = function () { return _this.enabled = false; };
             this.toViewItem = function (product) {
-                var _a, _b;
                 return {
                     currency: product.currency,
-                    items: [_this.toItem(product)],
-                    value: ((_a = product.variants[0]) === null || _a === void 0 ? void 0 : _a.saleprice) || ((_b = product.variants[0]) === null || _b === void 0 ? void 0 : _b.price),
+                    items: [_this.toItem(product)]
                 };
             };
             this.toViewItemList = function (data) {
@@ -2566,6 +2637,11 @@
                     item_list_name: data.item_list_name || 'Collection',
                     item_list_id: data.item_list_id || 'collection'
                 };
+                console.log('toViewItemList ', {
+                    items: data.products.map(function (product) { return _this.toItem(product); }),
+                    item_list_name: data.item_list_name || 'Collection',
+                    item_list_id: data.item_list_id || 'collection'
+                });
             };
             this.toRemoveToCart = function (product) {
                 var _a, _b;
@@ -2577,13 +2653,24 @@
                 };
             };
             this.toItem = function (product) {
-                var _a, _b, _c;
+                var _a, _b, _c, _d;
                 return ({
-                    item_name: product.name,
                     item_id: product.id,
+                    item_name: product.name,
+                    //coupon:'',
+                    discount: product.discount || 0,
+                    //index:'',
                     item_brand: ((_a = product.attributes) === null || _a === void 0 ? void 0 : _a.length) ? product.attributes[0].name : '',
                     item_category: product.category,
-                    price: ((_b = product.variants[0]) === null || _b === void 0 ? void 0 : _b.saleprice) || ((_c = product.variants[0]) === null || _c === void 0 ? void 0 : _c.price),
+                    // item_category2: product.category,
+                    // item_category3: product.category,
+                    // item_category4: product.category,
+                    // item_category5: product.category,
+                    //item_list_id: '',
+                    //item_list_name: '',
+                    item_variant: ((_b = product.variants[0]) === null || _b === void 0 ? void 0 : _b.code) || '',
+                    //location_id: '',
+                    price: ((_c = product.variants[0]) === null || _c === void 0 ? void 0 : _c.saleprice) || ((_d = product.variants[0]) === null || _d === void 0 ? void 0 : _d.price),
                     quantity: product.quantity || 1,
                 });
             };
@@ -2592,15 +2679,30 @@
                 return {
                     coupon: _this.toCartDiscount(data),
                     currency: data.currency || "USD",
-                    items: data.items.map(function (item) { return ({
-                        id: item.product.id,
-                        name: item.product.name,
-                        category: item.product.category,
-                        price: item.total,
-                        quantity: item.quantity
-                    }); }),
                     payment_type: ((_b = (_a = data.payments[0]) === null || _a === void 0 ? void 0 : _a.method) === null || _b === void 0 ? void 0 : _b.code) || 'not-payments',
                     value: ((_c = data.totals) === null || _c === void 0 ? void 0 : _c.total) || 0,
+                    items: data.items.map(function (item) {
+                        var _a, _b, _c, _d;
+                        return ({
+                            item_id: item.product.id,
+                            item_name: item.product.name,
+                            //coupon:'',
+                            discount: item.product.discount || 0,
+                            //index:'',
+                            item_brand: ((_a = item.product.attributes) === null || _a === void 0 ? void 0 : _a.length) ? item.product.attributes[0].name : '',
+                            item_category: item.product.category,
+                            // item_category2: product.category,
+                            // item_category3: product.category,
+                            // item_category4: product.category,
+                            // item_category5: product.category,
+                            //item_list_id: '',
+                            //item_list_name: '',
+                            item_variant: ((_b = item.product.variants[0]) === null || _b === void 0 ? void 0 : _b.code) || '',
+                            //location_id: '',
+                            price: ((_c = item.product.variants[0]) === null || _c === void 0 ? void 0 : _c.saleprice) || ((_d = item.product.variants[0]) === null || _d === void 0 ? void 0 : _d.price),
+                            quantity: item.product.quantity || 1,
+                        });
+                    }),
                 };
             };
             this.toShippingInfo = function (data) {
@@ -2608,20 +2710,40 @@
                 return {
                     coupon: _this.toCartDiscount(data),
                     currency: data.currency || "USD",
-                    items: data.items.map(function (item) { return ({
-                        id: item.product.id,
-                        name: item.product.name,
-                        category: item.product.category,
-                        price: item.total,
-                        quantity: item.quantity
-                    }); }),
                     shipping_tier: ((_b = (_a = data.shipments[0]) === null || _a === void 0 ? void 0 : _a.method) === null || _b === void 0 ? void 0 : _b.code) || 'not-shipping',
                     value: ((_c = data.totals) === null || _c === void 0 ? void 0 : _c.total) || 0,
+                    items: data.items.map(function (item) {
+                        var _a, _b, _c, _d;
+                        return ({
+                            item_id: item.product.id,
+                            item_name: item.product.name,
+                            //coupon:'',
+                            discount: item.product.discount || 0,
+                            //index:'',
+                            item_brand: ((_a = item.product.attributes) === null || _a === void 0 ? void 0 : _a.length) ? item.product.attributes[0].name : '',
+                            item_category: item.product.category,
+                            // item_category2: product.category,
+                            // item_category3: product.category,
+                            // item_category4: product.category,
+                            // item_category5: product.category,
+                            //item_list_id: '',
+                            //item_list_name: '',
+                            item_variant: ((_b = item.product.variants[0]) === null || _b === void 0 ? void 0 : _b.code) || '',
+                            //location_id: '',
+                            price: ((_c = item.product.variants[0]) === null || _c === void 0 ? void 0 : _c.saleprice) || ((_d = item.product.variants[0]) === null || _d === void 0 ? void 0 : _d.price),
+                            quantity: item.product.quantity || 1,
+                        });
+                    }),
                 };
             };
             this.toSignUp = function (data) {
                 return __assign$5({}, data);
             };
+            this.toSelectPromotion = function (data) {
+                return {
+                    prueba: true
+                };
+            };
         }
         GTMService.prototype.getDataLayer = function () {
             var window = this.browserGlobals.windowRef();
@@ -5601,7 +5723,7 @@
             this.waitUntilData = function (next) {
                 var subscription = _this.parameters.subscribe(function (res) {
                     if (res) {
-                        _this.insertAnalitycs();
+                        next(res);
                         subscription.unsubscribe();
                     }
                 });
@@ -7909,7 +8031,7 @@
                 ((_a = items) === null || _a === void 0 ? void 0 : _a.length) && _this.cartService.addAllToCart(items);
             };
             _this.getObjectWithVariant = function () {
-                return { type: 'color', code: 'color', defaultFirstOption: false, checkIfStock: true };
+                return _this.consts.getParamsProductsWithUniqueVariant();
             };
             _this.paramsSrv.parameters.subscribe(function (param) { return _this.params = param; });
             _this.defaultFilters = _this.consts.getDefaultFilters();
@@ -9119,22 +9241,47 @@
                 return _this.productsService.getProductsWithUniqueVariant([product], withOption);
             };
         }
-        ProductDetailService.prototype.addToCart = function (quantity) {
+        /**
+         * @description agrega/actualiza un item en el carrito
+         * @param quantity cantidad a agregar
+         * @param variant_code **(opcional)** codigo de la variante seleccionada del producto.
+         * @returns
+         */
+        ProductDetailService.prototype.addToCart = function (quantity, variant_code) {
             quantity = parseInt(quantity);
             if (!this.variants.length) {
                 this.toastrService.show('cant-buy');
                 return;
             }
             var product_selected = _.clone(this.productSubject.value);
-            if (this.variants.length > 1 || this.variants.length == 0 || this.asociatedDataSubject.value.stock == 0) {
-                this.variants.length == 0 && this.toastrService.show('no-variants');
-                (this.variants.length > 1 && this.asociatedDataSubject.value.stock > 0) && this.toastrService.show('variants-left');
-                (this.variants.length != 0 && this.asociatedDataSubject.value.stock == 0) && this.toastrService.show('out-of-stock');
-                return;
+            var variant;
+            switch (this.variants.length) {
+                case 0:
+                    this.toastrService.show('no-variants');
+                    break;
+                case 1:
+                    this.asociatedDataSubject.value.stock == 0 ?
+                        this.toastrService.show('out-of-stock') :
+                        variant = this.variants[0];
+                    break;
+                default:
+                    if (variant_code) {
+                        variant = this.variants.find(function (variant) { return variant.code === variant_code; });
+                        if (variant.stock == 0) {
+                            this.toastrService.show('out-of-stock');
+                            variant = undefined;
+                        }
+                    }
+                    else {
+                        this.toastrService.show('variants-left');
+                    }
+                    break;
             }
+            if (!variant)
+                return;
             if (!this.validateQuantity(quantity))
                 return;
-            this.cartService.addToCart(this.makeAffordableProduct(product_selected), quantity, this.variants[0].code);
+            this.cartService.addToCart(this.makeAffordableProduct(product_selected), quantity, variant.code);
         };
         ;
         ProductDetailService.prototype.makeAffordableProduct = function (product_selected) {
@@ -9443,8 +9590,11 @@
                     _this.quantity > 1 ? _this.quantity = _this.quantity - 1 : null;
                 }
             };
+            /**
+             * @description Agrega el producto al carrito. Si es una variante se enviara el codigo de la variante.
+             */
             _this.addToCart = function () {
-                _this.productService.addToCart(+_this.quantity);
+                _this.product.currentOption ? _this.productService.addToCart(+_this.quantity, _this.product.currentOption.variantCode) : _this.productService.addToCart(+_this.quantity);
             };
             _this.getBrandName = function (product) {
                 if (product && product.attributes)
@@ -16625,7 +16775,9 @@
                     }
                 });
                 if (!existMark) {
-                    existMark = _this.productDirective.variants.find(function (v) { return v.stock > 0; }) == undefined;
+                    existMark = _this.productDirective.variant_id ?
+                        _this.productDirective.variants.find(function (v) { return v.code == _this.productDirective.variant_id && v.stock > 0; }) == undefined :
+                        _this.productDirective.variants.find(function (v) { return v.stock > 0; }) == undefined;
                 }
                 return existMark;
             };