Skip to content

Commit

Permalink
add canal to add product in delivery order
Browse files Browse the repository at this point in the history
  • Loading branch information
soker90 committed Jul 13, 2023
1 parent 106d50c commit b8681bd
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 8 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# [3.4.3] - 13/07/2023
- Añadida opción para agregar el canal al añadir un producto en un albarán nuevo

# [3.4.2] - 13/07/2023
- Corregida visualización de los totales en la modal de editar totales de un albarán

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"author": "Eduardo Parra Mazuecos",
"email": "eduparra90@gmail.com",
"licence": "MIT",
"version": "3.4.2",
"version": "3.4.3",
"private": true,
"type": "module",
"scripts": {
Expand Down
5 changes: 3 additions & 2 deletions src/pages/DeliveryOrder/components/DeliveryOrder.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const DeliveryOrder = () => {
addProduct
} = useDeliveryOrder(idDeliveryOrder)

if (!deliveryOrder) return <LoadingScreen />
if (!deliveryOrder) return <LoadingScreen/>

const {
provider,
Expand All @@ -46,6 +46,7 @@ const DeliveryOrder = () => {
invoice={invoice}
deleteDeliveryOrder={deleteDeliveryOrder}
addProduct={addProduct}
hasCanal={deliveryOrder.hasCanal}
/>

{
Expand All @@ -72,7 +73,7 @@ const DeliveryOrder = () => {
/>
</Grid>
<Grid item xs={12} md={8}>
<DeliveryOrderTotals totals={totals} isEditable={!nOrder} updateData={updateData} />
<DeliveryOrderTotals totals={totals} isEditable={!nOrder} updateData={updateData}/>
</Grid>
</Grid>

Expand Down
14 changes: 9 additions & 5 deletions src/pages/DeliveryOrder/components/Header/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,17 @@ const HeaderDeliveryOrder = ({
readOnly,
invoice,
deleteDeliveryOrder,
addProduct
addProduct,
hasCanal
}) => {
const [showAddModal, setShowAddModal] = useState(false)
const [showDeleteModal, setShowDeleteModal] = useState(false)
const _closeAddModal = useCallback(() => setShowAddModal(false), [setShowAddModal])
const _openAddModal = useCallback(() => setShowAddModal(true), [setShowAddModal])
const _closeDeleteModal = useCallback(() => setShowDeleteModal(false), [setShowDeleteModal])
const _openDeleteModal = useCallback(() => setShowDeleteModal(true), [setShowDeleteModal])

console.log(provider, deleteDeliveryOrder)
return (
<>
<Header
Expand All @@ -38,8 +41,8 @@ const HeaderDeliveryOrder = ({
link: `/app/proveedores/${provider}#Albaranes`,
title: 'Albaranes'
}]}
title='Albarán'
description=''
title="Albarán"
description=""
buttons={[{
variant: 'outlined',
onClick: _openDeleteModal,
Expand All @@ -66,7 +69,7 @@ const HeaderDeliveryOrder = ({
/>
<AddProductModal
idProvider={provider} show={showAddModal} close={_closeAddModal}
hasCanal={deleteDeliveryOrder?.hasCanal} addProductToDeliveryOrder={addProduct}
hasCanal={hasCanal} addProductToDeliveryOrder={addProduct}
/>
<DeleteDeliveryOrderModal
show={showDeleteModal} close={_closeDeleteModal}
Expand All @@ -82,7 +85,8 @@ HeaderDeliveryOrder.propTypes = {
readOnly: PropTypes.bool.isRequired,
invoice: PropTypes.string,
deleteDeliveryOrder: PropTypes.func.isRequired,
addProduct: PropTypes.func.isRequired
addProduct: PropTypes.func.isRequired,
hasCanal: PropTypes.bool
}

HeaderDeliveryOrder.displayName = 'Header-DeliveryOrder'
Expand Down

1 comment on commit b8681bd

@vercel
Copy link

@vercel vercel bot commented on b8681bd Jul 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

arroyo-erp-client – ./

arroyo-erp-client-soker90.vercel.app
arroyo-erp-client.vercel.app
arroyo-erp-client-git-master-soker90.vercel.app

Please sign in to comment.