diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json index 4a937161..6e2e672d 100644 --- a/.eslintrc-auto-import.json +++ b/.eslintrc-auto-import.json @@ -317,6 +317,7 @@ "watchTriggerable": true, "watchWithFilter": true, "whenever": true, - "getFileBytes": true + "getFileBytes": true, + "CreateQuoteSchema": true } } diff --git a/auto-imports.d.ts b/auto-imports.d.ts index 52a2d1ce..9c324e4b 100644 --- a/auto-imports.d.ts +++ b/auto-imports.d.ts @@ -10,6 +10,7 @@ declare global { const CreateInvoiceSchema: typeof import('./src/schemas/invoice.schema')['CreateInvoiceSchema'] const CreateOrderSchema: typeof import('./src/schemas/order.schema')['CreateOrderSchema'] const CreateProductSchema: typeof import('./src/schemas/products.schema')['CreateProductSchema'] + const CreateQuoteSchema: typeof import('./src/schemas/quote.schema')['CreateQuoteSchema'] const CreateSupplierSchema: typeof import('./src/schemas/supplier.schema')['CreateSupplierSchema'] const EffectScope: typeof import('vue')['EffectScope'] const asyncComputed: typeof import('@vueuse/core')['asyncComputed'] diff --git a/src-tauri/service/src/query.rs b/src-tauri/service/src/query.rs index a42bcf63..0bda741b 100644 --- a/src-tauri/service/src/query.rs +++ b/src-tauri/service/src/query.rs @@ -927,7 +927,6 @@ impl QueriesService { None => Err(DbErr::RecordNotFound(String::from("no invoice"))), } } - // pub async fn list_inventory(db: &DbConn, args: ListArgs) -> Result { let count = InventoryMouvements::find() diff --git a/src/components/InvoiceCreate.vue b/src/components/InvoiceCreate.vue index 9ee349f8..5c1f9936 100644 --- a/src/components/InvoiceCreate.vue +++ b/src/components/InvoiceCreate.vue @@ -162,9 +162,15 @@ const hideModal = () => { - Paid - Cancelled - Pending + + {{ t("g.status.paid") }} + + + {{ t("g.status.cancelled") }} + + + {{ t("g.status.pending") }} + diff --git a/src/components/InvoiceUpdate.vue b/src/components/InvoiceUpdate.vue index 70be52d3..ece85180 100644 --- a/src/components/InvoiceUpdate.vue +++ b/src/components/InvoiceUpdate.vue @@ -199,9 +199,15 @@ const deleteInvoiceItem = (index: number) => { - Paid - Cancelled - Pending + + {{ t("g.status.paid") }} + + + {{ t("g.status.cancelled") }} + + + {{ t("g.status.pending") }} + diff --git a/src/components/Navigation.vue b/src/components/Navigation.vue index 8d6befb0..694e5510 100644 --- a/src/components/Navigation.vue +++ b/src/components/Navigation.vue @@ -20,10 +20,18 @@ const { t } = useI18n(); class="w-full h-full flex items-center py-3 px-2 bg-white justify-between" >
- - + + - + + + + Delete + + + + Edit + + + + Print + + + + + Create invoice + + + +
+ + + + + + + diff --git a/src/components/SideBar.vue b/src/components/SideBar.vue index d9fdba43..5815ca44 100644 --- a/src/components/SideBar.vue +++ b/src/components/SideBar.vue @@ -46,8 +46,11 @@ const openTranslationModal = () => { @@ -60,12 +63,12 @@ const openTranslationModal = () => { {{ t("g.r.Clients") }} @@ -77,12 +80,12 @@ const openTranslationModal = () => { {{ t("g.r.Suppliers") }} @@ -94,12 +97,12 @@ const openTranslationModal = () => { {{ t("g.r.Products") }} @@ -111,12 +114,12 @@ const openTranslationModal = () => { {{ t("g.r.Orders") }} @@ -128,12 +131,12 @@ const openTranslationModal = () => { {{ t("g.r.Invoices") }} @@ -145,12 +148,12 @@ const openTranslationModal = () => { {{ t("g.r.Inventory") }} @@ -162,12 +165,12 @@ const openTranslationModal = () => { {{ t("g.r.Dashboard") }} @@ -180,12 +183,12 @@ const openTranslationModal = () => { {{ locale.text }} @@ -197,12 +200,12 @@ const openTranslationModal = () => { {{ t("g.r.Settings") }} diff --git a/src/pages/index/clients/index.vue b/src/pages/index/clients/index.vue index da97d3cf..3bd923f7 100644 --- a/src/pages/index/clients/index.vue +++ b/src/pages/index/clients/index.vue @@ -114,8 +114,11 @@ const updateModal = (name: string) => { - diff --git a/src/pages/index/invoices/index.vue b/src/pages/index/invoices/index.vue index 9219258c..5db49eb5 100644 --- a/src/pages/index/invoices/index.vue +++ b/src/pages/index/invoices/index.vue @@ -163,9 +163,15 @@ const updateModal = (name: string) => { - Paid - Cancelled - Pending + + {{ t("g.status.paid") }} + + + {{ t("g.status.cancelled") }} + + + {{ t("g.status.pending") }} + @@ -186,8 +192,11 @@ const updateModal = (name: string) => { - diff --git a/src/pages/index/orders/index.vue b/src/pages/index/orders/index.vue index 4adb97c8..a7bd4d9d 100644 --- a/src/pages/index/orders/index.vue +++ b/src/pages/index/orders/index.vue @@ -163,9 +163,15 @@ const updateModal = (name: string) => { - Delivered - Cancelled - Pending + + {{ t("g.status.delivered") }} + + + {{ t("g.status.cancelled") }} + + + {{ t("g.status.pending") }} + @@ -186,8 +192,11 @@ const updateModal = (name: string) => { - diff --git a/src/pages/index/products.vue b/src/pages/index/products.vue index bb5da837..1c5ed9f5 100644 --- a/src/pages/index/products.vue +++ b/src/pages/index/products.vue @@ -113,8 +113,11 @@ const updateModal = (name: string) => { - diff --git a/src/pages/index/quotes/[id].vue b/src/pages/index/quotes/[id].vue new file mode 100644 index 00000000..9e2e50cf --- /dev/null +++ b/src/pages/index/quotes/[id].vue @@ -0,0 +1,285 @@ + + +