diff --git a/.gitignore b/.gitignore index e9d19f7..db0d666 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ *.csv *.xlsx .~lock.* +workdir/ diff --git a/README.md b/README.md index 99e8b06..654c6f2 100644 --- a/README.md +++ b/README.md @@ -157,11 +157,13 @@ The columns of the resulting file are defined as follows: - Income by ownership (MiTi or LoLa): - `Gross Income MiTi`: Gross income from menus [`Gross MiTi (MiTi)`] - `Gross Income LoLa`: Gross income from LoLa items [`Gross MiTi (LoLa)`] + - `Commission LoLa`: Commission for LoLa payments [`LoLa_Commission_MiTi`] + - `Net Income LoLa`: Net Income for selling LoLa items [`Gross Income LoLa` - `Commission LoLa`] - Card related income, gross, commission and net, income from selling LoLa and total credit: - `Gross Card MiTi`: Gross income from menus payed by card [`Gross MiTi (MiTi) Card`] - `Commission MiTi`: Commission on `Gross Card MiTi` [`MiTi_Commission`] - `Net Card MiTi`: Net income from menus payed by card [`Net MiTi (MiTi) Card`] - - `Contribution LoLa`: 20% share on net income from selling lola items + - `Contribution LoLa`: 20% share on net income from selling lola items [0.2 * `Net Income LoLa`] - `Credit MiTi`: Total credit, i.e. [`Net Card MiTi` + `Contribution LoLa` + `Tips Card`, or `Credit MiTi`] ### Accounting Report diff --git a/src/export/export_miti.rs b/src/export/export_miti.rs index 0e6add9..132320b 100644 --- a/src/export/export_miti.rs +++ b/src/export/export_miti.rs @@ -24,6 +24,11 @@ pub fn gather_df_miti(df: &DataFrame) -> PolarsResult { .round(2) .alias("Payment Total"), ) + .with_column( + (col("Gross MiTi (LoLa)").fill_null(0.0) - col("LoLa_Commission_MiTi").fill_null(0.0)) + .round(2) + .alias("Net Income LoLa"), + ) .select([ col("Date"), col("MiTi_Cash").alias("Income Cash"), @@ -37,6 +42,8 @@ pub fn gather_df_miti(df: &DataFrame) -> PolarsResult { col("Payment Total"), col("Gross MiTi (MiTi)").alias("Gross Income MiTi"), col("Gross MiTi (LoLa)").alias("Gross Income LoLa"), + col("LoLa_Commission_MiTi").alias("Commission LoLa"), + col("Net Income LoLa"), col("Gross MiTi (MiTi) Card").alias("Gross Card MiTi"), col("MiTi_Commission").alias("Commission MiTi"), col("Net MiTi (MiTi) Card").alias("Net Card MiTi"), @@ -112,6 +119,8 @@ mod tests { "Payment Total" => &[304.5], "Gross Income MiTi" => &[Some(250.0)], "Gross Income LoLa" => &[Some(53)], + "Commission LoLa" => &[0.44], + "Net Income LoLa" => &[52.56], "Gross Card MiTi" => &[Some(167.0)], "Commission MiTi" => &[2.75], "Net Card MiTi" => &[164.25],