Merge branch 'gabshr' into dayana

2 files changed, 4 insertions, 3 deletions

diff --git a/front/odiparpack/app/containers/Odipar/Camiones/CamionTab/CamionTab.js b/front/odiparpack/app/containers/Odipar/Camiones/CamionTab/CamionTab.js
index 2f9862e..5110566 100644
--- a/front/odiparpack/app/containers/Odipar/Camiones/CamionTab/CamionTab.js
+++ b/front/odiparpack/app/containers/Odipar/Camiones/CamionTab/CamionTab.js
@@ -6,7 +6,7 @@ import { Paper, Typography } from '@material-ui/core';
 import { connect } from 'react-redux';
 
 //actions
-import { getPedidos } from 'ba-actions/pedido';
+import { getCamiones } from 'ba-actions/camion';
 
 const styles = ({
     root: {
@@ -21,11 +21,12 @@ class CamionTab extends Component {
     this.state = {
       dataRealF: []
     };
-    this.props.dispatch(getPedidos()).then((res) => {
+    this.props.dispatch(getCamiones()).then((res) => {
       if (res) {
           this.setState({
             dataRealF: res.data,
           });
+          console.log("Vengo del back", res.data)
       }
     })
   }
diff --git a/front/odiparpack/app/containers/Odipar/Camiones/CamionTab/table/CrudCamionTab.js b/front/odiparpack/app/containers/Odipar/Camiones/CamionTab/table/CrudCamionTab.js
index 5a1783c..11c0805 100644
--- a/front/odiparpack/app/containers/Odipar/Camiones/CamionTab/table/CrudCamionTab.js
+++ b/front/odiparpack/app/containers/Odipar/Camiones/CamionTab/table/CrudCamionTab.js
@@ -72,7 +72,7 @@ class CrudCamionTab extends Component {
           <CrudTableForm
             dataTable={dataTable}
             openForm={openForm}
-            dataInit={dataApi}
+            dataInit={dataReal}
             anchor={anchorTable}
             title={title}
             fetchData={fetchData}