ng-easycommerce 0.0.653 → 0.0.655-beta.1

package/README.md

@@ -1,3 +1,9 @@
+# version 0.0.655-beta.1
+- Soporte para agregar, editar y borrar notas en ítems del carrito:
+  - `product-detail-ec`: prellenar textarea con nota existente al volver a la ficha.
+  - `cart-ec`: mantener nota al actualizar cantidades.
+# version 0.0.654
+- funcion para excluir paises en el formulario en el proceso del checkout
 # version 0.0.653
 - fix: `ecCurrencySymbol` pure:false
 - **Moneda (currency):** inicializar la moneda activa a partir de `baseCurrency` del canal, cargando siempre `/shop-api/currencies` aunque `applyCurrencyExchange` sea `false`.

package/bundles/ng-easycommerce.umd.js

@@ -499,6 +499,11 @@
              * @example ['AR','ES','GB']
              */
             this.countries = [];
+            /**
+             * @description contiene un arreglo de string cuyo contenido son los codigos de los paises a excluir.
+             * @example ['GB']
+             */
+            this.excludedCountries = [];
             /**
              *
              * @param countries debe contener los codigos de los paises que se quiere mostrar
@@ -4744,12 +4749,22 @@
                 _this.updateLocalCart();
                 _this.requestInProcess.next(false);
             };
-            this.updateCartItemQuantity = function (variant_id, quantity) {
-                var newQuantity = _this.items.find(function (item) { return item.variant_id == variant_id; }).quantity = quantity;
+            this.updateCartItemQuantity = function (variant_id, quantity, comments) {
+                var normalizedComments = comments !== undefined ? ((comments !== null && comments !== void 0 ? comments : '')).trim() : undefined;
+                var newItems = _this.items.map(function (it) {
+                    if (it.variant_id !== variant_id)
+                        return it;
+                    var updated = __assign$a(__assign$a({}, it), { quantity: Number(quantity) });
+                    if (normalizedComments !== undefined) {
+                        updated.comments = normalizedComments;
+                    }
+                    return updated;
+                });
+                _this.items = newItems;
                 _this.cartItemsSubject.next(_this.items);
                 _this.requestInProcess.next(false);
                 _this.updateLocalCart();
-                _this.toastrService.show('product-updated', { quantity: newQuantity });
+                _this.toastrService.show('product-updated', { quantity: quantity });
             };
             this.appendToCart = function (cart) {
                 _this.updateCartObj(cart);
@@ -4771,11 +4786,11 @@
                 // this.googleAnalytics.removeFromCart(product);
                 _this.analyticsService.callEvent('remove_from_cart', __assign$a(__assign$a({}, product), { currency: _this.consts.currency.code }));
             };
-            this.addIfAllreadyExists = function (product, variant_id, quantityAdd) {
+            this.addIfAllreadyExists = function (product, variant_id, quantityAdd, comments) {
                 if (quantityAdd === void 0) { quantityAdd = 1; }
                 return _this.items.find(function (item, index) {
                     if (item.product.id == product.id && item.variant_id == variant_id) {
-                        _this.updateItemQuantity(item, _this.findItem(product.id).quantity + quantityAdd);
+                        _this.updateItemQuantity(item, _this.findItem(product.id).quantity + quantityAdd, comments);
                         return true;
                     }
                     return false;
@@ -4829,7 +4844,7 @@
                     return;
                 }
                 _this.requestInProcess.next(true);
-                var added = _this.addIfAllreadyExists(product, variant_id, quantity);
+                var added = _this.addIfAllreadyExists(product, variant_id, quantity, comments);
                 if (!added) {
                     var payload = {
                         productCode: product.id,
@@ -4869,7 +4884,7 @@
                 !added && _this.connection.post(_this.addItemApi(), { productCode: product.id, quantity: quantity, variantCode: variant_id, id: id || '', order_item_id: order_item_id || '', lot_quantity: lot_quantity || '', unit_price: unit_price || '', unit_total: unit_total || '', ajustement_total: ajustement_total || '', total_lot: total_lot || '', lot_status: lot_status || '', date_request: date_request || '', notes: notes || '', shipping_address_id: shipping_address_id || '', shipping_address_name: shipping_address_name || '', action: action || 'newlot' })
                     .subscribe(function (res) { return _this.appendToCart(res); }, function (err) { return _this.handleError(err); });
             };
-            this.addToCartPromise = function (product, quantity, variant_id) { return __awaiter$5(_this, void 0, void 0, function () {
+            this.addToCartPromise = function (product, quantity, variant_id, comments) { return __awaiter$5(_this, void 0, void 0, function () {
                 var added, result;
                 return __generator$5(this, function (_a) {
                     switch (_a.label) {
@@ -4879,7 +4894,7 @@
                                 return [2 /*return*/];
                             }
                             this.requestInProcess.next(true);
-                            added = this.addIfAllreadyExists(product, variant_id, quantity);
+                            added = this.addIfAllreadyExists(product, variant_id, quantity, comments);
                             if (!!added) return [3 /*break*/, 2];
                             return [4 /*yield*/, (this.connection.post(this.addItemApi(), { productCode: product.id, quantity: quantity, variantCode: variant_id }).toPromise())];
                         case 1:
@@ -4925,13 +4940,18 @@
                 items = items.filter(function (itemParam) { return !_this.items.find(function (item) { return itemParam.variantCode == item.variant_id; }); });
                 return __spread$3(items, paramsMerge);
             };
-            this.updateItemQuantity = function (item, quantity) {
+            this.updateItemQuantity = function (item, quantity, comments) {
                 if (_this.validateQuantity(item, quantity) && (_this.validatePriceAndCredits(item, quantity))) {
                     _this.requestInProcess.next(true);
+                    var payload = { quantity: Number(quantity) };
+                    if (comments !== undefined) {
+                        var cleaned = ((comments !== null && comments !== void 0 ? comments : '')).trim();
+                        payload.comments = cleaned;
+                    }
                     _this.connection
-                        .put(_this.updateItemQuantityApi(_this.findItemByIdVariant(item.variant_id)), { 'quantity': Number(quantity) })
+                        .put(_this.updateItemQuantityApi(_this.findItemByIdVariant(item.variant_id)), payload)
                         .pipe(operators.finalize(function () { return _this.requestInProcess.next(false); }))
-                        .subscribe(function (res) { return _this.updateCartObj(res) && _this.updateCartItemQuantity(item.variant_id, Number(quantity)); }, function (err) { return _this.handleError(err); });
+                        .subscribe(function (res) { return _this.updateCartObj(res) && _this.updateCartItemQuantity(item.variant_id, Number(quantity), comments); }, function (err) { return _this.handleError(err); });
                 }
             };
             this.validateQuantity = function (item, quantity) {
@@ -7578,7 +7598,7 @@
         };
         CartEcComponent.prototype.actualizarCantidad = function (item, cantidad, stock, id) {
             var _this = this;
-            var _a;
+            var _a, _b, _c;
             if (this.cartLoading) {
                 return;
             }
@@ -7598,10 +7618,11 @@
                     newQuantity = Math.round(newQuantity / step) * step;
                 }
             }
+            var keepSameComment = (_c = (_b = item) === null || _b === void 0 ? void 0 : _b.comments, (_c !== null && _c !== void 0 ? _c : undefined));
             if (id) {
                 this.isDisabled = true; // Actualiza la propiedad vinculada a `[disabled]`
                 if (newQuantity > 0 && newQuantity <= stock) {
-                    this.cartService.updateItemQuantity(item, newQuantity);
+                    this.cartService.updateItemQuantity(item, newQuantity, keepSameComment);
                 }
                 else {
                     this.toastrService.show('out-of-stock-actually');
@@ -7612,7 +7633,7 @@
             }
             else {
                 if (newQuantity > 0 && newQuantity <= stock) {
-                    this.cartService.updateItemQuantity(item, newQuantity);
+                    this.cartService.updateItemQuantity(item, newQuantity, keepSameComment);
                 }
                 else {
                     this.toastrService.show('out-of-stock-actually');
@@ -8177,18 +8198,24 @@
              * @returns un arreglo de countries.
              */
             _this.filterCountryByCode = function (countries) {
+                // 1. Si hay países EXCLUIDOS, quítalos siempre
+                var filtered = countries;
+                if (_this.consts.excludedCountries && _this.consts.excludedCountries.length > 0) {
+                    filtered = filtered.filter(function (elem) { return !_this.consts.excludedCountries.includes(elem.code); });
+                }
+                // 2. Si hay países INCLUIDOS, aplica el filtro de inclusión
                 if (_this.consts.getCountries().length > 0) {
-                    var countriesFiltered = countries.filter(function (elem) { return _this.consts.getCountries().includes(elem.code); });
+                    var countriesFiltered = filtered.filter(function (elem) { return _this.consts.getCountries().includes(elem.code); });
                     if (countriesFiltered.length > 0) {
                         return countriesFiltered;
                     }
                     else {
                         console.error('El/los codigo/s ingresado/s no coinciden con los provistos desde el backend');
-                        return countries;
+                        return filtered;
                     }
                 }
                 else {
-                    return countries;
+                    return filtered;
                 }
             };
             _this.showFormFacturacion = function () {
@@ -11181,6 +11208,22 @@
         else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
         return c > 3 && r && Object.defineProperty(target, key, r), r;
     };
+    var __read$7 = (this && this.__read) || function (o, n) {
+        var m = typeof Symbol === "function" && o[Symbol.iterator];
+        if (!m) return o;
+        var i = m.call(o), r, ar = [], e;
+        try {
+            while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+        }
+        catch (error) { e = { error: error }; }
+        finally {
+            try {
+                if (r && !r.done && (m = i["return"])) m.call(i);
+            }
+            finally { if (e) throw e.error; }
+        }
+        return ar;
+    };
     var ProductDetailEcComponent = /** @class */ (function (_super) {
         __extends$w(ProductDetailEcComponent, _super);
         function ProductDetailEcComponent(productService, consts, activedRoute, cartService, optionsService, productsService, analyticsService, router, toastrService, meta, injector) {
@@ -11209,7 +11252,8 @@
             _this.enableFieldNotesInArticleFile = false;
             _this.addToCart = function () {
                 var _a;
-                _this.quantity > 0 && _this.productService.addToCart(_this.quantity, undefined, ((_a = _this.comments) === null || _a === void 0 ? void 0 : _a.trim()) || null);
+                var note = ((_a = _this.comments) === null || _a === void 0 ? void 0 : _a.trim()) || null;
+                _this.quantity > 0 && _this.productService.addToCart(_this.quantity, undefined, note);
             };
             _this.addAllProductosToCart = function () {
                 var _a, _b;
@@ -11333,7 +11377,31 @@
             return cadena.replace(expresionRegular, '');
         };
         ProductDetailEcComponent.prototype.ngOnInit = function () {
+            var _this = this;
             this.ecOnInit();
+            // Prellenar comentarios cuando:
+            // - cargue el producto
+            // - cambie la variante seleccionada (asociatedData$)
+            // - cambien los ítems del carrito        
+            this.prefillSub = rxjs.combineLatest([
+                this.productService.product$.pipe(operators.filter(function (p) { return !!p && !!p.id; })),
+                this.productService.asociatedData$.pipe(operators.startWith(null)),
+                this.cartService.cartItems.pipe(operators.startWith([])),
+            ]).subscribe(function (_a) {
+                var _b = __read$7(_a, 3), product = _b[0], data = _b[1], items = _b[2];
+                var _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+                var variantId = (_k = (_f = (_d = (_c = data) === null || _c === void 0 ? void 0 : _c.variantCode, (_d !== null && _d !== void 0 ? _d : (_e = data) === null || _e === void 0 ? void 0 : _e.variant_id)), (_f !== null && _f !== void 0 ? _f : (_j = (_h = (_g = product) === null || _g === void 0 ? void 0 : _g.variants) === null || _h === void 0 ? void 0 : _h[0]) === null || _j === void 0 ? void 0 : _j.code)), (_k !== null && _k !== void 0 ? _k : null));
+                var match = (_l = items) === null || _l === void 0 ? void 0 : _l.find(function (it) {
+                    var _a, _b, _c, _d;
+                    return ((_b = (_a = it) === null || _a === void 0 ? void 0 : _a.product) === null || _b === void 0 ? void 0 : _b.id) === ((_c = product) === null || _c === void 0 ? void 0 : _c.id) &&
+                        (variantId ? ((_d = it) === null || _d === void 0 ? void 0 : _d.variant_id) === variantId : true);
+                });
+                _this.comments = (_o = (_m = match) === null || _m === void 0 ? void 0 : _m.comments, (_o !== null && _o !== void 0 ? _o : ''));
+            });
+        };
+        ProductDetailEcComponent.prototype.ngOnDestroy = function () {
+            var _a;
+            (_a = this.prefillSub) === null || _a === void 0 ? void 0 : _a.unsubscribe();
         };
         ProductDetailEcComponent.prototype.scroll = function () {
             var el = this.contact.nativeElement;
@@ -11482,7 +11550,6 @@
         ProductEcComponent.prototype.ngOnChanges = function () {
         };
         ProductEcComponent.prototype.selectItem = function (product) {
-            console.log('entro');
             this.analyticsService.callEvent('select_item', product);
         };
         ProductEcComponent.ctorParameters = function () { return [
@@ -12753,7 +12820,7 @@
         else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
         return c > 3 && r && Object.defineProperty(target, key, r), r;
     };
-    var __read$7 = (this && this.__read) || function (o, n) {
+    var __read$8 = (this && this.__read) || function (o, n) {
         var m = typeof Symbol === "function" && o[Symbol.iterator];
         if (!m) return o;
         var i = m.call(o), r, ar = [], e;
@@ -12797,7 +12864,7 @@
             var _this = this;
             var state;
             rxjs.combineLatest([this.activedRoute.params, this.activedRoute.queryParams]).subscribe(function (_a) {
-                var _b = __read$7(_a, 2), queryRouter = _b[0], queryParams = _b[1];
+                var _b = __read$8(_a, 2), queryRouter = _b[0], queryParams = _b[1];
                 state = queryRouter.state;
                 state && state == 'statuspayment' && (state = queryParams.status);
                 console.log('PARAMETROS STATE  -> ', state);
@@ -15420,12 +15487,10 @@
                             _this.loading = false;
                         }
                         else {
-                            /* console.log('Entro al else'); */
                             _this.renderPayPal();
                         }
                     }
                     catch (error) {
-                        /* console.log('Entro al catch'); */
                         _this.renderPayPal();
                     }
                 }, 1000);
@@ -16098,7 +16163,7 @@
         else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
         return c > 3 && r && Object.defineProperty(target, key, r), r;
     };
-    var __read$8 = (this && this.__read) || function (o, n) {
+    var __read$9 = (this && this.__read) || function (o, n) {
         var m = typeof Symbol === "function" && o[Symbol.iterator];
         if (!m) return o;
         var i = m.call(o), r, ar = [], e;
@@ -16130,7 +16195,7 @@
             var _this = this;
             var token;
             rxjs.combineLatest([this.activedRoute.params, this.activedRoute.queryParams]).subscribe(function (_a) {
-                var _b = __read$8(_a, 2), queryRouter = _b[0], queryParams = _b[1];
+                var _b = __read$9(_a, 2), queryRouter = _b[0], queryParams = _b[1];
                 token = queryRouter.token;
                 console.log('PARAMETROS token  -> ', token);
                 _this.cartService.loadCartByToken(token).then(function (res) {
@@ -19276,7 +19341,7 @@
             });
         };
         SidebarEcComponent.prototype.actualizarCantidad = function (item, cantidad, stock, id) {
-            var _a;
+            var _a, _b, _c;
             if (this.cartLoading) {
                 return;
             }
@@ -19296,13 +19361,14 @@
                     newQuantity = Math.round(newQuantity / step) * step;
                 }
             }
+            var keepSameComment = (_c = (_b = item) === null || _b === void 0 ? void 0 : _b.comments, (_c !== null && _c !== void 0 ? _c : undefined));
             if (id) {
                 var elem_1 = document.getElementById(id);
                 if (elem_1) {
                     elem_1.disabled = true;
                 }
                 if (newQuantity > 0 && newQuantity <= stock) {
-                    this.cartService.updateItemQuantity(item, newQuantity);
+                    this.cartService.updateItemQuantity(item, newQuantity, keepSameComment);
                 }
                 else {
                     this.toastrService.show('out-of-stock-actually');
@@ -19315,7 +19381,7 @@
             }
             else {
                 if (newQuantity > 0 && newQuantity <= stock) {
-                    this.cartService.updateItemQuantity(item, newQuantity);
+                    this.cartService.updateItemQuantity(item, newQuantity, keepSameComment);
                 }
             }
         };
@@ -20114,7 +20180,7 @@
         else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
         return c > 3 && r && Object.defineProperty(target, key, r), r;
     };
-    var __read$9 = (this && this.__read) || function (o, n) {
+    var __read$a = (this && this.__read) || function (o, n) {
         var m = typeof Symbol === "function" && o[Symbol.iterator];
         if (!m) return o;
         var i = m.call(o), r, ar = [], e;
@@ -20180,7 +20246,7 @@
             var forceShow = mode === 'alwaysShowDecimals';
             var forceHide = mode === 'alwaysHideDecimals';
             var showDecimals = forceShow ? true : forceHide ? false : !withoutDecimalGlobal;
-            var _b = __read$9((value || '').split(','), 2), ent = _b[0], _c = _b[1], dec = _c === void 0 ? '00' : _c;
+            var _b = __read$a((value || '').split(','), 2), ent = _b[0], _c = _b[1], dec = _c === void 0 ? '00' : _c;
             if (showDecimals) {
                 if (dec.length > 2)
                     dec = dec.slice(0, 2);