ng-easycommerce 0.0.570 → 0.0.572

package/README.md

@@ -1,3 +1,10 @@
+# version 0.0.572
+- Se implementó la lógica para gestionar un observable `balanceCustomerSubject` en `cart.service` que contiene los datos referentes al crédito del usuario.  
+- Se añadió la validaciónes en `cart.service` y `product-detail`, para verificar si el usuario tiene suficientes créditos antes de continuar con la compra.  
+- Se mostraron mensajes de retroalimentación para casos de créditos insuficientes.
+- Se modifica `build-your-ec.component.html` para que permita retroceder en los pasos.  
+# version 0.0.571
+- Update Bancard Version
 # version 0.0.570
 - Se actualizaron los mensajes de error para aclarar que los pedidos no se pueden repetir si el carrito no está vacío.
 - Se modifica cuando un articulo no esta activado pero si su variante. Tambien cuando en endpoint devuelve un 404 Not found redirige a  la home.

package/assets/bancardCatastro.html

@@ -13,7 +13,7 @@
         console.log('Datos cargados desde catastro_data:', catastro_data);
 
         let script_tag = document.createElement('script');
-        script_tag.setAttribute('src', catastro_data.environment + '/checkout/javascript/dist/bancard-checkout-3.0.0.js');
+        script_tag.setAttribute('src', catastro_data.environment + '/checkout/javascript/dist/bancard-checkout-4.0.0.js');
         document.head.appendChild(script_tag);
 
         let styles = {

package/assets/ec-i18n/ct.json

@@ -273,5 +273,6 @@
      "will_contact": "Un cop percebuda la transferència, ens posarem en contacte amb vostè per informar l'estat de la seva compra",
      "date": "Data",
      "repeat-order": "Repetir comanda",
-     "no-products-to-add": "No hi ha productes per afegir"
+     "no-products-to-add": "No hi ha productes per afegir",
+     "not-enough-credits": "No té prou crèdits per comprar aquest producte"
 }

package/assets/ec-i18n/en.json

@@ -375,5 +375,6 @@
     "instructions": "Instructions",
     "error-convertibility": "Convertibility error. Try again later.",
     "repeat-order": "Repeat order",
-    "no-products-to-add": "You have no products to add"
+    "no-products-to-add": "You have no products to add",
+    "not-enough-credits": "You do not have enough credits to make this purchase."
 }

package/assets/ec-i18n/es.json

@@ -380,5 +380,6 @@
     "success-review": "Su reseña fue enviada",
     "error-convertibility": "Se produjo un error al realizar la conversión",
     "repeat-order": "Repetir pedido",
-    "no-products-to-add": "No hay productos para agregar"
+    "no-products-to-add": "No hay productos para agregar",
+    "not-enough-credits": "No tiene suficientes créditos para comprar este producto"
 }

package/assets/ec-i18n/fr.json

@@ -265,5 +265,6 @@
      "will_contact": "Une fois le virement reçu, nous vous contacterons pour vous informer de l'état de votre achat",
      "date": "Date",
      "repeat-order": "Répéter la commande",
-     "no-products-to-add": "Aucun produit à ajouter"
+     "no-products-to-add": "Aucun produit à ajouter",
+     "not-enough-credits": "Vous n'avez pas assez de crédits pour acheter ce produit"
 }

package/assets/ec-i18n/gl.json

@@ -273,5 +273,6 @@
      "will_contact": "Unha vez recibida a transferencia, porémonos en contacto con vostede para informarche do estado da súa compra",
      "date": "Data",
      "repeat-order": "Repetir pedido",
-     "no-products-to-add": "Non hai produtos para engadir"
+     "no-products-to-add": "Non hai produtos para engadir",
+     "not-enough-credits": "Non ten suficientes créditos para realizar a compra"
 }

package/assets/ec-i18n/pr.json

@@ -273,5 +273,6 @@
      "will_contact": "Assim que a transferência for recebida, entraremos em contato para informá-lo sobre o status de sua compra",
      "date": "Encontro",
      "repeat-order": "Repetir pedido",
-     "no-products-to-add": "Não há produtos para adicionar"
+     "no-products-to-add": "Não há produtos para adicionar",
+     "not-enough-credits": "Você não tem créditos suficientes para fazer essa compra"
 }

package/bundles/ng-easycommerce.umd.js

@@ -4524,6 +4524,14 @@
             this.cartSubject = new rxjs.BehaviorSubject(null);
             this.requestInProcess = new rxjs.BehaviorSubject(false);
             this.promotionsSubject = new rxjs.BehaviorSubject([]);
+            this.balanceCustomerSubject = new rxjs.BehaviorSubject({
+                allowAnyPaymentMethod: false,
+                allowExceedBalance: false,
+                creditAmount: 0,
+                showMax: false,
+                showPrice: false,
+                remainingCredits: 0,
+            });
             this.items = [];
             this.count = 0;
             this.locale = "";
@@ -4545,6 +4553,12 @@
             this.cart = this.cartSubject.asObservable();
             this.promotions = this.promotionsSubject.asObservable();
             this.deleting = false;
+            this.balanceCustomer$ = this.balanceCustomerSubject.asObservable();
+            this.allowAnyPaymentMethod$ = this.balanceCustomer$.pipe(operators.map(function (data) { return data.allowAnyPaymentMethod; }));
+            this.allowExceedBalance$ = this.balanceCustomer$.pipe(operators.map(function (data) { return data.allowExceedBalance; }));
+            this.creditAmount$ = this.balanceCustomer$.pipe(operators.map(function (data) { return data.creditAmount; }));
+            this.showMax$ = this.balanceCustomer$.pipe(operators.map(function (data) { return data.showMax; }));
+            this.showPrice$ = this.balanceCustomer$.pipe(operators.map(function (data) { return data.showPrice; }));
             this.getAddressBook = function () { return __awaiter$5(_this, void 0, void 0, function () { return __generator$5(this, function (_a) {
                 return [2 /*return*/, this.connection.get(this.addressBookApi()).pipe(operators.map(function (res) { var _a; return ((_a = res) === null || _a === void 0 ? void 0 : _a.length) && res.map(function (addres) { return addres && __assign$9(__assign$9({}, addres), { selected: addres.default }); }) || null; })).toPromise()];
             }); }); };
@@ -4654,6 +4668,7 @@
             this.resetCart = function (next) {
                 _this.items = [];
                 _this.cartSubject.next(null);
+                _this.updateBalanceAttributes(null);
                 _this.cart_token = null;
                 _this.cartItemsSubject.next([]);
                 _this.count = 0;
@@ -4664,6 +4679,7 @@
             this.updateCartObj = function (cart, emitEvent) {
                 if (emitEvent === void 0) { emitEvent = true; }
                 _this.cartSubject.next(cart);
+                _this.updateBalanceAttributes(cart);
                 emitEvent && _this.analyticsService.callEvent('add_to_cart', cart);
                 _this.promotionsSubject.next(_this.orderUtils.getPromotions(cart, true));
                 cart.couponCode
@@ -4770,7 +4786,7 @@
                 return __spread$3(items, paramsMerge);
             };
             this.updateItemQuantity = function (item, quantity) {
-                if (_this.validateQuantity(item, quantity)) {
+                if (_this.validateQuantity(item, quantity) && (_this.validatePriceAndCredits(item, quantity))) {
                     _this.connection.put(_this.updateItemQuantityApi(_this.findItemByIdVariant(item.variant_id)), { 'quantity': Number(quantity) }).subscribe(function (res) { return _this.updateCartObj(res) && _this.updateCartItemQuantity(item.variant_id, Number(quantity)); }, function (err) { return _this.handleError(err); });
                 }
             };
@@ -4785,6 +4801,38 @@
                 }
                 return true;
             };
+            this.validatePriceAndCredits = function (item, quantity) {
+                if (_this.balanceCustomerSubject.value.creditAmount === null) {
+                    return true;
+                }
+                if (_this.balanceCustomerSubject.value.remainingCredits === undefined) {
+                    return false;
+                }
+                var unitPrice = item.total / item.quantity;
+                var additionalQuantity = quantity - item.quantity;
+                if (additionalQuantity <= 0) {
+                    return true;
+                }
+                var additionalCost = unitPrice * additionalQuantity;
+                if (additionalCost > _this.balanceCustomerSubject.value.remainingCredits) {
+                    _this.toastrService.show('not-enough-credits');
+                    return false;
+                }
+                return true;
+            };
+            this.hasSufficientCreditsForCartTotal = function () {
+                if (_this.balanceCustomerSubject.value.creditAmount === null) {
+                    return true;
+                }
+                if (_this.balanceCustomerSubject.value.remainingCredits === undefined) {
+                    return false;
+                }
+                if (_this.cartSubject.value.totals.total > _this.balanceCustomerSubject.value.creditAmount) {
+                    _this.toastrService.show('not-enough-credits');
+                    return false;
+                }
+                return true;
+            };
             this.calculateStockCounts = function (item, quantity) {
                 if (item.product.stock < item.quantity + quantity) {
                     // this.toastrService.show('out-of-stock');
@@ -4930,6 +4978,12 @@
                 // }, 100);
                 return item;
             }); };
+            this.getCreditAmount = function () {
+                return _this.balanceCustomerSubject.pipe(operators.map(function (balanceCustomer) { var _a, _b; return _b = (_a = balanceCustomer) === null || _a === void 0 ? void 0 : _a.creditAmount, (_b !== null && _b !== void 0 ? _b : null); }));
+            };
+            this.getRemainingCredits = function () {
+                return _this.balanceCustomerSubject.pipe(operators.map(function (balanceCustomer) { var _a; return (_a = balanceCustomer) === null || _a === void 0 ? void 0 : _a.remainingCredits; }));
+            };
             this.requestInProcess.next(true);
             this.items = JSON.parse(localStorage.getItem('cart')) || [];
             this.cart_token = localStorage.getItem('cart_token') || null;
@@ -5003,6 +5057,20 @@
                 return subtotal - total;
             }));
         };
+        CartService$1.prototype.updateBalanceAttributes = function (cartData) {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+            var balanceData = {
+                allowAnyPaymentMethod: (_b = (_a = cartData) === null || _a === void 0 ? void 0 : _a.allowAnyPaymentMethod, (_b !== null && _b !== void 0 ? _b : false)),
+                allowExceedBalance: (_d = (_c = cartData) === null || _c === void 0 ? void 0 : _c.allowExceedBalance, (_d !== null && _d !== void 0 ? _d : false)),
+                creditAmount: (_f = (_e = cartData) === null || _e === void 0 ? void 0 : _e.creditAmount, (_f !== null && _f !== void 0 ? _f : null)),
+                showMax: (_h = (_g = cartData) === null || _g === void 0 ? void 0 : _g.showMax, (_h !== null && _h !== void 0 ? _h : false)),
+                showPrice: (_k = (_j = cartData) === null || _j === void 0 ? void 0 : _j.showPrice, (_k !== null && _k !== void 0 ? _k : false)),
+                remainingCredits: ((_l = cartData) === null || _l === void 0 ? void 0 : _l.creditAmount) && ((_m = cartData) === null || _m === void 0 ? void 0 : _m.creditAmount) >= ((_o = cartData) === null || _o === void 0 ? void 0 : _o.totals.total)
+                    ? ((_p = cartData) === null || _p === void 0 ? void 0 : _p.creditAmount) - ((_q = cartData) === null || _q === void 0 ? void 0 : _q.totals.total)
+                    : 0,
+            };
+            this.balanceCustomerSubject.next(balanceData);
+        };
         CartService$1.ctorParameters = function () { return [
             { type: ConnectionService },
             { type: ToastService },
@@ -7208,7 +7276,14 @@
                     cantidad > 0 && cantidad <= stock ? _this.cartService.updateItemQuantity(item, cantidad) : _this.toastrService.show('out-of-stock-actually');
                 }
             };
-            _this.redirectCheckout = function () { return _this.router.navigateByUrl("/checkout"); };
+            _this.redirectCheckout = function () {
+                if (_this.cartService.hasSufficientCreditsForCartTotal()) {
+                    _this.router.navigateByUrl("/checkout");
+                }
+                else {
+                    console.warn("No se puede redirigir al checkout debido a una validación fallida.");
+                }
+            };
             _this.redirectRegister = function () { return _this.router.navigateByUrl("/auth/login"); };
             _this.getVariants = function (product) {
                 var item = product.product;
@@ -9486,8 +9561,15 @@
             this.paramsService.parameters.subscribe(function (res) { return _this.params = res; });
             var mediaQuery = window.matchMedia('(max-width: 992px)');
             this.mediaMenu = mediaQuery.matches;
+            this.subscribeToBalance();
             this.ecOnInit();
         };
+        HeaderEcComponent.prototype.subscribeToBalance = function () {
+            var _this = this;
+            this.balanceSubscription = this.cartService.balanceCustomer$.subscribe(function (balanceData) {
+                _this.balanceAttributes = balanceData;
+            });
+        };
         HeaderEcComponent.ctorParameters = function () { return [
             { type: router.Router },
             { type: Constants },
@@ -9976,6 +10058,7 @@
                 _this.optionsSubject.next(_this.getOptions());
                 variant_code ? _this.updateVariants(variant_code) : _this.updateVariants();
                 _this.variants.length && _this.generateAsociatedDataFromVariants();
+                _this.fetchCartData();
                 //this.analyticsService.callEvent('view_item', { ...product, currency: this.constants.currency.code })
                 // variant_code && this.analyticsService.callEvent('view_item', { ...product, currency: this.constants.currency.code })
             };
@@ -10188,6 +10271,31 @@
                 }
                 return true;
             };
+            this.validatePriceAndCredits = function (price) {
+                if (_this.creditAmount === null) {
+                    console.log('No hay configuración de créditos para este usuario.');
+                    return true;
+                }
+                if (_this.remainingCredits === undefined) {
+                    return false;
+                }
+                if (price > _this.remainingCredits) {
+                    _this.toastrService.show('not-enough-credits');
+                    return false;
+                }
+                return true;
+            };
+            this.fetchCartData = function () {
+                _this.cartService.getTotalAmount().subscribe(function (totalAmount) {
+                    _this.currentTotalAmount = totalAmount;
+                });
+                _this.cartService.getCreditAmount().subscribe(function (creditAmount) {
+                    _this.creditAmount = creditAmount;
+                });
+                _this.cartService.getRemainingCredits().subscribe(function (remainingCredits) {
+                    _this.remainingCredits = remainingCredits;
+                });
+            };
             // Cuando haya modelos de respuesta, validamos que no se intente cargar un producto incompleto
             this.isProductValid = function (product) { return true; };
             /**
@@ -10242,6 +10350,8 @@
                 return;
             if (!this.validateQuantity(quantity))
                 return;
+            if (!this.validatePriceAndCredits(product_selected.price * quantity))
+                return;
             this.cartService.addToCart(this.makeAffordableProduct(product_selected), quantity, variant.code);
         };
         ;
@@ -15948,7 +16058,7 @@
             _this.prev = function (index) {
                 if (index === void 0) { index = -1; }
                 _this.values.pop();
-                _this.attributes.pop();
+                // this.attributes.pop();
                 _this.total.pop();
                 _this.taxonCode = 0;
                 _this.noMoreCoincidences = false;