Uecko/Uecko_ERP
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Uecko:b52ca8349636b8c3514492c214dbc041ecca6929
Branches Tags
Uecko:main
..
compare: Uecko:3a0262cbf757f5b224831bebc30d66e4d27f70ec
Branches Tags
Uecko:main

No commits in common. "b52ca8349636b8c3514492c214dbc041ecca6929" and "3a0262cbf757f5b224831bebc30d66e4d27f70ec" have entirely different histories.
b52ca83496 ... 3a0262cbf7

14 changed files with 81 additions and 111 deletions
Show Stats Expand all files Collapse all files

26
modules/catalogs/src/api/infrastructure/payment-methods/express/payment-methods.routes.ts
View File

@ -48,28 +48,20 @@ export const paymentMethodsRouter = (params: StartParams) => {
// ----------------------------------------------
router.get(
"/",
validateRequest(ListPaymentMethodsRequestSchema, "params"),
(req: Request, res: Response, next: NextFunction) => {
router.get("/", validateRequest(ListPaymentMethodsRequestSchema, "query"), (req, res, next) => {
const controller = new ListPaymentMethodsController(deps.useCases.listPaymentMethods());
return controller.execute(req, res, next);
}
);
});
router.post(
"/",
validateRequest(CreatePaymentMethodRequestSchema, "body"),
(req: Request, res: Response, next: NextFunction) => {
router.post("/", validateRequest(CreatePaymentMethodRequestSchema, "body"), (req, res, next) => {
const controller = new CreatePaymentMethodController(deps.useCases.createPaymentMethod());
return controller.execute(req, res, next);
}
);
});
router.get(
"/:payment_method_id",
validateRequest(GetPaymentMethodByIdRequestSchema, "params"),
(req: Request, res: Response, next: NextFunction) => {
(req, res, next) => {
const controller = new GetPaymentMethodByIdController(deps.useCases.getPaymentMethodById());
return controller.execute(req, res, next);
}
@ -78,7 +70,7 @@ export const paymentMethodsRouter = (params: StartParams) => {
router.delete(
"/:payment_method_id",
validateRequest(DeletePaymentMethodByIdRequestSchema, "params"),
(req: Request, res: Response, next: NextFunction) => {
(req, res, next) => {
const controller = new DeletePaymentMethodByIdController(
deps.useCases.deletePaymentMethodById()
);
@ -90,7 +82,7 @@ export const paymentMethodsRouter = (params: StartParams) => {
"/:payment_method_id",
validateRequest(UpdatePaymentMethodByIdParamsRequestSchema, "params"),
validateRequest(UpdatePaymentMethodByIdRequestSchema, "body"),
(req: Request, res: Response, next: NextFunction) => {
(req, res, next) => {
const controller = new UpdatePaymentMethodByIdController(
deps.useCases.updatePaymentMethodById()
);
@ -101,7 +93,7 @@ export const paymentMethodsRouter = (params: StartParams) => {
router.patch(
"/:payment_method_id/disable",
validateRequest(GetPaymentMethodByIdRequestSchema, "params"),
(req: Request, res: Response, next: NextFunction) => {
(req, res, next) => {
const controller = new DisablePaymentMethodByIdController(
deps.useCases.disablePaymentMethodById()
);
@ -112,7 +104,7 @@ export const paymentMethodsRouter = (params: StartParams) => {
router.patch(
"/:payment_method_id/enable",
validateRequest(GetPaymentMethodByIdRequestSchema, "params"),
(req: Request, res: Response, next: NextFunction) => {
(req, res, next) => {
const controller = new EnablePaymentMethodByIdController(
deps.useCases.enablePaymentMethodById()
);

26
modules/catalogs/src/api/infrastructure/payment-terms/express/payment-terms.routes.ts
View File

@ -42,28 +42,20 @@ export const paymentTermsRouter = (params: StartParams) => {
requireCompanyContext()(req as RequestWithAuth, res, next),
]);
router.get(
"/",
validateRequest(ListPaymentTermsRequestSchema, "params"),
(req: Request, res: Response, next: NextFunction) => {
router.get("/", validateRequest(ListPaymentTermsRequestSchema, "query"), (req, res, next) => {
const controller = new ListPaymentTermsController(deps.useCases.listPaymentTerms());
return controller.execute(req, res, next);
}
);
});
router.post(
"/",
validateRequest(CreatePaymentTermRequestSchema, "body"),
(req: Request, res: Response, next: NextFunction) => {
router.post("/", validateRequest(CreatePaymentTermRequestSchema, "body"), (req, res, next) => {
const controller = new CreatePaymentTermController(deps.useCases.createPaymentTerm());
return controller.execute(req, res, next);
}
);
});
router.get(
"/:payment_term_id",
validateRequest(GetPaymentTermByIdRequestSchema, "params"),
(req: Request, res: Response, next: NextFunction) => {
(req, res, next) => {
const controller = new GetPaymentTermByIdController(deps.useCases.getPaymentTermById());
return controller.execute(req, res, next);
}
@ -72,7 +64,7 @@ export const paymentTermsRouter = (params: StartParams) => {
router.delete(
"/:payment_term_id",
validateRequest(DeletePaymentTermByIdRequestSchema, "params"),
(req: Request, res: Response, next: NextFunction) => {
(req, res, next) => {
const controller = new DeletePaymentTermByIdController(deps.useCases.deletePaymentTermById());
return controller.execute(req, res, next);
}
@ -82,7 +74,7 @@ export const paymentTermsRouter = (params: StartParams) => {
"/:payment_term_id",
validateRequest(UpdatePaymentTermByIdParamsRequestSchema, "params"),
validateRequest(UpdatePaymentTermByIdRequestSchema, "body"),
(req: Request, res: Response, next: NextFunction) => {
(req, res, next) => {
const controller = new UpdatePaymentTermByIdController(deps.useCases.updatePaymentTermById());
return controller.execute(req, res, next);
}
@ -91,7 +83,7 @@ export const paymentTermsRouter = (params: StartParams) => {
router.patch(
"/:payment_term_id/disable",
validateRequest(GetPaymentTermByIdRequestSchema, "params"),
(req: Request, res: Response, next: NextFunction) => {
(req, res, next) => {
const controller = new DisablePaymentTermByIdController(
deps.useCases.disablePaymentTermById()
);
@ -102,7 +94,7 @@ export const paymentTermsRouter = (params: StartParams) => {
router.patch(
"/:payment_term_id/enable",
validateRequest(GetPaymentTermByIdRequestSchema, "params"),
(req: Request, res: Response, next: NextFunction) => {
(req, res, next) => {
const controller = new EnablePaymentTermByIdController(deps.useCases.enablePaymentTermById());
return controller.execute(req, res, next);
}

20
modules/catalogs/src/api/infrastructure/tax-definitions/express/tax-definitions.routes.ts
View File

@ -44,8 +44,8 @@ export const taxDefinitionsRouter = (params: StartParams) => {
router.get(
"/",
validateRequest(ListTaxDefinitionsRequestSchema, "params"),
(req: Request, res: Response, next: NextFunction) => {
validateRequest(ListTaxDefinitionsRequestSchema, "query"),
(req, res, next) => {
const controller = new ListTaxDefinitionsController(deps.useCases.listTaxDefinitions());
return controller.execute(req, res, next);
}
@ -54,7 +54,7 @@ export const taxDefinitionsRouter = (params: StartParams) => {
router.post(
"/",
validateRequest(CreateTaxDefinitionRequestSchema, "body"),
(req: Request, res: Response, next: NextFunction) => {
(req, res, next) => {
const controller = new CreateTaxDefinitionController(deps.useCases.createTaxDefinition());
return controller.execute(req, res, next);
}
@ -63,8 +63,10 @@ export const taxDefinitionsRouter = (params: StartParams) => {
router.get(
"/:tax_definition_id",
validateRequest(GetTaxDefinitionByIdRequestSchema, "params"),
(req: Request, res: Response, next: NextFunction) => {
const controller = new GetTaxDefinitionByIdController(deps.useCases.getTaxDefinitionById());
(req, res, next) => {
const controller = new GetTaxDefinitionByIdController(
deps.useCases.getTaxDefinitionById()
);
return controller.execute(req, res, next);
}
);
@ -72,7 +74,7 @@ export const taxDefinitionsRouter = (params: StartParams) => {
router.delete(
"/:tax_definition_id",
validateRequest(DeleteTaxDefinitionByIdRequestSchema, "params"),
(req: Request, res: Response, next: NextFunction) => {
(req, res, next) => {
const controller = new DeleteTaxDefinitionByIdController(
deps.useCases.deleteTaxDefinitionById()
);
@ -84,7 +86,7 @@ export const taxDefinitionsRouter = (params: StartParams) => {
"/:tax_definition_id",
validateRequest(UpdateTaxDefinitionByIdParamsRequestSchema, "params"),
validateRequest(UpdateTaxDefinitionByIdRequestSchema, "body"),
(req: Request, res: Response, next: NextFunction) => {
(req, res, next) => {
const controller = new UpdateTaxDefinitionByIdController(
deps.useCases.updateTaxDefinitionById()
);
@ -95,7 +97,7 @@ export const taxDefinitionsRouter = (params: StartParams) => {
router.patch(
"/:tax_definition_id/disable",
validateRequest(GetTaxDefinitionByIdRequestSchema, "params"),
(req: Request, res: Response, next: NextFunction) => {
(req, res, next) => {
const controller = new DisableTaxDefinitionByIdController(
deps.useCases.disableTaxDefinitionById()
);
@ -106,7 +108,7 @@ export const taxDefinitionsRouter = (params: StartParams) => {
router.patch(
"/:tax_definition_id/enable",
validateRequest(GetTaxDefinitionByIdRequestSchema, "params"),
(req: Request, res: Response, next: NextFunction) => {
(req, res, next) => {
const controller = new EnableTaxDefinitionByIdController(
deps.useCases.enableTaxDefinitionById()
);

39
modules/catalogs/src/api/infrastructure/tax-regimes/express/tax-regimes.routes.ts
View File

@ -42,41 +42,29 @@ export const taxRegimesRouter = (params: StartParams) => {
requireCompanyContext()(req as RequestWithAuth, res, next),
]);
router.get(
"/",
//checkTabContext,
validateRequest(ListTaxRegimesRequestSchema, "params"),
async (req: Request, res: Response, next: NextFunction) => {
router.get("/", validateRequest(ListTaxRegimesRequestSchema, "query"), (req, res, next) => {
const controller = new ListTaxRegimesController(deps.useCases.listTaxRegimes());
return controller.execute(req, res, next);
}
);
});
router.post("/", validateRequest(CreateTaxRegimeRequestSchema, "body"), (req, res, next) => {
const controller = new CreateTaxRegimeController(deps.useCases.createTaxRegime());
return controller.execute(req, res, next);
});
router.get(
"/:tax_regime_id",
//checkTabContext,
validateRequest(GetTaxRegimeByIdRequestSchema, "params"),
async (req: Request, res: Response, next: NextFunction) => {
(req, res, next) => {
const controller = new GetTaxRegimeByIdController(deps.useCases.getTaxRegimeById());
return controller.execute(req, res, next);
}
);
router.post(
"/",
//checkTabContext,
validateRequest(CreateTaxRegimeRequestSchema, "body"),
async (req: Request, res: Response, next: NextFunction) => {
const controller = new CreateTaxRegimeController(deps.useCases.createTaxRegime());
return controller.execute(req, res, next);
}
);
router.delete(
"/:tax_regime_id",
//checkTabContext,
validateRequest(DeleteTaxRegimeByIdRequestSchema, "params"),
async (req: Request, res: Response, next: NextFunction) => {
(req, res, next) => {
const controller = new DeleteTaxRegimeByIdController(deps.useCases.deleteTaxRegimeById());
return controller.execute(req, res, next);
}
@ -84,10 +72,9 @@ export const taxRegimesRouter = (params: StartParams) => {
router.put(
"/:tax_regime_id",
//checkTabContext,
validateRequest(UpdateTaxRegimeByIdParamsRequestSchema, "params"),
validateRequest(UpdateTaxRegimeByIdRequestSchema, "body"),
async (req: Request, res: Response, next: NextFunction) => {
(req, res, next) => {
const controller = new UpdateTaxRegimeByIdController(deps.useCases.updateTaxRegimeById());
return controller.execute(req, res, next);
}
@ -95,9 +82,8 @@ export const taxRegimesRouter = (params: StartParams) => {
router.patch(
"/:tax_regime_id/disable",
//checkTabContext,
validateRequest(GetTaxRegimeByIdRequestSchema, "params"),
async (req: Request, res: Response, next: NextFunction) => {
(req, res, next) => {
const controller = new DisableTaxRegimeByIdController(deps.useCases.disableTaxRegimeById());
return controller.execute(req, res, next);
}
@ -105,9 +91,8 @@ export const taxRegimesRouter = (params: StartParams) => {
router.patch(
"/:tax_regime_id/enable",
//checkTabContext,
validateRequest(GetTaxRegimeByIdRequestSchema, "params"),
async (req: Request, res: Response, next: NextFunction) => {
(req, res, next) => {
const controller = new EnableTaxRegimeByIdController(deps.useCases.enableTaxRegimeById());
return controller.execute(req, res, next);
}

8
modules/catalogs/src/api/infrastructure/tax-regimes/persistence/sequelize/models/sequelize-tax-regime.model.ts
View File

@ -39,10 +39,10 @@ export default (database: Sequelize) => {
code: {
type: DataTypes.STRING(2),
allowNull: false,
unique: false,
unique: true,
},
description: {
type: DataTypes.STRING(500),
type: DataTypes.STRING,
allowNull: false,
},
is_active: {
@ -71,8 +71,8 @@ export default (database: Sequelize) => {
indexes: [
{
name: "idx_tax_regimes_company_id_code",
fields: ["company_id", "code", "deletedAt"],
name: "idx_tax_regimes_code",
fields: ["code", "deleted_at"],
unique: true,
},
],

2
modules/catalogs/src/web/tax-regimes/utils/tax-regime-options.utils.ts
View File

@ -4,7 +4,7 @@ import type { TaxRegimeListRow } from "../shared";
export const getTaxRegimeOptions = (taxRegimes: TaxRegimeListRow[]): SelectFieldItem[] => {
return taxRegimes.map((taxRegime) => ({
value: taxRegime.code,
value: taxRegime.id,
label: taxRegime.description,
}));
};

16
modules/customer-invoices/src/api/application/proformas/services/assemblers/proforma-full-read-model.assembler.ts
View File

@ -4,10 +4,10 @@ import { Maybe, Result } from "@repo/rdx-utils";
import type { Proforma } from "../../../../domain";
import type {
InvocieTaxRegimeFullReadModel,
InvoicePaymentMethodReadModel,
} from "../../../common/models";
import type { ProformaFullReadModel } from "../../models";
ProformaFullReadModel,
ProformaPaymentMethodReadModel,
ProformaTaxRegimeFullReadModel,
} from "../../models";
export interface IProformaFullReadModelAssembler {
assemble(params: {
@ -62,7 +62,7 @@ export class ProformaFullReadModelAssembler implements IProformaFullReadModelAss
companyId: UniqueID;
proforma: Proforma;
transaction?: unknown;
}): Promise<Result<Maybe<InvoicePaymentMethodReadModel>, Error>> {
}): Promise<Result<Maybe<ProformaPaymentMethodReadModel>, Error>> {
if (params.proforma.paymentMethodId.isNone()) {
return Result.ok(Maybe.none());
}
@ -82,7 +82,7 @@ export class ProformaFullReadModelAssembler implements IProformaFullReadModelAss
if (result.data.isNone()) {
return Result.ok(
Maybe.some({
id: paymentMethodId,
id: paymentMethodId.toString(),
name: "",
description: Maybe.none(),
})
@ -93,7 +93,7 @@ export class ProformaFullReadModelAssembler implements IProformaFullReadModelAss
return Result.ok(
Maybe.some({
id: paymentMethod.id,
id: paymentMethod.id.toString(),
name: paymentMethod.name.toString(),
description: paymentMethod.description ?? null,
})
@ -104,7 +104,7 @@ export class ProformaFullReadModelAssembler implements IProformaFullReadModelAss
companyId: UniqueID;
proforma: Proforma;
transaction?: unknown;
}): Promise<Result<Maybe<InvocieTaxRegimeFullReadModel>, Error>> {
}): Promise<Result<Maybe<ProformaTaxRegimeFullReadModel>, Error>> {
if (params.proforma.taxRegimeCode.isNone()) {
return Result.ok(Maybe.none());
}

2
modules/customer-invoices/src/api/application/proformas/services/proforma-updater.ts
View File

@ -77,8 +77,6 @@ export class ProformaUpdater implements IProformaUpdater {
}): Promise<Result<ProformaPatchProps, Error>> {
const { patch, companyId, currentInvoiceDate } = params;
console.log(patch);
if (patch.taxRegimeCode !== undefined) {
const taxRegimeResult = await this.deps.taxResolver.ensureTaxRegimeByCode({
companyId,

21
modules/customer-invoices/src/api/application/proformas/snapshot-builders/full/proforma-full-snapshot-builder.ts
View File

@ -1,5 +1,5 @@
import type { ISnapshotBuilder } from "@erp/core/api";
import { maybeToEmptyString, maybeToNullable } from "@repo/rdx-ddd";
import { maybeToNullable } from "@repo/rdx-ddd";
import type { GetProformaByIdResponseDTO } from "../../../../../common";
import type { ProformaFullReadModel } from "../../models";
@ -21,7 +21,7 @@ export class ProformaFullSnapshotBuilder implements IProformaFullSnapshotBuilder
) {}
toOutput(source: ProformaFullReadModel): ProformaFullSnapshot {
const { proforma, paymentMethod, taxRegime } = source;
const { proforma } = source;
const calculationContext = {
languageCode: proforma.languageCode,
@ -58,16 +58,19 @@ export class ProformaFullSnapshotBuilder implements IProformaFullSnapshotBuilder
linked_invoice_id: maybeToNullable(proforma.linkedInvoiceId, (value) => value.toString()),
payment_method: maybeToNullable(paymentMethod, (paymentMethod) => ({
id: paymentMethod.id.toString(),
name: paymentMethod.name,
description: maybeToEmptyString(paymentMethod.description),
})),
tax_regime: maybeToNullable(taxRegime, (taxRegime) => taxRegime),
/*payment_method: {
id: source.paymentMethod.,
name: value.name,
description: maybeToNullable(value.description, (description) => description),
},
payment_term: null,
tax_regime: {
code: value.code,
description: maybeToNullable(value.description, (description) => description),
},*/
subtotal_amount: allTotals.subtotalAmount.toObjectString(),
items_discount_amount: allTotals.itemsDiscountAmount.toObjectString(),

2
modules/customer-invoices/src/api/infrastructure/common/persistence/sequelize/models/customer-invoice.model.ts
View File

@ -315,7 +315,7 @@ export default (database: Sequelize) => {
},
tax_regime_code: {
type: DataTypes.STRING(2),
type: DataTypes.STRING(),
allowNull: true,
},

1
modules/customer-invoices/src/web/proformas/update/controllers/use-update-proforma-payment-controller.ts
View File

@ -11,7 +11,6 @@ import { useMemo } from "react";
export const useUpdateProformaPaymentController = () => {
const paymentMethodsQuery = usePaymentMethodsListQuery({
criteria: {
pageSize: 999,
filters: [
{
field: "isActive",

1
modules/customer-invoices/src/web/proformas/update/controllers/use-update-proforma-tax-controller.ts
View File

@ -46,7 +46,6 @@ export const useUpdateProformaTaxController = ({ form }: UseUpdateProformaTaxCon
const taxRegimesQuery = useTaxRegimesListQuery({
criteria: {
pageSize: 999,
filters: [
{
field: "isActive",

4
modules/customer-invoices/src/web/proformas/update/ui/editors/proforma-taxes-card.tsx
View File

@ -17,7 +17,7 @@ import {
SelectTrigger,
SelectValue,
} from "@repo/shadcn-ui/components";
import { LandmarkIcon } from "lucide-react";
import { FileText } from "lucide-react";
import { useTranslation } from "../../../../i18n";
@ -29,7 +29,7 @@ export const ProformaTaxesCard = () => {
<CardHeader className="px-6 pb-7 pt-3">
<div className="flex items-start gap-3">
<div className="flex size-12 shrink-0 items-center justify-center rounded-lg bg-primary-50 text-primary-600">
<LandmarkIcon aria-hidden="true" className="size-5" />
<FileText aria-hidden="true" className="size-5" />
</div>
<div className="space-y-1">

4
modules/customer-invoices/src/web/proformas/update/ui/editors/proforma-update-tax-editor.tsx
View File

@ -7,7 +7,7 @@ import {
} from "@repo/rdx-ui/components";
import { PercentageHelper } from "@repo/rdx-utils";
import { Separator } from "@repo/shadcn-ui/components";
import { LandmarkIcon } from "lucide-react";
import { ReceiptTextIcon } from "lucide-react";
import { useTranslation } from "../../../../i18n";
import {
@ -45,7 +45,7 @@ export const ProformaUpdateTaxEditor = ({
"Configuración fiscal de la proforma"
)}
disabled={disabled}
icon={<LandmarkIcon className="size-5" />}
icon={<ReceiptTextIcon className="size-5" />}
title={t("form_groups.proformas.taxes.title", "Impuestos y retenciones")}
>
<FormSectionGrid>