ng-easycommerce 0.0.596 → 0.0.598

package/README.md

@@ -1,3 +1,10 @@
+# version 0.0.598
+- Se implementa la validación de códigos postales según el país seleccionado en el formulario de checkout.
+- Se agrega la lógica en `dataform-ec.component.ts` para establecer patrones de validación dinámicos de acuerdo con el país.
+- Se obtiene el código del país seleccionado en el formulario y se aplica la validación correspondiente.
+- Se añaden patrones de validación para los códigos postales de Argentina, Uruguay, Reino Unido, España, Brasil, Francia y Portugal.
+# version 0.0.597
+- Se integran los parámetros `hideDiscounts` y `hideTaxes` del servicio `channel-config.service.ts` en el componente `sidebar-ec.component.ts` y `detail-checkout-block-ec.component.ts`
 # version 0.0.596
 - Se integran los parámetros `hidePrices`, `hideDiscounts` y `hideTaxes` del servicio `channel-config.service.ts` en los siguientes componentes:
     - `product-detail-ec.component` y `product-ec.component`: Se ocultan los precios si `hidePrices` está activado.

package/bundles/ng-easycommerce.umd.js

@@ -549,6 +549,15 @@
                 return _this.sortFilters = filtersCode;
             };
             this.getSortFilters = function () { return _this.sortFilters; };
+            this.postalCodePatterns = {
+                'AR': /^[0-9]{4}$/,
+                'UY': /^[0-9]{5}$/,
+                'GB': /^[A-Z]{1,2}[0-9][A-Z0-9]?\s?[0-9][A-Z]{2}$/,
+                'ES': /^(?:0[1-9]|[1-4]\d|5[0-2])\d{3}$/,
+                'BR': /^[0-9]{5}-[0-9]{3}$/,
+                'FR': /^[0-9]{5}$/,
+                'PT': /^[0-9]{4}-[0-9]{3}$/,
+            };
         }
         /**
          *
@@ -586,6 +595,9 @@
                 : params.find(function (param) { return param.code == (prefix + searched + suffix) || param.code == searched; });
         };
         ;
+        Constants$1.prototype.getPostalCodePattern = function (countryCode) {
+            return this.postalCodePatterns[countryCode] || /^[A-Za-z0-9\s\-]+$/;
+        };
         Constants$1.ctorParameters = function () { return [
             { type: core$1.TranslateService },
             { type: router.Router },
@@ -8023,7 +8035,7 @@
             _this.viewDataFacturacion = true;
             _this.params = {};
             _this.selectAddres = false;
-            _this.postalCodePattern = '^[0-9][0-9]*$';
+            _this.postalCodePattern = '^[A-Z]?[0-9]{4}[A-Z]{0,3}$';
             /**
              * @description filtra los paises de acuerdo al a los codigos retornados en la funcion getCountries.
              * Casos de usos: Si getCountries es vacio, retorna el arreglo que ingresa por parametro.
@@ -8073,6 +8085,10 @@
                 _this.checkoutForm.controls['countryCode'].setValue(value == 'null' ? null : value);
                 _this.checkoutForm.controls['provinceCode'].setValue(null);
                 _this.checkoutForm.controls['documentType'].setValue('');
+                var selectedCountry = _this.countriesSubject.value.find(function (country) { return country.code == value; });
+                if (selectedCountry) {
+                    _this.updatePostalCodeValidation(selectedCountry.code);
+                }
                 //Provinces
                 var provinces = value && value != 'null' ?
                     _this.countriesSubject.value.find(function (country) { return country.code == value; }).provinces
@@ -8251,12 +8267,12 @@
             _this.getLabelNotesParam = function () { return _this.hasParams(_this.params, 'label_notes_' + _this.consts.getChannel() + '_' + _this.consts.getLocale().split('_')[0]); };
             _this.getParamByChannelAndLanguage = function (nameParam) { return _this.hasParams(_this.params, nameParam + _this.consts.getChannel() + '_' + _this.consts.getLocale().split('_')[0]); };
             _this.ecOnConstruct();
-            _this.checkoutForm = _this.fb.group(__assign$j(__assign$j({}, _this.addressingService.getTypeForm().configForm.formAddres), { postcode: ['', [forms.Validators.required, forms.Validators.pattern(_this.postalCodePattern)]] // Se agrega para que sólo acepte códigos postales mayores que cero
+            _this.checkoutForm = _this.fb.group(__assign$j(__assign$j({}, _this.addressingService.getTypeForm().configForm.formAddres), { postcode: ['', [forms.Validators.required]] // Se agrega para que sólo acepte códigos postales mayores que cero
              }));
             _this.checkoutForm.statusChanges
                 .pipe(operators.filter(function () { _this.onFormChange(); return _this.checkoutForm.valid; }))
                 .subscribe(function () { return _this.onFormValid(); });
-            _this.checkoutFormFacturacion = _this.fb.group(__assign$j(__assign$j({}, _this.addressingService.getTypeForm().configForm.formBilling), { postcode: ['', [forms.Validators.required, forms.Validators.pattern(_this.postalCodePattern)]] // Se agrega para que sólo acepte códigos postales mayores que cero
+            _this.checkoutFormFacturacion = _this.fb.group(__assign$j(__assign$j({}, _this.addressingService.getTypeForm().configForm.formBilling), { postcode: ['', [forms.Validators.required]] // Se agrega para que sólo acepte códigos postales mayores que cero
              }));
             _this.checkoutFormFacturacion.statusChanges
                 .pipe(operators.filter(function () { _this.onFormChange(); return _this.checkoutFormFacturacion.valid; }))
@@ -8276,15 +8292,27 @@
                 _this.countriesSubject.next(countries);
                 _this.countriesFacturacionSubject.next(countries);
             });
-            (this.addressingService.modeSelectAddress == 'LOAD_ADDRESS_AND_SELECTION' || this.addressingService.modeSelectAddress == 'ONLY_ADDRESS_SELECTION')
-                && this.addressingService.getAddressBook().then(function (res) {
-                    _this.addressBook = res && res || null;
-                    _this.addressBook == null && _this.setMode('carga');
+            if (this.addressingService.modeSelectAddress === 'LOAD_ADDRESS_AND_SELECTION' ||
+                this.addressingService.modeSelectAddress === 'ONLY_ADDRESS_SELECTION') {
+                this.addressingService.getAddressBook().then(function (res) {
+                    _this.addressBook = res || null;
+                    if (_this.addressBook) {
+                        var selectedAddress = _this.addressBook.find(function (address) { return address.selected; });
+                        if (selectedAddress) {
+                            _this.checkoutForm.controls['countryCode'].setValue(selectedAddress.countryCode);
+                            _this.updatePostalCodeValidation(selectedAddress.countryCode);
+                        }
+                    }
+                    else {
+                        _this.setMode('carga');
+                    }
                 });
+            }
             this.countries$.subscribe(function (res) {
                 var _a, _b, _c, _d;
                 if (res && res.length > 0) {
                     _this.checkoutForm.controls['countryCode'].setValue(res[0].code);
+                    _this.updatePostalCodeValidation(res[0].code);
                     // Provincia
                     _this.checkoutForm.controls['provinceCode'].setValue((_a = res[0]) === null || _a === void 0 ? void 0 : _a.provinces[0].code);
                     _this.provincesSubject.next((_b = res[0]) === null || _b === void 0 ? void 0 : _b.provinces);
@@ -8311,6 +8339,14 @@
         DataFormEcComponent.prototype.openModal = function (template) {
             this.modalRef = this.modalService.show(template, { class: 'modal-lg ', keyboard: false, backdrop: 'static' });
         };
+        DataFormEcComponent.prototype.updatePostalCodeValidation = function (countryCode) {
+            var postalCodePattern = this.consts.getPostalCodePattern(countryCode) || '.*';
+            this.checkoutForm.controls['postcode'].setValidators([
+                forms.Validators.required,
+                forms.Validators.pattern(postalCodePattern)
+            ]);
+            this.checkoutForm.controls['postcode'].updateValueAndValidity();
+        };
         DataFormEcComponent.prototype.prueba = function (x) {
             console.log(x);
         };
@@ -14118,15 +14154,18 @@
     };
     var DetailCheckoutBlockEcComponent = /** @class */ (function (_super) {
         __extends$V(DetailCheckoutBlockEcComponent, _super);
-        function DetailCheckoutBlockEcComponent(checkoutService, cartService) {
+        function DetailCheckoutBlockEcComponent(checkoutService, cartService, channelConfigService) {
             var _this = _super.call(this) || this;
             _this.checkoutService = checkoutService;
             _this.cartService = cartService;
+            _this.channelConfigService = channelConfigService;
             _this.data = null;
             _this.discountTotal = 0;
             _this.couponTotal = 0;
             _this.showPrice = false;
             _this.creditAmountConfigured = false;
+            _this.hideDiscounts = false;
+            _this.hideTaxes = false;
             _this.getIcon = function (data_item) {
                 switch (data_item.type) {
                     case 'coupon': return 'fas fa-ticket-alt fa-3x';
@@ -14159,6 +14198,11 @@
             this.cartService.creditAmount$.subscribe(function (creditAmount) {
                 _this.creditAmountConfigured = creditAmount !== null;
             });
+            this.channelConfigService.channelConfig$.subscribe(function (channel) {
+                var _a, _b, _c, _d;
+                _this.hideDiscounts = (_b = (_a = channel) === null || _a === void 0 ? void 0 : _a.hideDiscounts, (_b !== null && _b !== void 0 ? _b : false));
+                _this.hideTaxes = (_d = (_c = channel) === null || _c === void 0 ? void 0 : _c.hideTaxes, (_d !== null && _d !== void 0 ? _d : false));
+            });
         };
         DetailCheckoutBlockEcComponent.prototype.calcularTotales = function () {
             if (this.data) {
@@ -14172,7 +14216,8 @@
         };
         DetailCheckoutBlockEcComponent.ctorParameters = function () { return [
             { type: CheckoutService },
-            { type: CartService }
+            { type: CartService },
+            { type: ChannelConfigService }
         ]; };
         __decorate$1u([
             core.Input()
@@ -14180,7 +14225,7 @@
         DetailCheckoutBlockEcComponent = __decorate$1u([
             core.Component({
                 selector: 'app-detail-checkout-block-ec',
-                template: "<div id=\"appDetailCheckoutBlockEc\" class=\"d-flex flex-row w-100 justify-content-center flex-wrap\"\n    *ngIf=\"data && (creditAmountConfigured ? showPrice : true)\">\n    <ng-container *ngFor=\"let item of data; let i = index\">\n        <ng-container *ngIf=\"item.type != 'discount' && item.type != 'coupon'\">\n            <div class=\"d-flex flex-column justify-content-center mx-sm-3 mx-2 text-center mb-4 resumen\">\n                <i ngClass=\"mb-2 colorIconoCheckout\" [class]=\"getIcon(item)\"></i>\n                <strong class=\"text-center w-100 font-brandon font-md mb-1\">{{ item.type | translate }}</strong>\n                <span class=\"text-center w-100 font-brandon font-md text-gray\">{{ (item.amount != 0 ) ? (item.amount |\n                    ecCurrencySymbol) : ('free' | translate) }}</span>\n            </div>\n        </ng-container>\n\n\n        <!-- Mostrar total de descuentos -->\n        <div class=\"d-flex flex-column justify-content-center mx-sm-3 mx-2 text-center mb-4 resumen\"\n            *ngIf=\"this.discountTotal != 0 && i === 1\">\n            <i ngClass=\"mb-2 colorIconoCheckout\" [class]=\"getIcon2('discount')\"></i>\n            <strong class=\"text-center w-100 font-brandon font-md mb-1\">Descuento</strong>\n            <span class=\"text-center w-100 font-brandon font-md text-gray\">{{ (this.discountTotal | ecCurrencySymbol)\n                }}</span>\n        </div>\n\n        <!-- Mostrar total de cupones -->\n        <div class=\"d-flex flex-column justify-content-center mx-sm-3 mx-2 text-center mb-4 resumen\"\n            *ngIf=\"this.couponTotal != 0 && i === 1\">\n            <i ngClass=\"mb-2 colorIconoCheckout\" [class]=\"getIcon2('coupon')\"></i>\n            <strong class=\"text-center w-100 font-brandon font-md mb-1\">Cupon</strong>\n            <span class=\"text-center w-100 font-brandon font-md text-gray\">{{(this.couponTotal| ecCurrencySymbol)\n                }}</span>\n        </div>\n    </ng-container>\n</div>",
+                template: "<div id=\"appDetailCheckoutBlockEc\" class=\"d-flex flex-row w-100 justify-content-center flex-wrap\"\n    *ngIf=\"data && (creditAmountConfigured ? showPrice : true)\">\n    <ng-container *ngFor=\"let item of data; let i = index\">\n        <ng-container *ngIf=\"item.type != 'discount' && item.type != 'coupon'\">\n            <div class=\"d-flex flex-column justify-content-center mx-sm-3 mx-2 text-center mb-4 resumen\">\n                <i ngClass=\"mb-2 colorIconoCheckout\" [class]=\"getIcon(item)\"></i>\n                <strong class=\"text-center w-100 font-brandon font-md mb-1\">{{ item.type | translate }}</strong>\n                <span class=\"text-center w-100 font-brandon font-md text-gray\">{{ (item.amount != 0 ) ? (item.amount |\n                    ecCurrencySymbol) : ('free' | translate) }}</span>\n            </div>\n        </ng-container>\n\n\n        <!-- Mostrar total de descuentos -->\n        <div class=\"d-flex flex-column justify-content-center mx-sm-3 mx-2 text-center mb-4 resumen\"\n            *ngIf=\"!hideDiscounts && this.discountTotal != 0 && i === 1\">\n            <i ngClass=\"mb-2 colorIconoCheckout\" [class]=\"getIcon2('discount')\"></i>\n            <strong class=\"text-center w-100 font-brandon font-md mb-1\">Descuento</strong>\n            <span class=\"text-center w-100 font-brandon font-md text-gray\">{{ (this.discountTotal | ecCurrencySymbol)\n                }}</span>\n        </div>\n\n        <!-- Mostrar total de cupones -->\n        <div class=\"d-flex flex-column justify-content-center mx-sm-3 mx-2 text-center mb-4 resumen\"\n            *ngIf=\"!hideDiscounts && this.couponTotal != 0 && i === 1\">\n            <i ngClass=\"mb-2 colorIconoCheckout\" [class]=\"getIcon2('coupon')\"></i>\n            <strong class=\"text-center w-100 font-brandon font-md mb-1\">Cupon</strong>\n            <span class=\"text-center w-100 font-brandon font-md text-gray\">{{(this.couponTotal| ecCurrencySymbol)\n                }}</span>\n        </div>\n    </ng-container>\n</div>",
                 styles: [""]
             })
         ], DetailCheckoutBlockEcComponent);
@@ -18501,16 +18546,19 @@
         return c > 3 && r && Object.defineProperty(target, key, r), r;
     };
     var SidebarEcComponent = /** @class */ (function () {
-        function SidebarEcComponent(cartService, consts, authService, router, toastrService) {
+        function SidebarEcComponent(cartService, consts, authService, router, toastrService, channelConfigService) {
             var _this = this;
             this.cartService = cartService;
             this.consts = consts;
             this.authService = authService;
             this.router = router;
             this.toastrService = toastrService;
+            this.channelConfigService = channelConfigService;
             this.user = null;
             this.promotions = [];
             this.variantsToShow = ['TALLE', 'COLOR'];
+            this.hideDiscounts = false;
+            this.hideTaxes = false;
             this.actualizarCantidad = function (item, cantidad, stock, id) {
                 if (id) {
                     var elem_1 = document.getElementById(id);
@@ -18574,6 +18622,11 @@
             this.authService.getUserProfile().subscribe(function (u) {
                 _this.user = u;
             });
+            this.channelConfigService.channelConfig$.subscribe(function (channel) {
+                var _a, _b, _c, _d;
+                _this.hideDiscounts = (_b = (_a = channel) === null || _a === void 0 ? void 0 : _a.hideDiscounts, (_b !== null && _b !== void 0 ? _b : false));
+                _this.hideTaxes = (_d = (_c = channel) === null || _c === void 0 ? void 0 : _c.hideTaxes, (_d !== null && _d !== void 0 ? _d : false));
+            });
         };
         SidebarEcComponent.prototype.redirectDetailProduct = function (product) {
             var variant = product.variants[0];
@@ -18595,7 +18648,8 @@
             { type: Constants },
             { type: AuthService },
             { type: router.Router },
-            { type: ToastService }
+            { type: ToastService },
+            { type: ChannelConfigService }
         ]; };
         SidebarEcComponent = __decorate$1$([
             core.Component({