- {deliveryNote?.number &&
Albarán nº:{deliveryNote.number}
}
+ {deliveryNote?.number &&
Albarán nº: {deliveryNote.number}
}
{deliveryNote?.date &&
}
@@ -75,9 +106,22 @@ export default function DeliveryInfo() {
{deliveryNote?.customer &&
Observaciones:{deliveryNote.observations}
}
-
TOTAL: {total.toFixed(2)} €
+
TOTAL: {total.toFixed(2)} €
+
+ {showConfirmDelete && (
+
+ )}
+ {deliveryNote && (
+
}
+ fileName={`delivery-note-${deliveryNote.number}.pdf`}
+ >
+ {({ loading }) => (loading ? "Generando PDF..." : "Descargar PDF")}
+
+ )}
+
)
diff --git a/staff/jose-canto/project/FactuClient/src/components/view/DeliveryNotePDF.jsx b/staff/jose-canto/project/FactuClient/src/components/view/DeliveryNotePDF.jsx
new file mode 100644
index 000000000..27f8424b9
--- /dev/null
+++ b/staff/jose-canto/project/FactuClient/src/components/view/DeliveryNotePDF.jsx
@@ -0,0 +1,149 @@
+import { Page, Text, View, Document, StyleSheet, Image } from "@react-pdf/renderer"
+
+const styles = StyleSheet.create({
+ page: {
+ padding: 10,
+ backgroundColor: "aliceblue"
+ },
+ section: {
+ margin: 5,
+ padding: 5,
+ flexGrow: 1
+ },
+ headerRow: {
+ flexDirection: "row",
+ justifyContent: "space-between",
+ alignItems: "center",
+ marginBottom: 15
+ },
+ header: {
+ fontSize: 16,
+ textAlign: "center"
+ },
+ date: {
+ fontSize: 12,
+ textAlign: "center"
+ },
+ borderedSection: {
+ border: "1px solid black",
+ padding: 10,
+ marginBottom: 10,
+ flex: 1,
+ textAlign: "center"
+ },
+ companyInfo: {
+ backgroundColor: "#e0f7fa"
+ },
+ customerInfo: {
+ backgroundColor: "#f1f8e9"
+ },
+ infoRow: {
+ flexDirection: "row",
+ justifyContent: "space-between",
+ marginBottom: 5,
+ fontSize: 12
+ },
+ workInfoHeader: {
+ flexDirection: "row",
+ justifyContent: "space-between",
+ marginBottom: 5,
+ fontWeight: "bold",
+ fontSize: 14,
+ backgroundColor: "#d5cabd",
+ padding: 5
+ },
+ workInfo: {
+ flexDirection: "row",
+ justifyContent: "space-between",
+ marginBottom: 5,
+ fontSize: 12
+ },
+ concept: {
+ flex: 3,
+ textAlign: "left"
+ },
+ quantity: {
+ flex: 1,
+ textAlign: "right"
+ },
+ price: {
+ flex: 1,
+ textAlign: "right"
+ },
+ totalAmount: {
+ flex: 1,
+ textAlign: "right"
+ },
+ total: {
+ marginTop: 20,
+ fontSize: 16,
+ textAlign: "right"
+ },
+ logo: {
+ width: 50,
+ height: 50,
+ marginBottom: 15
+ }
+})
+
+const DeliveryNotePDF = ({ deliveryNote, total }) => {
+ const formattedDate = new Date(deliveryNote.date).toLocaleDateString()
+
+ return (
+
+
+
+
+
+
+ Albarán nº: {deliveryNote.number}
+ Fecha: {formattedDate}
+
+
+
+
+ {deliveryNote.company.companyName}
+ {"\n"}
+ {deliveryNote.company.address}
+ {"\n"}
+ {deliveryNote.company.taxId}
+ {"\n"}
+ {deliveryNote.company.email}
+
+
+ Cliente:
+
+ {deliveryNote.customer.companyName}
+ {"\n"}
+ {deliveryNote.customer.address}
+ {"\n"}
+ {deliveryNote.customer.taxId}
+ {"\n"}
+ {deliveryNote.customer.email}
+
+
+
+
+
+ Concepto
+ Cantidad
+ Precio
+ Total
+
+ {deliveryNote.works.map((work) => (
+
+ {work.concept}
+ {work.quantity.toFixed(2)}
+ {work.price.toFixed(2)}
+ {(work.quantity * work.price).toFixed(2)}
+
+ ))}
+
+ TOTAL: {total.toFixed(2)} €
+
+
+
+ )
+}
+
+export default DeliveryNotePDF
diff --git a/staff/jose-canto/project/FactuClient/src/components/view/DeliveryNotesList.css b/staff/jose-canto/project/FactuClient/src/components/view/DeliveryNotesList.css
index e63cdeb47..795e39262 100644
--- a/staff/jose-canto/project/FactuClient/src/components/view/DeliveryNotesList.css
+++ b/staff/jose-canto/project/FactuClient/src/components/view/DeliveryNotesList.css
@@ -6,7 +6,7 @@
}
.DeliveryLink {
- @apply flex items-start;
+ @apply flex items-center;
}
.DeliveryNote {
diff --git a/staff/jose-canto/project/FactuClient/src/logic/deleteDeliveryNote.js b/staff/jose-canto/project/FactuClient/src/logic/deleteDeliveryNote.js
new file mode 100644
index 000000000..9cc704189
--- /dev/null
+++ b/staff/jose-canto/project/FactuClient/src/logic/deleteDeliveryNote.js
@@ -0,0 +1,27 @@
+import errors, { SystemError } from "com/errors.js"
+import validate from "com/validate.js"
+
+const deleteDeliveryNote = (deliveryNoteId) => {
+ validate.id(deliveryNoteId, "deliveryNoteId")
+
+ return fetch(`${import.meta.env.VITE_API_URL}/delivery-notes/${deliveryNoteId}`, {
+ method: "DELETE",
+ headers: {
+ "Content-Type": "application/json",
+ "Authorization": `Bearer ${sessionStorage.token}`
+ }
+ })
+ .catch(() => { throw new SystemError("connection error") })
+ .then(response => {
+ if (response.status === 204) return
+
+ return response.json()
+ .catch(() => { throw new SystemError("connection error") })
+ .then(body => {
+ const { error, message } = body
+ const constructor = errors[error]
+ throw new constructor(message)
+ })
+ })
+}
+export default deleteDeliveryNote
\ No newline at end of file
diff --git a/staff/jose-canto/project/FactuClient/src/logic/index.js b/staff/jose-canto/project/FactuClient/src/logic/index.js
index 601672ca9..d9540eb2b 100644
--- a/staff/jose-canto/project/FactuClient/src/logic/index.js
+++ b/staff/jose-canto/project/FactuClient/src/logic/index.js
@@ -12,6 +12,7 @@ import getProfileUser from "./getProfileUser.js"
import getAllDeliveryNotes from "./getAllDeliveryNotes.js"
import getDeliveryNote from "./getDeliveryNote.js"
+import deleteDeliveryNote from "./deleteDeliveryNote.js"
import createDeliveryNote from "./createDeliveryNote.js"
import createWork from "./createWork.js"
@@ -19,6 +20,7 @@ import createWork from "./createWork.js"
import getAllInvoices from "./getAllInvoices.js"
import getInvoice from "./getInvoice.js"
+
const logic = {
isUserLoggedIn,
loginUser,
@@ -34,6 +36,7 @@ const logic = {
getAllDeliveryNotes,
getDeliveryNote,
+ deleteDeliveryNote,
createDeliveryNote,
createWork,
diff --git a/staff/jose-canto/project/api/handlers/deleteDeliveryNoteHandler.js b/staff/jose-canto/project/api/handlers/deleteDeliveryNoteHandler.js
new file mode 100644
index 000000000..5f64da31a
--- /dev/null
+++ b/staff/jose-canto/project/api/handlers/deleteDeliveryNoteHandler.js
@@ -0,0 +1,31 @@
+import jwt from "../utils/jsonwebtoken-promised.js";
+import { CredentialsError } from "com/errors.js"
+import logic from "../logic/index.js";
+
+const { JWT_SECRET } = process.env
+
+export default ((req, res, next) => {
+
+ try {
+ const token = req.headers.authorization.slice(7)
+
+ jwt.verify(token, JWT_SECRET)
+ .then(payload => {
+ const { sub: userId } = payload
+ const { deliveryNoteId } = req.params
+
+ try {
+ logic.deleteDeliveryNote(userId, deliveryNoteId)
+ .then(() => res.status(204).send())
+ .catch(error => next(error))
+
+ } catch (error) {
+ next(error)
+ }
+ })
+ .catch(error => next(new CredentialsError(error.message)))
+
+ } catch (error) {
+ next(error)
+ }
+})
\ No newline at end of file
diff --git a/staff/jose-canto/project/api/handlers/index.js b/staff/jose-canto/project/api/handlers/index.js
index b537afff1..50e8a9f33 100644
--- a/staff/jose-canto/project/api/handlers/index.js
+++ b/staff/jose-canto/project/api/handlers/index.js
@@ -16,6 +16,7 @@ import createWorkHandler from "./createWorkHandler.js"
import getAllInvoicesHandler from "./getAllInvoicesHandler.js"
import getInvoiceHandler from "./getInvoiceHandler.js"
+import deleteDeliveryNoteHandler from "./deleteDeliveryNoteHandler.js"
export default {
@@ -30,6 +31,7 @@ export default {
getAllDeliveryNotesHandler,
getDeliveryNoteHandler,
+ deleteDeliveryNoteHandler,
createDeliveryNoteHandler,
diff --git a/staff/jose-canto/project/api/logic/deleteDeliveryNote.js b/staff/jose-canto/project/api/logic/deleteDeliveryNote.js
index 5a6b30fdc..23b7bc1df 100644
--- a/staff/jose-canto/project/api/logic/deleteDeliveryNote.js
+++ b/staff/jose-canto/project/api/logic/deleteDeliveryNote.js
@@ -20,11 +20,13 @@ const deleteDeliveryNote = (userId, deliveryNoteId) => {
throw new NotFoundError("Delivery Note not found")
}
+ if (deliveryNote.company.toString() !== userId) {
+ throw new NotFoundError("No puedes borrar una nota de entrega que no es tuya")
+ }
+
return DeliveryNote.deleteOne({ _id: deliveryNoteId })
.catch(error => { throw new SystemError(error.message) })
- .then(() => {
- return deliveryNote
- })
+ .then(() => { })
})
})
}
diff --git a/staff/jose-canto/project/api/logic/deleteDeliveryNote.test.js b/staff/jose-canto/project/api/logic/deleteDeliveryNote.test.js
index a93d1304a..c1da507e7 100644
--- a/staff/jose-canto/project/api/logic/deleteDeliveryNote.test.js
+++ b/staff/jose-canto/project/api/logic/deleteDeliveryNote.test.js
@@ -8,9 +8,9 @@ mongoose.connect(MONGODB_URL)
.then(() => {
try {
- deleteDeliveryNote("66b1237dd5adf0eb620e97bc", "66b8d630e4f3e5906c89d05b")
+ deleteDeliveryNote("66b1237dd5adf0eb620e97bc", "66b8cbece4f3e5906c7f2f69")
.then((deliveryNote) => {
- console.log(`Delivery note ${deliveryNote} deleted`)
+ console.log(`Delivery note deleted`)
})
.catch(error => console.error(error))
diff --git a/staff/jose-canto/project/api/logic/getAllInvoices.js b/staff/jose-canto/project/api/logic/getAllInvoices.js
index 7ee437e1d..4ceca9947 100644
--- a/staff/jose-canto/project/api/logic/getAllInvoices.js
+++ b/staff/jose-canto/project/api/logic/getAllInvoices.js
@@ -9,7 +9,7 @@ const getAllInvoices = (userId) => {
.catch(error => { throw new SystemError(error.message) })
.then(user => {
if (!user) {
- throw new NotFoundError("user not found")
+ throw new NotFoundError("User not found")
}
return Invoice.find({}).populate("company").populate("customer").sort({ date: -1 }).select("-__v").lean()
diff --git a/staff/jose-canto/project/api/logic/getAllInvoices.spec.js b/staff/jose-canto/project/api/logic/getAllInvoices.spec.js
new file mode 100644
index 000000000..1c8aabc10
--- /dev/null
+++ b/staff/jose-canto/project/api/logic/getAllInvoices.spec.js
@@ -0,0 +1,69 @@
+import { mongoose, Types } from "mongoose"
+import bcrypt from "bcryptjs"
+import { expect } from "chai"
+import { User, Invoice } from "../model/index.js"
+import getAllInvoices from "./getAllInvoices.js"
+import { NotFoundError, ContentError } from "com/errors.js"
+
+const { ObjectId } = Types
+const { MONGODB_URL_TEST } = process.env
+
+describe("getAllInvoices", () => {
+ before(() => mongoose.connect(MONGODB_URL_TEST).then(() => User.deleteMany().then(() => Invoice.deleteMany())))
+
+ beforeEach(() => User.deleteMany().then(() => Invoice.deleteMany()))
+
+ it("succeeds on getting all invoices", () =>
+ bcrypt.hash("1234", 10)
+ .then((hash) => User.create({ username: "Jack", email: "jack@email.es", password: hash }))
+ .then((user) => {
+ const { id } = user
+
+ return Invoice.create({ company: id, customer: id, number: "2024/123", date: new Date(), observations: "test", paymentType: "cash" })
+ .then(() => Invoice.create({ company: id, customer: id, number: "2024/124", date: new Date(), observations: "test2", paymentType: "credit card" }))
+ .then(() => getAllInvoices(id))
+ .then((invoices) => {
+ expect(invoices).to.be.an("array")
+ expect(invoices.length).to.equal(2)
+
+ invoices.map(invoice => {
+ expect(invoice.id).to.be.a("string")
+ expect(invoice.company).to.be.an("object")
+ expect(invoice.customer).to.be.an("object")
+ expect(invoice.date).to.be.an.instanceOf(Date)
+ expect(invoice.number).to.be.a("string")
+ expect(invoice.deliveryNotes).to.be.an("array")
+ expect(invoice.observations).to.be.a("string")
+ expect(invoice.paymentType).to.be.a("string")
+ });
+ });
+ })
+ );
+
+ it("fails on existing customer user", () => {
+ let errorThrown
+
+ return getAllInvoices(new ObjectId().toString())
+ .catch((error) => errorThrown = error)
+ .finally(() => {
+ expect(errorThrown).to.be.instanceOf(NotFoundError)
+ expect(errorThrown.message).to.equal("User not found")
+ })
+ })
+
+ it("fails on invalid userId", () => {
+ let errorThrown
+
+ try {
+ getAllInvoices(77777)
+ } catch (error) {
+ errorThrown = error
+
+ } finally {
+ expect(errorThrown).to.be.instanceOf(ContentError)
+ expect(errorThrown.message).to.equal("userId is not valid")
+ }
+ })
+
+ after(() => User.deleteMany().then(() => mongoose.disconnect()))
+})
\ No newline at end of file
diff --git a/staff/jose-canto/project/api/logic/registerCustomer.js b/staff/jose-canto/project/api/logic/registerCustomer.js
index a94fdea5d..f94211a15 100644
--- a/staff/jose-canto/project/api/logic/registerCustomer.js
+++ b/staff/jose-canto/project/api/logic/registerCustomer.js
@@ -1,11 +1,8 @@
import validate from "com/validate.js"
import { User } from "../model/index.js"
-import { DuplicityError, NotFoundError, SystemError } from "com/errors.js"
+import { NotFoundError, SystemError } from "com/errors.js"
import bcrypt from "bcryptjs"
-import mongoose from "mongoose"
-const { ObjectId } = mongoose.Types
-
const registerCustomer = (userId, username, companyName, email, password, taxId, address, phone) => {
validate.id(userId)
validate.username(username)
@@ -23,34 +20,27 @@ const registerCustomer = (userId, username, companyName, email, password, taxId,
throw new NotFoundError('User not found')
}
- return User.findOne({ $or: [{ username }, { email }, { taxId }] })
- .catch((error) => { throw new SystemError(error.message) })
- .then(user => {
- if (user) {
- throw new DuplicityError('User already exists')
+ return bcrypt.hash(password, 10)
+ .catch(error => { throw new SystemError(error.message) })
+ .then(hash => {
+
+ const newCustomer = {
+ username,
+ companyName,
+ email,
+ password: hash,
+ taxId,
+ address,
+ phone,
+ role: "customer",
+ manager: userId
}
- return bcrypt.hash(password, 10)
+ return User.create(newCustomer)
.catch(error => { throw new SystemError(error.message) })
- .then(hash => {
-
- const newCustomer = {
- username,
- companyName,
- email,
- password: hash,
- taxId,
- address,
- phone,
- role: "customer",
- manager: userId
- }
-
- return User.create(newCustomer)
- .catch(error => { throw new SystemError(error.message) })
- .then(() => { })
- })
+ .then(() => { })
})
+
})
}
export default registerCustomer
diff --git a/staff/jose-canto/project/api/logic/registerCustomer.spec.js b/staff/jose-canto/project/api/logic/registerCustomer.spec.js
index 460476ef1..0b429af40 100644
--- a/staff/jose-canto/project/api/logic/registerCustomer.spec.js
+++ b/staff/jose-canto/project/api/logic/registerCustomer.spec.js
@@ -7,12 +7,11 @@ import { expect } from "chai"
import { User } from "../model/index.js"
import registerCustomer from "./registerCustomer.js"
-import { NotFoundError, DuplicityError, ContentError } from "com/errors.js"
+import { NotFoundError, ContentError } from "com/errors.js"
const { ObjectId } = Types
const { MONGODB_URL_TEST } = process.env
-
describe("registerCustomer", () => {
before(() => mongoose.connect(MONGODB_URL_TEST).then(() => User.deleteMany()))
@@ -50,17 +49,6 @@ describe("registerCustomer", () => {
})
})
- it("fails on exist customer user", () =>
-
- bcrypt.hash("1234", 10)
- .then((hash) => User.create({ username: "Jack", email: "jack@email.es", password: hash }))
- .then((user) => registerCustomer(user.id, "Jack", "Pepito Enterprise, Inc.", "jack@email.es", "1234", "B03413111", "Calle falsa 123", "666555443"))
- .catch((error) => {
- expect(error).to.be.instanceOf(DuplicityError)
- expect(error.message).to.equal("User already exists")
- })
- )
-
it("fails on invalid username", () => {
let errorThrown
diff --git a/staff/jose-canto/project/api/model/User.js b/staff/jose-canto/project/api/model/User.js
index 810634436..ce8336970 100644
--- a/staff/jose-canto/project/api/model/User.js
+++ b/staff/jose-canto/project/api/model/User.js
@@ -10,7 +10,6 @@ const user = new Schema({
email: {
type: String,
required: true,
- unique: true
},
password: {
type: String,
diff --git a/staff/jose-canto/project/api/routes.js b/staff/jose-canto/project/api/routes.js
index 6449b1b27..29d8b3375 100644
--- a/staff/jose-canto/project/api/routes.js
+++ b/staff/jose-canto/project/api/routes.js
@@ -17,6 +17,7 @@ router.get("/users/:targetUserId/profile", routes.getProfileUserHandler)
router.get("/delivery-notes", routes.getAllDeliveryNotesHandler)
router.get("/delivery-notes/:deliveryNoteId", routes.getDeliveryNoteHandler)
+router.delete("/delivery-notes/:deliveryNoteId", routes.deleteDeliveryNoteHandler)
router.post("/create/delivery-notes/:customerId", jsonBodyParser, routes.createDeliveryNoteHandler)
router.patch("/create/work/delivery-notes/:deliveryNoteId", jsonBodyParser, routes.createWorkHandler)