ng-easycommerce 0.0.653 → 0.0.655-beta.1

package/fesm5/ng-easycommerce.js

@@ -7,7 +7,7 @@ import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import { ToastrService, ToastrModule } from 'ngx-toastr';
 import { ReplaySubject, of, BehaviorSubject, forkJoin, combineLatest, Observable, throwError } from 'rxjs';
 import 'rxjs/add/operator/map';
-import { take, map, catchError, filter, mapTo, finalize, skipWhile, concatMap } from 'rxjs/operators';
+import { take, map, catchError, filter, mapTo, finalize, startWith, skipWhile, concatMap } from 'rxjs/operators';
 import 'rxjs/add/operator/catch';
 import 'rxjs/add/observable/of';
 import * as moment from 'moment';
@@ -513,6 +513,11 @@ var Constants = /** @class */ (function () {
          * @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
@@ -4758,12 +4763,22 @@ var CartService = /** @class */ (function () {
             _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);
@@ -4785,11 +4800,11 @@ var CartService = /** @class */ (function () {
             // 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;
@@ -4843,7 +4858,7 @@ var CartService = /** @class */ (function () {
                 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,
@@ -4883,7 +4898,7 @@ var CartService = /** @class */ (function () {
             !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) {
@@ -4893,7 +4908,7 @@ var CartService = /** @class */ (function () {
                             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:
@@ -4939,13 +4954,18 @@ var CartService = /** @class */ (function () {
             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(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) {
@@ -7592,7 +7612,7 @@ var CartEcComponent = /** @class */ (function (_super) {
     };
     CartEcComponent.prototype.actualizarCantidad = function (item, cantidad, stock, id) {
         var _this = this;
-        var _a;
+        var _a, _b, _c;
         if (this.cartLoading) {
             return;
         }
@@ -7612,10 +7632,11 @@ var CartEcComponent = /** @class */ (function (_super) {
                 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');
@@ -7626,7 +7647,7 @@ var CartEcComponent = /** @class */ (function (_super) {
         }
         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');
@@ -8191,18 +8212,24 @@ var DataFormEcComponent = /** @class */ (function (_super) {
          * @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 () {
@@ -11195,6 +11222,22 @@ var __decorate$14 = (this && this.__decorate) || function (decorators, target, k
     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) {
@@ -11223,7 +11266,8 @@ var ProductDetailEcComponent = /** @class */ (function (_super) {
         _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;
@@ -11347,7 +11391,31 @@ var ProductDetailEcComponent = /** @class */ (function (_super) {
         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 = combineLatest([
+            this.productService.product$.pipe(filter(function (p) { return !!p && !!p.id; })),
+            this.productService.asociatedData$.pipe(startWith(null)),
+            this.cartService.cartItems.pipe(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;
@@ -11496,7 +11564,6 @@ var ProductEcComponent = /** @class */ (function (_super) {
     ProductEcComponent.prototype.ngOnChanges = function () {
     };
     ProductEcComponent.prototype.selectItem = function (product) {
-        console.log('entro');
         this.analyticsService.callEvent('select_item', product);
     };
     ProductEcComponent.ctorParameters = function () { return [
@@ -12767,7 +12834,7 @@ var __decorate$1g = (this && this.__decorate) || function (decorators, target, k
     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;
@@ -12811,7 +12878,7 @@ var RedsysCatchEcComponent = /** @class */ (function (_super) {
         var _this = this;
         var state;
         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);
@@ -15434,12 +15501,10 @@ var PaypalExpressEcComponent = /** @class */ (function (_super) {
                         _this.loading = false;
                     }
                     else {
-                        /* console.log('Entro al else'); */
                         _this.renderPayPal();
                     }
                 }
                 catch (error) {
-                    /* console.log('Entro al catch'); */
                     _this.renderPayPal();
                 }
             }, 1000);
@@ -16112,7 +16177,7 @@ var __decorate$1D = (this && this.__decorate) || function (decorators, target, k
     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;
@@ -16144,7 +16209,7 @@ var CartLoadEcComponent = /** @class */ (function (_super) {
         var _this = this;
         var token;
         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) {
@@ -19290,7 +19355,7 @@ var SidebarEcComponent = /** @class */ (function () {
         });
     };
     SidebarEcComponent.prototype.actualizarCantidad = function (item, cantidad, stock, id) {
-        var _a;
+        var _a, _b, _c;
         if (this.cartLoading) {
             return;
         }
@@ -19310,13 +19375,14 @@ var SidebarEcComponent = /** @class */ (function () {
                 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');
@@ -19329,7 +19395,7 @@ var SidebarEcComponent = /** @class */ (function () {
         }
         else {
             if (newQuantity > 0 && newQuantity <= stock) {
-                this.cartService.updateItemQuantity(item, newQuantity);
+                this.cartService.updateItemQuantity(item, newQuantity, keepSameComment);
             }
         }
     };
@@ -20128,7 +20194,7 @@ var __decorate$27 = (this && this.__decorate) || function (decorators, target, k
     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;
@@ -20194,7 +20260,7 @@ var ecCurrencySymbolPipe = /** @class */ (function () {
         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);