diff --git a/api/db/inventary.go b/api/db/inventary.go index 20ec20bad4cdd2856ca47be27c62125615b25839..34b2abd0cd3373d203ecfb3e9e2117602f1d58b1 100644 --- a/api/db/inventary.go +++ b/api/db/inventary.go @@ -75,6 +75,7 @@ func (d *DB) GetInventary(id int) (inventary Inventary, err error) { func (d *DB) ListInventary() (inventaries []Inventary, err error) { err = d.db.Preload("Products.Product"). Preload(clause.Associations). + Order("date desc"). Find(&inventaries). Error return diff --git a/src/inventary/CreateInventary.js b/src/inventary/CreateInventary.js index bfc15c5aa71fe88dca160735a40c87526e93f29e..f69408fbf89b432ec74f9316578c4b6b848652cb 100644 --- a/src/inventary/CreateInventary.js +++ b/src/inventary/CreateInventary.js @@ -44,8 +44,6 @@ function CreateInventary() { suppliers.map((s) => <option key={s.ID}>{s.name}</option>) ); - // TODO: debug it, it doesn't send correctly - // it doesnt load picks when they change... return ( <Sender url="/api/inventary" body={body} onSuccess={setRedirect}> <Form.Group as={Row}> diff --git a/src/inventary/InventaryList.js b/src/inventary/InventaryList.js index 23b51ecf827ef072898c91681a6cb712beb80839..53a1f64435045d4742c01295f64a5f8a2f92c545 100644 --- a/src/inventary/InventaryList.js +++ b/src/inventary/InventaryList.js @@ -18,6 +18,7 @@ function inventaryOverlay(entry) { return ( <div key={"I" + entry.ID + "-" + p.ID}> + {p.comment && <p>p.comment</p>} {p.product.name + ": " + stock + " " + price} <br /> </div> @@ -43,7 +44,6 @@ function InventaryList() { <td>{printDate(i.date)}</td> <td>{i.member.name}</td> <td>{supplier(i)}</td> - <td>{i.comment}</td> </tr> </LinkContainer> </OverlayTrigger> @@ -58,7 +58,6 @@ function InventaryList() { <th>Fecha</th> <th>Por</th> <th>Proveedor</th> - <th>Comentario</th> </tr> </thead> <tbody>{entries}</tbody>