diff --git a/src/server/models/cart.js b/src/server/models/cart.js
index b4cf9eb..1aebc03 100755
--- a/src/server/models/cart.js
+++ b/src/server/models/cart.js
@@ -53,19 +53,30 @@ module.exports.getCartByUserId = async function (uid, idapp) {
     if (!!mycart) {
       for (const idkey in mycart.items) {
         try {
-          idorder = mycart.items[idkey]._id.toString();
-          const myorder = mycart.items[idkey].order;
+          // idorder = mycart.items[idkey]._id.toString();
+          let myorder = mycart.items[idkey].order;
           if (!!myorder) {
             idorder = mycart.items[idkey].order._id.toString();
           }
-          const myord = await Order.getTotalOrderById(idorder);
-          if (myord.length > 0) {
-            mycart.items[idkey].order = myord[0];
+          if (idorder) {
+            let myord = await Order.getTotalOrderById(idorder);
+            if (myord.length > 0) {
+              mycart.items[idkey].order = myord[0];
+            }
           }
         } catch (e) {
           console.log('err', e);
         }
       }
+
+      mycart.newitems = []
+      for (let item of mycart.items) {
+        if (item.order && item.order.hasOwnProperty('idapp'))
+          mycart.newitems.push(item)
+      }
+      mycart.items = [...mycart.newitems]
+      mycart.newitems = []
+
       return mycart;
     }
     return null;
diff --git a/src/server/models/order.js b/src/server/models/order.js
index 2625a10..97b11b5 100755
--- a/src/server/models/order.js
+++ b/src/server/models/order.js
@@ -409,6 +409,12 @@ module.exports.getTotalOrderById = async function (id) {
         as: 'producer'
       }
     },
+    {
+      $unwind: {
+        path: '$producer',
+        preserveNullAndEmptyArrays: true,
+      },
+    },
     {
       $lookup: {
         from: 'storehouses',
@@ -417,6 +423,12 @@ module.exports.getTotalOrderById = async function (id) {
         as: 'storehouse'
       }
     },
+    {
+      $unwind: {
+        path: '$storehouse',
+        preserveNullAndEmptyArrays: true,
+      },
+    },
     {
       $lookup: {
         from: 'providers',
@@ -425,6 +437,12 @@ module.exports.getTotalOrderById = async function (id) {
         as: 'provider'
       }
     },
+    {
+      $unwind: {
+        path: '$provider',
+        preserveNullAndEmptyArrays: true,
+      },
+    },
     {
       $lookup: {
         from: 'gasordines',
@@ -455,24 +473,6 @@ module.exports.getTotalOrderById = async function (id) {
         as: 'scontisticas'
       }
     },
-    {
-      $unwind: {
-        path: '$producer',
-        preserveNullAndEmptyArrays: true,
-      },
-    },
-    {
-      $unwind: {
-        path: '$storehouse',
-        preserveNullAndEmptyArrays: true,
-      },
-    },
-    {
-      $unwind: {
-        path: '$provider',
-        preserveNullAndEmptyArrays: true,
-      },
-    },
     {
       $lookup: {
         from: 'orders',