From 173140257afe6826ae201d2b6d29e1e4ee893bd6 Mon Sep 17 00:00:00 2001
From: xXpuma99Xx <51341582+xXpuma99Xx@users.noreply.github.com>
Date: Thu, 21 Apr 2022 12:50:53 -0500
Subject: [PATCH 1/2] todos los tipos carrito

---
 server/controller/TipoCarrito/get.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/server/controller/TipoCarrito/get.js b/server/controller/TipoCarrito/get.js
index 97c5ef3..e0350c6 100644
--- a/server/controller/TipoCarrito/get.js
+++ b/server/controller/TipoCarrito/get.js
@@ -1,9 +1,5 @@
-const { Op } = require('sequelize');
 const TipoCarrito = require('../../db/tablas/TipoCarrito');
 
-const get = async () =>
-  TipoCarrito.findAll({
-    where: { [Op.or]: [{ idTipoCarrito: 1 }, { idTipoCarrito: 2 }] },
-  });
+const get = async () => TipoCarrito.findAll();
 
 module.exports = get;

From 1fc473407953fe1e367501af27146db59e19061b Mon Sep 17 00:00:00 2001
From: xXpuma99Xx <51341582+xXpuma99Xx@users.noreply.github.com>
Date: Thu, 5 May 2022 18:16:12 -0500
Subject: [PATCH 2/2] cambio de descripcion error

---
 server/config/mariadb.conf.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/config/mariadb.conf.js b/server/config/mariadb.conf.js
index 570627e..f6a2eba 100644
--- a/server/config/mariadb.conf.js
+++ b/server/config/mariadb.conf.js
@@ -29,7 +29,7 @@ const obtenerAlumno = async (numeroCuenta) => {
     })
     .catch((err) => {
       conn.end();
-      throw new Error('Hubo un problema con el querry.' + err);
+      throw new Error('Hubo un problema, intenta más tarde.');
     });
 };