ng-easycommerce 0.0.684 → 0.0.685

package/fesm5/ng-easycommerce.js

@@ -16832,6 +16832,7 @@ var RedSysRedirectEcComponent = /** @class */ (function (_super) {
         _this.isDobleAuth = false;
         _this.urls = [];
         _this.closeModalReason = ''; // Renombrado para evitar confusión
+        _this.finished = false;
         _this.dataRedirect = function () { return _this.consts.getUrlBase() + 'shop-api/' + _this.consts.getChannel() + '/redsys/redirect/' + _this.cartService.cart_token + '/process-payment'; };
         _this.clearStorageState = function () {
             sessionStorage.removeItem('state');
@@ -16840,31 +16841,23 @@ var RedSysRedirectEcComponent = /** @class */ (function (_super) {
         // Método que se llama desde la X de la cabecera del modal en el HTML
         _this.clickClose = function () {
             _this.closeModalReason = 'cancel';
+            _this.finished = true;
+            if (_this.stateTimeout) {
+                clearTimeout(_this.stateTimeout);
+                _this.stateTimeout = null;
+            }
             if (_this.modalRef) {
                 _this.modalRef.hide();
             }
             _this.processError('Se canceló el pago con tarjeta');
         };
         _this.callState = function () {
-            var _a, _b, _c;
+            if (_this.finished) {
+                return;
+            }
             var state = _this.closeModalReason != '' ? _this.closeModalReason : sessionStorage.getItem('state');
             if (state) {
-                _this.clearStorageState();
-                if (state == 'ok') {
-                    (_a = _this.modalRef) === null || _a === void 0 ? void 0 : _a.hide();
-                    _this.ready.emit(true);
-                    return;
-                }
-                if (state == 'menosuno') {
-                    (_b = _this.modalRef) === null || _b === void 0 ? void 0 : _b.hide();
-                    _this.processError('Error en el pago');
-                    return;
-                }
-                if (state == 'cancel') {
-                    return; // El modal ya se escondió dentro de clickClose()
-                }
-                (_c = _this.modalRef) === null || _c === void 0 ? void 0 : _c.hide();
-                _this.processError('Error desconocido en la transacción');
+                _this.handleState(state);
                 return;
             }
             // Guardamos el timeout en una variable de clase
@@ -16872,6 +16865,33 @@ var RedSysRedirectEcComponent = /** @class */ (function (_super) {
                 _this.callState();
             }, 6000);
         };
+        _this.handleState = function (state) {
+            var _a, _b, _c, _d;
+            if (_this.finished)
+                return;
+            _this.finished = true;
+            if (_this.stateTimeout) {
+                clearTimeout(_this.stateTimeout);
+                _this.stateTimeout = null;
+            }
+            _this.clearStorageState();
+            if (state === 'ok') {
+                (_a = _this.modalRef) === null || _a === void 0 ? void 0 : _a.hide();
+                _this.ready.emit(true);
+                return;
+            }
+            if (state === 'menosuno' || state === 'error' || state === 'failure') {
+                (_b = _this.modalRef) === null || _b === void 0 ? void 0 : _b.hide();
+                _this.processError('Error en el pago');
+                return;
+            }
+            if (state === 'cancel') {
+                (_c = _this.modalRef) === null || _c === void 0 ? void 0 : _c.hide();
+                return;
+            }
+            (_d = _this.modalRef) === null || _d === void 0 ? void 0 : _d.hide();
+            _this.processError('Error desconocido en la transacción');
+        };
         _this.processError = function (err) {
             _this.toastrService.show(err != '' ? err : 'payment-error');
             console.log("ERROR ENVIO BACK  ", err);
@@ -16890,10 +16910,11 @@ var RedSysRedirectEcComponent = /** @class */ (function (_super) {
         }
     };
     RedSysRedirectEcComponent.prototype.ngOnChanges = function () {
-        console.log("SE CAMBIO");
+        // console.log("SE CAMBIO");
     };
     RedSysRedirectEcComponent.prototype.openModal = function (template) {
         this.clearStorageState();
+        this.finished = false;
         sessionStorage.setItem('dataRedirect', this.dataRedirect());
         // Abrimos el modal y guardamos la referencia en this.modalRef
         this.modalRef = this.modalService.show(template, { class: 'modal-lg modal-dialog-centered', keyboard: false, backdrop: 'static', animated: true });
@@ -16902,11 +16923,33 @@ var RedSysRedirectEcComponent = /** @class */ (function (_super) {
     };
     // Opcional pero recomendado: Capturar mensajes enviados desde el Iframe de Redsys
     RedSysRedirectEcComponent.prototype.onMessage = function (event) {
-        if (event.data === 'pago_completado' || event.data === 'ok') {
-            sessionStorage.setItem('state', 'ok');
+        var _a, _b, _c, _d;
+        var data = (_a = event) === null || _a === void 0 ? void 0 : _a.data;
+        var state = typeof data === 'string'
+            ? data
+            : ((_b = data) === null || _b === void 0 ? void 0 : _b.state) || ((_c = data) === null || _c === void 0 ? void 0 : _c.status) || ((_d = data) === null || _d === void 0 ? void 0 : _d.result) || null;
+        if (!state) {
+            return;
+        }
+        if (state === 'pago_completado' || state === 'ok' || state === 'success') {
+            this.handleState('ok');
+            return;
+        }
+        if (state === 'pago_error' || state === 'menosuno' || state === 'error' || state === 'failure') {
+            this.handleState('menosuno');
+        }
+    };
+    RedSysRedirectEcComponent.prototype.onStorage = function (event) {
+        var _a;
+        if (!((_a = event) === null || _a === void 0 ? void 0 : _a.key) || event.key !== 'state' || !event.newValue) {
+            return;
+        }
+        if (event.newValue === 'ok' || event.newValue === 'success') {
+            this.handleState('ok');
+            return;
         }
-        else if (event.data === 'pago_error' || event.data === 'menosuno') {
-            sessionStorage.setItem('state', 'menosuno');
+        if (event.newValue === 'menosuno' || event.newValue === 'error' || event.newValue === 'failure') {
+            this.handleState('menosuno');
         }
     };
     RedSysRedirectEcComponent.ctorParameters = function () { return [
@@ -16936,6 +16979,9 @@ var RedSysRedirectEcComponent = /** @class */ (function (_super) {
     __decorate$1m([
         HostListener('window:message', ['$event'])
     ], RedSysRedirectEcComponent.prototype, "onMessage", null);
+    __decorate$1m([
+        HostListener('window:storage', ['$event'])
+    ], RedSysRedirectEcComponent.prototype, "onStorage", null);
     RedSysRedirectEcComponent = __decorate$1m([
         Component({
             selector: 'app-redsys-redirect-ec',
@@ -19141,7 +19187,7 @@ var RedSysRedirectOutEcComponent = /** @class */ (function (_super) {
             (_a = _this.ventana) === null || _a === void 0 ? void 0 : _a.close();
         };
         _this.callState = function () {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d;
             var state = _this.closeModal != '' ? _this.closeModal : localStorage.getItem('state');
             !state && _this.ventana.closed && (state = 'cancel');
             _this.loading = true;
@@ -19149,27 +19195,22 @@ var RedSysRedirectOutEcComponent = /** @class */ (function (_super) {
             if (state) {
                 _this.loading = false;
                 localStorage.removeItem('state');
-                if (state == 'success' || state == 'ok') {
+                if (state == 'success' || state == 'ok' || state == 'pending') {
                     (_a = _this.ventana) === null || _a === void 0 ? void 0 : _a.close();
                     _this.ready.emit(true);
                     return;
                 }
-                if (state == 'pending' || state == 'ok') {
+                if (state == 'failure' || state == 'error' || state == 'menosuno') {
                     (_b = _this.ventana) === null || _b === void 0 ? void 0 : _b.close();
-                    _this.ready.emit(true);
-                    return;
-                }
-                if (state == 'failure' || state == 'error') {
-                    (_c = _this.ventana) === null || _c === void 0 ? void 0 : _c.close();
                     _this.processError('');
                     return;
                 }
                 if (state == 'cancel') {
-                    (_d = _this.ventana) === null || _d === void 0 ? void 0 : _d.close();
+                    (_c = _this.ventana) === null || _c === void 0 ? void 0 : _c.close();
                     _this.processError('Se cancelo el pago con redsys');
                     return;
                 }
-                (_e = _this.ventana) === null || _e === void 0 ? void 0 : _e.close();
+                (_d = _this.ventana) === null || _d === void 0 ? void 0 : _d.close();
                 _this.processError('');
                 return;
             }