ng-easycommerce 0.0.653 → 0.0.655-beta.1

package/fesm2015/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';
@@ -469,6 +469,11 @@ let Constants = class Constants {
          * @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
@@ -4032,12 +4037,22 @@ let CartService = class CartService {
             this.updateLocalCart();
             this.requestInProcess.next(false);
         };
-        this.updateCartItemQuantity = (variant_id, quantity) => {
-            let newQuantity = this.items.find(item => item.variant_id == variant_id).quantity = quantity;
+        this.updateCartItemQuantity = (variant_id, quantity, comments) => {
+            const normalizedComments = comments !== undefined ? ((comments !== null && comments !== void 0 ? comments : '')).trim() : undefined;
+            const newItems = this.items.map(it => {
+                if (it.variant_id !== variant_id)
+                    return it;
+                const updated = Object.assign(Object.assign({}, 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 });
         };
         this.appendToCart = (cart) => {
             this.updateCartObj(cart);
@@ -4058,9 +4073,9 @@ let CartService = class CartService {
             // this.googleAnalytics.removeFromCart(product);
             this.analyticsService.callEvent('remove_from_cart', Object.assign(Object.assign({}, product), { currency: this.consts.currency.code }));
         };
-        this.addIfAllreadyExists = (product, variant_id, quantityAdd = 1) => this.items.find((item, index) => {
+        this.addIfAllreadyExists = (product, variant_id, quantityAdd = 1, comments) => this.items.find((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;
@@ -4112,7 +4127,7 @@ let CartService = class CartService {
                 return;
             }
             this.requestInProcess.next(true);
-            let added = this.addIfAllreadyExists(product, variant_id, quantity);
+            let added = this.addIfAllreadyExists(product, variant_id, quantity, comments);
             if (!added) {
                 const payload = {
                     productCode: product.id,
@@ -4152,13 +4167,13 @@ let CartService = class CartService {
             !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(res => this.appendToCart(res), err => this.handleError(err));
         };
-        this.addToCartPromise = (product, quantity, variant_id) => __awaiter$5(this, void 0, void 0, function* () {
+        this.addToCartPromise = (product, quantity, variant_id, comments) => __awaiter$5(this, void 0, void 0, function* () {
             if (!this.authService.isAbleToBuy()) {
                 this.toastrService.show('must-select-customer');
                 return;
             }
             this.requestInProcess.next(true);
-            let added = this.addIfAllreadyExists(product, variant_id, quantity);
+            let added = this.addIfAllreadyExists(product, variant_id, quantity, comments);
             if (!added) {
                 let result = yield (this.connection.post(this.addItemApi(), { productCode: product.id, quantity: quantity, variantCode: variant_id }).toPromise());
                 if (!result || result.error)
@@ -4200,13 +4215,18 @@ let CartService = class CartService {
             items = items.filter(itemParam => !this.items.find(item => itemParam.variantCode == item.variant_id));
             return [...items, ...paramsMerge];
         };
-        this.updateItemQuantity = (item, quantity) => {
+        this.updateItemQuantity = (item, quantity, comments) => {
             if (this.validateQuantity(item, quantity) && (this.validatePriceAndCredits(item, quantity))) {
                 this.requestInProcess.next(true);
+                const payload = { quantity: Number(quantity) };
+                if (comments !== undefined) {
+                    const 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(() => this.requestInProcess.next(false)))
-                    .subscribe(res => this.updateCartObj(res) && this.updateCartItemQuantity(item.variant_id, Number(quantity)), err => this.handleError(err));
+                    .subscribe(res => this.updateCartObj(res) && this.updateCartItemQuantity(item.variant_id, Number(quantity), comments), err => this.handleError(err));
             }
         };
         this.validateQuantity = (item, quantity) => {
@@ -6385,7 +6405,7 @@ let CartEcComponent = class CartEcComponent extends ComponentHelper {
         this.ecOnInit();
     }
     actualizarCantidad(item, cantidad, stock, id) {
-        var _a;
+        var _a, _b, _c;
         if (this.cartLoading) {
             return;
         }
@@ -6405,10 +6425,11 @@ let CartEcComponent = class CartEcComponent extends ComponentHelper {
                 newQuantity = Math.round(newQuantity / step) * step;
             }
         }
+        const 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');
@@ -6419,7 +6440,7 @@ let CartEcComponent = class CartEcComponent extends ComponentHelper {
         }
         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');
@@ -6885,18 +6906,24 @@ let DataFormEcComponent = class DataFormEcComponent extends ComponentHelper {
          * @returns un arreglo de countries.
          */
         this.filterCountryByCode = (countries) => {
+            // 1. Si hay países EXCLUIDOS, quítalos siempre
+            let filtered = countries;
+            if (this.consts.excludedCountries && this.consts.excludedCountries.length > 0) {
+                filtered = filtered.filter(elem => !this.consts.excludedCountries.includes(elem.code));
+            }
+            // 2. Si hay países INCLUIDOS, aplica el filtro de inclusión
             if (this.consts.getCountries().length > 0) {
-                let countriesFiltered = countries.filter(elem => this.consts.getCountries().includes(elem.code));
+                let countriesFiltered = filtered.filter(elem => 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 = () => {
@@ -9311,7 +9338,8 @@ let ProductDetailEcComponent = class ProductDetailEcComponent extends ComponentH
         this.enableFieldNotesInArticleFile = false;
         this.addToCart = () => {
             var _a;
-            this.quantity > 0 && this.productService.addToCart(this.quantity, undefined, ((_a = this.comments) === null || _a === void 0 ? void 0 : _a.trim()) || null);
+            const 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 = () => {
             var _a, _b;
@@ -9430,6 +9458,28 @@ let ProductDetailEcComponent = class ProductDetailEcComponent extends ComponentH
     }
     ngOnInit() {
         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((p) => !!p && !!p.id)),
+            this.productService.asociatedData$.pipe(startWith(null)),
+            this.cartService.cartItems.pipe(startWith([])),
+        ]).subscribe(([product, data, items]) => {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+            const variantId = (_h = (_d = (_b = (_a = data) === null || _a === void 0 ? void 0 : _a.variantCode, (_b !== null && _b !== void 0 ? _b : (_c = data) === null || _c === void 0 ? void 0 : _c.variant_id)), (_d !== null && _d !== void 0 ? _d : (_g = (_f = (_e = product) === null || _e === void 0 ? void 0 : _e.variants) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.code)), (_h !== null && _h !== void 0 ? _h : null));
+            const match = (_j = items) === null || _j === void 0 ? void 0 : _j.find(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 = (_l = (_k = match) === null || _k === void 0 ? void 0 : _k.comments, (_l !== null && _l !== void 0 ? _l : ''));
+        });
+    }
+    ngOnDestroy() {
+        var _a;
+        (_a = this.prefillSub) === null || _a === void 0 ? void 0 : _a.unsubscribe();
     }
     scroll() {
         let el = this.contact.nativeElement;
@@ -9560,7 +9610,6 @@ let ProductEcComponent = class ProductEcComponent extends ComponentHelper {
     ngOnChanges() {
     }
     selectItem(product) {
-        console.log('entro');
         this.analyticsService.callEvent('select_item', product);
     }
 };
@@ -12892,12 +12941,10 @@ let PaypalExpressEcComponent = class PaypalExpressEcComponent extends ComponentH
                         this.loading = false;
                     }
                     else {
-                        /* console.log('Entro al else'); */
                         this.renderPayPal();
                     }
                 }
                 catch (error) {
-                    /* console.log('Entro al catch'); */
                     this.renderPayPal();
                 }
             }, 1000);
@@ -16316,7 +16363,7 @@ let SidebarEcComponent = class SidebarEcComponent {
         });
     }
     actualizarCantidad(item, cantidad, stock, id) {
-        var _a;
+        var _a, _b, _c;
         if (this.cartLoading) {
             return;
         }
@@ -16336,13 +16383,14 @@ let SidebarEcComponent = class SidebarEcComponent {
                 newQuantity = Math.round(newQuantity / step) * step;
             }
         }
+        const keepSameComment = (_c = (_b = item) === null || _b === void 0 ? void 0 : _b.comments, (_c !== null && _c !== void 0 ? _c : undefined));
         if (id) {
             const elem = document.getElementById(id);
             if (elem) {
                 elem.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');
@@ -16355,7 +16403,7 @@ let SidebarEcComponent = class SidebarEcComponent {
         }
         else {
             if (newQuantity > 0 && newQuantity <= stock) {
-                this.cartService.updateItemQuantity(item, newQuantity);
+                this.cartService.updateItemQuantity(item, newQuantity, keepSameComment);
             }
         }
     }