ng-easycommerce 0.0.684 → 0.0.685

package/fesm2015/ng-easycommerce.js

@@ -14285,6 +14285,7 @@ let RedSysRedirectEcComponent = class RedSysRedirectEcComponent extends Componen
         this.isDobleAuth = false;
         this.urls = [];
         this.closeModalReason = ''; // Renombrado para evitar confusión
+        this.finished = false;
         this.dataRedirect = () => this.consts.getUrlBase() + 'shop-api/' + this.consts.getChannel() + '/redsys/redirect/' + this.cartService.cart_token + '/process-payment';
         this.clearStorageState = () => {
             sessionStorage.removeItem('state');
@@ -14293,31 +14294,23 @@ let RedSysRedirectEcComponent = class RedSysRedirectEcComponent extends Componen
         // Método que se llama desde la X de la cabecera del modal en el HTML
         this.clickClose = () => {
             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 = () => {
-            var _a, _b, _c;
+            if (this.finished) {
+                return;
+            }
             let 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
@@ -14325,6 +14318,33 @@ let RedSysRedirectEcComponent = class RedSysRedirectEcComponent extends Componen
                 this.callState();
             }, 6000);
         };
+        this.handleState = (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 = (err) => {
             this.toastrService.show(err != '' ? err : 'payment-error');
             console.log("ERROR ENVIO BACK  ", err);
@@ -14342,10 +14362,11 @@ let RedSysRedirectEcComponent = class RedSysRedirectEcComponent extends Componen
         }
     }
     ngOnChanges() {
-        console.log("SE CAMBIO");
+        // console.log("SE CAMBIO");
     }
     openModal(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 });
@@ -14354,11 +14375,33 @@ let RedSysRedirectEcComponent = class RedSysRedirectEcComponent extends Componen
     }
     // Opcional pero recomendado: Capturar mensajes enviados desde el Iframe de Redsys
     onMessage(event) {
-        if (event.data === 'pago_completado' || event.data === 'ok') {
-            sessionStorage.setItem('state', 'ok');
+        var _a, _b, _c, _d;
+        const data = (_a = event) === null || _a === void 0 ? void 0 : _a.data;
+        const 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');
+        }
+    }
+    onStorage(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');
         }
     }
 };
@@ -14389,6 +14432,9 @@ __decorate$1m([
 __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',
@@ -16266,7 +16312,7 @@ let RedSysRedirectOutEcComponent = class RedSysRedirectOutEcComponent extends Co
             (_a = this.ventana) === null || _a === void 0 ? void 0 : _a.close();
         };
         this.callState = () => {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d;
             let state = this.closeModal != '' ? this.closeModal : localStorage.getItem('state');
             !state && this.ventana.closed && (state = 'cancel');
             this.loading = true;
@@ -16274,27 +16320,22 @@ let RedSysRedirectOutEcComponent = class RedSysRedirectOutEcComponent extends Co
             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;
             }