ng-easycommerce 0.0.631 → 0.0.633

package/README.md

@@ -1,3 +1,8 @@
+# version 0.0.633
+- mejorar la lógica de actualización de cantidad en el carrito
+- optimizar la generación de breadcrumbs
+# version 0.0.632
+- mejorar la validación de cantidad y stock en el carrito
 # version 0.0.631
 - mejorar la lógica de actualización y formato de precios en el filtro
 # version 0.0.630

package/assets/ec-i18n/ct.json

@@ -295,5 +295,7 @@
      "taxes": "Impostos",
      "price-without-national-taxes": "Preu sense impostos nacionals",
      "this-payment-method-cannot-be-used": "Aquest mètode de pagament no es pot utilitzar",
-     "must-be-multiple": "La quantitat total ha de ser un múltiple de {{quantity}}"
+     "must-be-multiple": "La quantitat total ha de ser un múltiple de {{quantity}}",
+     "payment-date": "Data de pagament",
+     "total-paid": "Total abonado"
 }

package/assets/ec-i18n/en.json

@@ -406,5 +406,7 @@
     "email_already_registered": "The email entered is already registered.",
     "mail-enter": "Mail",
     "this-payment-method-cannot-be-used": "This payment method cannot be used",
-    "must-be-multiple":  "The total quantity must be a multiple of {{quantity}}"    
+    "must-be-multiple":  "The total quantity must be a multiple of {{quantity}}",
+    "payment-date": "Payment date",
+    "total-paid": "Total paid" 
 }

package/assets/ec-i18n/es.json

@@ -220,7 +220,7 @@
     "payment-error": "Hubo un error al procesar el pago. Vuelva a intentarlo más  tarde.",
     "payment-preferences-error": "Hubo un problema al intentar obtener las preferencias del pago. Vuelva a intentarlo más tarde",
     "payment-state": "Estado de compra",
-    "pending": "Tu pedido está siendo procesado, una vez verificado el pago, recibirás un mail con información adicional del mismo",
+    "pending": "Tu compra está siendo procesado, una vez verificado el pago, recibirás un mail con información adicional del mismo",
     "balance-in-account-message": "El pago ha sido completado automáticamente con el método seleccionado. Su pedido está siendo procesado y pronto recibirá más información.",
     "phone": "Teléfono",
     "phone-cases": "Fundas de teléfono",
@@ -317,8 +317,8 @@
     "national-taxes": "Impuestos nacionales",
     "price-without-national-taxes": "Precio sin impuestos nacionales",
     "taxon": "Categoría",
-    "thanks-details": "Su compra se ha realizado con éxito. A continuación recibirá un mail con los detalles de su compra",
-    "thanks-for-buying": "Gracias por su compra",
+    "thanks-details": "Tu compra se ha realizado con éxito. A continuación recibirás un mail con los detalles",
+    "thanks-for-buying": "Gracias por tu compra",
     "thanks-for-register": "Gracias por registrarse",
     "thanks-for-register-detail": "Ahora ya puede iniciar sesión. A continuación le dejamos el acceso al inicio de sesión",
     "thumbnail-below": "miniatura",
@@ -413,6 +413,8 @@
     "email_already_registered": "El email ingresado ya se encuentra registrado.",
     "quantity-not-exceeded": "Debe realizar un pedido con un monto mínimo de {{ amount }} para finalizar su compra.",
     "mail-enter": "Correo electronico",
-    "this-payment-method-cannot-be-used": "Este método de pago no puede ser utilizado"
+    "this-payment-method-cannot-be-used": "Este método de pago no puede ser utilizado",
+    "payment-date": "Fecha de pago",
+    "total-paid": "Total abonado"
 
 }

package/assets/ec-i18n/fr.json

@@ -287,5 +287,7 @@
      "taxes": "Taxes",
      "price-without-national-taxes": "Prix sans taxes nationales",
      "this-payment-method-cannot-be-used": "Ce mode de paiement ne peut pas être utilisé",
-     "must-be-multiple": "La quantité totale doit être un multiple de {{quantity}}"
+     "must-be-multiple": "La quantité totale doit être un multiple de {{quantity}}",
+     "payment-date": "Date de paiement",
+     "total-paid": "Total payé"
 }

package/assets/ec-i18n/gl.json

@@ -295,5 +295,7 @@
      "taxes": "Impostos",
      "price-without-national-taxes": "Prezo sen impostos nacionais",
      "this-payment-method-cannot-be-used": "Este método de pago non pode ser usado",
-     "must-be-multiple": "A cantidade total debe ser múltiplo de {{quantity}}"
+     "must-be-multiple": "A cantidade total debe ser múltiplo de {{quantity}}",
+     "payment-date": "Data de pago",
+     "total-paid": "Total abonado"
 }

package/assets/ec-i18n/pr.json

@@ -295,5 +295,7 @@
      "taxes": "Impostos",
      "price-without-national-taxes": "Preço sem impostos nacionais",
      "this-payment-method-cannot-be-used": "Este método de pagamento não pode ser utilizado",
-     "must-be-multiple": "A quantidade total deve ser um múltiplo de {{quantity}}"
+     "must-be-multiple": "A quantidade total deve ser um múltiplo de {{quantity}}",
+     "payment-date": "Data de pagamento",
+     "total-paid": "Total pago"
 }

package/bundles/ng-easycommerce.umd.js

@@ -989,6 +989,17 @@
         for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
         return ar;
     };
+    var __values = (this && this.__values) || function(o) {
+        var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+        if (m) return m.call(o);
+        if (o && typeof o.length === "number") return {
+            next: function () {
+                if (o && i >= o.length) o = void 0;
+                return { value: o && o[i++], done: !o };
+            }
+        };
+        throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+    };
     var OptionsService = /** @class */ (function () {
         function OptionsService(connection, constants) {
             var _this = this;
@@ -1122,26 +1133,31 @@
                 });
                 return final_result;
             };
-            this.generateBreadcrumb = function (code, elements, result) {
-                var element = elements.find(function (elem) { return elem.code == code; });
-                if (element) {
-                    result.push(element);
-                }
-                else {
-                    elements.some(function (elem) {
-                        if (elem.children && elem.children.length) {
-                            var length_1 = result.length;
-                            var new_result = _this.generateBreadcrumb(code, elem.children, result);
-                            if (new_result.length > length_1) {
-                                result = new_result;
-                                result.push(elem);
-                                return true;
-                            }
+            this.generateBreadcrumb = function (code, elements, path) {
+                var e_1, _a;
+                if (path === void 0) { path = []; }
+                var _b;
+                try {
+                    for (var elements_1 = __values(elements), elements_1_1 = elements_1.next(); !elements_1_1.done; elements_1_1 = elements_1.next()) {
+                        var elem = elements_1_1.value;
+                        if (elem.code === code) {
+                            return __spread(path, [elem]);
                         }
-                        return false;
-                    });
+                        if ((_b = elem.children) === null || _b === void 0 ? void 0 : _b.length) {
+                            var childPath = _this.generateBreadcrumb(code, elem.children, __spread(path, [elem]));
+                            if (childPath.length)
+                                return childPath;
+                        }
+                    }
                 }
-                return result;
+                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                finally {
+                    try {
+                        if (elements_1_1 && !elements_1_1.done && (_a = elements_1.return)) _a.call(elements_1);
+                    }
+                    finally { if (e_1) throw e_1.error; }
+                }
+                return [];
             };
             this.getAllData();
             // this.authService.loggedIn.subscribe(res => res && this.getAllData());
@@ -7406,7 +7422,7 @@
             if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
         }
     };
-    var __values = (this && this.__values) || function(o) {
+    var __values$1 = (this && this.__values) || function(o) {
         var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
         if (m) return m.call(o);
         if (o && typeof o.length === "number") return {
@@ -7746,7 +7762,7 @@
         CartEcComponent.prototype.checkStock = function (item) {
             var e_1, _a;
             try {
-                for (var _b = __values(item.product.variants), _c = _b.next(); !_c.done; _c = _b.next()) {
+                for (var _b = __values$1(item.product.variants), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var variant = _c.value;
                     if (item.variant_id === variant.code) {
                         if (variant.stock === 0) {
@@ -7777,7 +7793,7 @@
                 res.forEach(function (item) {
                     var e_2, _a;
                     try {
-                        for (var _b = __values(item.product.variants), _c = _b.next(); !_c.done; _c = _b.next()) {
+                        for (var _b = __values$1(item.product.variants), _c = _b.next(); !_c.done; _c = _b.next()) {
                             var variant = _c.value;
                             if (item.variant_id === variant.code && !_this.exitUpdate) {
                                 if (variant.stock === 0) {
@@ -8682,7 +8698,7 @@
             if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
         }
     };
-    var __values$1 = (this && this.__values) || function(o) {
+    var __values$2 = (this && this.__values) || function(o) {
         var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
         if (m) return m.call(o);
         if (o && typeof o.length === "number") return {
@@ -8827,7 +8843,7 @@
             var e_1, _a;
             var parent = e.target.parentElement.children;
             try {
-                for (var parent_1 = __values$1(parent), parent_1_1 = parent_1.next(); !parent_1_1.done; parent_1_1 = parent_1.next()) {
+                for (var parent_1 = __values$2(parent), parent_1_1 = parent_1.next(); !parent_1_1.done; parent_1_1 = parent_1.next()) {
                     var button = parent_1_1.value;
                     if (button.classList.contains('active')) {
                         button.classList.remove('active');
@@ -8897,7 +8913,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 __values$2 = (this && this.__values) || function(o) {
+    var __values$3 = (this && this.__values) || function(o) {
         var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
         if (m) return m.call(o);
         if (o && typeof o.length === "number") return {
@@ -8986,7 +9002,7 @@
             var e_1, _a;
             var parent = e.target.parentElement.children;
             try {
-                for (var parent_1 = __values$2(parent), parent_1_1 = parent_1.next(); !parent_1_1.done; parent_1_1 = parent_1.next()) {
+                for (var parent_1 = __values$3(parent), parent_1_1 = parent_1.next(); !parent_1_1.done; parent_1_1 = parent_1.next()) {
                     var button = parent_1_1.value;
                     if (button.classList.contains('active')) {
                         button.classList.remove('active');
@@ -9054,6 +9070,8 @@
             _this.orderDetails = {};
             _this.params = {};
             _this.from_mp = true;
+            _this.totalAmount = null;
+            _this.paymentDate = null;
             /**
              * @description Chequea si existe un bloque recibido por parametro.
              * @param codeBlock codigo del bloque.
@@ -9061,19 +9079,29 @@
              */
             _this.containsBlock = function (codeBlock) { return _this.blocks.find(function (block) { return block.code == codeBlock; }); };
             _this.isBalanceInAccount = function (code) { return code && code.toLocaleLowerCase().includes('balance_in_account'); };
+            _this.isPlaceToPay = function (code) { return code && code.toLocaleLowerCase().includes('place_to_pay'); };
             _this.ecOnConstruct();
             return _this;
         }
         SuccessEcComponent.prototype.ngOnInit = function () {
             var _this = this;
             this.checkoutService.order$.subscribe(function (res) {
-                var _a, _b;
+                var _a, _b, _c, _d, _e, _f, _g, _h;
                 //console.log('LO QUE LLEGA EN ORDEN', res);
                 ((_a = res) === null || _a === void 0 ? void 0 : _a.number) ? _this.params = {
                     external_reference: res.number,
                 } : null;
                 //this.payments = [{method:{code:'bank_transsfer'}}]
                 _this.payments = ((_b = res) === null || _b === void 0 ? void 0 : _b.payments) ? res.payments : null;
+                if (((_e = (_d = (_c = _this.payments) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.method) === null || _e === void 0 ? void 0 : _e.code) && _this.isPlaceToPay(_this.payments[0].method.code)) {
+                    _this.totalAmount = (_h = (_g = (_f = res) === null || _f === void 0 ? void 0 : _f.totals) === null || _g === void 0 ? void 0 : _g.total, (_h !== null && _h !== void 0 ? _h : null));
+                    var now = new Date();
+                    _this.paymentDate = now.toLocaleDateString('es-AR', {
+                        day: '2-digit',
+                        month: '2-digit',
+                        year: 'numeric',
+                    });
+                }
             });
             this.blocksService.getBlocks('info_metodo_pago');
             this.blocksService.blocks.subscribe(function (res) { return _this.blocks = res; });
@@ -9090,7 +9118,7 @@
         SuccessEcComponent = __decorate$U([
             core.Component({
                 selector: 'app-order-success-ec',
-                template: "<div id=\"container\" class=\"flex-center generalContainer container-xl\">\n    <div class=\"Main card my-2\" *ngIf=\"this.payments && this.payments[0].method.code; else loading\">\n        <ng-container *ngIf=\"this.blocks && this.blocks.length > 0; else notInfoToMethod\">\n            <ng-container *ngIf=\"containsBlock(this.payments[0].method.code) as bloque; else notInfoToMethod\">\n                <div class=\"wrap my-4 card-body\" [id]=\"bloque.code\">\n                    <div class=\"row\">\n                        <div class=\"col-md-12 col-12\">\n                            <h5 [class]=\"bloque.code+'-title'\">{{ (bloque?.translations[consts.getLocale()]?.name ?\n                                bloque.translations[consts.getLocale()].name :\n                                'thanks-for-buying') | translate\n                                | uppercase }}</h5>\n                        </div>\n                    </div>\n                    <div class=\"row\">\n                        <div class=\"col-md-12 col-12 text-start\">\n                            <app-blocks-ec [section]=\"'info_metodo_pago'\" [blockFilters]=\"this.payments[0].method.code\">\n                            </app-blocks-ec>\n                            <div class=\"d-flex flex-column details\">\n                                <p class=\"card-text\">{{ ('number' | translate) + ': ' + params.external_reference }}</p>\n                                <p class=\"card-text\">\n                                    {{ isBalanceInAccount(payments[0].method.code) ?\n                                    ('balance-in-account-message' | translate) :\n                                    ((params.payment_status || 'pending') | translate) }}\n                                </p>\n                            </div>\n                        </div>\n                    </div>\n                </div>\n            </ng-container>\n        </ng-container>\n        <ng-template #notInfoToMethod>\n            <ng-template #defaultMessage>\n                <div class=\"wrap my-4 card-body\">\n                    <div class=\"row\">\n                        <div class=\"col-md-12 col-12\">\n                            <h5 class=\"card-title titpage center-block text-center\">\n                                {{ 'thanks-for-buying' | translate | uppercase }}\n                            </h5>\n                        </div>\n                    </div>\n                    <div class=\"row\">\n                        <div class=\"col-md-12 col-12 text-center py-3\">\n                            <h4 class=\"thanks-details\">{{ 'thanks-details' | translate }}</h4>\n                            <h5 class=\"number\">{{ ('number' | translate) + ': ' + params.external_reference }}</h5>\n                            <h5 class=\"pending\">\n                                {{ isBalanceInAccount(payments[0].method.code) ?\n                                ('balance-in-account-message' | translate) :\n                                ((params.payment_status || 'pending') | translate) }}\n                            </h5>\n                            <!-- <h5 *ngIf=\"!from_mp\">{{ ('will_contact' | translate) }}</h5> -->\n\n                            <!-- <a routerLink=\"/collection\"><button class=\"comprar\">{{ 'continue-shopping' | translate }}</button></a> -->\n                        </div>\n                    </div>\n                </div>\n            </ng-template>\n            <ng-container [ngTemplateOutlet]=\"notInfoToMethodTemplate ? notInfoToMethodTemplate : defaultMessage\"\n                [ngTemplateOutletContext]=\"{params:params}\">\n            </ng-container>\n        </ng-template>\n    </div>\n</div>\n\n<ng-template #loading>\n    <app-loading-full-ec></app-loading-full-ec>\n</ng-template>",
+                template: "<div id=\"container\" class=\"flex-center generalContainer container-xl\">\n    <div class=\"Main card my-2\" *ngIf=\"this.payments && this.payments[0].method.code; else loading\">\n        <ng-container *ngIf=\"this.blocks && this.blocks.length > 0; else notInfoToMethod\">\n            <ng-container *ngIf=\"containsBlock(this.payments[0].method.code) as bloque; else notInfoToMethod\">\n                <div class=\"wrap my-4 card-body\" [id]=\"bloque.code\">\n                    <div class=\"row\">\n                        <div class=\"col-md-12 col-12\">\n                            <h5 [class]=\"bloque.code+'-title'\">{{ (bloque?.translations[consts.getLocale()]?.name ?\n                                bloque.translations[consts.getLocale()].name :\n                                'thanks-for-buying') | translate\n                                | uppercase }}</h5>\n                        </div>\n                    </div>\n                    <div class=\"row\">\n                        <div class=\"col-md-12 col-12 text-start\">\n                            <app-blocks-ec [section]=\"'info_metodo_pago'\" [blockFilters]=\"this.payments[0].method.code\">\n                            </app-blocks-ec>\n                            <div class=\"d-flex flex-column details\">\n                                <p class=\"card-text\">{{ ('number' | translate) + ': ' + params.external_reference }}</p>\n                                <p class=\"card-text\">\n                                    {{ isBalanceInAccount(payments[0].method.code) ?\n                                    ('balance-in-account-message' | translate) :\n                                    ((params.payment_status || 'pending') | translate) }}\n                                </p>\n                            </div>\n                        </div>\n                    </div>\n                </div>\n            </ng-container>\n        </ng-container>\n        <ng-template #notInfoToMethod>\n            <ng-template #defaultMessage>\n                <div class=\"wrap my-4 card-body\">\n                    <div class=\"row\">\n                        <div class=\"col-md-12 col-12\">\n                            <h5 class=\"card-title titpage center-block text-center\">\n                                {{ 'thanks-for-buying' | translate | uppercase }}\n                            </h5>\n                        </div>\n                    </div>\n                    <div class=\"row\">\n                        <div class=\"col-md-12 col-12 text-center py-3\">\n                            <h4 class=\"thanks-details\">{{ 'thanks-details' | translate }}</h4>\n                            <h5 class=\"number order-info-line\" [ngClass]=\"{ 'compact': paymentDate && totalAmount }\">{{ ('number' | translate) + ': ' + params.external_reference }}</h5>\n                            <h5 class=\"order-info-line\" *ngIf=\"paymentDate && totalAmount\">\n                                {{'payment-date' | translate }}: {{ paymentDate }}\n                            </h5>\n                            <h5 class=\"order-info-line\" *ngIf=\"paymentDate && totalAmount\">\n                                {{'total-paid' | translate }}: {{ totalAmount | ecCurrencySymbol }}\n                            </h5>\n                            <h5 class=\"pending\">\n                                {{ isBalanceInAccount(payments[0].method.code) ?\n                                ('balance-in-account-message' | translate) :\n                                ((params.payment_status || 'pending') | translate) }}\n                            </h5>\n                            <!-- <h5 *ngIf=\"!from_mp\">{{ ('will_contact' | translate) }}</h5> -->\n\n                            <!-- <a routerLink=\"/collection\"><button class=\"comprar\">{{ 'continue-shopping' | translate }}</button></a> -->\n                        </div>\n                    </div>\n                </div>\n            </ng-template>\n            <ng-container [ngTemplateOutlet]=\"notInfoToMethodTemplate ? notInfoToMethodTemplate : defaultMessage\"\n                [ngTemplateOutletContext]=\"{params:params}\">\n            </ng-container>\n        </ng-template>\n    </div>\n</div>\n\n<ng-template #loading>\n    <app-loading-full-ec></app-loading-full-ec>\n</ng-template>",
                 styles: [""]
             })
         ], SuccessEcComponent);
@@ -10830,11 +10858,18 @@
                 return min_price == max_price ? max_price.toString() : min_price + ' - ' + max_price;
             };
             this.inRange = function (quantity, min, max) { return ((quantity - min) * (quantity - max) <= 0); };
-            this.validateQuantity = function (quantity) {
-                var actualQuantity = _this.cartService.getCountFromItemInCart(_this.variants[0].code);
+            this.validateQuantity = function (quantity, variantCode) {
+                var _a, _b;
+                var codeToCheck = variantCode || _this.variants[0].code;
+                var actualQuantity = _this.cartService.getCountFromItemInCart(codeToCheck);
                 var asociatedData = _this.asociatedDataSubject.value;
                 var totalQuantity = actualQuantity + quantity;
-                console.log('La cantidad que llegó: ', quantity, ' y la cantidad actual: ', actualQuantity);
+                var variant = _this.variants.find(function (v) { return v.code === codeToCheck; });
+                var stock = (_b = (_a = variant) === null || _a === void 0 ? void 0 : _a.stock, (_b !== null && _b !== void 0 ? _b : 0));
+                if (totalQuantity > stock) {
+                    _this.toastrService.show('out-of-stock-actually');
+                    return false;
+                }
                 if (asociatedData.maximumItemsQuantity && totalQuantity > asociatedData.maximumItemsQuantity) {
                     _this.toastrService.show('maximum-items-quantity', { quantity: asociatedData.maximumItemsQuantity });
                     return false;
@@ -10927,7 +10962,7 @@
             }
             if (!variant)
                 return;
-            if (!this.validateQuantity(quantity))
+            if (!this.validateQuantity(quantity, variant.code))
                 return;
             var priceToValidate = product_selected.saleprice ? product_selected.saleprice * quantity : product_selected.price * quantity;
             if (!this.validatePriceAndCredits(priceToValidate))
@@ -11086,9 +11121,10 @@
             _this.plus = function (stock, changeAmount, forceMultiple) {
                 if (changeAmount === void 0) { changeAmount = 1; }
                 if (forceMultiple === void 0) { forceMultiple = false; }
-                var newQuantity = _this.quantity + changeAmount;
+                var currentQuantity = Number(_this.quantity);
+                var newQuantity = currentQuantity + changeAmount;
                 if (forceMultiple && changeAmount > 0) {
-                    if (_this.quantity < changeAmount) {
+                    if (currentQuantity < changeAmount) {
                         newQuantity = changeAmount;
                     }
                     else {
@@ -13762,8 +13798,8 @@
         RegisterFormEcComponent.prototype.ngOnInit = function () {
             var _this = this;
             this.registerForm = this.formBuilder.group({
-                firstName: ['', forms.Validators.required],
-                lastName: ['', forms.Validators.required],
+                firstName: ['', [forms.Validators.required, forms.Validators.pattern(/^[A-Za-zÁÉÍÓÚáéíóúÑñ\s]+$/)]],
+                lastName: ['', [forms.Validators.required, forms.Validators.pattern(/^[A-Za-zÁÉÍÓÚáéíóúÑñ\s]+$/)]],
                 email: ['', forms.Validators.required],
                 plainPassword: ['', forms.Validators.required],
                 plainPassword2: ['', forms.Validators.required],
@@ -14359,8 +14395,8 @@
             var _this = this;
             this.paramsService.parameters.subscribe(function (res) { return _this.params = res; });
             this.registerForm = this.formBuilder.group({
-                firstName: ['', [forms.Validators.required]],
-                lastName: ['', [forms.Validators.required]],
+                firstName: ['', [forms.Validators.required, forms.Validators.pattern(/^[A-Za-zÁÉÍÓÚáéíóúÑñ\s]+$/)]],
+                lastName: ['', [forms.Validators.required, forms.Validators.pattern(/^[A-Za-zÁÉÍÓÚáéíóúÑñ\s]+$/)]],
                 documentType: [null, [forms.Validators.required]],
                 documentNumber: ['', [forms.Validators.required]],
                 email: ['', [forms.Validators.required, forms.Validators.email]],