From 9c396976bb42a9d41407358ce1a1d37242230f21 Mon Sep 17 00:00:00 2001
From: gabrhr <73925454+gabrhr@users.noreply.github.com>
Date: Fri, 27 May 2022 12:50:13 -0500
Subject: Add redux, dispatch and etiquetas
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- estetica de etiquetas (ok)
- add message, pedido Reducer
- add dispatch en Componentes con connect
- add api reducer que obtienen el JSON todo ok

#TODO
- FIX logica de añadiir
- FIX axios y dispatch fuera de un componente
---
 front/odiparpack/app/actions/actionTypes.js |  7 +++++++
 front/odiparpack/app/actions/message.js     | 17 +++++++++++++++++
 front/odiparpack/app/actions/pedido.js      | 26 ++++++++++++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 front/odiparpack/app/actions/message.js
 create mode 100644 front/odiparpack/app/actions/pedido.js

(limited to 'front/odiparpack/app/actions')

diff --git a/front/odiparpack/app/actions/actionTypes.js b/front/odiparpack/app/actions/actionTypes.js
index 08986f2..5aaa47a 100644
--- a/front/odiparpack/app/actions/actionTypes.js
+++ b/front/odiparpack/app/actions/actionTypes.js
@@ -82,3 +82,10 @@ export const DELETE_EVENT = 'DELETE_EVENT';
 
 // Notification Form
 export const CLOSE_NOTIF = 'CLOSE_NOTIF';
+
+
+//Odi Message 
+export const CLOSE_MESSAGE = 'CLOSE_MESSAGE';
+export const OPEN_MESSAGE = 'OPEN_MESSAGE';
+
+export const LISTA_PEDIDO = 'SAVE_PEDIDO';
\ No newline at end of file
diff --git a/front/odiparpack/app/actions/message.js b/front/odiparpack/app/actions/message.js
new file mode 100644
index 0000000..881a41f
--- /dev/null
+++ b/front/odiparpack/app/actions/message.js
@@ -0,0 +1,17 @@
+import * as types from './actionTypes';
+import { partial } from 'odi-utils/constants';
+
+
+export const closeMessage = () => ({
+    type: types.CLOSE_MESSAGE,
+})
+
+export const setMessage = (type, message) => ({
+    type: types.OPEN_MESSAGE,
+    payload: {
+        type, message
+    }
+})
+
+export const openSuccessMessage = partial(setMessage, 'success');
+export const openErrorMessage = partial(setMessage, 'error');
\ No newline at end of file
diff --git a/front/odiparpack/app/actions/pedido.js b/front/odiparpack/app/actions/pedido.js
new file mode 100644
index 0000000..15382fe
--- /dev/null
+++ b/front/odiparpack/app/actions/pedido.js
@@ -0,0 +1,26 @@
+import {
+    getPedidosAPI
+} from 'ba-api/pedido';
+import { addMessageCurry } from 'odi-utils/api';
+import * as types from './actionTypes'
+
+export const setPedidos = (payload) => ({
+        type: types.LISTA_PEDIDO,
+        payload
+});
+
+export const getPedidos = () => {
+    return dispatch => {
+        return new Promise(
+            (resolve, reject) => {
+                console.log("entreeeeeeeeee")
+                addMessageCurry(getPedidosAPI(), dispatch, '',"aaaaaaaaa")
+                    .then(pedidos => {
+                        dispatch(setPedidos({pedidos}));
+                        resolve(pedidos)
+                        console.log(pedidos)
+                    })
+            }
+        )
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 32fb17de8f78317b165b6f269a8bab2d4e852d0d Mon Sep 17 00:00:00 2001
From: gabrhr <73925454+gabrhr@users.noreply.github.com>
Date: Mon, 30 May 2022 20:08:04 -0500
Subject: Fix axios and add new
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- FIX logica de añadiir (ok)
- FIX axios y dispatch fuera de un componente (ok)
- Cambiar las notificaciones
---
 front/odiparpack/app/actions/pedido.js             | 22 +++----
 front/odiparpack/app/api/notifMessage.js           |  8 +--
 front/odiparpack/app/api/pedido.js                 | 18 +++++-
 front/odiparpack/app/app.js                        |  6 +-
 .../app/components/Notification/Notification.js    | 69 +++++++++++++++++++---
 .../app/components/Tables/CrudTableForm.js         | 36 +++++++++--
 .../app/components/Tables/tableParts/Form.js       |  4 +-
 .../components/Tables/tableParts/MainTableForm.js  |  4 +-
 .../components/Tables/tableParts/RowReadOnly.js    | 17 +++++-
 .../app/containers/Odipar/Pedidos/Pedidos.js       | 42 ++++++++++++-
 .../containers/Odipar/Pedidos/table/CrudPedido.js  | 33 ++++-------
 .../containers/Odipar/Pedidos/table/sampleData.js  |  1 -
 front/odiparpack/app/redux/configureStore.js       | 20 +++++--
 .../odiparpack/app/redux/modules/crudTableForm.js  | 15 ++++-
 front/odiparpack/app/utils/odipar/api.js           | 20 ++-----
 front/odiparpack/package-lock.json                 |  5 ++
 front/odiparpack/package.json                      |  3 +-
 17 files changed, 235 insertions(+), 88 deletions(-)

(limited to 'front/odiparpack/app/actions')

diff --git a/front/odiparpack/app/actions/pedido.js b/front/odiparpack/app/actions/pedido.js
index 15382fe..f8e95d6 100644
--- a/front/odiparpack/app/actions/pedido.js
+++ b/front/odiparpack/app/actions/pedido.js
@@ -9,18 +9,12 @@ export const setPedidos = (payload) => ({
         payload
 });
 
-export const getPedidos = () => {
-    return dispatch => {
-        return new Promise(
-            (resolve, reject) => {
-                console.log("entreeeeeeeeee")
-                addMessageCurry(getPedidosAPI(), dispatch, '',"aaaaaaaaa")
-                    .then(pedidos => {
-                        dispatch(setPedidos({pedidos}));
-                        resolve(pedidos)
-                        console.log(pedidos)
-                    })
-            }
-        )
+export const getPedidos = () => async dispatch => {
+    try{
+        const res = await getPedidosAPI();
+        dispatch(setPedidos({res}))
+        return res;
+    }catch(e){
+        console.log(e)
     }
-}
\ No newline at end of file
+}
diff --git a/front/odiparpack/app/api/notifMessage.js b/front/odiparpack/app/api/notifMessage.js
index 2d2b48b..bc7a60c 100644
--- a/front/odiparpack/app/api/notifMessage.js
+++ b/front/odiparpack/app/api/notifMessage.js
@@ -1,10 +1,10 @@
 module.exports = {
-  saved: 'Data has been saved',
-  updated: 'Data has been updated',
-  removed: 'Item has been removed',
+  saved: 'Se ha guardado correctamente',
+  updated: 'Se ha actualizado correctamente',
+  removed: 'Se ha eliminado correctamente',
   posted: 'Your post has been submitted',
   commented: 'Your comment has been submitted',
-  discard: 'Action canceled',
+  discard: 'Cancelado',
   addCart: 'Item added to cart',
   checkout: 'Thank you for shopping',
   sent: 'Email sent',
diff --git a/front/odiparpack/app/api/pedido.js b/front/odiparpack/app/api/pedido.js
index 7cfb3f7..63d6e2e 100644
--- a/front/odiparpack/app/api/pedido.js
+++ b/front/odiparpack/app/api/pedido.js
@@ -1,6 +1,18 @@
-import { apiPost, apiGet, apiDelete, apiPut } from "odi-utils/api";
+import axios from 'axios';
+import { apiGet } from '../utils/odipar/api';
 
 //GET APIS
-export const getPedidosAPI = () => {
-    return apiGet('ayuda/')
+export const getPedidosAPI = async () => {
+    return await apiGet(`ayuda/`)
+}
+
+export function getAPi(){
+    axios.get(
+        `http://localhost:8083/ayuda/`, //TODO: check currentTimeStamp
+        { 
+            headers: {
+                'Content-type': 'application/json',
+            },
+        }
+    )
 }
\ No newline at end of file
diff --git a/front/odiparpack/app/app.js b/front/odiparpack/app/app.js
index 6845268..34f6a9f 100644
--- a/front/odiparpack/app/app.js
+++ b/front/odiparpack/app/app.js
@@ -34,9 +34,13 @@ import { translationMessages } from './i18n';
 
 // Create redux store with history
 const initialState = {};
-const store = configureStore(initialState, history);
+//const store = configureStore(initialState, history);
 const MOUNT_NODE = document.getElementById('app');
 
+//New store
+import { confStore } from './redux/configureStore';
+const store = confStore()
+
 const render = messages => {
   ReactDOM.render(
     <Provider store={store}>
diff --git a/front/odiparpack/app/components/Notification/Notification.js b/front/odiparpack/app/components/Notification/Notification.js
index 7e73896..fcc53a4 100644
--- a/front/odiparpack/app/components/Notification/Notification.js
+++ b/front/odiparpack/app/components/Notification/Notification.js
@@ -2,8 +2,13 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { withStyles } from '@material-ui/core/styles';
 import CloseIcon from '@material-ui/icons/Close';
+import classNames from 'classnames';
+import CheckCircleOutlinedIcon from '@material-ui/icons/CheckCircleOutlined';
+import ErrorOutlineOutlinedIcon from '@material-ui/icons/ErrorOutlineOutlined';
+import InfoOutlinedIcon from '@material-ui/icons/InfoOutlined';
+import ReportProblemOutlinedIcon from '@material-ui/icons/ReportProblemOutlined';
 
-import { Snackbar, IconButton } from '@material-ui/core';
+import { Snackbar, IconButton, SnackbarContent } from '@material-ui/core';
 
 const styles = theme => ({
   close: {
@@ -11,6 +16,41 @@ const styles = theme => ({
   },
 });
 
+const variantIcon = {
+  success: CheckCircleOutlinedIcon,
+  warning: ReportProblemOutlinedIcon,
+  error: ErrorOutlineOutlinedIcon,
+  info: InfoOutlinedIcon,
+};
+
+const styles1 = theme => ({
+  success: {
+    backgroundColor: '#b6f8c4',
+  },
+  error: {
+    backgroundColor: '#faabab',
+  },
+  info: {
+    backgroundColor: '#b2e7f5',
+  },
+  warning: {
+    backgroundColor: '#f5ea9f',
+  },
+  icon: {
+    fontSize: 20,
+    color: 'black'
+  },
+  iconVariant: {
+    opacity: 0.9,
+    marginRight: theme.spacing(1),
+  },
+  message: {
+    display: 'flex',
+    alignItems: 'center',
+    color: 'black'
+  },
+});
+
 class Notification extends React.Component {
   handleClose = (event, reason) => {
     if (reason === 'clickaway') {
@@ -20,20 +60,30 @@ class Notification extends React.Component {
   };
 
   render() {
-    const { classes, message } = this.props;
+    const { classes, message, variant } = this.props;
+    const Icon = variantIcon[variant];
     return (
       <Snackbar
-        anchorOrigin={{
-          vertical: 'bottom',
-          horizontal: 'left',
-        }}
         open={message !== ''}
         autoHideDuration={3000}
         onClose={() => this.handleClose()}
         ContentProps={{
           'aria-describedby': 'message-id',
         }}
-        message={message}
+        anchorOrigin={{
+          vertical: 'top',
+          horizontal: 'right',
+        }}
+      
+      >
+      <SnackbarContent
+        className={classNames(classes[variant])}
+        message={(
+          <span id="client-snackbar" className={classes.message}>
+            <Icon className={classNames(classes.icon, classes.iconVariant)} />
+            {message}
+          </span>
+        )}
         action={[
           <IconButton
             key="close"
@@ -42,10 +92,11 @@ class Notification extends React.Component {
             className={classes.close}
             onClick={() => this.handleClose()}
           >
-            <CloseIcon />
+            <CloseIcon className={classes.icon}/>
           </IconButton>,
         ]}
       />
+    </Snackbar>
     );
   }
 }
@@ -56,4 +107,4 @@ Notification.propTypes = {
   message: PropTypes.string.isRequired,
 };
 
-export default withStyles(styles)(Notification);
+export default withStyles(styles1)(Notification);
diff --git a/front/odiparpack/app/components/Tables/CrudTableForm.js b/front/odiparpack/app/components/Tables/CrudTableForm.js
index 219fcd2..0ba5264 100644
--- a/front/odiparpack/app/components/Tables/CrudTableForm.js
+++ b/front/odiparpack/app/components/Tables/CrudTableForm.js
@@ -5,15 +5,39 @@ import MainTableForm from './tableParts/MainTableForm';
 import FloatingPanel from './../Panel/FloatingPanel';
 
 class CrudTableForm extends React.Component {
-  componentDidMount() {
-    console.log("en el FORM",this.props.dataInit)
-    this.props.fetchData(this.props.dataInit, this.props.branch);
+
+  componentDidUpdate(previousProps) {
+    if (previousProps.dataInit !== this.props.dataInit) {
+      //console.log("en el FORM",this.props.dataInit)
+      this.props.fetchData(this.props.dataInit, this.props.branch);
+    }
   }
 
   sendValues = (values) => {
     setTimeout(() => {
       this.props.submit(values, this.props.branch);
     }, 500);
+    if (this.props.editingId === this.props.initValues.get('id')) {
+      this.props.dispatch(this.props.editRowAPI()).then((res) => {
+        if (res) {
+            console.log("EDIT RO ", res)
+        }
+      })
+    } else {
+      this.props.dispatch(this.props.addNewAPI()).then((res) => {
+        if (res) {
+            console.log("ADD NEW FORM ", res)
+        }
+      })
+    }
+    
+  }
+
+  getTitle( ){
+    if (this.props.editingId === this.props.initValues.get(this.props.anchor[0].name)) {
+      return "Editar"
+    } 
+    return "Añadir nuevo"
   }
 
   render() {
@@ -28,12 +52,13 @@ class CrudTableForm extends React.Component {
       anchor,
       children,
       branch,
-      initValues
+      initValues,
+      removeRowAPI
     } = this.props;
     return (
       <div>
         
-        <FloatingPanel openForm={openForm} branch={branch} closeForm={closeForm}>
+        <FloatingPanel openForm={openForm} branch={branch} closeForm={closeForm} title = {this.getTitle()}>
           <Form onSubmit={this.sendValues} initValues={initValues} branch={branch}>
             {children}
           </Form>
@@ -46,6 +71,7 @@ class CrudTableForm extends React.Component {
           editRow={editRow}
           anchor={anchor}
           branch={branch}
+          removeRowAPI={removeRowAPI}
         />
       </div>
     );
diff --git a/front/odiparpack/app/components/Tables/tableParts/Form.js b/front/odiparpack/app/components/Tables/tableParts/Form.js
index da66966..66188c7 100644
--- a/front/odiparpack/app/components/Tables/tableParts/Form.js
+++ b/front/odiparpack/app/components/Tables/tableParts/Form.js
@@ -31,14 +31,14 @@ class Form extends Component {
           </section>
           <div className={css.buttonArea}>
             <Button variant="contained" color="secondary" type="submit" disabled={submitting}>
-              Submit
+              Guardar
             </Button>
             <Button
               type="button"
               disabled={pristine || submitting}
               onClick={reset}
             >
-              Reset
+              Limpiar
             </Button>
           </div>
         </form>
diff --git a/front/odiparpack/app/components/Tables/tableParts/MainTableForm.js b/front/odiparpack/app/components/Tables/tableParts/MainTableForm.js
index 8869212..1437fa8 100644
--- a/front/odiparpack/app/components/Tables/tableParts/MainTableForm.js
+++ b/front/odiparpack/app/components/Tables/tableParts/MainTableForm.js
@@ -29,7 +29,8 @@ class MainTableForm extends React.Component {
       editRow,
       addNew,
       anchor,
-      branch
+      branch,
+      removeRowAPI
     } = this.props;
     const getItems = dataArray => dataArray.map(item => (
       <RowReadOnly
@@ -39,6 +40,7 @@ class MainTableForm extends React.Component {
         editRow={() => editRow(item, branch)}
         anchor={anchor}
         branch={branch}
+        removeRowAPI = {removeRowAPI}
       />
     ));
 
diff --git a/front/odiparpack/app/components/Tables/tableParts/RowReadOnly.js b/front/odiparpack/app/components/Tables/tableParts/RowReadOnly.js
index 2f4a519..d060d02 100644
--- a/front/odiparpack/app/components/Tables/tableParts/RowReadOnly.js
+++ b/front/odiparpack/app/components/Tables/tableParts/RowReadOnly.js
@@ -8,6 +8,7 @@ import EditIcon from '@material-ui/icons/BorderColor';
 import { etiqueta } from 'ba-components/Odipar/common';
 
 import { TableCell, IconButton, LinearProgress } from '@material-ui/core';
+import { connect } from 'react-redux';
 
 const styles = theme => ({
   button: {
@@ -23,10 +24,16 @@ class RowReadOnly extends React.Component {
       item,
       removeRow,
       editRow,
-      branch
+      branch,
+      removeRowAPI
     } = this.props;
     const eventDel = () => {
       removeRow(item, branch);
+      this.props.dispatch(removeRowAPI()).then((res) => {
+        if (res) {
+            console.log("REMOVE READ ONLY ", res)
+        }
+      })
     };
     const eventEdit = () => {
       editRow(item, branch);
@@ -86,5 +93,11 @@ RowReadOnly.propTypes = {
   editRow: PropTypes.func.isRequired,
   branch: PropTypes.string.isRequired,
 };
+const mapDispatchToProps = dispatch => ({
+  dispatch
+});
 
-export default withStyles(styles)(RowReadOnly);
+const RowReadOnlyMapped = connect(
+  mapDispatchToProps
+)(RowReadOnly);
+export default withStyles(styles)(RowReadOnlyMapped);
diff --git a/front/odiparpack/app/containers/Odipar/Pedidos/Pedidos.js b/front/odiparpack/app/containers/Odipar/Pedidos/Pedidos.js
index a9baab8..27adce5 100644
--- a/front/odiparpack/app/containers/Odipar/Pedidos/Pedidos.js
+++ b/front/odiparpack/app/containers/Odipar/Pedidos/Pedidos.js
@@ -3,6 +3,11 @@ import { withStyles } from '@material-ui/core/styles';
 import PropTypes from 'prop-types';
 import { CrudPedido } from './table'
 import { Paper, Typography } from '@material-ui/core';
+import { connect } from 'react-redux';
+
+//
+import { getPedidos } from 'ba-actions/pedido';
+import pedido from '../../../redux/modules/pedido';
 
 const styles = ({
     root: {
@@ -12,7 +17,25 @@ const styles = ({
   });
 
 class Pedidos extends Component {
+  constructor (props) {
+    super(props)
+    this.state = {
+      dataRealF: []
+    };
+    this.props.dispatch(getPedidos()).then((res) => {
+      if (res) {
+          this.setState({
+            dataRealF: res.data,
+          });
+      }
+    })
+    //console.log("Pedido - LUEGO DE THEN ", this.state.dataRealF)
+  }
+
+
     render() {
+      const {dataRealF} = this.state;
+      //console.log ("aNTESZSSSS?", pedidosLista)
       const { classes } = this.props;
         return (
           <div>
@@ -21,7 +44,7 @@ class Pedidos extends Component {
             </Typography>
             <div>  
               <Paper className={classes.root}>
-                <CrudPedido title = "Historial de Pedidos"/>
+                <CrudPedido title = "Historial de Pedidos" dataReal={dataRealF}/>
               </Paper>
             </div>
           </div>
@@ -33,4 +56,19 @@ Pedidos.propTypes = {
   classes: PropTypes.object.isRequired,
 };
 
-export default withStyles(styles)(Pedidos);
\ No newline at end of file
+const reducer = 'pedido'
+const mapStateToProps = state => ({
+  force: state, // force state from reducer
+  pedidosLista : state.getIn([reducer]),
+});
+
+const mapDispatchToProps = dispatch => ({
+  dispatch
+});
+
+const PedidosMapped = connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(Pedidos);
+
+export default withStyles(styles)(PedidosMapped);
\ No newline at end of file
diff --git a/front/odiparpack/app/containers/Odipar/Pedidos/table/CrudPedido.js b/front/odiparpack/app/containers/Odipar/Pedidos/table/CrudPedido.js
index d1fd553..c7a7a58 100644
--- a/front/odiparpack/app/containers/Odipar/Pedidos/table/CrudPedido.js
+++ b/front/odiparpack/app/containers/Odipar/Pedidos/table/CrudPedido.js
@@ -20,8 +20,7 @@ import {
 import { anchorTable, dataApi } from './sampleData';
 import FormPedido from './FormPedido';
 //actions
-import { setPedidos, getPedidos } from '../../../../actions/pedido';
-
+import { getPedidos } from '../../../../actions/pedido';
 const branch = 'crudPedido';
 
 const renderRadioGroup = ({ input, ...rest }) => (
@@ -41,25 +40,9 @@ const styles = ({
 });
 
 class CrudPedido extends Component {
-  constructor (props) {
-    super(props)
-    this.state = {
-      dataReal: []
-    };
-
-    this.props.dispatch(getPedidos())
-    .then( res => {
-      console.log("aqui en el then ps", res)
-      this.setState({
-        dataReal: res
-      })
-    })
-    console.log("aqui en el then ps 2", this.props.pedidosLista)
-
-  }
 
   render() {
-    console.log("render ps")
+    //console.log("render ps")
     const {
       classes,
       fetchData,
@@ -74,15 +57,17 @@ class CrudPedido extends Component {
       closeNotif,
       messageNotif,
       title,
+      dataReal,
+      dispatch,
+      editingId
     } = this.props;
     
-    const {dataReal} = this.state;
     //console.log("render ps DATA", dataReal)
     //console.log("original", dataApi)
     
     return (
       <div>
-        <Notification close={() => closeNotif(branch)} message={messageNotif} />
+        <Notification close={() => closeNotif(branch)} variant = "success" message={messageNotif} />
         <Paper className={classes.root}>
           <CrudTableForm
             dataTable={dataTable}
@@ -98,6 +83,11 @@ class CrudPedido extends Component {
             editRow={editRow}
             branch={branch}
             initValues={initValues}
+            addNewAPI={getPedidos}
+            removeRowAPI={getPedidos}
+            editRowAPI={getPedidos}
+            dispatch = {dispatch}
+            editingId = {editingId}
           >
             {/* Create Your own form, then arrange or custom it as You like */}
             <FormPedido/>
@@ -136,6 +126,7 @@ const mapStateToProps = state => ({
   dataTable: state.getIn([branch, 'dataTable']),
   openForm: state.getIn([branch, 'showFrm']),
   messageNotif: state.getIn([branch, 'notifMsg']),
+  editingId: state.getIn([branch, 'editingId']),
   pedidosLista : state.getIn(['pedido','pedidos']),
 });
 
diff --git a/front/odiparpack/app/containers/Odipar/Pedidos/table/sampleData.js b/front/odiparpack/app/containers/Odipar/Pedidos/table/sampleData.js
index e16f7cc..3a7556c 100644
--- a/front/odiparpack/app/containers/Odipar/Pedidos/table/sampleData.js
+++ b/front/odiparpack/app/containers/Odipar/Pedidos/table/sampleData.js
@@ -66,7 +66,6 @@ export const dataApi = [
   {
     id: '1',
     cantidad: 30,
-    
     origen: 'Arequipa',
     fecha: '24/05/2022 11:28 AM',
     destino: 'Cuzco',
diff --git a/front/odiparpack/app/redux/configureStore.js b/front/odiparpack/app/redux/configureStore.js
index 80c84c0..767af03 100644
--- a/front/odiparpack/app/redux/configureStore.js
+++ b/front/odiparpack/app/redux/configureStore.js
@@ -8,14 +8,15 @@ import { routerMiddleware } from 'connected-react-router/immutable';
 import createSagaMiddleware from 'redux-saga';
 import createReducer from './reducers';
 import thunk from 'redux-thunk';
+import { composeWithDevTools } from "redux-devtools-extension";
 
 const sagaMiddleware = createSagaMiddleware();
 
-export default function configureStore(initialState = {}, history) {
+export function configureStore(initialState = {}, history) {
   // Create the store with two middlewares
   // 1. sagaMiddleware: Makes redux-sagas work
   // 2. routerMiddleware: Syncs the location/URL path to the state
-  const middlewares = [thunk,sagaMiddleware, routerMiddleware(history)];
+  const middlewares = [thunk, routerMiddleware(history)];
 
   const enhancers = [applyMiddleware(...middlewares)];
 
@@ -35,13 +36,13 @@ export default function configureStore(initialState = {}, history) {
   const store = createStore(
     createReducer(),
     fromJS(initialState),
-    composeEnhancers(...enhancers)
+    composeWithDevTools(applyMiddleware(thunk))
   );
 
   // Extensions
-  store.runSaga = sagaMiddleware.run;
+  //store.runSaga = sagaMiddleware.run;
   store.injectedReducers = {}; // Reducer registry
-  store.injectedSagas = {}; // Saga registry
+  //store.injectedSagas = {}; // Saga registry
 
   // Make reducers hot reloadable, see http://mxs.is/googmo
   /* istanbul ignore next */
@@ -53,3 +54,12 @@ export default function configureStore(initialState = {}, history) {
 
   return store;
 }
+
+export function confStore (){
+  const store = createStore(
+    createReducer(),
+    composeWithDevTools(applyMiddleware(thunk))
+  );
+  store.injectedReducers = {};
+  return store;
+}
diff --git a/front/odiparpack/app/redux/modules/crudTableForm.js b/front/odiparpack/app/redux/modules/crudTableForm.js
index 29b9813..acf9abd 100644
--- a/front/odiparpack/app/redux/modules/crudTableForm.js
+++ b/front/odiparpack/app/redux/modules/crudTableForm.js
@@ -31,6 +31,19 @@ const initialItem = (keyTemplate, anchor) => {
 
   return Map(staticKey);
 };
+
+const initialItemNew = (anchor) => {
+  const [...rawKey] = anchor.map((e) => e.name);
+  const staticKey = {};
+  for (let i = 0; i < rawKey.length; i += 1) {
+    if (rawKey[i] !== 'id') {
+      staticKey[rawKey[i]] = anchor[i].initialValue;
+    }
+  }
+
+  return Map(staticKey);
+};
+
 let editingIndex = 0;
 
 const initialImmutableState = fromJS(initialState);
@@ -46,7 +59,7 @@ export default function reducer(state = initialImmutableState, action = {}) {
     case `${branch}/${ADD_NEW}`:
       return state.withMutations((mutableState) => {
         const raw = state.get('dataTable').last();
-        const initial = initialItem(raw, action.anchor);
+        const initial = initialItemNew(action.anchor);
         mutableState.set('formValues', initial);
         mutableState.set('showFrm', true);
       });
diff --git a/front/odiparpack/app/utils/odipar/api.js b/front/odiparpack/app/utils/odipar/api.js
index ea5e617..50c2beb 100644
--- a/front/odiparpack/app/utils/odipar/api.js
+++ b/front/odiparpack/app/utils/odipar/api.js
@@ -1,4 +1,4 @@
-import Axios from 'axios'
+import axios from 'axios'
 import {apiUrl} from './constants';
 import qs from "query-string";
 import { openSuccessMessage, openErrorMessage } from 'ba-actions/message';
@@ -28,8 +28,7 @@ export function saveSession(value) {
 }
 
 export function apiReq(endPoint, data, method, headers, requestOptions = {}) {
-	return new Promise((res, rej) => {
-
+		//console.log("apiReq - ANTES DE PROMESA")
 		headers = {
 			...headers
 		}
@@ -44,18 +43,7 @@ export function apiReq(endPoint, data, method, headers, requestOptions = {}) {
 			}
 		}
 
-		Axios[method](endPoint, data, { headers }).then((result) => {
-			let { data } = result;
-			console.log("aca en la promesa ps")
-			if (data.status === false) {
-				return rej(data);
-			}
-
-			return res(data);
-		}).catch((err) => {
-			return rej(err);
-		});
-	})
+		return axios[method](endPoint, data, { headers })
 }
 
 export function generateUrl(path) {
@@ -87,7 +75,7 @@ export function addMessageCurry(promise, dispatch, errorMsg = '', successMsg = '
 				.then(response => {
 
 					if (successMsg) {
-						console.log("mensajitooooo=?????")
+						console.log("addMessageCurry -SUCCESS MSG")
 						dispatch(
 							openSuccessMessage(successMsg)
 						)
diff --git a/front/odiparpack/package-lock.json b/front/odiparpack/package-lock.json
index ff64c1f..2b4b0e5 100644
--- a/front/odiparpack/package-lock.json
+++ b/front/odiparpack/package-lock.json
@@ -19244,6 +19244,11 @@
       "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz",
       "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng=="
     },
+    "when": {
+      "version": "3.7.8",
+      "resolved": "https://registry.npmjs.org/when/-/when-3.7.8.tgz",
+      "integrity": "sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I="
+    },
     "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
diff --git a/front/odiparpack/package.json b/front/odiparpack/package.json
index 480d0a7..d2cde1e 100644
--- a/front/odiparpack/package.json
+++ b/front/odiparpack/package.json
@@ -182,7 +182,8 @@
     "serve-favicon": "^2.4.5",
     "slick-carousel": "^1.8.1",
     "warning": "4.0.2",
-    "whatwg-fetch": "2.0.4"
+    "whatwg-fetch": "2.0.4",
+    "when": "^3.7.8"
   },
   "devDependencies": {
     "@babel/cli": "7.4.3",
-- 
cgit v1.2.3


From cbc7d7f7494508fda69e88c76702a878bebca0e2 Mon Sep 17 00:00:00 2001
From: gabrhr <73925454+gabrhr@users.noreply.github.com>
Date: Tue, 31 May 2022 03:58:23 -0500
Subject: Add Almacenes

- todo de almacenes, redux, pagina
- mejoro form de pedido (etiqueta estado, RUC)

#TODO
- Ver combobox con API
---
 front/odiparpack/app/actions/actionTypes.js        |   6 +-
 front/odiparpack/app/actions/almacen.js            |  19 +++
 front/odiparpack/app/actions/pedido.js             |   1 -
 front/odiparpack/app/api/almacen.js                |   6 +
 front/odiparpack/app/api/themePalette.js           |  17 ++-
 .../app/components/Forms/ReduxFormMUI.js           |   7 +
 front/odiparpack/app/components/Odipar/common.js   |  11 +-
 .../app/components/Tables/CrudTableForm.js         |   5 +-
 front/odiparpack/app/containers/App/Application.js |   4 +-
 .../app/containers/Odipar/Almacen/Almacenes.js     |  66 +++++++++
 .../containers/Odipar/Almacen/table/CrudAlmacen.js | 148 +++++++++++++++++++++
 .../containers/Odipar/Almacen/table/FormAlmacen.js | 124 +++++++++++++++++
 .../containers/Odipar/Almacen/table/dataAlmacen.js |  75 +++++++++++
 .../app/containers/Odipar/Almacen/table/index.js   |   1 +
 .../app/containers/Odipar/Pedidos/Pedidos.js       |   3 +-
 .../containers/Odipar/Pedidos/table/FormPedido.js  |  30 ++++-
 .../containers/Odipar/Pedidos/table/sampleData.js  |   5 +-
 front/odiparpack/app/containers/pageListAsync.js   |   8 ++
 front/odiparpack/app/redux/modules/almacen.js      |  16 +++
 front/odiparpack/app/redux/reducers.js             |   3 +
 .../odiparpack/app/styles/layout/_typography.scss  |   4 +-
 front/odiparpack/app/utils/odipar/menu.js          |   2 +-
 22 files changed, 539 insertions(+), 22 deletions(-)
 create mode 100644 front/odiparpack/app/actions/almacen.js
 create mode 100644 front/odiparpack/app/api/almacen.js
 create mode 100644 front/odiparpack/app/containers/Odipar/Almacen/Almacenes.js
 create mode 100644 front/odiparpack/app/containers/Odipar/Almacen/table/CrudAlmacen.js
 create mode 100644 front/odiparpack/app/containers/Odipar/Almacen/table/FormAlmacen.js
 create mode 100644 front/odiparpack/app/containers/Odipar/Almacen/table/dataAlmacen.js
 create mode 100644 front/odiparpack/app/containers/Odipar/Almacen/table/index.js
 create mode 100644 front/odiparpack/app/redux/modules/almacen.js

(limited to 'front/odiparpack/app/actions')

diff --git a/front/odiparpack/app/actions/actionTypes.js b/front/odiparpack/app/actions/actionTypes.js
index 5aaa47a..8fd305f 100644
--- a/front/odiparpack/app/actions/actionTypes.js
+++ b/front/odiparpack/app/actions/actionTypes.js
@@ -87,5 +87,7 @@ export const CLOSE_NOTIF = 'CLOSE_NOTIF';
 //Odi Message 
 export const CLOSE_MESSAGE = 'CLOSE_MESSAGE';
 export const OPEN_MESSAGE = 'OPEN_MESSAGE';
-
-export const LISTA_PEDIDO = 'SAVE_PEDIDO';
\ No newline at end of file
+//Odi Pedido
+export const LISTA_PEDIDO = 'LISTA_PEDIDO';
+//Odi Almacen
+export const LISTA_ALMACEN = 'LISTA_ALMACEN';
\ No newline at end of file
diff --git a/front/odiparpack/app/actions/almacen.js b/front/odiparpack/app/actions/almacen.js
new file mode 100644
index 0000000..b5694cd
--- /dev/null
+++ b/front/odiparpack/app/actions/almacen.js
@@ -0,0 +1,19 @@
+import {
+    getAlmacenesAPI
+} from 'ba-api/almacen';
+import * as types from './actionTypes'
+
+export const setAlmacenes = (payload) => ({
+        type: types.LISTA_ALMACEN,
+        payload
+});
+
+export const getAlmacenes = () => async dispatch => {
+    try{
+        const res = await getAlmacenesAPI();
+        dispatch(setAlmacenes({res}))
+        return res;
+    }catch(e){
+        console.log(e)
+    }
+}
\ No newline at end of file
diff --git a/front/odiparpack/app/actions/pedido.js b/front/odiparpack/app/actions/pedido.js
index f8e95d6..8a011f0 100644
--- a/front/odiparpack/app/actions/pedido.js
+++ b/front/odiparpack/app/actions/pedido.js
@@ -1,7 +1,6 @@
 import {
     getPedidosAPI
 } from 'ba-api/pedido';
-import { addMessageCurry } from 'odi-utils/api';
 import * as types from './actionTypes'
 
 export const setPedidos = (payload) => ({
diff --git a/front/odiparpack/app/api/almacen.js b/front/odiparpack/app/api/almacen.js
new file mode 100644
index 0000000..dcc629b
--- /dev/null
+++ b/front/odiparpack/app/api/almacen.js
@@ -0,0 +1,6 @@
+import { apiGet } from 'odi-utils/api';
+
+//GET APIS
+export const getAlmacenesAPI = async () => {
+    return await apiGet(`ayuda/almacen`)
+}
\ No newline at end of file
diff --git a/front/odiparpack/app/api/themePalette.js b/front/odiparpack/app/api/themePalette.js
index c7971b3..eaec9e7 100644
--- a/front/odiparpack/app/api/themePalette.js
+++ b/front/odiparpack/app/api/themePalette.js
@@ -200,7 +200,22 @@ const themePalette = (color) => ({
     secondary: palette[color].palette.secondary,
   },
   typography: {
-    useNextVariants: true,
+    h5: {
+      fontSize: 18,
+      fontWeight: 600,
+      color: "#202A75",
+      margin: "5px 0 10px",
+    },
+    h4: {
+      fontSize: 25,
+      fontWeight: 500,
+      margin: "10px 0 5px",
+    },
+    h6: {
+      fontSize: 17,
+      fontWeight: 420,
+      margin: "0px 0 0px",
+    },
   },
 });
 
diff --git a/front/odiparpack/app/components/Forms/ReduxFormMUI.js b/front/odiparpack/app/components/Forms/ReduxFormMUI.js
index e3f5c33..285543f 100644
--- a/front/odiparpack/app/components/Forms/ReduxFormMUI.js
+++ b/front/odiparpack/app/components/Forms/ReduxFormMUI.js
@@ -6,6 +6,8 @@ import Checkbox from '@material-ui/core/Checkbox';
 import Switch from '@material-ui/core/Switch';
 import { DateTimePicker, MuiPickersUtilsProvider } from '@material-ui/pickers';
 
+import { etiqueta } from '../Odipar/common';
+import { Chip } from '@material-ui/core';
 import MomentUtils from '@date-io/moment';
 import moment from 'moment'
 import 'moment/locale/es'
@@ -88,3 +90,8 @@ export const DatePickerRedux = ({ input, label, readonly}) => (
   />
   </MuiPickersUtilsProvider>
 );
+
+export const EstadoRedux = ({input, label}) => {
+  const value = input.value? input.value : 0
+  return etiqueta("etiq_pedido", value)
+}
diff --git a/front/odiparpack/app/components/Odipar/common.js b/front/odiparpack/app/components/Odipar/common.js
index 39ba76a..b6fb49d 100644
--- a/front/odiparpack/app/components/Odipar/common.js
+++ b/front/odiparpack/app/components/Odipar/common.js
@@ -3,7 +3,7 @@ import { Chip } from "@material-ui/core";
 import { pedido, camion, bloqueo, almacen } from './EtiquetaData'
 import Brightness1Icon from '@material-ui/icons/Brightness1';
 
-const etiquetaStyle = color => ({
+export const etiquetaStyle = color => ({
   fontWeight: 'bold',
   color: '#FFF',
   backgroundColor: color
@@ -27,10 +27,11 @@ export function etiqueta(tipo , estado) { // eslint-disable-line
       color = bloqueo[Object.keys(bloqueo)[estado]].color
       break;
     case 'etiq_alma': 
-      console.log("entre?")
-      text = almacen[Object.keys(almacen)[estado]].text
-      color = almacen[Object.keys(almacen)[estado]].color
-      icon = almacen[Object.keys(almacen)[estado]].icon
+      let {estadoNum} = 2
+      estado === false? estadoNum = 0 : estadoNum = 1
+      text = almacen[Object.keys(almacen)[estadoNum]].text
+      color = almacen[Object.keys(almacen)[estadoNum]].color
+      icon = almacen[Object.keys(almacen)[estadoNum]].icon
       break;
   }
 
diff --git a/front/odiparpack/app/components/Tables/CrudTableForm.js b/front/odiparpack/app/components/Tables/CrudTableForm.js
index 0ba5264..017a3fc 100644
--- a/front/odiparpack/app/components/Tables/CrudTableForm.js
+++ b/front/odiparpack/app/components/Tables/CrudTableForm.js
@@ -5,10 +5,13 @@ import MainTableForm from './tableParts/MainTableForm';
 import FloatingPanel from './../Panel/FloatingPanel';
 
 class CrudTableForm extends React.Component {
+  /* componentDidMount(){
+    this.props.fetchData(this.props.dataInit, this.props.branch);
+  } */
 
   componentDidUpdate(previousProps) {
     if (previousProps.dataInit !== this.props.dataInit) {
-      //console.log("en el FORM",this.props.dataInit)
+      //console.log("en el FORM",this.props.dataInit)}
       this.props.fetchData(this.props.dataInit, this.props.branch);
     }
   }
diff --git a/front/odiparpack/app/containers/App/Application.js b/front/odiparpack/app/containers/App/Application.js
index 21c7a76..8a30720 100644
--- a/front/odiparpack/app/containers/App/Application.js
+++ b/front/odiparpack/app/containers/App/Application.js
@@ -26,7 +26,8 @@ import {
   Photos, Error, Settings,
   HelpSupport, MapMarker, MapDirection, SearchMap,
   TrafficIndicator, StreetViewMap, NotFound, 
-  Pedidos
+  Pedidos,
+  Almacenes
 } from '../pageListAsync';
 
 function Application(props) {
@@ -39,6 +40,7 @@ function Application(props) {
         <Route exact path="/app/dashboard-v2" component={DashboardV2} />
         {/* Pedidos */}
         <Route exact path="/app/pedidos" component={Pedidos}/>
+        <Route exact path="/app/almacenes" component={Almacenes}/>
         { /* Layout */ }
         <Route exact path="/app/layouts" component={Parent} />
         <Route path="/app/layouts/grid" component={Grid} />
diff --git a/front/odiparpack/app/containers/Odipar/Almacen/Almacenes.js b/front/odiparpack/app/containers/Odipar/Almacen/Almacenes.js
new file mode 100644
index 0000000..31a3039
--- /dev/null
+++ b/front/odiparpack/app/containers/Odipar/Almacen/Almacenes.js
@@ -0,0 +1,66 @@
+import React, { Component } from 'react';
+import { withStyles } from '@material-ui/core/styles';
+import PropTypes from 'prop-types';
+import { CrudAlmacen } from './table'
+import { Paper, Typography } from '@material-ui/core';
+import { connect } from 'react-redux';
+
+//actions
+import { getAlmacenes } from '../../../actions/almacen';
+
+const styles = ({
+    root: {
+      flexGrow: 1,
+      marginTop: 30,
+    }
+  });
+
+class Almacenes extends Component {
+  constructor (props) {
+    super(props)
+    this.state = {
+      dataRealF: []
+    };
+    this.props.dispatch(getAlmacenes()).then((res) => {
+      if (res) {
+          this.setState({
+            dataRealF: res.data,
+          });
+      }
+    })
+    //console.log("Pedido - LUEGO DE THEN ", this.state.dataRealF)
+  }
+
+
+    render() {
+      const {dataRealF} = this.state;
+      //console.log ("aNTESZSSSS?")
+      const { classes } = this.props;
+        return (
+          <div>
+            <Typography variant="h4">
+                {`Almacenes`}
+            </Typography>
+            <div>  
+              <Paper className={classes.root}>
+                <CrudAlmacen title = "Lista de Almacenes" dataReal={dataRealF}/>
+              </Paper>
+            </div>
+          </div>
+        );
+    }
+}
+
+Almacenes.propTypes = {
+  classes: PropTypes.object.isRequired,
+};
+
+const mapDispatchToProps = dispatch => ({
+  dispatch
+});
+
+const AlmacenesMapped = connect(
+  mapDispatchToProps
+)(Almacenes);
+
+export default withStyles(styles)(AlmacenesMapped);
\ No newline at end of file
diff --git a/front/odiparpack/app/containers/Odipar/Almacen/table/CrudAlmacen.js b/front/odiparpack/app/containers/Odipar/Almacen/table/CrudAlmacen.js
new file mode 100644
index 0000000..887d603
--- /dev/null
+++ b/front/odiparpack/app/containers/Odipar/Almacen/table/CrudAlmacen.js
@@ -0,0 +1,148 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { withStyles } from '@material-ui/core/styles';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+import {
+  fetchAction,
+  addAction,
+  closeAction,
+  submitAction,
+  removeAction,
+  editAction,
+  closeNotifAction
+} from 'ba-actions/CrudTbFrmActions';
+import { CrudTableForm, Notification } from 'ba-components';
+import {
+  Paper,
+  RadioGroup,
+} from '@material-ui/core';
+import { anchorTable, dataApi } from './dataAlmacen';
+import FormAlmacen from './FormAlmacen';
+//actions
+import { getPedidos } from '../../../../actions/pedido';
+const branch = 'crudAlmacen';
+
+const renderRadioGroup = ({ input, ...rest }) => (
+  <RadioGroup
+    {...input}
+    {...rest}
+    valueselected={input.value}
+    onChange={(event, value) => input.onChange(value)}
+  />
+);
+
+
+const styles = ({
+  root: {
+    flexGrow: 1,
+  }
+});
+
+class CrudAlmacen extends Component {
+  render() {
+    //console.log("render ps")
+    const {
+      classes,
+      fetchData,
+      addNew,
+      closeForm,
+      submit,
+      removeRow,
+      editRow,
+      dataTable,
+      openForm,
+      initValues,
+      closeNotif,
+      messageNotif,
+      title,
+      dataReal,
+      dispatch,
+      editingId
+    } = this.props;
+    
+    //console.log("render ps DATA", dataReal)
+    //console.log("original", dataApi)
+    //console.log("original", anchorTable)
+    
+    return (
+      <div>
+        <Notification close={() => closeNotif(branch)} variant = "success" message={messageNotif} />
+        <Paper className={classes.root}>
+          <CrudTableForm
+            dataTable={dataTable}
+            openForm={openForm}
+            dataInit={dataReal}
+            anchor={anchorTable}
+            title={title}
+            fetchData={fetchData}
+            addNew={addNew}
+            closeForm={closeForm}
+            submit={submit}
+            removeRow={removeRow}
+            editRow={editRow}
+            branch={branch}
+            initValues={initValues}
+            addNewAPI={getPedidos}
+            removeRowAPI={getPedidos}
+            editRowAPI={getPedidos}
+            dispatch = {dispatch}
+            editingId = {editingId}
+          >
+            {/* Create Your own form, then arrange or custom it as You like */}
+            <FormAlmacen/>
+            {/* No need create button or submit, because that already made in this component */}
+          </CrudTableForm>
+        </Paper>
+      </div>
+    );
+  }
+}
+
+renderRadioGroup.propTypes = {
+  input: PropTypes.object.isRequired,
+};
+
+CrudAlmacen.propTypes = {
+  dataTable: PropTypes.object.isRequired,
+  openForm: PropTypes.bool.isRequired,
+  classes: PropTypes.object.isRequired,
+  fetchData: PropTypes.func.isRequired,
+  addNew: PropTypes.func.isRequired,
+  closeForm: PropTypes.func.isRequired,
+  submit: PropTypes.func.isRequired,
+  removeRow: PropTypes.func.isRequired,
+  editRow: PropTypes.func.isRequired,
+  initValues: PropTypes.object.isRequired,
+  closeNotif: PropTypes.func.isRequired,
+  messageNotif: PropTypes.string.isRequired,
+  title: PropTypes.string.isRequired,
+};
+
+
+const mapStateToProps = state => ({
+  force: state, // force state from reducer
+  initValues: state.getIn([branch, 'formValues']),
+  dataTable: state.getIn([branch, 'dataTable']),
+  openForm: state.getIn([branch, 'showFrm']),
+  messageNotif: state.getIn([branch, 'notifMsg']),
+  editingId: state.getIn([branch, 'editingId']),
+});
+
+const mapDispatchToProps = dispatch => ({
+  fetchData: bindActionCreators(fetchAction, dispatch),
+  addNew: bindActionCreators(addAction, dispatch),
+  closeForm: bindActionCreators(closeAction, dispatch),
+  submit: bindActionCreators(submitAction, dispatch),
+  removeRow: bindActionCreators(removeAction, dispatch),
+  editRow: bindActionCreators(editAction, dispatch),
+  closeNotif: bindActionCreators(closeNotifAction, dispatch),
+  dispatch
+});
+
+const CrudAlmacenMapped = connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(CrudAlmacen);
+
+export default withStyles(styles)(CrudAlmacenMapped);
diff --git a/front/odiparpack/app/containers/Odipar/Almacen/table/FormAlmacen.js b/front/odiparpack/app/containers/Odipar/Almacen/table/FormAlmacen.js
new file mode 100644
index 0000000..05cfda7
--- /dev/null
+++ b/front/odiparpack/app/containers/Odipar/Almacen/table/FormAlmacen.js
@@ -0,0 +1,124 @@
+import React, { Component } from 'react';
+import { withStyles } from '@material-ui/core/styles';
+import PropTypes from 'prop-types';
+import { Field } from 'redux-form/immutable';
+import {required, integer} from 'ba-api/validation'
+import {
+    SelectRedux,
+    TextFieldRedux
+} from 'ba-components/Forms/ReduxFormMUI';
+import {
+    MenuItem,
+    InputLabel,
+    FormControl,
+  } from '@material-ui/core';
+
+const styles = ({
+    root: {
+      flexGrow: 1,
+    },
+    field: {
+      width: '100%',
+      marginBottom: 20
+    },
+    fieldBasic: {
+      width: '100%',
+      marginBottom: 20,
+      marginTop: 10
+    },
+    inlineWrap: {
+      display: 'flex',
+      flexDirection: 'row'
+    }
+  });
+  
+
+class FormAlmacen extends Component {
+    saveRef = ref => {
+        this.ref = ref;
+        return this.ref;
+    };
+
+    render() { 
+        const { classes } = this.props;
+        const trueBool = true;
+        return (
+            <>
+                <div>
+                    <FormControl className={classes.field}>
+                    <InputLabel htmlFor="selection">Tipo de Almacen</InputLabel>
+                    <Field
+                    name="esPrincipal"
+                    component={SelectRedux}
+                    placeholder="Seleccionar"
+                    autoWidth={trueBool}
+                    >
+                    <MenuItem value={true}>Principal</MenuItem>
+                    <MenuItem value={false}>Pequeño</MenuItem>
+                    </Field>
+                </FormControl>
+                </div>
+                <div>
+                    <FormControl className={classes.field}>
+                    <InputLabel htmlFor="selection">Region</InputLabel>
+                    <Field
+                    name="region"
+                    component={SelectRedux}
+                    placeholder="Seleccionar"
+                    autoWidth={trueBool}
+                    >
+                    <MenuItem value="Costa">Costa</MenuItem>
+                    <MenuItem value="Sierra">Sierra</MenuItem>
+                    <MenuItem value="Selva">Selva</MenuItem>
+                    </Field>
+                </FormControl>
+                </div>
+                <div>
+                    <FormControl className={classes.field}>
+                    <InputLabel htmlFor="selection">Provincia</InputLabel>
+                    <Field
+                    name="provincia"
+                    component={SelectRedux}
+                    placeholder="Seleccionar"
+                    autoWidth={trueBool}
+                    >
+                    <MenuItem value="Lima">Lima</MenuItem>
+                    <MenuItem value="Arequipa">Arequipa</MenuItem>
+                    <MenuItem value="Cuzco">Cuzco</MenuItem>
+                    </Field>
+                </FormControl>
+                </div>
+                <div>
+                    <Field
+                        name="latitud"
+                        component={TextFieldRedux}
+                        placeholder="Latitud"
+                        label="Latitud de Provincia"
+                        validate={required}
+                        disabled
+                        required
+                        ref={this.saveRef}
+                        className={classes.field}
+                    />
+                    <Field
+                        name="longitud"
+                        component={TextFieldRedux}
+                        placeholder="Longitud"
+                        label="Longitud de Provincia"
+                        validate={required}
+                        disabled
+                        required
+                        ref={this.saveRef}
+                        className={classes.field}
+                    />
+                </div>
+            </>
+        );
+    }
+}
+
+FormAlmacen.propTypes = {
+    classes: PropTypes.object.isRequired,
+  };
+
+export default withStyles(styles)(FormAlmacen);
\ No newline at end of file
diff --git a/front/odiparpack/app/containers/Odipar/Almacen/table/dataAlmacen.js b/front/odiparpack/app/containers/Odipar/Almacen/table/dataAlmacen.js
new file mode 100644
index 0000000..685df27
--- /dev/null
+++ b/front/odiparpack/app/containers/Odipar/Almacen/table/dataAlmacen.js
@@ -0,0 +1,75 @@
+export const anchorTable = [
+  {
+    name: 'id',
+    label: 'Identificador',
+    initialValue: '',
+    hidden: false,
+    type: 'texto'
+  }, {
+    name: 'esPrincipal',
+    label: 'Tipo de Almacen',
+    initialValue: true,
+    width: 'auto',
+    hidden: false,
+    type: 'etiq_alma'
+  }, {
+    name: 'region',
+    label: 'Region',
+    initialValue: 'Costa',
+    width: 'auto',
+    hidden: false,
+    type: 'texto'
+  }, {
+    name: 'provincia',
+    label: 'Provincia',
+    initialValue: 'Lima',
+    width: 'auto',
+    hidden: false,
+    type: 'texto'
+  }, {
+    name: 'latitud',
+    label: 'Latitud',
+    initialValue: 0,
+    width: 'auto',
+    hidden: false,
+    type: 'texto'
+  }, {
+    name: 'longitud',
+    label: 'Longitud',
+    initialValue: 0,
+    width: 'auto',
+    hidden: false,
+    type: 'texto'
+  }, 
+  {
+    name: 'action',
+    label: 'Acciones',
+    initialValue: '',
+    hidden: false
+  },
+];
+
+export const dataApi = [
+  {
+    id: '1',
+    esPrincipal: false,
+    region: 'Costa',
+    provincia: 'Arequipa',
+    latitud: 24,
+    longitud: 50,
+    estado: 0,
+    correo: 'mail@boss.com',
+    dni: '123456'
+  }, {
+    id: '2',
+    esPrincipal: true,
+    region: 'Costa',
+    provincia: 'Lima',
+    latitud: 24,
+    longitud: 50,
+    nombre: 'Juan',
+    estado: 1,
+    correo: 'mail@boss.com',
+    dni: '123456'
+  }
+];
diff --git a/front/odiparpack/app/containers/Odipar/Almacen/table/index.js b/front/odiparpack/app/containers/Odipar/Almacen/table/index.js
new file mode 100644
index 0000000..38d22f6
--- /dev/null
+++ b/front/odiparpack/app/containers/Odipar/Almacen/table/index.js
@@ -0,0 +1 @@
+export CrudAlmacen from "./CrudAlmacen";
\ No newline at end of file
diff --git a/front/odiparpack/app/containers/Odipar/Pedidos/Pedidos.js b/front/odiparpack/app/containers/Odipar/Pedidos/Pedidos.js
index 27adce5..f617458 100644
--- a/front/odiparpack/app/containers/Odipar/Pedidos/Pedidos.js
+++ b/front/odiparpack/app/containers/Odipar/Pedidos/Pedidos.js
@@ -5,9 +5,8 @@ import { CrudPedido } from './table'
 import { Paper, Typography } from '@material-ui/core';
 import { connect } from 'react-redux';
 
-//
+//actions
 import { getPedidos } from 'ba-actions/pedido';
-import pedido from '../../../redux/modules/pedido';
 
 const styles = ({
     root: {
diff --git a/front/odiparpack/app/containers/Odipar/Pedidos/table/FormPedido.js b/front/odiparpack/app/containers/Odipar/Pedidos/table/FormPedido.js
index 40bc801..548f47b 100644
--- a/front/odiparpack/app/containers/Odipar/Pedidos/table/FormPedido.js
+++ b/front/odiparpack/app/containers/Odipar/Pedidos/table/FormPedido.js
@@ -6,12 +6,14 @@ import {required, integer} from 'ba-api/validation'
 import {
     SelectRedux,
     TextFieldRedux,
-    DatePickerRedux
+    DatePickerRedux,
+    EstadoRedux
 } from 'ba-components/Forms/ReduxFormMUI';
 import {
     MenuItem,
     InputLabel,
     FormControl,
+    Typography,
   } from '@material-ui/core';
 
 const styles = ({
@@ -53,6 +55,9 @@ class FormPedido extends Component {
         const trueBool = true;
         return (
             <>
+                <Typography variant="h5">
+                {`Datos de Pedido`}
+                </Typography>
                 <div>
                     <Field
                         name="cantidad"
@@ -76,9 +81,20 @@ class FormPedido extends Component {
                         />
                      </FormControl>
                 </div> 
+                <div> 
+                <InputLabel htmlFor="selection" style={{fontSize:12.5, marginBottom: 5}}>Estado</InputLabel>
+                    <Field
+                        name = "estado"
+                        component={EstadoRedux}
+                    />
+                
+                </div> 
+                <Typography variant="h5" style={{marginTop: 5}}>
+                {`Datos de Entrega`}
+                </Typography>
                 <div>
                     <FormControl className={classes.field}>
-                    <InputLabel htmlFor="selection">Lugar de Origen</InputLabel>
+                    <InputLabel htmlFor="selection">Origen</InputLabel>
                     <Field
                     name="origen"
                     component={SelectRedux}
@@ -113,9 +129,15 @@ class FormPedido extends Component {
                         placeholder="Plazo entrega"
                         label="Plazo de Entrega"
                         ref={this.saveRef}
+                        disabled
                         className={classes.field}
                     />
                 </div>
+
+                <Typography variant="h5">
+                {`Datos de Cliente`}
+                </Typography>
+
                 <div>
                     <Field
                         name="nombre"
@@ -132,8 +154,8 @@ class FormPedido extends Component {
                     <Field
                         name="dni"
                         component={TextFieldRedux}
-                        placeholder="Ingrese el dni"
-                        label="DNI del Cliente"
+                        placeholder="Ingrese el RUC"
+                        label="RUC del Cliente"
                         validate={required}
                         required
                         ref={this.saveRef}
diff --git a/front/odiparpack/app/containers/Odipar/Pedidos/table/sampleData.js b/front/odiparpack/app/containers/Odipar/Pedidos/table/sampleData.js
index 3a7556c..4972669 100644
--- a/front/odiparpack/app/containers/Odipar/Pedidos/table/sampleData.js
+++ b/front/odiparpack/app/containers/Odipar/Pedidos/table/sampleData.js
@@ -1,9 +1,10 @@
 export const anchorTable = [
   {
     name: 'id',
-    label: 'Id',
+    label: 'Identificador',
     initialValue: '',
-    hidden: true,
+    hidden: false,
+    type: 'texto'
   }, {
     name: 'cantidad',
     label: 'Cantidad',
diff --git a/front/odiparpack/app/containers/pageListAsync.js b/front/odiparpack/app/containers/pageListAsync.js
index 102bb97..14381b1 100644
--- a/front/odiparpack/app/containers/pageListAsync.js
+++ b/front/odiparpack/app/containers/pageListAsync.js
@@ -7,6 +7,14 @@ export const Pedidos = Loadable({
   loading: Loading,
 });
 
+// 4. Almacenes
+export const Almacenes = Loadable({
+  loader: () => import('./Odipar/Almacen/Almacenes'),
+  loading: Loading,
+});
+
+
+
 // Dashboard
 export const DashboardV1 = Loadable({
   loader: () => import('./Dashboard/Dashboard'),
diff --git a/front/odiparpack/app/redux/modules/almacen.js b/front/odiparpack/app/redux/modules/almacen.js
new file mode 100644
index 0000000..bb9b7d6
--- /dev/null
+++ b/front/odiparpack/app/redux/modules/almacen.js
@@ -0,0 +1,16 @@
+import { LISTA_ALMACEN } from 'ba-actions/actionTypes';
+
+const initState = {
+    almacenes : []
+}
+
+const almacen = (state = initState, action) => {
+    switch (action.type) {
+        case LISTA_ALMACEN:
+            return { ...state, pedidos: action.payload }
+        default :
+            return state
+    }
+}
+
+export default almacen;
\ No newline at end of file
diff --git a/front/odiparpack/app/redux/reducers.js b/front/odiparpack/app/redux/reducers.js
index e0e2547..0c2e9b8 100644
--- a/front/odiparpack/app/redux/reducers.js
+++ b/front/odiparpack/app/redux/reducers.js
@@ -23,6 +23,7 @@ import initval from './modules/initForm';
 //Odipar
 import pedido from './modules/pedido';
 import message from './modules/message'
+import almacen from './modules/almacen';
 
 /**
  * Branching reducers to use one reducer for many components
@@ -60,7 +61,9 @@ export default function createReducer(injectedReducers) {
     crudTableForm,
     crudTbFrmDemo: branchReducer(crudTableForm, 'crudTbFrmDemo'),
     crudPedido: branchReducer(crudTableForm, 'crudPedido'),
+    crudAlmacen: branchReducer(crudTableForm, 'crudAlmacen'),
     pedido,
+    almacen,
     message,
     language: languageProviderReducer,
     router: connectRouter(history),
diff --git a/front/odiparpack/app/styles/layout/_typography.scss b/front/odiparpack/app/styles/layout/_typography.scss
index 49a10c6..247921b 100644
--- a/front/odiparpack/app/styles/layout/_typography.scss
+++ b/front/odiparpack/app/styles/layout/_typography.scss
@@ -13,14 +13,14 @@ h3,
 h4,
 h6 {
   font-family: $heading-font-family;
-  font-size: modular-scale(1);
+  font-size: modular-scale(0.5);
   line-height: $heading-line-height;
   margin: 0 0 $small-spacing;
 }
 
 h5 {
   font-family: $heading-font-family;
-  font-size: modular-scale(1);
+  font-size: 1;
   line-height: $base-line-height;
   font-weight: 600;
   color: #202A75;
diff --git a/front/odiparpack/app/utils/odipar/menu.js b/front/odiparpack/app/utils/odipar/menu.js
index eca2600..1b280b8 100644
--- a/front/odiparpack/app/utils/odipar/menu.js
+++ b/front/odiparpack/app/utils/odipar/menu.js
@@ -24,7 +24,7 @@ module.exports = [
       key: 'almacenes',
       name: 'Almacenes',
       icon: 'warehouse',
-      link: '/app/tables/crud-table',
+      link: '/app/almacenes',
       child: [ ]
     },
     {
-- 
cgit v1.2.3