chore: invoice updated (#237)

Author: hmbanan666

apps/web-app/app/components/InvoiceCard.vue

@@ -2,7 +2,7 @@
   <UCard class="group/list">
     <div class="flex flex-col gap-2.5">
       <div class="flex flex-row justify-between">
-        <UIcon name="i-lucide-banknote-arrow-up" class="size-14 text-primary" />
+        <UIcon name="i-lucide-banknote-arrow-up" class="size-10 text-muted/50" />
 
         <UButton
           variant="outline"
@@ -14,6 +14,10 @@
         />
       </div>
 
+      <div class="text-sm/4 text-muted">
+        Создан {{ format(new Date(invoice.createdAt), 'd MMMM в HH:mm', { locale: ru }) }}
+      </div>
+
       <h3 class="text-xl md:text-xl/6 font-semibold">
         {{ new Intl.NumberFormat().format(invoice.total) }} ₽
       </h3>
@@ -22,7 +26,7 @@
         {{ invoice.title }}
       </p>
 
-      <p class="text-sm/4 text-muted">
+      <p v-if="invoice.description" class="text-sm/4 text-muted">
         {{ invoice.description }}
       </p>
 
@@ -36,7 +40,7 @@
 
         <UBadge
           :label="getInfoByStatus(invoice.status)"
-          :color="invoice.status === 'unpaid' ? 'error' : 'success'"
+          :color="invoice.status === 'unpaid' ? 'error' : 'neutral'"
           size="md"
           variant="soft"
         />
@@ -48,6 +52,8 @@
 <script setup lang="ts">
 import type { Invoice } from '@roll-stack/database'
 import { ModalUpdateInvoice } from '#components'
+import { format } from 'date-fns'
+import { ru } from 'date-fns/locale/ru'
 
 defineProps<{
   invoice: Invoice
@@ -59,8 +65,16 @@ function getInfoByType(type: Invoice['type']) {
       return 'Пополнение'
     case 'royalties':
       return 'Роялти'
+    case 'lump_sum_fee':
+      return 'Паушальный взнос'
+    case 'marketing_fee':
+      return 'Маркетинговый сбор'
+    case 'rospatent_fee':
+      return 'Роспатент'
     case 'other':
       return 'Другое'
+    default:
+      return 'Другое'
   }
 }
 
@@ -70,6 +84,8 @@ function getInfoByStatus(status: Invoice['status']) {
       return 'Не оплачен'
     case 'paid':
       return 'Оплачен'
+    default:
+      return 'Неизвестно'
   }
 }
 

apps/web-app/app/components/form/CreateInvoice.vue

@@ -31,11 +31,7 @@
     <UFormField label="Тип" name="type">
       <USelect
         v-model="state.type"
-        :items="[
-          { label: 'Оплата роялти', value: 'royalties' },
-          { label: 'Пополнение', value: 'replenishment' },
-          { label: 'Другое', value: 'other' },
-        ]"
+        :items="getInvoiceTypeForSelect()"
         :placeholder="$t('common.select')"
         size="xl"
         class="w-full"
@@ -72,6 +68,7 @@
 import type { CreatePartnerInvoice } from '#shared/services/partner'
 import type { FormSubmitEvent } from '@nuxt/ui'
 import { createPartnerInvoiceSchema } from '#shared/services/partner'
+import { getInvoiceTypeForSelect } from '#shared/utils/helpers'
 
 const { partnerId } = defineProps<{ partnerId?: string }>()
 const emit = defineEmits(['success', 'submitted'])

apps/web-app/app/components/form/UpdateInvoice.vue

@@ -48,10 +48,7 @@
     <UFormField label="Тип" name="type">
       <USelect
         v-model="state.type"
-        :items="[
-          { label: 'Оплата роялти', value: 'royalties' },
-          { label: 'Пополнение', value: 'replenishment' },
-        ]"
+        :items="getInvoiceTypeForSelect()"
         :placeholder="$t('common.select')"
         size="xl"
         class="w-full"
@@ -88,6 +85,7 @@
 import type { UpdatePartnerInvoice } from '#shared/services/partner'
 import type { FormSubmitEvent } from '@nuxt/ui'
 import { updatePartnerInvoiceSchema } from '#shared/services/partner'
+import { getInvoiceTypeForSelect } from '#shared/utils/helpers'
 
 const { invoiceId } = defineProps<{
   invoiceId: string

apps/web-app/app/pages/partner/[id]/invoice.vue

@@ -4,7 +4,7 @@
       <PartnerBalanceCard :balance="partner?.balance ?? 0" />
 
       <InvoiceCard
-        v-for="invoice in activeInvoices"
+        v-for="invoice in invoices"
         :key="invoice.id"
         :invoice="invoice"
       />
@@ -28,8 +28,7 @@ const { params } = useRoute('partner-id')
 
 const partnerStore = usePartnerStore()
 const partner = computed(() => partnerStore.partners.find((partner) => partner.id === params.id))
-
-const activeInvoices = computed(() => partner.value?.invoices)
+const invoices = computed(() => partner.value?.invoices.toSorted((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()))
 
 const overlay = useOverlay()
 const modalCreateInvoice = overlay.create(ModalCreateInvoice)

apps/web-app/server/services/invoice.ts

@@ -5,16 +5,16 @@ export async function recountPartnerBalance(partnerId: string) {
 
   let balance = 0
   for (const invoice of partnerInvoices) {
-    if (invoice.type === 'replenishment' && invoice.status === 'paid') {
-      balance += invoice.total
-    }
+    if (invoice.type === 'replenishment') {
+      if (invoice.status === 'paid') {
+        balance += invoice.total
+      }
 
-    if (invoice.type === 'royalties') {
-      balance -= invoice.total
-    }
-    if (invoice.type === 'other') {
-      balance -= invoice.total
+      continue
     }
+
+    // All other invoices
+    balance -= invoice.total
   }
 
   await db.partner.update(partnerId, {

apps/web-app/shared/utils/helpers.ts

@@ -1,6 +1,17 @@
 import type { AgreementPatentStatus, User } from '@roll-stack/database'
 import type { Resolution } from '../services/task'
 
+export function getInvoiceTypeForSelect() {
+  return [
+    { label: 'Оплата роялти', value: 'royalties' },
+    { label: 'Паушальный взнос', value: 'lump_sum_fee' },
+    { label: 'Маркетинговый сбор', value: 'marketing_fee' },
+    { label: 'Роспатент', value: 'rospatent_fee' },
+    { label: 'Пополнение', value: 'replenishment' },
+    { label: 'Другое', value: 'other' },
+  ]
+}
+
 export function getResolutionForSelect(): { value: Resolution, label: string, icon: string }[] {
   return [
     { value: 'success', label: 'Успешно выполнена', icon: 'i-lucide-circle-check' },

packages/database/src/types/entities.ts

@@ -97,5 +97,10 @@ export type ActivityScheduleTag = 'permanent'
   | 'optional'
   | 'advertising'
 
-export type InvoiceType = 'replenishment' | 'royalties' | 'other'
+export type InvoiceType = 'replenishment'
+  | 'royalties' // Роялти
+  | 'lump_sum_fee' // Паушальный взнос
+  | 'marketing_fee' // Маркетинговый сбор
+  | 'rospatent_fee' // Роспатент
+  | 'other'
 export type InvoiceStatus = 'paid' | 'unpaid'