Merge branch 'IMP_invoice_liquidation_column'

Som-Energia · May 27, 2024 · c274ce3 · c274ce3
2 parents 90a687a + b50ab96
commit c274ce3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 0 deletions.
diff --git a/frontend/src/i18n/locale-ca.yaml b/frontend/src/i18n/locale-ca.yaml
@@ -275,6 +275,7 @@ INVOICES:
   PAID_STATUS_OPTION_UNPAID_VERBOSE: Impagada
   PAID_STATUS_OPTION_PAID_VERBOSE: Pagada
   PAID_STATUS_OPTION_OPEN_VERBOSE: En procés
+  COMPLEMENTARY_LIQUIDATION: Complementària
 HIJACK:
   HIJACK_DIALOG_TITLE: Suplantant una altra usuària
   USERNAME_LABEL: Usuària a suplantar

diff --git a/frontend/src/i18n/locale-es.yaml b/frontend/src/i18n/locale-es.yaml
@@ -207,6 +207,7 @@ INVOICES:
   PAID_STATUS_OPTION_PAID_VERBOSE: Pagada
   PAID_STATUS_OPTION_OPEN_VERBOSE: En proceso
   PAID_STATUS_OPTION_UNPAID_VERBOSE: Impagada
+  COMPLEMENTARY_LIQUIDATION: Complementaria
 PRODUCTION:
   PRODUCTION_TITLE: Producción
   LABEL_CONTRACT: Contrato

diff --git a/frontend/src/i18n/locale-eu.yaml b/frontend/src/i18n/locale-eu.yaml
@@ -104,6 +104,7 @@ INVOICES:
   PAID_STATUS_OPTION_PAID_VERBOSE: Ordainduta
   COLUMN_INVOICE_NUMBER: Faktura
   COLUMN_CONTRACT: Kontratua
+  COMPLEMENTARY_LIQUIDATION: Osagarria
 PRODUCTION:
   PRODUCTION_TITLE: Ekoizpena
   LEGEND_PRODUCTION: Ekoizpena (kWh)

diff --git a/frontend/src/i18n/locale-gl.yaml b/frontend/src/i18n/locale-gl.yaml
@@ -104,6 +104,7 @@ INVOICES:
   PAID_STATUS_OPTION_OPEN: En proceso
   PAID_STATUS_OPTION_UNPAID: Non
   PAID_STATUS_OPTION_UNPAID_VERBOSE: Impaga
+  COMPLEMENTARY_LIQUIDATION: Complementaria
 PRODUCTION:
   PRODUCTION_TITLE: Produción
   LEGEND_PRODUCTION: Produción (kWh)

diff --git a/frontend/src/pages/InvoicesPage/index.jsx b/frontend/src/pages/InvoicesPage/index.jsx
@@ -100,6 +100,13 @@ function PaymentStatusCell({ paymentStatus }) {
   )
 }
 
+function LiquidationCell({ liquidation }) {
+  const { t } = useTranslation()
+  if (liquidation === 'COMPLEMENTARY')
+    return t('INVOICES.COMPLEMENTARY_LIQUIDATION')
+  return liquidation
+}
+
 PaymentStatusCell.propTypes = {
   paymentStatus: PropTypes.oneOf(['paid', 'open', 'unpaid']).isRequired,
 }
@@ -167,6 +174,7 @@ export default function InvoicesPage() {
       label: t('INVOICES.COLUMN_LIQUIDATION'),
       searchable: true,
       numeric: false,
+      view: (invoice) => <LiquidationCell liquidation={invoice.liquidation} />
     },
     {
       id: 'emission_date',

diff --git a/scripts/representa_manage.py b/scripts/representa_manage.py